diff options
| author | Ralf Corsépius <ralf.corsepius@rtems.org> | 2012-02-17 15:57:33 +0100 |
|---|---|---|
| committer | Ralf Corsépius <ralf.corsepius@rtems.org> | 2012-02-17 15:57:33 +0100 |
| commit | ad6833b080fb29c49b85305f5fa2918268604149 (patch) | |
| tree | 96ce007eb90e31d841287abdf781c3cfdaa80e4a | |
| parent | 305567ce121e9b4633ea7197a39387a91f930e0c (diff) | |
Remove (Moved to git.rtems.org/data/git/rtems-crossrpms.git).4.9
145 files changed, 0 insertions, 64001 deletions
diff --git a/contrib/crossrpms/AUTHORS b/contrib/crossrpms/AUTHORS deleted file mode 100644 index db8ac59dd6..0000000000 --- a/contrib/crossrpms/AUTHORS +++ /dev/null @@ -1,9 +0,0 @@ -Ralf Corsépius <ralf.corsepius@rtems.org> - -Chris Johns <chrisj@rtems.org> - - Testing. - - Bugfixes. - - mingw32. - -Joel Sherrill <joel@oarcorp.com> - - Testing. diff --git a/contrib/crossrpms/COPYING b/contrib/crossrpms/COPYING deleted file mode 100644 index 623b6258a1..0000000000 --- a/contrib/crossrpms/COPYING +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - <signature of Ty Coon>, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/contrib/crossrpms/ChangeLog b/contrib/crossrpms/ChangeLog deleted file mode 100644 index 17541f68f1..0000000000 --- a/contrib/crossrpms/ChangeLog +++ /dev/null @@ -1,128 +0,0 @@ -2007-12-17 Chris Johns <chrisj@rtems.org> - - * rtems4.8/.cvsignore, rtems4.8/arm/.cvsignore, - rtems4.8/avr/.cvsignore, rtems4.8/bfin/.cvsignore, - rtems4.8/h8300/.cvsignore, rtems4.8/i386/.cvsignore, - rtems4.8/m68k/.cvsignore, rtems4.8/mips/.cvsignore, - rtems4.8/mipstx39/.cvsignore, rtems4.8/powerpc/.cvsignore, - rtems4.8/sh/.cvsignore, rtems4.8/sparc/.cvsignore, - rtems4.8/tic4x/.cvsignore: New. - -2006-12-02 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac: New BUG-REPORT address. - -2006-11-19 Ralf Corsépius <ralf.corsepius@rtems.org> - - * autotools/Makefile.am, autotools/autoconf.add: - Upgrade to autoconf-2.61. - -2006-11-15 Ralf Corsépius <ralf.corsepius@rtems.org> - - * patches/gcc-core-4.2-20061114-rtems4.8-20061115.diff: New. - * patches/newlib-1.14.0-bfinrtems-20060810a.diff: Remove (Obsolete). - * patches/gcc-4.1.1-bfinrtems-20060810a.diff: Remove (Obsolete). - * rtems-4.8/bfin/Makefile.am, rtems-4.8/bin/gcc-sources.add: - GCC_REL=4. Upgrade to gcc-core-4.2-20061114-rtems4.8-20061115.diff. - -2006-10-27 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac, Makefile.am: Remove rtems4.7. - * rtems4.7: Remove (Development now in rtems-4-7-branch only). - -2006-10-27 Ralf Corsépius <ralf.corsepius@rtems.org> - - * patches/newlib-1.14.0-rtems4.8-20061027.diff: New. - * patches/newlib-1.14.0-rtems-20061026.diff: Remove (broken). - -2006-10-26 Joel Sherrill <joel@OARcorp.com> - - * patches/newlib-1.14.0-rtems-20061026.diff: New file. - -2006-10-22 Ralf Corsépius <ralf.corsepius@rtems.org> - - * Makefile.am, configure.ac: Add rtems-4.8. - -2006-10-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * configure.ac: Set RTEMS_API to 4.8. - -2006-10-16 Ralf Corsépius <ralf.corsepius@rtems.org> - - * autotools/Makefile.am, autotools/automake.add: Update to - automake-1.10. - -2006-08-23 Ralf Corsépius <ralf.corsepius@rtems.org> - - * rtems4.7/arm/gcc-sources.add, rtems4.7/h8300/gcc-sources.add, - rtems4.7/i386/gcc-sources.add, rtems4.7/m68k/gcc-sources.add, - rtems4.7/mips/gcc-sources.add, rtems4.7/powerpc/gcc-sources.add - rtems4.7/sh/gcc-sources.add, rtems4.7/sparc/gcc-sources.add - rtems4.7/tic4x/gcc-sources.add: Add gcc-4.0.3. - -2006-08-23 Ralf Corsépius <ralf.corsepius@rtems.org> - - * gcc/build.add: Revert --disable-libssp etc. hacks. - -2006-08-22 Chris Johns <chrisj@rtems.org> - - * rtems4.7/avr/gcc-sources.add: Add the 4.0.3 patch. - * patches/gcc-core-4.0.3-rtems-20060822.diff: - The .exe for the versioned execuable for MinGW. - -2006-08-21 Joel Sherrill <joel@OARcorp.com> - - * rtems4.7/h8300/binutils-sources.add, - rtems4.7/m68k/binutils-sources.add: Add h8300 _tinydata patch and - bump patch for targets needing it. - * patches/binutils-2.17-rtems-20060815.diff: New file. - -2006-08-11 Joel Sherrill <joel@oarcorp.com> - - * configure.ac, gcc/build.add, gcc/target-gcc.add: Add bfin target - prior to merge. Add ability to disable libssp and libstdcxx-pch which - apparently are required to build the Blackfin port. - * patches/binutils-2.17-rtems-bfin-20060810.diff, - patches/gcc-4.1.1-bfinrtems-20060810a.diff, - patches/gdb-6.5-bfinrtems-20060810a.diff, - patches/newlib-1.14.0-bfinrtems-20060810a.diff, - rtems4.7/bfin/.cvsignore, rtems4.7/bfin/Makefile.am, - rtems4.7/bfin/binutils-sources.add, rtems4.7/bfin/gcc-sources.add, - rtems4.7/bfin/gdb-sources.add: New files. - -2006-08-09 Joel Sherrill <joel@OARcorp.com> - - * .cvsignore: Add INSTALL. - -2006-07-19 Chris Johns <chrisj@rtems.org> - - * patches/gcc-core-4.1.1-rtems-20060720.diff: - Added patch to fix GCC bug PR28400. - -2006-07-13 Joel Sherrill <joel@oarcorp.com> - - * configure.ac, rtems4.7/Makefile.am, rtems4.7/arm/Makefile.am, - rtems4.7/arm/gdb-sources.add, rtems4.7/avr/Makefile.am, - rtems4.7/avr/gdb-sources.add, rtems4.7/h8300/Makefile.am, - rtems4.7/h8300/gdb-sources.add, rtems4.7/i386/Makefile.am, - rtems4.7/i386/gdb-sources.add, rtems4.7/m68k/Makefile.am, - rtems4.7/m68k/gdb-sources.add, rtems4.7/mips/Makefile.am, - rtems4.7/mips/gdb-sources.add, rtems4.7/powerpc/Makefile.am, - rtems4.7/powerpc/gdb-sources.add, rtems4.7/sh/Makefile.am, - rtems4.7/sh/gdb-sources.add, rtems4.7/sparc/Makefile.am, - rtems4.7/sparc/gdb-sources.add, rtems4.7/tic4x/gdb-sources.add: - Updated to gdb 6.5 - * patches/gdb-6.5-rtems-20060713.diff, rtems4.7/mipstx39/.cvsignore, - rtems4.7/mipstx39/Makefile.am, rtems4.7/mipstx39/gdb-sources.add: New files. - -2006-07-12 Joel Sherrill <joel@oarcorp.com> - - * rtems4.7/arm/gdb-sources.add, rtems4.7/avr/gdb-sources.add, - rtems4.7/h8300/gdb-sources.add, rtems4.7/i386/gdb-sources.add, - rtems4.7/m68k/gdb-sources.add, rtems4.7/mips/gdb-sources.add, - rtems4.7/powerpc/gdb-sources.add, rtems4.7/sh/gdb-sources.add, - rtems4.7/sparc/gdb-sources.add, rtems4.7/tic4x/gdb-sources.add: - Update gdb to use newer patch. This lets sparc build simulator and - mips build at all. - * patches/gdb-6.4-rtems-20060712.diff: New file. - diff --git a/contrib/crossrpms/Makefile.am b/contrib/crossrpms/Makefile.am deleted file mode 100644 index f35d5fe506..0000000000 --- a/contrib/crossrpms/Makefile.am +++ /dev/null @@ -1,22 +0,0 @@ -## -## $Id$ -## - -EXTRA_DIST = - -SUBDIRS = @HOST_SUBDIRS@ @TARGET_SUBDIRS@ - -DIST_SUBDIRS = -DIST_SUBDIRS += rtems4.9 - -DIST_SUBDIRS += autotools - -EXTRA_DIST += specstrip -EXTRA_DIST += $(srcdir)/patches/*.diff - -install-patches: - @rpmsourcedir=`rpm --eval '%_sourcedir'`; \ - for f in $(srcdir)/patches/*.diff; do \ - echo "$(INSTALL_DATA) $$f $$rpmsourcedir"; \ - $(INSTALL_DATA) $$f $$rpmsourcedir; \ - done diff --git a/contrib/crossrpms/NEWS b/contrib/crossrpms/NEWS deleted file mode 100644 index 4ddc981651..0000000000 --- a/contrib/crossrpms/NEWS +++ /dev/null @@ -1,19 +0,0 @@ -2006-07-24 Add provisory/preliminary autotools support. - -2006-07-23 Rename "*-base-*" packages into <tool>-common. - Rename GCC's "*-<lang>" packages into "*-gcc-<lang>". - Many small directory ownership fixes. - Build all GCC packages with --enable-threads. - -2006-07-10 Completely reworked and restructurized. - -2006-03-10 Add preliminary rtems-gdb specs. - (Immature, incomplete, needs further testing). - -2006-03-09 Add fortran and objc to GCC's default languages for freebsd5.2, - freebsd6.0 and solaris. - -2006-03-02 Pass --enable-sysroot to non-rtems binutils (Required by - GCC-4.1 sys-root'ed toolchains). - -2006-02-25 Put this package under the GPL. diff --git a/contrib/crossrpms/README b/contrib/crossrpms/README deleted file mode 100644 index 3235b73ec2..0000000000 --- a/contrib/crossrpms/README +++ /dev/null @@ -1,18 +0,0 @@ - - Copyright (C) 2006 Ralf Corsépius, Ulm, Germany <ralf.corsepius@rtems.org> - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - diff --git a/contrib/crossrpms/TODO b/contrib/crossrpms/TODO deleted file mode 100644 index d2748bd884..0000000000 --- a/contrib/crossrpms/TODO +++ /dev/null @@ -1,22 +0,0 @@ -* Improve autotools support: -- Problem: The autotools packages conflict with OS provided packages - for --prefix=/usr. - -* Improve info files treatment: -- Problem: Infos are not target canonicalized. Therefore, installing them to - /usr or /usr/local is likely to conflict with vendor provided infos rsp. - locally installed packages. Additionally, installing to /usr/local is - completely out of our control. -- Current approach: Install infos/provide base packages only for - $prefix ==/opt/rtems* or if user is forcing them with --enable-infos -- Consider to canonicalize the infos (How?). Probably better be done by - upstream. - -* Ada: -- Consider to remove it (Lack of multilibs renders it unusable for rtems - toolchains). -- Consider to add support for non-multilib'ed toolchains. - -* gcc/build.add: Use --languages=fortran instead of f95 for gcc >= 4.1 - (--languages=f95 is deprecated in gcc >= 4.1) - diff --git a/contrib/crossrpms/acinclude.m4 b/contrib/crossrpms/acinclude.m4 deleted file mode 100644 index 28ad8d504a..0000000000 --- a/contrib/crossrpms/acinclude.m4 +++ /dev/null @@ -1,20 +0,0 @@ -# RTEMS_CANONICAL_SPLIT(THING) -# -------------------------- -# Generate the variables THING, THING_{alias cpu vendor os}. -m4_define([RTEMS_CANONICAL_SPLIT], -[case $ac_cv_$1 in -*-*-*) ;; -*) AC_MSG_ERROR([invalid value of canonical $1]);; -esac -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_$1 -shift -$1_cpu=$[1] -$1_vendor=$[2] -shift; shift -[# Remember, the first character of IFS is used to create $]*, -# except with old shells: -$1_os=$[*] -IFS=$ac_save_IFS -case $$1_os in *\ *) $1_os=`echo "$$1_os" | sed 's/ /-/g'`;; esac -])# RTEMS_CANONICAL_SPLIT diff --git a/contrib/crossrpms/autotools/Makefile.am b/contrib/crossrpms/autotools/Makefile.am deleted file mode 100644 index 7151e9695e..0000000000 --- a/contrib/crossrpms/autotools/Makefile.am +++ /dev/null @@ -1,13 +0,0 @@ -## -## $Id$ -## - -include $(top_srcdir)/mkspec.am - -AUTOCONF_VERS = 2.62 -AUTOCONF_RPMREL = 4 -include ./autoconf.am - -AUTOMAKE_VERS = 1.10.3 -AUTOMAKE_RPMREL = 1 -include ./automake.am diff --git a/contrib/crossrpms/autotools/autoconf-sources.add b/contrib/crossrpms/autotools/autoconf-sources.add deleted file mode 100644 index c30fa414e6..0000000000 --- a/contrib/crossrpms/autotools/autoconf-sources.add +++ /dev/null @@ -1,2 +0,0 @@ -Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2 - diff --git a/contrib/crossrpms/autotools/autoconf.add b/contrib/crossrpms/autotools/autoconf.add deleted file mode 100644 index 2435548d9d..0000000000 --- a/contrib/crossrpms/autotools/autoconf.add +++ /dev/null @@ -1,88 +0,0 @@ -%define srcvers @AUTOCONF_VERS@ -%define rpmvers %{expand:%(echo "@AUTOCONF_VERS@" | tr - _ )} - -%if "%{_prefix}" != "/usr" -%define name @rpmprefix@autoconf -%else -%define name autoconf -%endif - - -Name: %{name} -License: GPL -URL: http://www.gnu.org/software/autoconf -Group: Development/Tools -Version: %{rpmvers} -Release: @AUTOCONF_RPMREL@ -Summary: Tool for automatically generating GNU style Makefile.in's - -%if "%{_prefix}" != "/usr" -Obsoletes: @rpmprefix@autoconf-rtems < %{version}-%{release} -Provides: @rpmprefix@autoconf-rtems = %{version}-%{release} -%endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: perl m4 gawk emacs -%if "%{version}" >= "2.62" -BuildRequires: m4 >= 1.4.5 -%endif -Requires: m4 gawk -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -@SOURCES@ - -%description -GNU's Autoconf is a tool for configuring source code and Makefiles. -Using Autoconf, programmers can create portable and configurable -packages, since the person building the package is allowed to -specify various configuration options. -You should install Autoconf if you are developing software and you'd -like to use it to create shell scripts which will configure your -source code packages. -Note that the Autoconf package is not required for the end user who -may be configuring software with an Autoconf-generated script; -Autoconf is only required for the generation of the scripts, not -their use. - -%prep -%setup -q -n autoconf-%{srcvers} -%{?PATCH0:%patch0 -p1} - -# Work around rpm inserting bogus perl-module deps -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/^perl(Autom4te/d' -EOF -%define __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov -chmod +x %{__perl_provides} - -cat << \EOF > %{name}-requ -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/^perl(Autom4te/d' -EOF -%define __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ -chmod +x %{__perl_requires} - -%build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ - --bindir=%{_bindir} --datadir=%{_datadir} -make - -%install -rm -rf "${RPM_BUILD_ROOT}" -make DESTDIR=${RPM_BUILD_ROOT} install - -# Create this directory to prevent the corresponding line -# in %%files below to fail -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp - -# RTEMS's standards.info comes from binutils -rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* - -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -touch $RPM_BUILD_ROOT%{_infodir}/dir - diff --git a/contrib/crossrpms/autotools/autoconf.am b/contrib/crossrpms/autotools/autoconf.am deleted file mode 100644 index 8e0d714f54..0000000000 --- a/contrib/crossrpms/autotools/autoconf.am +++ /dev/null @@ -1,21 +0,0 @@ -AUTOCONF_SUBPACKAGES = $(top_srcdir)/common/common.add -AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/autoconf.add -AUTOCONF_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add -AUTOCONF_SUBPACKAGES += $(top_srcdir)/common/clean.add -AUTOCONF_SUBPACKAGES += $(top_srcdir)/autotools/target-autoconf.add - -autoconf.spec.in: $(AUTOCONF_SUBPACKAGES) Makefile.in $(srcdir)/autoconf-sources.add - cat $(AUTOCONF_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r $(srcdir)/autoconf-sources.add" \ - -e "/[@]SOURCES[@]/d" \ - -e "s/[@]AUTOCONF_VERS[@]/$(AUTOCONF_VERS)/" \ - -e "s/[@]AUTOCONF_RPMREL[@]/$(AUTOCONF_RPMREL)%{?dist}/" > $@ -CLEANFILES += autoconf.spec.in - - -@rpmprefix@autoconf.spec: autoconf.spec.in - $(MKSPEC) autoconf.spec.in | $(SPECSTRIP) > $@ -CLEANFILES += @rpmprefix@autoconf.spec -noinst_DATA += @rpmprefix@autoconf.spec - -EXTRA_DIST += $(AUTOCONF_SUBPACKAGES) diff --git a/contrib/crossrpms/autotools/automake-sources.add b/contrib/crossrpms/autotools/automake-sources.add deleted file mode 100644 index 6172f7076b..0000000000 --- a/contrib/crossrpms/autotools/automake-sources.add +++ /dev/null @@ -1,2 +0,0 @@ -Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2 - diff --git a/contrib/crossrpms/autotools/automake.add b/contrib/crossrpms/autotools/automake.add deleted file mode 100644 index d518aa3364..0000000000 --- a/contrib/crossrpms/autotools/automake.add +++ /dev/null @@ -1,100 +0,0 @@ -%define rpmvers @AUTOMAKE_VERS@ -%define srcvers @AUTOMAKE_VERS@ -%define amvers 1.10 - -%if "%{_prefix}" != "/usr" -%define name @rpmprefix@automake -%define requirements @rpmprefix@autoconf >= 2.60 -%else -%define name automake -%define requirements autoconf >= 2.60 -%endif - -Name: %{name} -URL: http://sources.redhat.com/automake -License: GPL -Group: Development/Tools -Version: %{rpmvers} -Release: @AUTOMAKE_RPMREL@ -Summary: Tool for automatically generating GNU style Makefile.in's - -%if "%{_prefix}" != "/usr" -Obsoletes: @rpmprefix@automake-rtems < %{version}-%{release} -Provides: @rpmprefix@automake-rtems = %{version}-%{release} -%endif - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: %{requirements} perl -%if "%{version}" < "1.11" -# automake >= 1.11 ships man-pages -BuildRequires: help2man -%endif -Requires: %{requirements} -Requires(post): /sbin/install-info -Requires(preun):/sbin/install-info - -@SOURCES@ - -%description -Automake is a tool for automatically generating "Makefile.in"s from -files called "Makefile.am". "Makefile.am" is basically a series of -"make" macro definitions (with rules being thrown in occasionally). -The generated "Makefile.in"s are compatible to the GNU Makefile -standards. - -%prep -%setup -q -n automake-%{srcvers} -%{?PATCH0:%patch0 -p1} - -# Work around rpm inserting bogus perl-module deps -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/^perl(Automake/d' -EOF -%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov -chmod +x %{__perl_provides} - -cat << \EOF > %{name}-requ -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/^perl(Automake/d' -EOF -%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ -chmod +x %{__perl_requires} - - -%build -PATH=%{_bindir}:$PATH -# Don't use %%configure, it replaces config.sub/config.guess with the -# outdated versions bundled with rpm. -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ - --bindir=%{_bindir} --datadir=%{_datadir} \ - --docdir=%{_datadir}/automake-%{amvers}/doc -make - -%install -rm -rf "$RPM_BUILD_ROOT" -make DESTDIR=${RPM_BUILD_ROOT} install - -%if "%{version}" < "1.11" -# automake >= 1.11 ships man-pages -install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1 -for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \ - $RPM_BUILD_ROOT%{_bindir}/automake ; -do - perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \ - help2man $i > `basename $i`.1 - install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1 -done -%endif - -%if "%{_prefix}" != "/usr" -mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal -echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist -%endif - -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -touch $RPM_BUILD_ROOT%{_infodir}/dir - diff --git a/contrib/crossrpms/autotools/automake.am b/contrib/crossrpms/autotools/automake.am deleted file mode 100644 index 87c0567549..0000000000 --- a/contrib/crossrpms/autotools/automake.am +++ /dev/null @@ -1,21 +0,0 @@ -AUTOMAKE_SUBPACKAGES = $(top_srcdir)/common/common.add -AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/automake.add -AUTOMAKE_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add -AUTOMAKE_SUBPACKAGES += $(top_srcdir)/common/clean.add -AUTOMAKE_SUBPACKAGES += $(top_srcdir)/autotools/target-automake.add - -automake.spec.in: $(AUTOMAKE_SUBPACKAGES) Makefile.am $(srcdir)/automake-sources.add - cat $(AUTOMAKE_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r $(srcdir)/automake-sources.add" \ - -e "/[@]SOURCES[@]/d" \ - -e "s/[@]AUTOMAKE_VERS[@]/$(AUTOMAKE_VERS)/g" \ - -e "s/[@]AUTOMAKE_RPMREL[@]/$(AUTOMAKE_RPMREL)%{?dist}/g" > $@ -CLEANFILES += automake.spec.in - - -@rpmprefix@automake.spec: automake.spec.in - $(MKSPEC) automake.spec.in | $(SPECSTRIP) > $@ -CLEANFILES += @rpmprefix@automake.spec -noinst_DATA += @rpmprefix@automake.spec - -EXTRA_DIST += $(AUTOMAKE_SUBPACKAGES) diff --git a/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec b/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec deleted file mode 100644 index 80c0480dc8..0000000000 --- a/contrib/crossrpms/autotools/rtems-4.9-autoconf.spec +++ /dev/null @@ -1,184 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define srcvers 2.62 -%define rpmvers %{expand:%(echo "2.62" | tr - _ )} - -%define name rtems-4.9-autoconf - - -Name: %{name} -License: GPL -URL: http://www.gnu.org/software/autoconf -Group: Development/Tools -Version: %{rpmvers} -Release: 4%{?dist} -Summary: Tool for automatically generating GNU style Makefile.in's - -Obsoletes: rtems-4.9-autoconf-rtems < %{version}-%{release} -Provides: rtems-4.9-autoconf-rtems = %{version}-%{release} - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: perl m4 gawk emacs -%if "%{version}" >= "2.62" -BuildRequires: m4 >= 1.4.5 -%endif -Requires: m4 gawk -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -Source0: ftp://ftp.gnu.org/gnu/autoconf/autoconf-%{srcvers}.tar.bz2 - - -%description -GNU's Autoconf is a tool for configuring source code and Makefiles. -Using Autoconf, programmers can create portable and configurable -packages, since the person building the package is allowed to -specify various configuration options. -You should install Autoconf if you are developing software and you'd -like to use it to create shell scripts which will configure your -source code packages. -Note that the Autoconf package is not required for the end user who -may be configuring software with an Autoconf-generated script; -Autoconf is only required for the generation of the scripts, not -their use. - -%prep -%setup -q -n autoconf-%{srcvers} -%{?PATCH0:%patch0 -p1} - -# Work around rpm inserting bogus perl-module deps -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/^perl(Autom4te/d' -EOF -%define __perl_provides %{_builddir}/autoconf-%{srcvers}/%{name}-prov -chmod +x %{__perl_provides} - -cat << \EOF > %{name}-requ -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/^perl(Autom4te/d' -EOF -%define __perl_requires %{_builddir}/autoconf-%{srcvers}/%{name}-requ -chmod +x %{__perl_requires} - -%build -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ - --bindir=%{_bindir} --datadir=%{_datadir} -make - -%install -rm -rf "${RPM_BUILD_ROOT}" -make DESTDIR=${RPM_BUILD_ROOT} install - -# Create this directory to prevent the corresponding line -# in %%files below to fail -mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/emacs/site-lisp - -# RTEMS's standards.info comes from binutils -rm -f $RPM_BUILD_ROOT%{_infodir}/standards.info* - -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -touch $RPM_BUILD_ROOT%{_infodir}/dir - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -%post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||: - -%preun -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||: -fi - -%files -%defattr(-,root,root) -# %doc AUTHORS COPYING ChangeLog NEWS README THANKS -%dir %{_bindir} -%{_bindir}/* -%dir %{_infodir} -%ghost %{_infodir}/dir - -%{_infodir}/autoconf.info* -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/* -%dir %{_datadir} -%{_datadir}/autoconf -%exclude %{_datadir}/emacs/site-lisp diff --git a/contrib/crossrpms/autotools/rtems-4.9-automake.spec b/contrib/crossrpms/autotools/rtems-4.9-automake.spec deleted file mode 100644 index baa347bcaf..0000000000 --- a/contrib/crossrpms/autotools/rtems-4.9-automake.spec +++ /dev/null @@ -1,195 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define rpmvers 1.10.3 -%define srcvers 1.10.3 -%define amvers 1.10 - -%define name rtems-4.9-automake -%define requirements rtems-4.9-autoconf >= 2.60 - -Name: %{name} -URL: http://sources.redhat.com/automake -License: GPL -Group: Development/Tools -Version: %{rpmvers} -Release: 1%{?dist} -Summary: Tool for automatically generating GNU style Makefile.in's - -Obsoletes: rtems-4.9-automake-rtems < %{version}-%{release} -Provides: rtems-4.9-automake-rtems = %{version}-%{release} - -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildArch: noarch -BuildRequires: %{requirements} perl -%if "%{version}" < "1.11" -# automake >= 1.11 ships man-pages -BuildRequires: help2man -%endif -Requires: %{requirements} -Requires(post): /sbin/install-info -Requires(preun):/sbin/install-info - -Source0: ftp://ftp.gnu.org/gnu/automake/automake-%{srcvers}.tar.bz2 - - -%description -Automake is a tool for automatically generating "Makefile.in"s from -files called "Makefile.am". "Makefile.am" is basically a series of -"make" macro definitions (with rules being thrown in occasionally). -The generated "Makefile.in"s are compatible to the GNU Makefile -standards. - -%prep -%setup -q -n automake-%{srcvers} -%{?PATCH0:%patch0 -p1} - -# Work around rpm inserting bogus perl-module deps -cat << \EOF > %{name}-prov -#!/bin/sh -%{__perl_provides} $* |\ - sed -e '/^perl(Automake/d' -EOF -%define __perl_provides %{_builddir}/automake-%{srcvers}/%{name}-prov -chmod +x %{__perl_provides} - -cat << \EOF > %{name}-requ -#!/bin/sh -%{__perl_requires} $* |\ - sed -e '/^perl(Automake/d' -EOF -%define __perl_requires %{_builddir}/automake-%{srcvers}/%{name}-requ -chmod +x %{__perl_requires} - - -%build -PATH=%{_bindir}:$PATH -# Don't use %%configure, it replaces config.sub/config.guess with the -# outdated versions bundled with rpm. -./configure --prefix=%{_prefix} --infodir=%{_infodir} --mandir=%{_mandir} \ - --bindir=%{_bindir} --datadir=%{_datadir} \ - --docdir=%{_datadir}/automake-%{amvers}/doc -make - -%install -rm -rf "$RPM_BUILD_ROOT" -make DESTDIR=${RPM_BUILD_ROOT} install - -%if "%{version}" < "1.11" -# automake >= 1.11 ships man-pages -install -m 755 -d $RPM_BUILD_ROOT/%{_mandir}/man1 -for i in $RPM_BUILD_ROOT%{_bindir}/aclocal \ - $RPM_BUILD_ROOT%{_bindir}/automake ; -do - perllibdir=$RPM_BUILD_ROOT/%{_datadir}/automake-%{amvers} \ - help2man $i > `basename $i`.1 - install -m 644 `basename $i`.1 $RPM_BUILD_ROOT/%{_mandir}/man1 -done -%endif - -mkdir -p $RPM_BUILD_ROOT%{_datadir}/aclocal -echo "/usr/share/aclocal" > $RPM_BUILD_ROOT%{_datadir}/aclocal/dirlist - -rm -f $RPM_BUILD_ROOT%{_infodir}/dir -touch $RPM_BUILD_ROOT%{_infodir}/dir - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -%post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||: - -%preun -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||: -fi - -%files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS -%dir %{_bindir} -%{_bindir}/aclocal* -%{_bindir}/automake* -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/automake.info*.gz -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/* -%dir %{_datadir} -%{_datadir}/aclocal -%{_datadir}/aclocal-%{amvers} -%{_datadir}/automake-%{amvers} - diff --git a/contrib/crossrpms/autotools/target-autoconf.add b/contrib/crossrpms/autotools/target-autoconf.add deleted file mode 100644 index e8d850841b..0000000000 --- a/contrib/crossrpms/autotools/target-autoconf.add +++ /dev/null @@ -1,23 +0,0 @@ -%post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||: - -%preun -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/autoconf.info.gz ||: -fi - -%files -%defattr(-,root,root) -# %doc AUTHORS COPYING ChangeLog NEWS README THANKS -%sysdir %{_bindir} -%{_bindir}/* -%sysdir %{_infodir} -%ghost %{_infodir}/dir - -%{_infodir}/autoconf.info* -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/* -%sysdir %{_datadir} -%{_datadir}/autoconf -%exclude %{_datadir}/emacs/site-lisp diff --git a/contrib/crossrpms/autotools/target-automake.add b/contrib/crossrpms/autotools/target-automake.add deleted file mode 100644 index 4658da4c8f..0000000000 --- a/contrib/crossrpms/autotools/target-automake.add +++ /dev/null @@ -1,27 +0,0 @@ -%post -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||: - -%preun -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/automake.info.gz ||: -fi - -%files -%defattr(-,root,root) -%doc AUTHORS COPYING ChangeLog NEWS README THANKS -%sysdir %{_bindir} -%{_bindir}/aclocal* -%{_bindir}/automake* -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/automake.info*.gz -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/* -%sysdir %{_datadir} -%if "%{_prefix}" != "/usr" -%{_datadir}/aclocal -%endif -%{_datadir}/aclocal-%{amvers} -%{_datadir}/automake-%{amvers} - diff --git a/contrib/crossrpms/binutils/base-binutils.add b/contrib/crossrpms/binutils/base-binutils.add deleted file mode 100644 index e981d12200..0000000000 --- a/contrib/crossrpms/binutils/base-binutils.add +++ /dev/null @@ -1,56 +0,0 @@ -%if %build_infos -# ============================================================== -# @rpmprefix@binutils-common -# ============================================================== -%package -n @rpmprefix@binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n @rpmprefix@binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n @rpmprefix@binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n @rpmprefix@binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n @rpmprefix@binutils-common -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%sysdir %{_prefix}/share -%sysdir %{_prefix}/share/locale -%endif - diff --git a/contrib/crossrpms/binutils/binutils.add b/contrib/crossrpms/binutils/binutils.add deleted file mode 100644 index f1ca500e8a..0000000000 --- a/contrib/crossrpms/binutils/binutils.add +++ /dev/null @@ -1,40 +0,0 @@ -%define binutils_pkgvers @BINUTILS_PKGVERS@ -%define binutils_version @BINUTILS_VERS@ -%define binutils_rpmvers %{expand:%(echo "@BINUTILS_VERS@" | tr - _ )} - -Name: @rpmprefix@@tool_target@-binutils -Summary: Binutils for target @tool_target@ -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: @BINUTILS_RPMREL@ -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -%if %build_infos -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%else -%if "@tool_target@" == "i686-pc-cygwin" -BuildRequires: texinfo >= 4.2 -%endif -%endif -%endif -BuildRequires: flex -BuildRequires: bison -%if %build_infos - -Requires: @rpmprefix@binutils-common -%endif - -@SOURCES@ - -%description -Cross binutils for target @tool_target@ diff --git a/contrib/crossrpms/binutils/build.add b/contrib/crossrpms/binutils/build.add deleted file mode 100644 index 29fe856f96..0000000000 --- a/contrib/crossrpms/binutils/build.add +++ /dev/null @@ -1,33 +0,0 @@ -%build -%if "%{_prefix}" != "/usr" - export PATH="%{_bindir}:${PATH}" -%endif -%if "@tool_target@" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=@tool_target@ \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --with-sysroot=%{_prefix}/@tool_target@/sys-root \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all -%if %build_infos - make info -%endif - cd .. - diff --git a/contrib/crossrpms/binutils/install.add b/contrib/crossrpms/binutils/install.add deleted file mode 100644 index d31d83950b..0000000000 --- a/contrib/crossrpms/binutils/install.add +++ /dev/null @@ -1,53 +0,0 @@ -%install -%if "%{_prefix}" != "/usr" - export PATH="%{_bindir}:${PATH}" -%endif - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - -%if %build_infos - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info -%endif - -%if %build_infos -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale -%else -# Conflict with a native binutils' infos - rm -rf $RPM_BUILD_ROOT%{_infodir} -%endif - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/@tool_target@-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/@tool_target@-windmc* - fi - - cd .. - diff --git a/contrib/crossrpms/binutils/prep.add b/contrib/crossrpms/binutils/prep.add deleted file mode 100644 index 3f2f71910f..0000000000 --- a/contrib/crossrpms/binutils/prep.add +++ /dev/null @@ -1,8 +0,0 @@ -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - diff --git a/contrib/crossrpms/binutils/rpm-install.add b/contrib/crossrpms/binutils/rpm-install.add deleted file mode 100644 index 07efd8fe29..0000000000 --- a/contrib/crossrpms/binutils/rpm-install.add +++ /dev/null @@ -1,32 +0,0 @@ -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -%if "%{_prefix}" != "/usr" -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -%endif -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ -%if "%{_prefix}" != "/usr" - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -%endif -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - diff --git a/contrib/crossrpms/binutils/target-binutils.add b/contrib/crossrpms/binutils/target-binutils.add deleted file mode 100644 index 9b5b3ff1b3..0000000000 --- a/contrib/crossrpms/binutils/target-binutils.add +++ /dev/null @@ -1,29 +0,0 @@ -# ============================================================== -# @tool_target@-binutils -# ============================================================== -# %package -n @rpmprefix@@tool_target@-binutils -# Summary: rtems binutils for @tool_target@ -# Group: Development/Tools -# %if %build_infos -# Requires: @rpmprefix@binutils-common -# %endif - -%description -n @rpmprefix@@tool_target@-binutils -GNU binutils targetting @tool_target@. - -%files -n @rpmprefix@@tool_target@-binutils -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/@tool_target@-*.1* - -%sysdir %{_bindir} -%{_bindir}/@tool_target@-* - -%dir %{_exec_prefix}/@tool_target@ -%dir %{_exec_prefix}/@tool_target@/bin -%{_exec_prefix}/@tool_target@/bin/* - -%dir %{_exec_prefix}/@tool_target@/lib -%{_exec_prefix}/@tool_target@/lib/ldscripts diff --git a/contrib/crossrpms/bootstrap b/contrib/crossrpms/bootstrap deleted file mode 100755 index 378696c789..0000000000 --- a/contrib/crossrpms/bootstrap +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -autoreconf -fis diff --git a/contrib/crossrpms/common/clean.add b/contrib/crossrpms/common/clean.add deleted file mode 100644 index 476559051e..0000000000 --- a/contrib/crossrpms/common/clean.add +++ /dev/null @@ -1,3 +0,0 @@ -%clean - rm -rf $RPM_BUILD_ROOT - diff --git a/contrib/crossrpms/common/common.add b/contrib/crossrpms/common/common.add deleted file mode 100644 index e354c73ea6..0000000000 --- a/contrib/crossrpms/common/common.add +++ /dev/null @@ -1,49 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%if "%{_prefix}" != "/usr" -%define _prefix @_prefix@ -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale -%endif - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - diff --git a/contrib/crossrpms/configure.ac b/contrib/crossrpms/configure.ac deleted file mode 100644 index 89828258e8..0000000000 --- a/contrib/crossrpms/configure.ac +++ /dev/null @@ -1,166 +0,0 @@ -## $Id$ - -m4_define([RTEMS_API],[4.9]) - -AC_PREREQ(2.61) -AC_INIT([crossrpms],[0.20080306.1],[http://www.rtems.org/bugzilla]) -AC_CONFIG_SRCDIR([binutils/binutils.add]) -AC_CONFIG_AUX_DIR(.) - -AC_CANONICAL_HOST - -AC_PREFIX_DEFAULT([/opt/rtems-][RTEMS_API]) - -AM_INIT_AUTOMAKE([1.9]) - -AC_ARG_ENABLE([targets], - AS_HELP_STRING([--enable-targets=<targets>],[build for targets <targets>]), - [targets="$enable_targets"], - [targets=rtems] -) - -case $targets in -rtems ) - savdir=`pwd` - cd $srcdir - targets= - for d in rtems*/*/Makefile.am; do - o=`echo $d | sed -e 's,/.*,,'` - a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'` - targets="$targets $a-$o" - done - cd $savdir - ;; -all ) - savdir=`pwd` - cd $srcdir - targets= - for d in rtems*/*/Makefile.am; do - o=`echo $d | sed -e 's,/.*,,'` - a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'` - targets="$targets $a-$o" - done - for d in freebsd*/*/Makefile.am \ - cygwin*/*/Makefile.am \ - mingw*/*/Makefile.am; \ - do - o=`echo $d | sed -e 's,/.*,,'` - a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'` - targets="$targets $a-pc-$o" - done - for d in solaris*/*/Makefile.am; \ - do - o=`echo $d | sed -e 's,/.*,,'` - a=`echo $d | sed -e 's,/Makefile\.am,,;s,.*/,,'` - targets="$targets $a-sun-$o" - done - cd $savdir - ;; -esac - -case "$prefix" in -/usr) - sysdirpattern="/%sysdir/d" - rpmprefix= - host_subdirs= - ;; -/usr/local) - sysdirpattern="/%sysdir/d" - rpmprefix="local-" - host_subdirs=autotools - ;; -/opt/rtems) - sysdirpattern="s/^%sysdir/%dir/g" - rpmprefix="rtems-" - host_subdirs=autotools - ;; -NONE|${ac_default_prefix}) # Default prefix - sysdirpattern="s/^%sysdir/%dir/g" - rpmprefix="[rtems-]RTEMS_API[-]" - host_subdirs=autotools - ;; -*) - sysdirpattern="s/^%sysdir/%dir/g" - rpmprefix="custom-" - host_subdirs=autotools - ;; -esac -AC_SUBST(sysdirpattern) -AC_SUBST(HOST_SUBDIRS,$host_subdirs) - -AC_ARG_ENABLE([rpmprefix], -[ --enable-rpmprefix=<rpmprefix> prefix rpms],[ - case "$enable_rpmprefix" in - yes) # ignore, use default - ;; - no) rpmprefix= - ;; - *) # presume user knows what he is doing - rpmprefix=$enable_rpmprefix;; - esac -]) -AC_SUBST(rpmprefix) - -SPECSTRIP_OPTS= - -AC_ARG_ENABLE([infos], -[ --enable-infos enable building infos],[ - case "$enable_infos" in - yes) - SPECSTRIP_OPTS="$SPECSTRIP_OPTS --enable-infos";; - no) - SPECSTRIP_OPTS="$SPECSTRIP_OPTS --disable-infos";; - *) - AC_MSG_ERROR([Invalid argument to --enable-infos]) - esac -]) -AC_SUBST(SPECSTRIP_OPTS) - -AS_IF([test "${host}" != "${build}"],[ -AC_MSG_CHECKING(for RPM OS) -case "$host" in - i?86-*cygwin*) RPM_OS=cygwin ;; - i?86-*mingw*) RPM_OS=mingw32 ;; - sparc-*solaris*) RPM_OS=solaris2.7 ;; - i?86-*freebsd5*) RPM_OS=freebsd5.2 ;; - i?86-*freebsd6.0) RPM_OS=freebsd6.0 ;; - i?86-*freebsd6.1) RPM_OS=freebsd6.1 ;; - *) - AC_MSG_ERROR([Unsupported host ${host}]) - ;; -esac -AC_MSG_RESULT($RPM_OS) -]) -AC_SUBST(RPM_OS) - -for f in $targets; do -ac_cv_mytarget=`$SHELL "$ac_aux_dir/config.sub" $f` || - AC_MSG_ERROR([$SHELL $ac_aux_dir/config.sub $f failed]) - RTEMS_CANONICAL_SPLIT(mytarget) - - AS_IF([test -d $srcdir/$mytarget_os/$mytarget_cpu],[ - target_subdirs="$target_subdirs $mytarget_os/$mytarget_cpu"],[ - AC_MSG_WARN([ignoring unsupported target $f]) - ]) -done -AC_SUBST(TARGET_SUBDIRS,$target_subdirs) -AC_SUBST(rtems_api,RTEMS_API) - -AC_CONFIG_FILES([Makefile]) - -AC_CONFIG_FILES([rtems4.9/Makefile]) -AC_CONFIG_FILES([rtems4.9/arm/Makefile]) -AC_CONFIG_FILES([rtems4.9/avr/Makefile]) -AC_CONFIG_FILES([rtems4.9/bfin/Makefile]) -AC_CONFIG_FILES([rtems4.9/h8300/Makefile]) -AC_CONFIG_FILES([rtems4.9/i386/Makefile]) -AC_CONFIG_FILES([rtems4.9/m68k/Makefile]) -AC_CONFIG_FILES([rtems4.9/mips/Makefile]) -AC_CONFIG_FILES([rtems4.9/mipstx39/Makefile]) -AC_CONFIG_FILES([rtems4.9/powerpc/Makefile]) -AC_CONFIG_FILES([rtems4.9/sh/Makefile]) -AC_CONFIG_FILES([rtems4.9/sparc/Makefile]) - -AC_CONFIG_FILES([autotools/Makefile]) - -AC_OUTPUT diff --git a/contrib/crossrpms/gcc/base-gcc.add b/contrib/crossrpms/gcc/base-gcc.add deleted file mode 100644 index 4119209783..0000000000 --- a/contrib/crossrpms/gcc/base-gcc.add +++ /dev/null @@ -1,56 +0,0 @@ -%if %build_infos -# ============================================================== -# @rpmprefix@gcc-common -# ============================================================== -%package -n @rpmprefix@gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n @rpmprefix@gcc-common -GCC files that are shared by all targets. - -%files -n @rpmprefix@gcc-common -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_prefix}/share - -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%sysdir %{_mandir} -%sysdir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n @rpmprefix@gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n @rpmprefix@gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -%endif diff --git a/contrib/crossrpms/gcc/base-gcj.add b/contrib/crossrpms/gcc/base-gcj.add deleted file mode 100644 index fe8aed9940..0000000000 --- a/contrib/crossrpms/gcc/base-gcj.add +++ /dev/null @@ -1,55 +0,0 @@ -%if %build_infos -%if %build_gcj -# ============================================================== -# @rpmprefix@gcc-gcj-common -# ============================================================== -%package -n @rpmprefix@gcc-gcj-common -Summary: Base package for rtems gcc/java compiler (gcj) -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n @rpmprefix@gcc-gcj-common -RTEMS is an open source operating system for embedded systems. - -This is the files for gcc/java (gcj) that are shared by all targets. - -%files -n @rpmprefix@gcc-gcj-common -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_prefix}/share - -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gcj.info* -%{_infodir}/fastjar.info* - -%if "%{gcc_version}" < "4.0" -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/gcjh.1* -%{_mandir}/man1/jv-scan.1* -%{_mandir}/man1/jcf-dump.1* -%{_mandir}/man1/gij.1* -%{_mandir}/man1/jv-convert.1* -%{_mandir}/man1/rmic.1* -%{_mandir}/man1/rmiregistry.1* -%{_mandir}/man1/jar.1* -%{_mandir}/man1/grepjar.1* -%endif - -%post -n @rpmprefix@gcc-gcj-common -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcj.info* || : -/sbin/install-info --info-dir=%{_infodir} %{_infodir}/fastjar.info* || : - -%preun -n @rpmprefix@gcc-gcj-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcj.info* || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/fastjar.info* || : -fi - -%endif -%endif diff --git a/contrib/crossrpms/gcc/base-gfortran.add b/contrib/crossrpms/gcc/base-gfortran.add deleted file mode 100644 index 993f763b38..0000000000 --- a/contrib/crossrpms/gcc/base-gfortran.add +++ /dev/null @@ -1,38 +0,0 @@ -%if %build_infos -%if %build_fortran -# ============================================================== -# @rpmprefix@gcc-gfortran-common -# ============================================================== -%package -n @rpmprefix@gcc-gfortran-common -Summary: Base package for RTEMS gcc/gfortran compiler -Group: Development/Tools -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n @rpmprefix@gcc-gfortran-common -RTEMS is an open source operating system for embedded systems. - -This is the files for gcc/gfortran that are shared by all targets. - -%files -n @rpmprefix@gcc-gfortran-common -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_prefix}/share - -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gfortran.info*.gz - -%post -n @rpmprefix@gcc-gfortran-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || : - -%preun -n @rpmprefix@gcc-gfortran-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gfortran.info.gz || : -fi - -%endif -%endif diff --git a/contrib/crossrpms/gcc/base-gnat.add b/contrib/crossrpms/gcc/base-gnat.add deleted file mode 100644 index 71dc5cc2b6..0000000000 --- a/contrib/crossrpms/gcc/base-gnat.add +++ /dev/null @@ -1,40 +0,0 @@ -%if %build_infos -%if %build_gnat -# ============================================================== -# @rpmprefix@gcc-gnat-common -# ============================================================== -%package -n @rpmprefix@gcc-gnat-common -Summary: Base package for RTEMS gcc/gnat compiler -Group: Development/Tools -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n @rpmprefix@gcc-gnat-common -RTEMS is an open source operating system for embedded systems. - -This is the gcc/gnat tools for the gcc/gnat compiler - -%files -n @rpmprefix@gcc-gnat-common -%defattr(-,root,root) -%sysdir %{_bindir} -%{_bindir}/vxaddr2line%{_exeext} - -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gnat* - -%post -n @rpmprefix@gcc-gnat-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || : - -%preun -n @rpmprefix@gcc-gnat-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_rm.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gnat_ugn_unw.info.gz || : -fi -%endif -%endif diff --git a/contrib/crossrpms/gcc/base-newlib.add b/contrib/crossrpms/gcc/base-newlib.add deleted file mode 100644 index 8dbe5aab85..0000000000 --- a/contrib/crossrpms/gcc/base-newlib.add +++ /dev/null @@ -1,41 +0,0 @@ -%if %build_infos -%if %build_newlib -# ============================================================== -# @rpmprefix@newlib-common -# ============================================================== -%package -n @rpmprefix@newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: @NEWLIB_RPMREL@ -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n @rpmprefix@newlib-common -newlib files that are shared by all targets. - -%files -n @rpmprefix@newlib-common -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_prefix}/share - -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n @rpmprefix@newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n @rpmprefix@newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - -%endif -%endif diff --git a/contrib/crossrpms/gcc/build.add b/contrib/crossrpms/gcc/build.add deleted file mode 100644 index fdedf95e63..0000000000 --- a/contrib/crossrpms/gcc/build.add +++ /dev/null @@ -1,70 +0,0 @@ -%build - mkdir -p build - - cd build - - languages="c" -%if %build_cxx - languages="$languages,c++" -%endif -%if %build_fortran - languages="$languages,fortran" -%endif -%if %build_gcj - languages="$languages,java" -%endif -%if %build_objc - languages="$languages,objc" -%endif -%if %build_gnat - languages="$languages,ada" -%endif -%if "%{_prefix}" != "/usr" - export PATH="%{_bindir}:${PATH}" -%endif -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=@tool_target@ \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --with-sysroot=%{_exec_prefix}/@tool_target@/sys-root \ -%if %build_newlib - --enable-newlib-io-c99-formats \ -%endif - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all -%if %build_infos - make info -%endif - cd .. - diff --git a/contrib/crossrpms/gcc/gccnewlib.add b/contrib/crossrpms/gcc/gccnewlib.add deleted file mode 100644 index 008645d09b..0000000000 --- a/contrib/crossrpms/gcc/gccnewlib.add +++ /dev/null @@ -1,237 +0,0 @@ - -%define gcc_pkgvers @GCC_PKGVERS@ -%define gcc_version @GCC_VERS@ -%define gcc_rpmvers %{expand:%(echo "@GCC_VERS@" | tr - _ )} - -%if %build_newlib -%define newlib_pkgvers @NEWLIB_PKGVERS@ -%define newlib_version @NEWLIB_VERS@ -%endif - -Name: @rpmprefix@@tool_target@-gcc -Summary: @tool_target@ gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: @GCC_RPMREL@ -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%if %build_fortran -%define gmp_required 4.1 -%define mpfr_required 2.2.1 -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - -%if %build_gcj -# Building gcj requires bison and zlib -BuildRequires: bison -%endif - -BuildRequires: texinfo >= 4.2 -BuildRequires: @rpmprefix@@tool_target@-binutils -BuildRequires: @rpmprefix@@tool_target@-sys-root -BuildRequires: @rpmprefix@@tool_target@-w32api-sys-root - -%if %build_infos -Requires: @rpmprefix@gcc-common -%endif -Requires: @rpmprefix@@tool_target@-binutils -Requires: @rpmprefix@@tool_target@-sys-root -Requires: @rpmprefix@@tool_target@-w32api-sys-root -Requires: @rpmprefix@@tool_target@-gcc-libgcc = %{gcc_rpmvers}-%{release} -%if %build_newlib -Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@ -%endif - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%if %build_gcj -BuildRequires: zlib-devel -%endif -%endif -%if %build_gnat -# Building gnat requires gnat -BuildRequires: gcc-gnat -BuildRequires: @rpmprefix@@tool_target@-newlib < %{newlib_version}-@NEWLIB_RPMREL@ -%endif - -%global _gcclibdir %{_prefix}/lib - -@SOURCES@ - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for @tool_target@. - diff --git a/contrib/crossrpms/gcc/install.add b/contrib/crossrpms/gcc/install.add deleted file mode 100644 index 8591617ede..0000000000 --- a/contrib/crossrpms/gcc/install.add +++ /dev/null @@ -1,144 +0,0 @@ -%install -%if "%{_prefix}" != "/usr" - export PATH="%{_bindir}:${PATH}" -%endif - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - -%if %build_newlib - cd build/@tool_target@/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. -%endif - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-c++filt%{_exeext} - -%if %build_gnat - # Seemingly a VAX tool. Not meaningful, here. - rm -f $RPM_BUILD_ROOT%{_bindir}/vxaddr2line%{_exeext} -%endif - -%if %build_infos - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir -%else -# Conflict with a native GCC's infos - rm -rf $RPM_BUILD_ROOT%{_infodir} - -# Conflict with a native GCC's man pages - rm -rf $RPM_BUILD_ROOT%{_mandir}/man7 -%endif - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/@tool_target@-@tool_target@-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/@tool_target@/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - -%if %build_newlib - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/@tool_target@/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done -%endif - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/@tool_target@/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done diff --git a/contrib/crossrpms/gcc/prep.add b/contrib/crossrpms/gcc/prep.add deleted file mode 100644 index 82e0398cdf..0000000000 --- a/contrib/crossrpms/gcc/prep.add +++ /dev/null @@ -1,81 +0,0 @@ -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%if %build_cxx -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. -%endif - -%if %build_fortran -%setup -q -T -D -n %{name}-%{version} -a2 -%{?PATCH2:%patch2 -p0} -%endif - -%if %build_gcj -%setup -q -T -D -n %{name}-%{version} -a3 -%{?PATCH3:%patch3 -p0} -%endif - -%if %build_gnat -%setup -q -T -D -n %{name}-%{version} -a4 -%{?PATCH4:%patch4 -p0} -%endif - -%if %build_objc -%setup -q -T -D -n %{name}-%{version} -a5 -%{?PATCH5:%patch5 -p0} -%endif - -%if %build_newlib -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos -%endif - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -@PREP@ - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. diff --git a/contrib/crossrpms/gcc/rpm-install.add b/contrib/crossrpms/gcc/rpm-install.add deleted file mode 100644 index e1b456dd19..0000000000 --- a/contrib/crossrpms/gcc/rpm-install.add +++ /dev/null @@ -1,73 +0,0 @@ -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -%if "%{_prefix}" != "/usr" -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -%endif -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ -%if "%{_prefix}" != "/usr" - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -%endif -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/@tool_target@/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/@tool_target@/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - diff --git a/contrib/crossrpms/gcc/target-c++.add b/contrib/crossrpms/gcc/target-c++.add deleted file mode 100644 index f8fce19adc..0000000000 --- a/contrib/crossrpms/gcc/target-c++.add +++ /dev/null @@ -1,65 +0,0 @@ -%if %build_cxx -# ============================================================== -# @rpmprefix@@tool_target@-gcc-c++ -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-c++ -Summary: GCC c++ compiler for @tool_target@ -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: @rpmprefix@@tool_target@-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: @rpmprefix@@tool_target@-gcc-c++ = %{gcc_rpmvers} -%endif - -%if %build_infos -Requires: @rpmprefix@gcc-common -%endif -Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release} - -%description -n @rpmprefix@@tool_target@-gcc-c++ -GCC c++ compiler for @tool_target@. - - -%package -n @rpmprefix@@tool_target@-gcc-libstdc++ -Summary: libstdc++ for @tool_target@ -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n @rpmprefix@@tool_target@-gcc-libstdc++ -%{summary} - - -%files -n @rpmprefix@@tool_target@-gcc-c++ -%defattr(-,root,root) -%sysdir %{_prefix} - -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/@tool_target@-g++.1* - -%sysdir %{_bindir} -%{_bindir}/@tool_target@-c++%{_exeext} -%{_bindir}/@tool_target@-g++%{_exeext} - -%sysdir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/@tool_target@ -%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1plus%{_exeext} - - -%files -n @rpmprefix@@tool_target@-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/@tool_target@ -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version} -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include -%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/c++ -%endif - diff --git a/contrib/crossrpms/gcc/target-gcc.add b/contrib/crossrpms/gcc/target-gcc.add deleted file mode 100644 index afd3379873..0000000000 --- a/contrib/crossrpms/gcc/target-gcc.add +++ /dev/null @@ -1,84 +0,0 @@ -# ============================================================== -# @rpmprefix@@tool_target@-gcc -# ============================================================== -# %package -n @rpmprefix@@tool_target@-gcc -# Summary: GNU cc compiler for @tool_target@ -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: @rpmprefix@@tool_target@-binutils -# Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@ -# License: GPL - -# %if %build_infos -# Requires: @rpmprefix@gcc-common -# %endif - -%description -n @rpmprefix@@tool_target@-gcc -GNU cc compiler for @tool_target@. - -# ============================================================== -# @rpmprefix@@tool_target@-gcc-libgcc -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-libgcc -Summary: libgcc for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: @rpmprefix@@tool_target@-newlib = %{newlib_version}-@NEWLIB_RPMREL@ -License: GPL - -%description -n @rpmprefix@@tool_target@-gcc-libgcc -libgcc @tool_target@-gcc. - - -%files -n @rpmprefix@@tool_target@-gcc -%defattr(-,root,root) -%sysdir %{_prefix} - -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/@tool_target@-gcc.1* -%{_mandir}/man1/@tool_target@-cpp.1* -%{_mandir}/man1/@tool_target@-gcov.1* - -%sysdir %{_bindir} -%{_bindir}/@tool_target@-cpp%{_exeext} -%{_bindir}/@tool_target@-gcc%{_exeext} -%{_bindir}/@tool_target@-gcc-%{gcc_version}%{_exeext} -%{_bindir}/@tool_target@-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/@tool_target@-gccbug -%endif - -%sysdir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/@tool_target@ -%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n @rpmprefix@@tool_target@-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/@tool_target@ -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version} -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "@tool_target@" != "bfin-rtems@rtems_api@" -%if "@tool_target@" != "avr-rtems@rtems_api@" -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include-fixed -%endif - diff --git a/contrib/crossrpms/gcc/target-gcj.add b/contrib/crossrpms/gcc/target-gcj.add deleted file mode 100644 index 0ea7735457..0000000000 --- a/contrib/crossrpms/gcc/target-gcj.add +++ /dev/null @@ -1,57 +0,0 @@ -%if %build_gcj -# ============================================================== -# @rpmprefix@@tool_target@-gcj -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-gcj -Summary: Java support (gcj) for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL - -%if %build_infos -Requires: @rpmprefix@gcc-gcj-common -%endif -Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release} - -%description -n @rpmprefix@@tool_target@-gcc-gcj -RTEMS is an open source operating system for embedded systems. - -This is the gcc/java compiler for @tool_target@ - -%files -n @rpmprefix@@tool_target@-gcc-gcj -f build/files.gcj -%defattr(-,root,root) -%sysdir %{_bindir} -%{_bindir}/@tool_target@-gcj%{_exeext} -%{_bindir}/@tool_target@-jcf-dump%{_exeext} -%{_bindir}/@tool_target@-jv-scan%{_exeext} -%{_bindir}/@tool_target@-gcjh%{_exeext} -%{_bindir}/@tool_target@-*jar%{_exeext} - -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/@tool_target@-*jar.1* -%{_mandir}/man1/@tool_target@-gcj*.1* -%{_mandir}/man1/@tool_target@-jv-*.1* -%{_mandir}/man1/@tool_target@-jcf-dump.1* -%{_mandir}/man1/@tool_target@-gij.1* - -%if "%{gcc_version}" >= "4.0" -%{_mandir}/man1/@tool_target@-grmi*.1* -%else -%{_mandir}/man1/@tool_target@-rmi*.1* -%endif - -%sysdir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/@tool_target@ -%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jc1%{_exeext} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/jvgenmain%{_exeext} - -%sysdir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/@tool_target@ -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version} - -%endif - diff --git a/contrib/crossrpms/gcc/target-gfortran.add b/contrib/crossrpms/gcc/target-gfortran.add deleted file mode 100644 index 81d5d48bd2..0000000000 --- a/contrib/crossrpms/gcc/target-gfortran.add +++ /dev/null @@ -1,60 +0,0 @@ -%if %build_fortran -# ============================================================== -# @rpmprefix@@tool_target@-gcc-gfortran -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-gfortran -Summary: Fortran 95 support for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL - -%if %build_infos -Requires: @rpmprefix@gcc-gfortran-common -%endif -Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release} -Requires: @rpmprefix@@tool_target@-gcc-libgfortran = %{gcc_rpmvers}-%{release} - -%description -n @rpmprefix@@tool_target@-gcc-gfortran -GCC fortran compiler for @tool_target@. - -%files -n @rpmprefix@@tool_target@-gcc-gfortran -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_bindir} -%{_bindir}/@tool_target@-gfortran%{_exeext} - -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/@tool_target@-gfortran.1* - -%sysdir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/@tool_target@ -%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/f951%{_exeext} - -# ============================================================== -# @rpmprefix@@tool_target@-gcc-libgfortran -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-libgfortran -Summary: Fortran 95 support libraries for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n @rpmprefix@@tool_target@-gcc-libgfortran -%{summary} - -%files -n @rpmprefix@@tool_target@-gcc-libgfortran -f build/files.gfortran -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/@tool_target@ -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version} -%if "%{gcc_version}" >= "4.2.0" -%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/finclude -%endif -%endif - diff --git a/contrib/crossrpms/gcc/target-gnat.add b/contrib/crossrpms/gcc/target-gnat.add deleted file mode 100644 index 3e034a51b9..0000000000 --- a/contrib/crossrpms/gcc/target-gnat.add +++ /dev/null @@ -1,42 +0,0 @@ -%if %build_gnat -# ============================================================== -# @rpmprefix@@tool_target@-gnat -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-gnat -Summary: Ada support for for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL - -%if %_build_infos -Requires: @rpmprefix@gcc-gnat-common -%endif -Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release} - -%description -n @rpmprefix@@tool_target@-gcc-gnat -RTEMS is an open source operating system for embedded systems. - -This is the gcc/gnat compiler for @tool_target@. - -%files -n @rpmprefix@@tool_target@-gcc-gnat -%defattr(-,root,root) -%sysdir %{_prefix} - -%sysdir %{_bindir} -%{_bindir}/@tool_target@-gnat* -%{_bindir}/@tool_target@-gprmake%{_exeext} - -%sysdir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/@tool_target@ -%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/gnat1%{_exeext} - -%sysdir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/@tool_target@ -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version} -%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adalib -%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/adainclude -%endif - diff --git a/contrib/crossrpms/gcc/target-newlib.add b/contrib/crossrpms/gcc/target-newlib.add deleted file mode 100644 index 50efe08fcd..0000000000 --- a/contrib/crossrpms/gcc/target-newlib.add +++ /dev/null @@ -1,26 +0,0 @@ -%if %build_newlib -# ============================================================== -# @rpmprefix@@tool_target@-newlib -# ============================================================== -%package -n @rpmprefix@@tool_target@-newlib -Summary: C Library (newlib) for @tool_target@ -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: @NEWLIB_RPMREL@ -%{?_with_noarch_subpackages:BuildArch: noarch} - -%if %build_infos -Requires: @rpmprefix@newlib-common -%endif - -%description -n @rpmprefix@@tool_target@-newlib -Newlib C Library for @tool_target@. - -%files -n @rpmprefix@@tool_target@-newlib -f build/files.newlib -%defattr(-,root,root) -%sysdir %{_exec_prefix} -%dir %{_exec_prefix}/@tool_target@ -%{_exec_prefix}/@tool_target@/include - -%endif diff --git a/contrib/crossrpms/gcc/target-objc.add b/contrib/crossrpms/gcc/target-objc.add deleted file mode 100644 index 41a5e8144b..0000000000 --- a/contrib/crossrpms/gcc/target-objc.add +++ /dev/null @@ -1,49 +0,0 @@ -%if %build_objc -# ============================================================== -# @rpmprefix@@tool_target@-gcc-objc -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-objc -Summary: Objective C support for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL - -Requires: @rpmprefix@@tool_target@-gcc = %{gcc_rpmvers}-%{release} -Requires: @rpmprefix@@tool_target@-gcc-libobjc = %{gcc_rpmvers}-%{release} - -%description -n @rpmprefix@@tool_target@-gcc-objc -GCC objc compiler for @tool_target@. - -%files -n @rpmprefix@@tool_target@-gcc-objc -%defattr(-,root,root) -%sysdir %{_exec_prefix} -%sysdir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/@tool_target@ -%dir %{_libexecdir}/gcc/@tool_target@/%{gcc_version} -%{_libexecdir}/gcc/@tool_target@/%{gcc_version}/cc1obj%{_exeext} - -# ============================================================== -# @rpmprefix@@tool_target@-gcc-libobjc -# ============================================================== -%package -n @rpmprefix@@tool_target@-gcc-libobjc -Summary: Objective C support for @tool_target@-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n @rpmprefix@@tool_target@-gcc-libobjc -Support libraries for GCC's objc compiler for @tool_target@. - -%files -n @rpmprefix@@tool_target@-gcc-libobjc -f build/files.objc -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/@tool_target@ -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version} -%dir %{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include -%{_gcclibdir}/gcc/@tool_target@/%{gcc_version}/include/objc -%endif - diff --git a/contrib/crossrpms/gdb/base-gdb.add b/contrib/crossrpms/gdb/base-gdb.add deleted file mode 100644 index 658f8a3861..0000000000 --- a/contrib/crossrpms/gdb/base-gdb.add +++ /dev/null @@ -1,43 +0,0 @@ -%if %build_infos -# ============================================================== -# @rpmprefix@gdb-common -# ============================================================== -%package -n @rpmprefix@gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n @rpmprefix@gdb-common - -GDB files shared by all targets. - -%post -n @rpmprefix@gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n @rpmprefix@gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n @rpmprefix@gdb-common -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_prefix}/share - -%sysdir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - -%endif diff --git a/contrib/crossrpms/gdb/build.add b/contrib/crossrpms/gdb/build.add deleted file mode 100644 index a60965ff99..0000000000 --- a/contrib/crossrpms/gdb/build.add +++ /dev/null @@ -1,40 +0,0 @@ -%build -%if "%{_prefix}" != "/usr" - export PATH="%{_bindir}:${PATH}" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=@tool_target@ \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --with-sysroot=%{_prefix}/@tool_target@/sys-root \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all -%if %build_infos - make info -%endif - cd .. - diff --git a/contrib/crossrpms/gdb/gdb.add b/contrib/crossrpms/gdb/gdb.add deleted file mode 100644 index 5ab5043dca..0000000000 --- a/contrib/crossrpms/gdb/gdb.add +++ /dev/null @@ -1,89 +0,0 @@ -%define gdb_version @GDB_VERS@ -%define gdb_rpmvers %{expand:%(echo @GDB_VERS@ | tr - _)} - -Name: @rpmprefix@@tool_target@-gdb -Summary: Gdb for target @tool_target@ -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: @GDB_RPMREL@ -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "@tool_target@" == "powerpc-rtems@rtems_api@" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "@tool_target@" == "sparc-rtems@rtems_api@" -%define build_sim --disable-sim -%endif -%if "@tool_target@" == "h8300-rtems@rtems_api@" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "@tool_target@" == "m32c-rtems@rtems_api@" -%define build_sim --disable-sim -%endif -%endif -%if "@tool_target@" == "lm32-rtems@rtems_api@" -%define build_sim --disable-sim -%endif -%if "@tool_target@" == "mipstx39-rtems@rtems_api@" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -%if %build_infos -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif - -%if %build_infos - -Requires: @rpmprefix@gdb-common -%endif - -@SOURCES@ - -%description -GDB for target @tool_target@ diff --git a/contrib/crossrpms/gdb/install.add b/contrib/crossrpms/gdb/install.add deleted file mode 100644 index 8bcd43b784..0000000000 --- a/contrib/crossrpms/gdb/install.add +++ /dev/null @@ -1,30 +0,0 @@ -%install -%if "%{_prefix}" != "/usr" - export PATH="%{_bindir}:${PATH}" -%endif - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - -%if %build_infos - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* -%else -# Conflict with a native gdb's infos - rm -rf $RPM_BUILD_ROOT%{_infodir} -%endif - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib@tool_target@-sim.a - - cd .. - diff --git a/contrib/crossrpms/gdb/prep.add b/contrib/crossrpms/gdb/prep.add deleted file mode 100644 index 02b65d6813..0000000000 --- a/contrib/crossrpms/gdb/prep.add +++ /dev/null @@ -1,10 +0,0 @@ -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} diff --git a/contrib/crossrpms/gdb/rpm-install.add b/contrib/crossrpms/gdb/rpm-install.add deleted file mode 100644 index 07efd8fe29..0000000000 --- a/contrib/crossrpms/gdb/rpm-install.add +++ /dev/null @@ -1,32 +0,0 @@ -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -%if "%{_prefix}" != "/usr" -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -%endif -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ -%if "%{_prefix}" != "/usr" - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -%endif -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - diff --git a/contrib/crossrpms/gdb/target-gdb.add b/contrib/crossrpms/gdb/target-gdb.add deleted file mode 100644 index 84cb7cf6b6..0000000000 --- a/contrib/crossrpms/gdb/target-gdb.add +++ /dev/null @@ -1,25 +0,0 @@ -# ============================================================== -# @tool_target@-gdb -# ============================================================== -# %package -n @rpmprefix@@tool_target@-gdb -# Summary: rtems gdb for @tool_target@ -# Group: Development/Tools -# %if %build_infos -# Requires: @rpmprefix@gdb-common -# %endif - -%description -n @rpmprefix@@tool_target@-gdb -GNU gdb targetting @tool_target@. - -%files -n @rpmprefix@@tool_target@-gdb -%defattr(-,root,root) -%sysdir %{_prefix} -%sysdir %{_prefix}/share - -%sysdir %{_mandir} -%sysdir %{_mandir}/man1 -%{_mandir}/man1/@tool_target@-*.1* - -%sysdir %{_bindir} -%{_bindir}/@tool_target@-* - diff --git a/contrib/crossrpms/mkspec.am b/contrib/crossrpms/mkspec.am deleted file mode 100644 index b251a19eb9..0000000000 --- a/contrib/crossrpms/mkspec.am +++ /dev/null @@ -1,17 +0,0 @@ -noinst_DATA = -CLEANFILES = -EXTRA_DIST = - -SPECSTRIP = $(top_srcdir)/specstrip --prefix=$(prefix) $(SPECSTRIP_OPTS) - -MKSPEC = sed \ - -e "s,[@]rpmprefix[@],$(rpmprefix),g" \ - -e "s,[@]_prefix[@],$(prefix),g" \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "/^%package -n [@]rpmprefix[@][@]tool_target[@]-gcc/d" \ - -e "@sysdirpattern@" \ - -e "/[@]PATCH/d" - -MKSPEC0 = sed \ - -e "s/[@]tool_target[@]/$(TARGET)/g" \ - -e "s/[@]rtems_api[@]/$(rtems_api)/g" diff --git a/contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff b/contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff deleted file mode 100644 index 6896980d5e..0000000000 --- a/contrib/crossrpms/patches/binutils-2.17.50-cygwin-20060817-1.diff +++ /dev/null @@ -1,24 +0,0 @@ -diff -Naur binutils-20060817-1.orig/configure binutils-20060817-1/configure ---- binutils-20060817-1.orig/configure 2006-08-17 07:00:58.000000000 +0200 -+++ binutils-20060817-1/configure 2008-03-12 03:52:57.000000000 +0100 -@@ -3681,7 +3681,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -Naur binutils-20060817-1.orig/configure.in binutils-20060817-1/configure.in ---- binutils-20060817-1.orig/configure.in 2006-08-17 07:00:58.000000000 +0200 -+++ binutils-20060817-1/configure.in 2008-03-12 03:52:57.000000000 +0100 -@@ -2232,7 +2232,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" diff --git a/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff b/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff deleted file mode 100644 index df54815012..0000000000 --- a/contrib/crossrpms/patches/binutils-2.18-rtems4.9-20080211.diff +++ /dev/null @@ -1,68 +0,0 @@ -diff -uNr binutils-2.18.orig/configure binutils-2.18/configure ---- binutils-2.18.orig/configure 2007-08-06 22:29:40.000000000 +0200 -+++ binutils-2.18/configure 2008-02-11 17:43:28.000000000 +0100 -@@ -6128,7 +6128,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -uNr binutils-2.18.orig/configure.ac binutils-2.18/configure.ac ---- binutils-2.18.orig/configure.ac 2007-08-28 22:24:26.000000000 +0200 -+++ binutils-2.18/configure.ac 2008-02-11 17:43:28.000000000 +0100 -@@ -2403,7 +2403,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -uNr binutils-2.18.orig/gas/config/tc-avr.c binutils-2.18/gas/config/tc-avr.c ---- binutils-2.18.orig/gas/config/tc-avr.c 2007-08-06 21:59:55.000000000 +0200 -+++ binutils-2.18/gas/config/tc-avr.c 2008-02-11 17:43:13.000000000 +0100 -@@ -63,7 +63,7 @@ - { - {"avr1", AVR_ISA_TINY1, bfd_mach_avr1}, - {"avr2", AVR_ISA_TINY2, bfd_mach_avr2}, -- {"avr3", AVR_ISA_M103, bfd_mach_avr3}, -+ {"avr3", AVR_ISA_AVR3, bfd_mach_avr3}, - {"avr4", AVR_ISA_M8, bfd_mach_avr4}, - {"avr5", AVR_ISA_ALL, bfd_mach_avr5}, - {"avr6", AVR_ISA_ALL, bfd_mach_avr6}, -@@ -102,6 +102,8 @@ - {"at43usb320", AVR_ISA_M103, bfd_mach_avr3}, - {"at43usb355", AVR_ISA_M603, bfd_mach_avr3}, - {"at76c711", AVR_ISA_M603, bfd_mach_avr3}, -+ {"at90usb82", AVR_ISA_USB162, bfd_mach_avr3}, -+ {"at90usb162", AVR_ISA_USB162, bfd_mach_avr3}, - {"atmega48", AVR_ISA_PWMx, bfd_mach_avr4}, - {"atmega8", AVR_ISA_M8, bfd_mach_avr4}, - {"atmega83", AVR_ISA_M8, bfd_mach_avr4}, /* XXX -> m8535 */ -@@ -150,8 +152,6 @@ - {"at90can32" , AVR_ISA_M323, bfd_mach_avr5}, - {"at90can64" , AVR_ISA_M323, bfd_mach_avr5}, - {"at90can128", AVR_ISA_M128, bfd_mach_avr5}, -- {"at90usb82", AVR_ISA_M323, bfd_mach_avr5}, -- {"at90usb162", AVR_ISA_M323, bfd_mach_avr5}, - {"at90usb646", AVR_ISA_M323, bfd_mach_avr5}, - {"at90usb647", AVR_ISA_M323, bfd_mach_avr5}, - {"at90usb1286",AVR_ISA_M128, bfd_mach_avr5}, -diff -uNr binutils-2.18.orig/include/opcode/avr.h binutils-2.18/include/opcode/avr.h ---- binutils-2.18.orig/include/opcode/avr.h 2006-04-07 17:18:08.000000000 +0200 -+++ binutils-2.18/include/opcode/avr.h 2008-02-11 17:43:13.000000000 +0100 -@@ -40,6 +40,10 @@ - AVR_ISA_LPMX | AVR_ISA_SPM) - #define AVR_ISA_M603 (AVR_ISA_2xxx | AVR_ISA_MEGA) - #define AVR_ISA_M103 (AVR_ISA_M603 | AVR_ISA_ELPM) -+#define AVR_ISA_USB162 (AVR_ISA_M603 | AVR_ISA_MOVW | \ -+ AVR_ISA_LPMX | AVR_ISA_SPM) -+#define AVR_ISA_AVR3 (AVR_ISA_M603 | AVR_ISA_MOVW | \ -+ AVR_ISA_LPMX | AVR_ISA_SPM | AVR_ISA_ELPM) - #define AVR_ISA_M161 (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | \ - AVR_ISA_LPMX | AVR_ISA_SPM) - #define AVR_ISA_94K (AVR_ISA_M603 | AVR_ISA_MUL | AVR_ISA_MOVW | AVR_ISA_LPMX) diff --git a/contrib/crossrpms/patches/gcc-ada-4.2.0-rtems4.8-20070705.diff b/contrib/crossrpms/patches/gcc-ada-4.2.0-rtems4.8-20070705.diff deleted file mode 100644 index 7001f9cdc9..0000000000 --- a/contrib/crossrpms/patches/gcc-ada-4.2.0-rtems4.8-20070705.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- /home/joel/tools-original/gcc-4.2.0/gcc/ada/s-osinte-rtems.ads 2005-06-30 20:29:17.000000000 -0500 -+++ gcc-4.2.0/gcc/ada/s-osinte-rtems.ads 2007-06-22 17:25:56.000000000 -0500 -@@ -291,12 +291,10 @@ - sig : Signal) return int; - pragma Import (C, pthread_kill, "pthread_kill"); - -- type sigset_t_ptr is access all sigset_t; -- - function pthread_sigmask - (how : int; -- set : sigset_t_ptr; -- oset : sigset_t_ptr) return int; -+ set : access sigset_t; -+ oset : access sigset_t) return int; - pragma Import (C, pthread_sigmask, "pthread_sigmask"); - - ---------------------------- diff --git a/contrib/crossrpms/patches/gcc-core-4.3.2-rtems4.9-20090825.diff b/contrib/crossrpms/patches/gcc-core-4.3.2-rtems4.9-20090825.diff deleted file mode 100644 index bc6fa64450..0000000000 --- a/contrib/crossrpms/patches/gcc-core-4.3.2-rtems4.9-20090825.diff +++ /dev/null @@ -1,139 +0,0 @@ -diff -Naur gcc-4.3.2.orig/configure gcc-4.3.2/configure ---- gcc-4.3.2.orig/configure 2008-02-02 04:29:30.000000000 +0100 -+++ gcc-4.3.2/configure 2009-08-25 07:05:20.000000000 +0200 -@@ -2185,6 +2185,7 @@ - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" - ;; - *-*-rtems*) -+ skipdirs="$skipdirs target-libiberty" - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - # The tpf target doesn't support gdb yet. -@@ -5829,7 +5830,7 @@ - # to it. This is right: we don't want to search that directory - # for binaries, but we want the header files in there, so add - # them explicitly. -- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include' -+ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed' - - # Someone might think of using the pre-installed headers on - # Canadian crosses, in case the installed compiler is not fully -diff -Naur gcc-4.3.2.orig/configure.ac gcc-4.3.2/configure.ac ---- gcc-4.3.2.orig/configure.ac 2008-02-02 04:29:30.000000000 +0100 -+++ gcc-4.3.2/configure.ac 2009-08-25 07:05:20.000000000 +0200 -@@ -462,6 +462,7 @@ - noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap" - ;; - *-*-rtems*) -+ skipdirs="$skipdirs target-libiberty" - noconfigdirs="$noconfigdirs target-libgloss ${libgcj}" - ;; - # The tpf target doesn't support gdb yet. -@@ -2340,7 +2341,7 @@ - # to it. This is right: we don't want to search that directory - # for binaries, but we want the header files in there, so add - # them explicitly. -- FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include' -+ FLAGS_FOR_TARGET=$FLAGS_FOR_TARGET' -isystem $$r/$(HOST_SUBDIR)/gcc/include -isystem $$r/$(HOST_SUBDIR)/gcc/include-fixed' - - # Someone might think of using the pre-installed headers on - # Canadian crosses, in case the installed compiler is not fully -diff -Naur gcc-4.3.2.orig/gcc/config/arm/rtems-elf.h gcc-4.3.2/gcc/config/arm/rtems-elf.h ---- gcc-4.3.2.orig/gcc/config/arm/rtems-elf.h 2008-02-06 08:33:26.000000000 +0100 -+++ gcc-4.3.2/gcc/config/arm/rtems-elf.h 2009-08-25 07:05:20.000000000 +0200 -@@ -43,4 +43,3 @@ - * with how this used to be defined. - */ - #undef LINK_GCC_C_SEQUENCE_SPEC --#define LINK_GCC_C_SEQUENCE_SPEC "%G %L" -diff -Naur gcc-4.3.2.orig/gcc/config/avr/t-rtems gcc-4.3.2/gcc/config/avr/t-rtems ---- gcc-4.3.2.orig/gcc/config/avr/t-rtems 2004-11-23 04:44:03.000000000 +0100 -+++ gcc-4.3.2/gcc/config/avr/t-rtems 2009-08-25 07:05:35.000000000 +0200 -@@ -1,3 +1,4 @@ - # Multilibs for avr RTEMS targets. - --# ATM, this is just a stub -+# RTEMS uses _exit from newlib -+LIB1ASMFUNCS := $(filter-out _exit,$(LIB1ASMFUNCS)) -diff -Naur gcc-4.3.2.orig/gcc/config/m68k/t-rtems gcc-4.3.2/gcc/config/m68k/t-rtems ---- gcc-4.3.2.orig/gcc/config/m68k/t-rtems 2008-02-16 06:52:54.000000000 +0100 -+++ gcc-4.3.2/gcc/config/m68k/t-rtems 2009-08-25 07:05:20.000000000 +0200 -@@ -4,5 +4,6 @@ - || MLIB == "5206" \ - || MLIB == "5208" \ - || MLIB == "5307" \ -+ || MLIB == "5329" \ - || MLIB == "5407" \ - || MLIB == "5475") -diff -Naur gcc-4.3.2.orig/gcc/config/mips/elf.h gcc-4.3.2/gcc/config/mips/elf.h ---- gcc-4.3.2.orig/gcc/config/mips/elf.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.3.2/gcc/config/mips/elf.h 2009-08-25 07:05:20.000000000 +0200 -@@ -48,6 +48,4 @@ - #undef ENDFILE_SPEC - #define ENDFILE_SPEC "crtend%O%s crtn%O%s" - --#define NO_IMPLICIT_EXTERN_C 1 -- - #define HANDLE_PRAGMA_PACK_PUSH_POP 1 -diff -Naur gcc-4.3.2.orig/gcc/config/rs6000/rtems.h gcc-4.3.2/gcc/config/rs6000/rtems.h ---- gcc-4.3.2.orig/gcc/config/rs6000/rtems.h 2007-08-02 12:49:31.000000000 +0200 -+++ gcc-4.3.2/gcc/config/rs6000/rtems.h 2009-08-25 07:05:20.000000000 +0200 -@@ -49,8 +49,18 @@ - %{mcpu=604: %{!Dppc*: %{!Dmpc*: -Dmpc604} } } \ - %{mcpu=750: %{!Dppc*: %{!Dmpc*: -Dmpc750} } } \ - %{mcpu=821: %{!Dppc*: %{!Dmpc*: -Dmpc821} } } \ --%{mcpu=860: %{!Dppc*: %{!Dmpc*: -Dmpc860} } }" -+%{mcpu=860: %{!Dppc*: %{!Dmpc*: -Dmpc860} } } \ -+%{mcpu=8540: %{!Dppc*: %{!Dmpc*: -Dppc8540} } }" - - #undef SUBSUBTARGET_EXTRA_SPECS - #define SUBSUBTARGET_EXTRA_SPECS \ - { "cpp_os_rtems", CPP_OS_RTEMS_SPEC } -+ -+#undef SUBSUBTARGET_OVERRIDE_OPTIONS -+#define SUBSUBTARGET_OVERRIDE_OPTIONS \ -+ do { \ -+ if (TARGET_E500) \ -+ { \ -+ rs6000_float_gprs = 1; \ -+ } \ -+ } while(0) -diff -Naur gcc-4.3.2.orig/gcc/config/rs6000/t-rtems gcc-4.3.2/gcc/config/rs6000/t-rtems ---- gcc-4.3.2.orig/gcc/config/rs6000/t-rtems 2005-05-27 09:54:06.000000000 +0200 -+++ gcc-4.3.2/gcc/config/rs6000/t-rtems 2009-08-25 07:05:20.000000000 +0200 -@@ -1,17 +1,15 @@ - # Multilibs for powerpc RTEMS targets. - - MULTILIB_OPTIONS = \ --mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400 \ -+mcpu=403/mcpu=505/mcpu=601/mcpu=603e/mcpu=604/mcpu=860/mcpu=7400/mcpu=8540 \ - Dmpc8260 \ - msoft-float - - MULTILIB_DIRNAMES = \ --m403 m505 m601 m603e m604 m860 m7400 \ -+m403 m505 m601 m603e m604 m860 m7400 m8540 \ - mpc8260 \ - nof - --MULTILIB_EXTRA_OPTS = mrelocatable-lib mno-eabi mstrict-align -- - # MULTILIB_MATCHES = ${MULTILIB_MATCHES_FLOAT} - MULTILIB_MATCHES = - MULTILIB_MATCHES += ${MULTILIB_MATCHES_ENDIAN} -@@ -31,6 +29,10 @@ - # Map 750 to . - MULTILIB_MATCHES += mcpu?750= - -+# Map e500, 8548 to 8540 -+MULTILIB_MATCHES += mcpu?8540=mcpu?e500 -+MULTILIB_MATCHES += mcpu?8540=mcpu?8548 -+ - # Soft-float only, default implies msoft-float - # NOTE: Must match with MULTILIB_MATCHES_FLOAT and MULTILIB_MATCHES - MULTILIB_SOFTFLOAT_ONLY = \ -@@ -64,3 +66,4 @@ - MULTILIB_EXCEPTIONS += *mcpu=750/Dmpc* - MULTILIB_EXCEPTIONS += *mcpu=860/Dmpc* - MULTILIB_EXCEPTIONS += *mcpu=7400/Dmpc* -+MULTILIB_EXCEPTIONS += *mcpu=8540/Dmpc* diff --git a/contrib/crossrpms/patches/gdb-6.5-bfinrtems-20090122.diff b/contrib/crossrpms/patches/gdb-6.5-bfinrtems-20090122.diff deleted file mode 100644 index 58253d8be5..0000000000 --- a/contrib/crossrpms/patches/gdb-6.5-bfinrtems-20090122.diff +++ /dev/null @@ -1,16252 +0,0 @@ -diff -Naur gdb-6.5.orig/bfd/sysdep.h gdb-6.5/bfd/sysdep.h ---- gdb-6.5.orig/bfd/sysdep.h 2005-05-05 20:51:14.000000000 +0200 -+++ gdb-6.5/bfd/sysdep.h 2009-01-22 08:19:21.000000000 +0100 -@@ -135,7 +135,7 @@ - #endif - - #if !HAVE_DECL_STRSTR --extern char *strstr (); -+/* extern char *strstr (); */ - #endif - - #ifdef HAVE_FTELLO -diff -Naur gdb-6.5.orig/configure gdb-6.5/configure ---- gdb-6.5.orig/configure 2006-05-02 02:16:50.000000000 +0200 -+++ gdb-6.5/configure 2009-01-22 08:19:21.000000000 +0100 -@@ -3648,7 +3648,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -Naur gdb-6.5.orig/configure.in gdb-6.5/configure.in ---- gdb-6.5.orig/configure.in 2006-06-21 07:16:16.000000000 +0200 -+++ gdb-6.5/configure.in 2009-01-22 08:19:21.000000000 +0100 -@@ -2217,7 +2217,7 @@ - # For an installed makeinfo, we require it to be from texinfo 4.4 or - # higher, else we use the "missing" dummy. - if ${MAKEINFO} --version \ -- | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[4-9]|[5-9])' >/dev/null 2>&1; then -+ | egrep 'texinfo[^0-9]*(4\.([4-9]|[1-9][0-9])|[5-9]|[1-9][0-9])' >/dev/null 2>&1; then - : - else - MAKEINFO="$MISSING makeinfo" -diff -Naur gdb-6.5.orig/gdb/bfin-tdep.c gdb-6.5/gdb/bfin-tdep.c ---- gdb-6.5.orig/gdb/bfin-tdep.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/bfin-tdep.c 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,1341 @@ -+/* Target-dependent code for Analog Devices Blackfin processer, for GDB. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+#include "defs.h" -+#include "frame.h" -+#include "frame-base.h" -+#include "frame-unwind.h" -+#include "dwarf2-frame.h" -+#include "trad-frame.h" -+#include "inferior.h" -+#include "gdbcore.h" -+#include "dis-asm.h" -+#include "regcache.h" -+#include "arch-utils.h" -+#include "gdb_assert.h" -+#include "sim-regno.h" -+#include "bfin-tdep.h" -+#include "gdb/sim-bfin.h" -+#include "elf-bfd.h" -+#include "elf/bfin.h" -+#include "infcall.h" -+ -+/* Macros used by prologue functions. */ -+#define P_LINKAGE 0xE800 -+#define P_MINUS_SP1 0x0140 -+#define P_MINUS_SP2 0x05C0 -+#define P_MINUS_SP3 0x0540 -+#define P_MINUS_SP4 0x04C0 -+#define P_SP_PLUS 0x6C06 -+#define P_P2_LOW 0xE10A -+#define P_P2_HIGH 0XE14A -+#define P_SP_EQ_SP_PLUS_P2 0X5BB2 -+#define P_SP_EQ_P2_PLUS_SP 0x5B96 -+#define P_MINUS_MINUS_SP_EQ_RETS 0x0167 -+ -+/* Macros used for program flow control. */ -+/* 16 bit instruction, max */ -+#define P_16_BIT_INSR_MAX 0xBFFF -+/* 32 bit instruction, min */ -+#define P_32_BIT_INSR_MIN 0xC000 -+/* 32 bit instruction, max */ -+#define P_32_BIT_INSR_MAX 0xE801 -+/* jump (preg), 16-bit, min */ -+#define P_JUMP_PREG_MIN 0x0050 -+/* jump (preg), 16-bit, max */ -+#define P_JUMP_PREG_MAX 0x0057 -+/* jump (pc+preg), 16-bit, min */ -+#define P_JUMP_PC_PLUS_PREG_MIN 0x0080 -+/* jump (pc+preg), 16-bit, max */ -+#define P_JUMP_PC_PLUS_PREG_MAX 0x0087 -+/* jump.s pcrel13m2, 16-bit, min */ -+#define P_JUMP_S_MIN 0x2000 -+/* jump.s pcrel13m2, 16-bit, max */ -+#define P_JUMP_S_MAX 0x2FFF -+/* jump.l pcrel25m2, 32-bit, min */ -+#define P_JUMP_L_MIN 0xE200 -+/* jump.l pcrel25m2, 32-bit, max */ -+#define P_JUMP_L_MAX 0xE2FF -+/* conditional jump pcrel11m2, 16-bit, min */ -+#define P_IF_CC_JUMP_MIN 0x1800 -+/* conditional jump pcrel11m2, 16-bit, max */ -+#define P_IF_CC_JUMP_MAX 0x1BFF -+/* conditional jump(bp) pcrel11m2, 16-bit, min */ -+#define P_IF_CC_JUMP_BP_MIN 0x1C00 -+/* conditional jump(bp) pcrel11m2, 16-bit, max */ -+#define P_IF_CC_JUMP_BP_MAX 0x1FFF -+/* conditional !jump pcrel11m2, 16-bit, min */ -+#define P_IF_NOT_CC_JUMP_MIN 0x1000 -+/* conditional !jump pcrel11m2, 16-bit, max */ -+#define P_IF_NOT_CC_JUMP_MAX 0x13FF -+/* conditional jump(bp) pcrel11m2, 16-bit, min */ -+#define P_IF_NOT_CC_JUMP_BP_MIN 0x1400 -+/* conditional jump(bp) pcrel11m2, 16-bit, max */ -+#define P_IF_NOT_CC_JUMP_BP_MAX 0x17FF -+/* call (preg), 16-bit, min */ -+#define P_CALL_PREG_MIN 0x0060 -+/* call (preg), 16-bit, max */ -+#define P_CALL_PREG_MAX 0x0067 -+/* call (pc+preg), 16-bit, min */ -+#define P_CALL_PC_PLUS_PREG_MIN 0x0070 -+/* call (pc+preg), 16-bit, max */ -+#define P_CALL_PC_PLUS_PREG_MAX 0x0077 -+/* call pcrel25m2, 32-bit, min */ -+#define P_CALL_MIN 0xE300 -+/* call pcrel25m2, 32-bit, max */ -+#define P_CALL_MAX 0xE3FF -+/* RTS */ -+#define P_RTS 0x0010 -+/* MNOP */ -+#define P_MNOP 0xC803 -+/* EXCPT, 16-bit, min */ -+#define P_EXCPT_MIN 0x00A0 -+/* EXCPT, 16-bit, max */ -+#define P_EXCPT_MAX 0x00AF -+/* multi instruction mask 1, 16-bit */ -+#define P_BIT_MULTI_INS_1 0xC000 -+/* multi instruction mask 2, 16-bit */ -+#define P_BIT_MULTI_INS_2 0x0800 -+ -+/* Macros used for signal handling */ -+/* Instruction 1 for signal */ -+#define P_SIGNAL_INS_1 0x0077E128 -+/* Instruction 1 for rt_signal */ -+#define P_RT_SIGNAL_INS_1 0x00ADE128 -+/* Instruction 2 is common for both signal and rt_signal */ -+#define P_SIGNAL_INS_2 0x000000A0 -+ -+/* The maximum bytes we search to skip the prologue. */ -+#define UPPER_LIMIT 40 -+ -+#define RETS_OFFSET 4 -+ -+/* Initial value: Register names used in BFIN's ISA documentation. */ -+ -+static char *bfin_register_name_strings[] = -+{ -+ "r0", "r1", "r2", "r3", "r4", "r5", "r6", "r7", -+ "p0", "p1", "p2", "p3", "p4", "p5", "sp", "fp", -+ "i0", "i1", "i2", "i3", "m0", "m1", "m2", "m3", -+ "b0", "b1", "b2", "b3", "l0", "l1", "l2", "l3", -+ "a0x", "a0w", "a1x", "a1w", "astat", "rets", -+ "lc0", "lt0", "lb0", "lc1", "lt1", "lb1", "cycles", "cycles2", -+ "usp", "seqstat", "syscfg", "reti", "retx", "retn", "rete", -+ "pc", "cc", "extra1", "extra2", "extra3", "fdpic_exec", "fdpic_interp", -+ "ipend" -+}; -+ -+ -+#define NUM_BFIN_REGNAMES \ -+ (sizeof (bfin_register_name_strings) / sizeof (char *)) -+ -+ -+/* In this diagram successive memory locations increase downwards or the -+ stack grows upwards with negative indices. (PUSH analogy for stack.) -+ -+ The top frame is the "frame" of the current function being executed. -+ -+ +--------------+ SP - -+ | local vars | ^ -+ +--------------+ | -+ | save regs | | -+ +--------------+ FP | -+ | old FP -|-- top -+ +--------------+ | frame -+ | RETS | | | -+ +--------------+ | | -+ | param 1 | | | -+ | param 2 | | | -+ | ... | | V -+ +--------------+ | - -+ | local vars | | ^ -+ +--------------+ | | -+ | save regs | | | -+ +--------------+<- | -+ | old FP -|-- next -+ +--------------+ | frame -+ | RETS | | | -+ +--------------+ | | -+ | param 1 | | | -+ | param 2 | | | -+ | ... | | V -+ +--------------+ | - -+ | local vars | | ^ -+ +--------------+ | | -+ | save regs | | | -+ +--------------+<- next frame -+ | old FP | | -+ +--------------+ | -+ | RETS | V -+ +--------------+ - -+ -+ The frame chain is formed as following: -+ -+ FP has the topmost frame. -+ FP + 4 has the previous FP and so on. */ -+ -+ -+/* Map from DWARF2 register number to GDB register number. */ -+ -+int map_gcc_gdb[] = -+{ -+ BFIN_R0_REGNUM, -+ BFIN_R1_REGNUM, -+ BFIN_R2_REGNUM, -+ BFIN_R3_REGNUM, -+ BFIN_R4_REGNUM, -+ BFIN_R5_REGNUM, -+ BFIN_R6_REGNUM, -+ BFIN_R7_REGNUM, -+ BFIN_P0_REGNUM, -+ BFIN_P1_REGNUM, -+ BFIN_P2_REGNUM, -+ BFIN_P3_REGNUM, -+ BFIN_P4_REGNUM, -+ BFIN_P5_REGNUM, -+ BFIN_SP_REGNUM, -+ BFIN_FP_REGNUM, -+ BFIN_I0_REGNUM, -+ BFIN_I1_REGNUM, -+ BFIN_I2_REGNUM, -+ BFIN_I3_REGNUM, -+ BFIN_B0_REGNUM, -+ BFIN_B1_REGNUM, -+ BFIN_B2_REGNUM, -+ BFIN_B3_REGNUM, -+ BFIN_L0_REGNUM, -+ BFIN_L1_REGNUM, -+ BFIN_L2_REGNUM, -+ BFIN_L3_REGNUM, -+ BFIN_M0_REGNUM, -+ BFIN_M1_REGNUM, -+ BFIN_M2_REGNUM, -+ BFIN_M3_REGNUM, -+ BFIN_A0_DOT_X_REGNUM, -+ BFIN_A1_DOT_X_REGNUM, -+ BFIN_CC_REGNUM, -+ BFIN_RETS_REGNUM, -+ BFIN_RETI_REGNUM, -+ BFIN_RETX_REGNUM, -+ BFIN_RETN_REGNUM, -+ BFIN_RETE_REGNUM, -+ BFIN_ASTAT_REGNUM, -+ BFIN_SEQSTAT_REGNUM, -+ BFIN_USP_REGNUM, -+ BFIN_LT0_REGNUM, -+ BFIN_LT1_REGNUM, -+ BFIN_LC0_REGNUM, -+ BFIN_LC1_REGNUM, -+ BFIN_LB0_REGNUM, -+ BFIN_LB1_REGNUM -+}; -+ -+ -+/* Check whether insn1 and insn2 are parts of a signal trampoline. */ -+ -+#define IS_SIGTRAMP(insn1, insn2) \ -+ /* P0=0x77 (X); EXCPT 0x0 */ \ -+ ((insn1 == P_SIGNAL_INS_1) && ((insn2 & P_SIGNAL_INS_2) == P_SIGNAL_INS_2)) -+ -+#define IS_RT_SIGTRAMP(insn1, insn2) \ -+ /* P0=0xad (X); EXCPT 0x0 */ \ -+ ((insn1 == P_RT_SIGNAL_INS_1) && ((insn2 & P_SIGNAL_INS_2) == P_SIGNAL_INS_2)) -+ -+#define SIGCONTEXT_OFFSET 28 -+#define UCONTEXT_OFFSET 172 -+ -+ -+/* From <asm/sigcontext.h>. */ -+ -+static int bfin_linux_sigcontext_reg_offset[BFIN_NUM_REGS] = -+{ -+ 2 * 4, /* %r0 */ -+ 3 * 4, /* %r1 */ -+ 4 * 4, /* %r2 */ -+ 5 * 4, /* %r3 */ -+ 6 * 4, /* %r4 */ -+ -1, /* %r5 */ -+ -1, /* %r6 */ -+ -1, /* %r7 */ -+ 7 * 4, /* %p0 */ -+ 8 * 4, /* %p1 */ -+ 9 * 4, /* %p2 */ -+ 10 * 4, /* %p3 */ -+ -1, /* %p4 */ -+ -1, /* %p5 */ -+ 1 * 4, /* %sp */ -+ -1, /* %fp */ -+ 11 * 4, /* %i0 */ -+ 12 * 4, /* %i1 */ -+ 13 * 4, /* %i2 */ -+ 14 * 4, /* %i3 */ -+ 15 * 4, /* %m0 */ -+ 16 * 4, /* %m1 */ -+ 17 * 4, /* %m2 */ -+ 18 * 4, /* %m3 */ -+ 23 * 4, /* %b0 */ -+ 24 * 4, /* %b1 */ -+ 25 * 4, /* %b2 */ -+ 26 * 4, /* %b3 */ -+ 19 * 4, /* %l0 */ -+ 20 * 4, /* %l1 */ -+ 21 * 4, /* %l2 */ -+ 22 * 4, /* %l3 */ -+ 27 * 4, /* %a0x */ -+ 28 * 4, /* %a0w */ -+ 29 * 4, /* %a1x */ -+ 30 * 4, /* %a1w */ -+ 31 * 4, /* %astat */ -+ 32 * 4, /* %rets */ -+ 33 * 4, /* %lc0 */ -+ 35 * 4, /* %lt0 */ -+ 37 * 4, /* %lb0 */ -+ 34 * 4, /* %lc1 */ -+ 36 * 4, /* %lt1 */ -+ 38 * 4, /* %lb1 */ -+ -1, /* %cycles */ -+ -1, /* %cycles2 */ -+ -1, /* %usp */ -+ 39 * 4, /* %seqstat */ -+ -1, /* syscfg */ -+ 40 * 4, /* %reti */ -+ 41 * 4, /* %retx */ -+ -1, /* %retn */ -+ -1, /* %rete */ -+ 40 * 4, /* %pc */ -+ -1, /* %cc */ -+ -1, /* %extra1 */ -+ -1, /* %extra2 */ -+ -1, /* %extra3 */ -+ -1 /* %ipend */ -+}; -+ -+ -+/* From <asm/ucontext.h>. */ -+ -+static int bfin_linux_ucontext_reg_offset[BFIN_NUM_REGS] = -+{ -+ 1 * 4, /* %r0 */ -+ 2 * 4, /* %r1 */ -+ 3 * 4, /* %r2 */ -+ 4 * 4, /* %r3 */ -+ 5 * 4, /* %r4 */ -+ 6 * 4, /* %r5 */ -+ 7 * 4, /* %r6 */ -+ 8 * 4, /* %r7 */ -+ 9 * 4, /* %p0 */ -+ 10 * 4, /* %p1 */ -+ 11 * 4, /* %p2 */ -+ 12 * 4, /* %p3 */ -+ 13 * 4, /* %p4 */ -+ 14 * 4, /* %p5 */ -+ 15 * 4, /* %sp */ -+ 24 * 4, /* %fp */ -+ 25 * 4, /* %i0 */ -+ 26 * 4, /* %i1 */ -+ 27 * 4, /* %i2 */ -+ 28 * 4, /* %i3 */ -+ 29 * 4, /* %m0 */ -+ 30 * 4, /* %m1 */ -+ 31 * 4, /* %m2 */ -+ 32 * 4, /* %m3 */ -+ 37 * 4, /* %b0 */ -+ 38 * 4, /* %b1 */ -+ 39 * 4, /* %b2 */ -+ 40 * 4, /* %b3 */ -+ 33 * 4, /* %l0 */ -+ 34 * 4, /* %l1 */ -+ 35 * 4, /* %l2 */ -+ 36 * 4, /* %l3 */ -+ 18 * 4, /* %a0x */ -+ 16 * 4, /* %a0w */ -+ 19 * 4, /* %a1x */ -+ 17 * 4, /* %a1w */ -+ 20 * 4, /* %astat */ -+ 21 * 4, /* %rets */ -+ 41 * 4, /* %lc0 */ -+ 43 * 4, /* %lt0 */ -+ 45 * 4, /* %lb0 */ -+ 42 * 4, /* %lc1 */ -+ 44 * 4, /* %lt1 */ -+ 46 * 4, /* %lb1 */ -+ -1, /* %cycles */ -+ -1, /* %cycles2 */ -+ -1, /* %usp */ -+ 47 * 4, /* %seqstat */ -+ -1, /* syscfg */ -+ 22 * 4, /* %reti */ -+ 23 * 4, /* %retx */ -+ -1, /* %retn */ -+ -1, /* %rete */ -+ 22 * 4, /* %pc */ -+ -1, /* %cc */ -+ -1, /* %extra1 */ -+ -1, /* %extra2 */ -+ -1, /* %extra3 */ -+ -1 /* %ipend */ -+}; -+ -+/* Get info about saved registers in sigtramp. */ -+ -+struct bfin_linux_sigtramp_info -+{ -+ /* Address of context. */ -+ CORE_ADDR context_addr; -+ -+ /* Offset of registers in `struct sigcontext'. */ -+ int *sc_reg_offset; -+}; -+ -+static enum bfin_abi -+bfin_abi (struct gdbarch *gdbarch) -+{ -+ return gdbarch_tdep (gdbarch)->bfin_abi; -+} -+ -+/* Return non-zero if PC points into the signal trampoline. For the -+ sake of bfin_linux_get_sigtramp_info. */ -+ -+static int -+bfin_linux_pc_in_sigtramp (struct frame_info *next_frame, CORE_ADDR pc) -+{ -+ gdb_byte buf[12]; -+ unsigned long insn0, insn1, insn2; -+ -+ if (pc < 4 -+ || pc >= (CORE_ADDR) 0x7ffffff8 -+ || !safe_frame_unwind_memory (next_frame, pc - 4, buf, sizeof (buf))) -+ return 0; -+ -+ insn1 = extract_unsigned_integer (buf + 4, 4); -+ insn2 = extract_unsigned_integer (buf + 8, 4); -+ -+ if (IS_SIGTRAMP (insn1, insn2)) -+ return 1; -+ -+ if (IS_RT_SIGTRAMP (insn1, insn2)) -+ return 2; -+ -+ insn0 = extract_unsigned_integer (buf, 4); -+ if (IS_SIGTRAMP (insn0, insn1)) -+ return 1; -+ -+ if (IS_RT_SIGTRAMP (insn0, insn1)) -+ return 2; -+ -+ insn0 = ((insn0 << 16) & 0xffffffff) | (insn1 >> 16); -+ insn1 = ((insn1 << 16) & 0xffffffff) | (insn2 >> 16); -+ -+ if (IS_SIGTRAMP (insn0, insn1)) -+ return 1; -+ -+ if (IS_RT_SIGTRAMP (insn0, insn1)) -+ return 2; -+ -+ return 0; -+} -+ -+static struct bfin_linux_sigtramp_info -+bfin_linux_get_sigtramp_info (struct frame_info *next_frame) -+{ -+ CORE_ADDR sp; -+ int ret; -+ struct bfin_linux_sigtramp_info info; -+ -+ sp = frame_unwind_register_unsigned (next_frame, BFIN_SP_REGNUM); -+ ret = bfin_linux_pc_in_sigtramp (next_frame, frame_pc_unwind (next_frame)); -+ -+ if (ret == 1) -+ { -+ /* Get sigcontext address. */ -+ info.context_addr = sp + SIGCONTEXT_OFFSET; -+ info.sc_reg_offset = bfin_linux_sigcontext_reg_offset; -+ } -+ else if (ret == 2) -+ { -+ /* Get ucontext address. */ -+ info.context_addr = sp + UCONTEXT_OFFSET; -+ info.sc_reg_offset = bfin_linux_ucontext_reg_offset; -+ } -+ else -+ internal_error (__FILE__, __LINE__, _("not a sigtramp\n")); -+ -+ return info; -+} -+ -+/* Signal trampolines. */ -+ -+static struct trad_frame_cache * -+bfin_linux_sigtramp_frame_cache (struct frame_info *next_frame, -+ void **this_cache) -+{ -+ struct frame_id this_id; -+ struct trad_frame_cache *cache; -+ struct bfin_linux_sigtramp_info info; -+ CORE_ADDR sp; -+ int i; -+ -+ if (*this_cache) -+ return *this_cache; -+ -+ cache = trad_frame_cache_zalloc (next_frame); -+ -+ /* The frame ID's code address should be the start-address of the -+ signal trampoline and not the current PC within that trampoline. */ -+ sp = frame_unwind_register_unsigned (next_frame, BFIN_SP_REGNUM); -+ -+ /* This would come after the LINK instruction in the ret_from_signal () -+ function, hence the frame id would be SP + 8. */ -+ this_id = frame_id_build (sp + 8, frame_pc_unwind (next_frame)); -+ trad_frame_set_id (cache, this_id); -+ -+ info = bfin_linux_get_sigtramp_info (next_frame); -+ -+ for (i = 0; i < BFIN_NUM_REGS; i++) -+ if (info.sc_reg_offset[i] != -1) -+ trad_frame_set_reg_addr (cache, i, -+ info.context_addr + info.sc_reg_offset[i]); -+ -+ *this_cache = cache; -+ return cache; -+} -+ -+static void -+bfin_linux_sigtramp_frame_this_id (struct frame_info *next_frame, -+ void **this_cache, -+ struct frame_id *this_id) -+{ -+ struct trad_frame_cache *cache; -+ -+ cache = bfin_linux_sigtramp_frame_cache (next_frame, this_cache); -+ trad_frame_get_id (cache, this_id); -+} -+ -+static void -+bfin_linux_sigtramp_frame_prev_register (struct frame_info *next_frame, -+ void **this_cache, -+ int regnum, -+ int *optimizedp, -+ enum lval_type *lvalp, -+ CORE_ADDR *addrp, -+ int *realnump, -+ gdb_byte *valuep) -+{ -+ struct trad_frame_cache *cache; -+ -+ cache = bfin_linux_sigtramp_frame_cache (next_frame, this_cache); -+ trad_frame_get_register (cache, next_frame, regnum, optimizedp, lvalp, -+ addrp, realnump, valuep); -+} -+ -+static const struct frame_unwind bfin_linux_sigtramp_frame_unwind = -+{ -+ SIGTRAMP_FRAME, -+ bfin_linux_sigtramp_frame_this_id, -+ bfin_linux_sigtramp_frame_prev_register -+}; -+ -+static const struct frame_unwind * -+bfin_linux_sigtramp_frame_sniffer (struct frame_info *next_frame) -+{ -+ CORE_ADDR pc = frame_pc_unwind (next_frame); -+ -+ if (bfin_linux_pc_in_sigtramp (next_frame, pc)) -+ return &bfin_linux_sigtramp_frame_unwind; -+ -+ return NULL; -+} -+ -+struct bfin_frame_cache -+{ -+ /* Base address. */ -+ CORE_ADDR base; -+ CORE_ADDR sp_offset; -+ CORE_ADDR pc; -+ int frameless_pc_value; -+ -+ /* Saved registers. */ -+ CORE_ADDR saved_regs[BFIN_NUM_REGS]; -+ CORE_ADDR saved_sp; -+ -+ /* Stack space reserved for local variables. */ -+ long locals; -+}; -+ -+/* Allocate and initialize a frame cache. */ -+ -+static struct bfin_frame_cache * -+bfin_alloc_frame_cache (void) -+{ -+ struct bfin_frame_cache *cache; -+ int i; -+ -+ cache = FRAME_OBSTACK_ZALLOC (struct bfin_frame_cache); -+ -+ /* Base address. */ -+ cache->base = 0; -+ cache->sp_offset = -4; -+ cache->pc = 0; -+ cache->frameless_pc_value = 0; -+ -+ /* Saved registers. We initialize these to -1 since zero is a valid -+ offset (that's where fp is supposed to be stored). */ -+ for (i = 0; i < BFIN_NUM_REGS; i++) -+ cache->saved_regs[i] = -1; -+ -+ /* Frameless until proven otherwise. */ -+ cache->locals = -1; -+ -+ return cache; -+} -+ -+static struct bfin_frame_cache * -+bfin_frame_cache (struct frame_info *next_frame, void **this_cache) -+{ -+ struct bfin_frame_cache *cache; -+ int i; -+ -+ if (*this_cache) -+ return *this_cache; -+ -+ cache = bfin_alloc_frame_cache (); -+ *this_cache = cache; -+ -+ cache->base = frame_unwind_register_unsigned (next_frame, BFIN_FP_REGNUM); -+ if (cache->base == 0) -+ return cache; -+ -+ /* For normal frames, PC is stored at [FP + 4]. */ -+ cache->saved_regs[BFIN_PC_REGNUM] = 4; -+ cache->saved_regs[BFIN_FP_REGNUM] = 0; -+ -+ /* Adjust all the saved registers such that they contain addresses -+ instead of offsets. */ -+ for (i = 0; i < BFIN_NUM_REGS; i++) -+ if (cache->saved_regs[i] != -1) -+ cache->saved_regs[i] += cache->base; -+ -+ cache->pc = frame_func_unwind (next_frame) ; -+ if (cache->pc == 0 || cache->pc == frame_pc_unwind (next_frame)) -+ { -+ /* Either there is no prologue (frameless function) or we are at -+ the start of a function. In short we do not have a frame. -+ PC is stored in rets register. FP points to previous frame. */ -+ -+ cache->saved_regs[BFIN_PC_REGNUM] = read_register (BFIN_RETS_REGNUM); -+ cache->frameless_pc_value = 1; -+ cache->base = frame_unwind_register_unsigned (next_frame, BFIN_FP_REGNUM); -+#ifdef _DEBUG -+ fprintf (stderr, "frameless pc case base %x\n", cache->base); -+#endif -+ cache->saved_regs[BFIN_FP_REGNUM] = cache->base; -+ cache->saved_sp = cache->base; -+ } -+ else -+ { -+ cache->frameless_pc_value = 0; -+ -+ /* Now that we have the base address for the stack frame we can -+ calculate the value of SP in the calling frame. */ -+ cache->saved_sp = cache->base + 8; -+ } -+ -+ return cache; -+} -+ -+static void -+bfin_frame_this_id (struct frame_info *next_frame, -+ void **this_cache, -+ struct frame_id *this_id) -+{ -+ struct bfin_frame_cache *cache = bfin_frame_cache (next_frame, this_cache); -+ -+ /* This marks the outermost frame. */ -+ if (cache->base == 0) -+ return; -+ -+ /* See the end of bfin_push_dummy_call. */ -+ *this_id = frame_id_build (cache->base + 8, cache->pc); -+} -+ -+static void -+bfin_frame_prev_register (struct frame_info *next_frame, -+ void **this_cache, -+ int regnum, -+ int *optimizedp, -+ enum lval_type *lvalp, -+ CORE_ADDR *addrp, -+ int *realnump, -+ gdb_byte *valuep) -+{ -+ struct bfin_frame_cache *cache = bfin_frame_cache (next_frame, this_cache); -+ -+ gdb_assert (regnum >= 0); -+ -+ if (regnum == BFIN_SP_REGNUM && cache->saved_sp) -+ { -+ *optimizedp = 0; -+ *lvalp = not_lval; -+ *addrp = 0; -+ *realnump = -1; -+ -+ if (valuep) -+ { -+ /* Store the value. */ -+ store_unsigned_integer (valuep, 4, cache->saved_sp); -+ } -+ -+ return; -+ } -+ -+ if (regnum < BFIN_NUM_REGS && cache->saved_regs[regnum] != -1) -+ { -+ *optimizedp = 0; -+ *lvalp = lval_memory; -+ *addrp = cache->saved_regs[regnum]; -+ *realnump = -1; -+ -+ if (valuep) -+ { -+ /* Read the value in from memory. */ -+ -+ if (regnum == BFIN_PC_REGNUM) -+ { -+ int *pi = (int *) valuep; -+ -+ if (cache->frameless_pc_value) -+ { -+ /* Blackfin stores the value of the return pc on -+ a register not a stack. A LINK command will -+ save it on the stack. */ -+ store_unsigned_integer (valuep, 4, *addrp); -+ } -+ else -+ store_unsigned_integer (valuep, 4, -+ read_memory_unsigned_integer (*addrp, 4)); -+ } -+ else if (regnum == BFIN_FP_REGNUM) -+ { -+ int *pi = (int *) valuep; -+ -+ if (cache->frameless_pc_value) -+ { -+ /* Blackfin stores the value of the return pc on -+ a register not a stack. A LINK command will -+ save it on the stack. */ -+#ifdef _DEBUG -+ fprintf (stderr, "returning frameless %x\n", *addrp); -+#endif -+ store_unsigned_integer (valuep, 4, *addrp); -+ } -+ else -+ store_unsigned_integer (valuep, 4, -+ read_memory_unsigned_integer (*addrp, 4)); -+ } -+ else -+ read_memory (*addrp, valuep, -+ register_size (current_gdbarch, regnum)); -+ } -+ return; -+ } -+ -+ frame_register_unwind (next_frame, regnum, -+ optimizedp, lvalp, addrp, realnump, valuep); -+} -+ -+CORE_ADDR -+bfin_frame_chain (struct frame_info *frame_ptr) -+{ -+ return read_memory_unsigned_integer (get_frame_base (frame_ptr), 4); -+} -+ -+static const struct frame_unwind bfin_frame_unwind = -+{ -+ NORMAL_FRAME, -+ bfin_frame_this_id, -+ bfin_frame_prev_register -+}; -+ -+static const struct frame_unwind * -+bfin_frame_sniffer (struct frame_info *next_frame) -+{ -+ return &bfin_frame_unwind; -+} -+ -+/* The following functions are for function prologue length calculations. */ -+ -+static int -+is_minus_minus_sp (int op) -+{ -+ op &= 0xFFC0; -+ -+ if ((op == P_MINUS_SP1) || (op == P_MINUS_SP2) -+ || (op == P_MINUS_SP3) || (op == P_MINUS_SP4)) -+ return 1; -+ -+ return 0; -+} -+ -+CORE_ADDR -+bfin_skip_prologue (CORE_ADDR pc) -+{ -+ int op = read_memory_unsigned_integer (pc, 2); -+ CORE_ADDR orig_pc = pc; -+ int done = 0; -+ -+ /* The new gcc prologue generates the register saves BEFORE the link -+ or RETS saving instruction. -+ So, our job is to stop either at those instructions or some upper -+ limit saying there is no frame! */ -+ -+ while (!done) -+ { -+ if (is_minus_minus_sp (op)) -+ { -+ while (is_minus_minus_sp (op)) -+ { -+ pc += 2; -+ op = read_memory_unsigned_integer (pc, 2); -+ } -+ -+ if (op == P_LINKAGE) -+ pc += 4; -+ -+ done = 1; -+ } -+ else if (op == P_LINKAGE) -+ { -+ pc += 4; -+ done = 1; -+ } -+ else if (op == P_MINUS_MINUS_SP_EQ_RETS) -+ { -+ pc += 2; -+ done = 1; -+ } -+ else if (op == P_RTS) -+ { -+ done = 1; -+ } -+ else if ((op >= P_JUMP_PREG_MIN && op <= P_JUMP_PREG_MAX) -+ || (op >= P_JUMP_PC_PLUS_PREG_MIN -+ && op <= P_JUMP_PC_PLUS_PREG_MAX) -+ || (op == P_JUMP_S_MIN && op <= P_JUMP_S_MAX)) -+ { -+ done = 1; -+ } -+ else if (pc - orig_pc >= UPPER_LIMIT) -+ { -+ fprintf (stderr, "Function Prologue not recognised. pc will point to ENTRY_POINT of the function\n"); -+ pc = orig_pc + 2; -+ done = 1; -+ } -+ else -+ { -+ pc += 2; /* Not a terminating instruction go on. */ -+ op = read_memory_unsigned_integer (pc, 2); -+ } -+ } -+ -+ /* TODO: -+ Dwarf2 uses entry point value AFTER some register initializations. -+ We should perhaps skip such asssignments as well (R6 = R1, ...). */ -+ -+ return pc; -+} -+ -+/* Return the GDB type object for the "standard" data type of data in -+ register N. This should be void pointer for P0-P5, SP, FP; -+ void pointer to function for PC; int otherwise. */ -+ -+static struct type * -+bfin_register_type (struct gdbarch *gdbarch, int regnum) -+{ -+ if ((regnum >= BFIN_P0_REGNUM && regnum <= BFIN_FP_REGNUM) -+ || regnum == BFIN_USP_REGNUM) -+ return builtin_type_void_data_ptr; -+ -+ if (regnum == BFIN_PC_REGNUM || regnum == BFIN_RETS_REGNUM) -+ return builtin_type_void_func_ptr; -+ -+ return builtin_type_int32; -+} -+ -+/* Return the saved PC from this frame. -+ Assumes LINK is used in every function. */ -+ -+CORE_ADDR -+bfin_frame_saved_pc (struct frame_info *frame) -+{ -+ return read_memory_unsigned_integer (get_frame_base (frame) + RETS_OFFSET, 4); -+} -+ -+static CORE_ADDR -+find_func_descr (struct gdbarch *gdbarch, CORE_ADDR entry_point) -+{ -+ CORE_ADDR descr; -+ char valbuf[4]; -+ -+ descr = bfin_fdpic_find_canonical_descriptor (entry_point); -+ -+ if (descr != 0) -+ return descr; -+ -+ /* Construct a non-canonical descriptor from space allocated on -+ the stack. */ -+ -+ descr = value_as_long (value_allocate_space_in_inferior (8)); -+ store_unsigned_integer (valbuf, 4, entry_point); -+ write_memory (descr, valbuf, 4); -+ store_unsigned_integer (valbuf, 4, -+ bfin_fdpic_find_global_pointer (entry_point)); -+ write_memory (descr + 4, valbuf, 4); -+ return descr; -+} -+ -+static CORE_ADDR -+bfin_convert_from_func_ptr_addr (struct gdbarch *gdbarch, CORE_ADDR addr, -+ struct target_ops *targ) -+{ -+ CORE_ADDR entry_point; -+ CORE_ADDR got_address; -+ -+ entry_point = get_target_memory_unsigned (targ, addr, 4); -+ got_address = get_target_memory_unsigned (targ, addr + 4, 4); -+ -+ if (got_address == bfin_fdpic_find_global_pointer (entry_point)) -+ return entry_point; -+ else -+ return addr; -+} -+ -+/* We currently only support passing parameters in integer registers. This -+ conforms with GCC's default model. Several other variants exist and -+ we should probably support some of them based on the selected ABI. */ -+ -+static CORE_ADDR -+bfin_push_dummy_call (struct gdbarch *gdbarch, -+ struct value * function, -+ struct regcache *regcache, -+ CORE_ADDR bp_addr, -+ int nargs, -+ struct value **args, -+ CORE_ADDR sp, -+ int struct_return, -+ CORE_ADDR struct_addr) -+{ -+ struct gdbarch_tdep *tdep = gdbarch_tdep (gdbarch); -+ char buf[4]; -+ int i; -+ long reg_r0, reg_r1, reg_r2; -+ int total_len = 0; -+ enum bfin_abi abi = bfin_abi (gdbarch); -+ CORE_ADDR func_addr = find_function_addr (function, NULL); -+ -+ for (i = nargs - 1; i >= 0; i--) -+ { -+ struct type *value_type = value_enclosing_type (args[i]); -+ int len = TYPE_LENGTH (value_type); -+ total_len += (len + 3) & ~3; -+ } -+ -+ /* At least twelve bytes of stack space must be allocated for the function's -+ arguments, even for functions that have less than 12 bytes of argument -+ data. */ -+ -+ if (total_len < 12) -+ sp -= 12 - total_len; -+ -+ /* Push arguments in reverse order. */ -+ -+ for (i = nargs - 1; i >= 0; i--) -+ { -+ struct type *value_type = value_enclosing_type (args[i]); -+ struct type *arg_type = check_typedef (value_type); -+ int len = TYPE_LENGTH (value_type); -+ int container_len = (len + 3) & ~3; -+ sp -= container_len; -+ -+ if (abi == BFIN_ABI_FDPIC -+ && len == 4 -+ && TYPE_CODE (arg_type) == TYPE_CODE_PTR -+ && TYPE_CODE (TYPE_TARGET_TYPE (arg_type)) == TYPE_CODE_FUNC) -+ { -+ CORE_ADDR descr; -+ -+ /* The FDPIC ABI requires function descriptors to be passed instead -+ of entry points. */ -+ descr = extract_unsigned_integer (value_contents (args[i]), 4); -+ descr = find_func_descr (gdbarch, descr); -+ write_memory_unsigned_integer (sp, 4, descr); -+ } -+ else -+ write_memory (sp, value_contents_writeable (args[i]), container_len); -+ } -+ -+ /* initialize R0, R1 and R2 to the first 3 words of paramters */ -+ -+ reg_r0 = read_memory_integer (sp, 4); -+ regcache_cooked_write_unsigned (regcache, BFIN_R0_REGNUM, reg_r0); -+ reg_r1 = read_memory_integer (sp + 4, 4); -+ regcache_cooked_write_unsigned (regcache, BFIN_R1_REGNUM, reg_r1); -+ reg_r2 = read_memory_integer (sp + 8, 4); -+ regcache_cooked_write_unsigned (regcache, BFIN_R2_REGNUM, reg_r2); -+ -+ /* Store struct value address. */ -+ -+ if (struct_return) -+ regcache_cooked_write_unsigned (regcache, BFIN_P0_REGNUM, struct_addr); -+ -+ /* Set the dummy return value to bp_addr. -+ A dummy breakpoint will be setup to execute the call. */ -+ -+ regcache_cooked_write_unsigned (regcache, BFIN_RETS_REGNUM, bp_addr); -+ -+ /* Finally, update the stack pointer. */ -+ -+ regcache_cooked_write_unsigned (regcache, BFIN_SP_REGNUM, sp); -+ -+ return sp; -+} -+ -+/* Convert DWARF2 register number REG to the appropriate register number -+ used by GDB. */ -+ -+static int -+bfin_reg_to_regnum (int reg) -+{ -+ if (reg > sizeof (map_gcc_gdb) / sizeof (int)) -+ return 0; -+ -+ return map_gcc_gdb[reg]; -+} -+ -+static int -+gdb_print_insn_bfin (bfd_vma memaddr, disassemble_info *info) -+{ -+ return print_insn_bfin (memaddr, info); -+} -+ -+/* This function implements the BREAKPOINT_FROM_PC macro. It returns -+ a pointer to a string of bytes that encode a breakpoint instruction, -+ stores the length of the string to *lenptr, and adjusts the program -+ counter (if necessary) to point to the actual memory location where -+ the breakpoint should be inserted. */ -+ -+const unsigned char * -+bfin_breakpoint_from_pc (CORE_ADDR *pcptr, int *lenptr) -+{ -+ static unsigned char bfin_breakpoint[] = {0xa1, 0x00}; -+ *lenptr = sizeof (bfin_breakpoint); -+ return bfin_breakpoint; -+} -+ -+static void -+bfin_extract_return_value (struct type *type, -+ struct regcache *regs, -+ gdb_byte *dst) -+{ -+ bfd_byte *valbuf = dst; -+ int len = TYPE_LENGTH (type); -+ ULONGEST tmp; -+ int regno = BFIN_R0_REGNUM; -+ -+ gdb_assert (len <= 8); -+ -+ while (len > 0) -+ { -+ regcache_cooked_read_unsigned (regs, regno++, &tmp); -+ store_unsigned_integer (valbuf, (len > 4 ? 4 : len), tmp); -+ len -= 4; -+ valbuf += 4; -+ } -+} -+ -+/* Write into appropriate registers a function return value of type -+ TYPE, given in virtual format. */ -+ -+static void -+bfin_store_return_value (struct type *type, -+ struct regcache *regs, -+ const gdb_byte *src) -+{ -+ const bfd_byte *valbuf = src; -+ -+ /* Integral values greater than one word are stored in consecutive -+ registers starting with R0. This will always be a multiple of -+ the register size. */ -+ -+ int len = TYPE_LENGTH (type); -+ int regno = BFIN_R0_REGNUM; -+ -+ gdb_assert (len <= 8); -+ -+ while (len > 0) -+ { -+ regcache_cooked_write (regs, regno++, valbuf); -+ len -= 4; -+ valbuf += 4; -+ } -+} -+ -+/* Determine, for architecture GDBARCH, how a return value of TYPE -+ should be returned. If it is supposed to be returned in registers, -+ and READBUF is non-zero, read the appropriate value from REGCACHE, -+ and copy it into READBUF. If WRITEBUF is non-zero, write the value -+ from WRITEBUF into REGCACHE. */ -+ -+static enum return_value_convention -+bfin_return_value (struct gdbarch *gdbarch, -+ struct type *type, -+ struct regcache *regcache, -+ gdb_byte *readbuf, -+ const gdb_byte *writebuf) -+{ -+ if (TYPE_LENGTH (type) > 8) -+ return RETURN_VALUE_STRUCT_CONVENTION; -+ -+ if (readbuf) -+ bfin_extract_return_value (type, regcache, readbuf); -+ -+ if (writebuf) -+ bfin_store_return_value (type, regcache, writebuf); -+ -+ return RETURN_VALUE_REGISTER_CONVENTION; -+} -+ -+/* Return the BFIN register name corresponding to register I. */ -+ -+static const char * -+bfin_register_name (int i) -+{ -+ return bfin_register_name_strings[i]; -+} -+ -+static CORE_ADDR -+bfin_frame_base_address (struct frame_info *next_frame, void **this_cache) -+{ -+ struct bfin_frame_cache *cache = bfin_frame_cache (next_frame, this_cache); -+ -+ return cache->base; -+} -+ -+static CORE_ADDR -+bfin_frame_local_address (struct frame_info *next_frame, void **this_cache) -+{ -+ struct bfin_frame_cache *cache = bfin_frame_cache (next_frame, this_cache); -+ -+ return cache->base - 4; -+} -+ -+static CORE_ADDR -+bfin_frame_args_address (struct frame_info *next_frame, void **this_cache) -+{ -+ struct bfin_frame_cache *cache = bfin_frame_cache (next_frame, this_cache); -+ -+ return cache->base + 8; -+} -+ -+static const struct frame_base bfin_frame_base = -+{ -+ &bfin_frame_unwind, -+ bfin_frame_base_address, -+ bfin_frame_local_address, -+ bfin_frame_args_address -+}; -+ -+static struct frame_id -+bfin_unwind_dummy_id (struct gdbarch *gdbarch, struct frame_info *next_frame) -+{ -+ CORE_ADDR sp; -+ -+ sp = frame_unwind_register_unsigned (next_frame, BFIN_SP_REGNUM); -+ -+ return frame_id_build (sp, frame_pc_unwind (next_frame)); -+} -+ -+static CORE_ADDR -+bfin_unwind_pc (struct gdbarch *gdbarch, struct frame_info *next_frame) -+{ -+ return frame_unwind_register_unsigned (next_frame, PC_REGNUM); -+} -+ -+static int -+bfin_sim_regno (int regno) -+{ -+ switch (regno) -+ { -+ case SIM_BFIN_ASTAT_REGNUM: -+ case SIM_BFIN_CYCLES_REGNUM: -+ case SIM_BFIN_CYCLES2_REGNUM: -+ case SIM_BFIN_USP_REGNUM: -+ case SIM_BFIN_SEQSTAT_REGNUM: -+ case SIM_BFIN_SYSCFG_REGNUM: -+ case SIM_BFIN_RETI_REGNUM: -+ case SIM_BFIN_RETX_REGNUM: -+ case SIM_BFIN_RETN_REGNUM: -+ case SIM_BFIN_RETE_REGNUM: -+ case SIM_BFIN_EXTRA1: -+ case SIM_BFIN_EXTRA2: -+ case SIM_BFIN_EXTRA3: -+ case SIM_BFIN_IPEND_REGNUM: -+ return SIM_REGNO_DOES_NOT_EXIST; -+ default: -+ return regno; -+ } -+} -+ -+CORE_ADDR -+bfin_frame_align (struct gdbarch *gdbarch, CORE_ADDR address) -+{ -+ return (address & ~0x3); -+} -+ -+/* Fetch the interpreter and executable loadmap addresses (for shared -+ library support) for the FDPIC ABI. Return 0 if successful, -1 if -+ not. (E.g, -1 will be returned if the ABI isn't the FDPIC ABI.) */ -+int -+bfin_fdpic_loadmap_addresses (struct gdbarch *gdbarch, CORE_ADDR *interp_addr, -+ CORE_ADDR *exec_addr) -+{ -+ if (bfin_abi (gdbarch) != BFIN_ABI_FDPIC) -+ return -1; -+ else -+ { -+ if (interp_addr != NULL) -+ { -+ ULONGEST val; -+ regcache_cooked_read_unsigned (current_regcache, -+ BFIN_FDPIC_INTERP_REGNUM, &val); -+ *interp_addr = val; -+ } -+ if (exec_addr != NULL) -+ { -+ ULONGEST val; -+ regcache_cooked_read_unsigned (current_regcache, -+ BFIN_FDPIC_EXEC_REGNUM, &val); -+ *exec_addr = val; -+ } -+ return 0; -+ } -+} -+ -+/* Initialize the current architecture based on INFO. If possible, -+ re-use an architecture from ARCHES, which is a list of -+ architectures already created during this debugging session. -+ -+ Called e.g. at program startup, when reading a core file, and when -+ reading a binary file. */ -+ -+static struct gdbarch * -+bfin_gdbarch_init (struct gdbarch_info info, struct gdbarch_list *arches) -+{ -+ struct gdbarch_tdep *tdep; -+ struct gdbarch *gdbarch; -+ int elf_flags; -+ enum bfin_abi abi; -+ -+ /* Extract the ELF flags, if available. */ -+ if (info.abfd && bfd_get_flavour (info.abfd) == bfd_target_elf_flavour) -+ elf_flags = elf_elfheader (info.abfd)->e_flags; -+ else -+ elf_flags = 0; -+ -+ if (elf_flags & EF_BFIN_FDPIC) -+ abi = BFIN_ABI_FDPIC; -+ else -+ abi = BFIN_ABI_FLAT; -+ -+ /* If there is already a candidate, use it. */ -+ -+ for (arches = gdbarch_list_lookup_by_info (arches, &info); -+ arches != NULL; -+ arches = gdbarch_list_lookup_by_info (arches->next, &info)) -+ { -+ if (gdbarch_tdep (arches->gdbarch)->bfin_abi != abi) -+ continue; -+ return arches->gdbarch; -+ } -+ -+ tdep = XMALLOC (struct gdbarch_tdep); -+ gdbarch = gdbarch_alloc (&info, tdep); -+ -+ tdep->bfin_abi = abi; -+ -+ set_gdbarch_num_regs (gdbarch, BFIN_NUM_REGS); -+ set_gdbarch_num_pseudo_regs (gdbarch, 0); -+ set_gdbarch_sp_regnum (gdbarch, BFIN_SP_REGNUM); -+ set_gdbarch_pc_regnum (gdbarch, BFIN_PC_REGNUM); -+ set_gdbarch_dwarf2_reg_to_regnum (gdbarch, bfin_reg_to_regnum); -+ set_gdbarch_register_name (gdbarch, bfin_register_name); -+ set_gdbarch_register_type (gdbarch, bfin_register_type); -+ set_gdbarch_unwind_dummy_id (gdbarch, bfin_unwind_dummy_id); -+ set_gdbarch_push_dummy_call (gdbarch, bfin_push_dummy_call); -+ set_gdbarch_call_dummy_location (gdbarch, ON_STACK); -+ set_gdbarch_register_sim_regno (gdbarch, bfin_sim_regno); -+ set_gdbarch_believe_pcc_promotion (gdbarch, 1); -+ set_gdbarch_return_value (gdbarch, bfin_return_value); -+ set_gdbarch_extract_return_value (gdbarch, bfin_extract_return_value); -+ set_gdbarch_store_return_value (gdbarch, bfin_store_return_value); -+ set_gdbarch_skip_prologue (gdbarch, bfin_skip_prologue); -+ set_gdbarch_inner_than (gdbarch, core_addr_lessthan); -+ set_gdbarch_breakpoint_from_pc (gdbarch, bfin_breakpoint_from_pc); -+ set_gdbarch_decr_pc_after_break (gdbarch, 0); -+ set_gdbarch_frame_args_skip (gdbarch, 8); -+ set_gdbarch_unwind_pc (gdbarch, bfin_unwind_pc); -+ set_gdbarch_frame_align (gdbarch, bfin_frame_align); -+ set_gdbarch_print_insn (gdbarch, gdb_print_insn_bfin); -+ -+ frame_unwind_append_sniffer (gdbarch, dwarf2_frame_sniffer); -+ -+ frame_base_set_default (gdbarch, &bfin_frame_base); -+ -+ frame_unwind_append_sniffer (gdbarch, bfin_linux_sigtramp_frame_sniffer); -+ frame_unwind_append_sniffer (gdbarch, bfin_frame_sniffer); -+ -+ -+ if (bfin_abi (gdbarch) == BFIN_ABI_FDPIC) -+ set_gdbarch_convert_from_func_ptr_addr (gdbarch, -+ bfin_convert_from_func_ptr_addr); -+ -+ if (bfin_abi (gdbarch) == BFIN_ABI_FDPIC) -+ set_gdbarch_use_get_offsets (gdbarch, 0); -+ -+ return gdbarch; -+} -+ -+static void -+bfin_dump_tdep (struct gdbarch *current_gdbarch, struct ui_file *file) -+{ -+ struct gdbarch_tdep *tdep = gdbarch_tdep (current_gdbarch); -+ -+ if (tdep == NULL) -+ return; -+} -+ -+extern initialize_file_ftype _initialize_bfin_tdep; /* -Wmissing-prototypes */ -+ -+void -+_initialize_bfin_tdep (void) -+{ -+ gdbarch_register (bfd_arch_bfin, bfin_gdbarch_init, bfin_dump_tdep); -+} -diff -Naur gdb-6.5.orig/gdb/bfin-tdep.h gdb-6.5/gdb/bfin-tdep.h ---- gdb-6.5.orig/gdb/bfin-tdep.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/bfin-tdep.h 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,180 @@ -+/* Target-dependent code for Analog Devices Blackfin processer, for GDB. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+enum gdb_regnum { -+ /* Core Registers */ -+ BFIN_R0_REGNUM = 0, -+ BFIN_R1_REGNUM, -+ BFIN_R2_REGNUM, -+ BFIN_R3_REGNUM, -+ BFIN_R4_REGNUM, -+ BFIN_R5_REGNUM, -+ BFIN_R6_REGNUM, -+ BFIN_R7_REGNUM, -+ BFIN_P0_REGNUM, -+ BFIN_P1_REGNUM, -+ BFIN_P2_REGNUM, -+ BFIN_P3_REGNUM, -+ BFIN_P4_REGNUM, -+ BFIN_P5_REGNUM, -+ BFIN_SP_REGNUM, -+ BFIN_FP_REGNUM, -+ BFIN_I0_REGNUM, -+ BFIN_I1_REGNUM, -+ BFIN_I2_REGNUM, -+ BFIN_I3_REGNUM, -+ BFIN_M0_REGNUM, -+ BFIN_M1_REGNUM, -+ BFIN_M2_REGNUM, -+ BFIN_M3_REGNUM, -+ BFIN_B0_REGNUM, -+ BFIN_B1_REGNUM, -+ BFIN_B2_REGNUM, -+ BFIN_B3_REGNUM, -+ BFIN_L0_REGNUM, -+ BFIN_L1_REGNUM, -+ BFIN_L2_REGNUM, -+ BFIN_L3_REGNUM, -+ BFIN_A0_DOT_X_REGNUM, -+ BFIN_AO_DOT_W_REGNUM, -+ BFIN_A1_DOT_X_REGNUM, -+ BFIN_A1_DOT_W_REGNUM, -+ BFIN_ASTAT_REGNUM, -+ BFIN_RETS_REGNUM, -+ BFIN_LC0_REGNUM, -+ BFIN_LT0_REGNUM, -+ BFIN_LB0_REGNUM, -+ BFIN_LC1_REGNUM, -+ BFIN_LT1_REGNUM, -+ BFIN_LB1_REGNUM, -+ BFIN_CYCLES_REGNUM, -+ BFIN_CYCLES2_REGNUM, -+ BFIN_USP_REGNUM, -+ BFIN_SEQSTAT_REGNUM, -+ BFIN_SYSCFG_REGNUM, -+ BFIN_RETI_REGNUM, -+ BFIN_RETX_REGNUM, -+ BFIN_RETN_REGNUM, -+ BFIN_RETE_REGNUM, -+ -+ /* Pseudo Registers */ -+ BFIN_PC_REGNUM, -+ BFIN_CC_REGNUM, -+ BFIN_EXTRA1, /* Address of .text section. */ -+ BFIN_EXTRA2, /* Address of .data section. */ -+ BFIN_EXTRA3, /* Address of .bss section. */ -+ -+ BFIN_FDPIC_EXEC_REGNUM, -+ BFIN_FDPIC_INTERP_REGNUM, -+ -+ /* MMRs */ -+ BFIN_IPEND_REGNUM, -+ -+ /* LAST ENTRY SHOULD NOT BE CHANGED. */ -+ BFIN_NUM_REGS /* The number of all registers. */ -+}; -+ -+enum gcc_regnum { -+ BFIN_GCC_R0_REGNUM = 0, -+ BFIN_GCC_R1_REGNUM, -+ BFIN_GCC_R2_REGNUM, -+ BFIN_GCC_R3_REGNUM, -+ BFIN_GCC_R4_REGNUM, -+ BFIN_GCC_R5_REGNUM, -+ BFIN_GCC_R6_REGNUM, -+ BFIN_GCC_R7_REGNUM, -+ BFIN_GCC_P0_REGNUM, -+ BFIN_GCC_P1_REGNUM, -+ BFIN_GCC_P2_REGNUM, -+ BFIN_GCC_P3_REGNUM, -+ BFIN_GCC_P4_REGNUM, -+ BFIN_GCC_P5_REGNUM, -+ BFIN_GCC_SP_REGNUM, -+ BFIN_GCC_FP_REGNUM, -+ BFIN_GCC_I0_REGNUM, -+ BFIN_GCC_I1_REGNUM, -+ BFIN_GCC_I2_REGNUM, -+ BFIN_GCC_I3_REGNUM, -+ BFIN_GCC_B0_REGNUM, -+ BFIN_GCC_B1_REGNUM, -+ BFIN_GCC_B2_REGNUM, -+ BFIN_GCC_B3_REGNUM, -+ BFIN_GCC_L0_REGNUM, -+ BFIN_GCC_L1_REGNUM, -+ BFIN_GCC_L2_REGNUM, -+ BFIN_GCC_L3_REGNUM, -+ BFIN_GCC_M0_REGNUM, -+ BFIN_GCC_M1_REGNUM, -+ BFIN_GCC_M2_REGNUM, -+ BFIN_GCC_M3_REGNUM, -+ BFIN_GCC_A0_REGNUM, -+ BFIN_GCC_A1_REGNUM, -+ BFIN_GCC_CC_REGNUM, -+ BFIN_GCC_RETS_REGNUM, -+ BFIN_GCC_RETI_REGNUM, -+ BFIN_GCC_RETX_REGNUM, -+ BFIN_GCC_RETN_REGNUM, -+ BFIN_GCC_RETE_REGNUM, -+ BFIN_GCC_ASTAT_REGNUM, -+ BFIN_GCC_SEQSTAT_REGNUM, -+ BFIN_GCC_USP_REGNUM, -+ BFIN_GCC_ARGP_REGNUM, -+ BFIN_GCC_LT0_REGNUM, -+ BFIN_GCC_LT1_REGNUM, -+ BFIN_GCC_LC0_REGNUM, -+ BFIN_GCC_LC1_REGNUM, -+ BFIN_GCC_LB0_REGNUM, -+ BFIN_GCC_LB1_REGNUM -+}; -+ -+/* The ABIs for Blackfin. */ -+enum bfin_abi -+{ -+ BFIN_ABI_FLAT, -+ BFIN_ABI_FDPIC -+}; -+ -+/* Target-dependent structure in gdbarch. */ -+struct gdbarch_tdep -+{ -+ /* Which ABI is in use? */ -+ enum bfin_abi bfin_abi; -+}; -+ -+/* in opcodes/bfin-dis.c */ -+extern int print_insn_bfin (bfd_vma pc, struct disassemble_info *outf); -+ -+/* Fetch the interpreter and executable loadmap addresses (for shared -+ library support) for the FDPIC ABI. Return 0 if successful, -1 if -+ not. (E.g, -1 will be returned if the ABI isn't the FDPIC ABI.) */ -+extern int bfin_fdpic_loadmap_addresses (struct gdbarch *gdbarch, -+ CORE_ADDR *interp_addr, -+ CORE_ADDR *exec_addr); -+ -+/* Given a function entry point, find and return the GOT address for the -+ containing load module. */ -+CORE_ADDR bfin_fdpic_find_global_pointer (CORE_ADDR addr); -+ -+/* Given a function entry point, find and return the canonical descriptor -+ for that function, if one exists. If no canonical descriptor could -+ be found, return 0. */ -+CORE_ADDR bfin_fdpic_find_canonical_descriptor (CORE_ADDR entry_point); -diff -Naur gdb-6.5.orig/gdb/config/bfin/bfin.mt gdb-6.5/gdb/config/bfin/bfin.mt ---- gdb-6.5.orig/gdb/config/bfin/bfin.mt 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/config/bfin/bfin.mt 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,4 @@ -+TDEPFILES= bfin-tdep.o solib.o solib-bfin.o -+DEPRECATED_TM_FILE= solib.h -+SIM_OBS= remote-sim.o -+SIM= ../sim/bfin/libsim.a -diff -Naur gdb-6.5.orig/gdb/configure.tgt gdb-6.5/gdb/configure.tgt ---- gdb-6.5.orig/gdb/configure.tgt 2006-04-21 01:18:48.000000000 +0200 -+++ gdb-6.5/gdb/configure.tgt 2009-01-22 08:19:21.000000000 +0100 -@@ -14,6 +14,7 @@ - am33_2.0*) gdb_target_cpu=mn10300 ;; - arm*) gdb_target_cpu=arm ;; - avr*) gdb_target_cpu=avr ;; -+bfin*) gdb_target_cpu=bfin ;; - hppa*) gdb_target_cpu=pa ;; - i[34567]86*) gdb_target_cpu=i386 ;; - m68hc11*|m6811*) gdb_target_cpu=m68hc11 ;; -@@ -69,6 +70,9 @@ - - avr-*-*) gdb_target=avr ;; - -+bfin-*-*) gdb_target=bfin -+ build_gdbserver=yes -+ ;; - cris*) gdb_target=cris ;; - - # OBSOLETE d10v-*-*) gdb_target=d10v ;; -diff -Naur gdb-6.5.orig/gdb/gdbarch.c gdb-6.5/gdb/gdbarch.c ---- gdb-6.5.orig/gdb/gdbarch.c 2006-04-18 21:20:06.000000000 +0200 -+++ gdb-6.5/gdb/gdbarch.c 2009-01-22 08:19:21.000000000 +0100 -@@ -235,6 +235,7 @@ - gdbarch_register_reggroup_p_ftype *register_reggroup_p; - gdbarch_fetch_pointer_argument_ftype *fetch_pointer_argument; - gdbarch_regset_from_core_section_ftype *regset_from_core_section; -+ int use_get_offsets; - }; - - -@@ -361,6 +362,7 @@ - default_register_reggroup_p, /* register_reggroup_p */ - 0, /* fetch_pointer_argument */ - 0, /* regset_from_core_section */ -+ 1, /* use_get_offsets */ - /* startup_gdbarch() */ - }; - -@@ -450,6 +452,7 @@ - current_gdbarch->coff_make_msymbol_special = default_coff_make_msymbol_special; - current_gdbarch->name_of_malloc = "malloc"; - current_gdbarch->register_reggroup_p = default_register_reggroup_p; -+ current_gdbarch->use_get_offsets = 1; - /* gdbarch_alloc() */ - - return current_gdbarch; -@@ -615,6 +618,7 @@ - /* Skip verify of register_reggroup_p, invalid_p == 0 */ - /* Skip verify of fetch_pointer_argument, has predicate */ - /* Skip verify of regset_from_core_section, has predicate */ -+ /* Skip verify of use_get_offsets, invalid_p == 0 */ - buf = ui_file_xstrdup (log, &dummy); - make_cleanup (xfree, buf); - if (strlen (buf) > 0) -@@ -1601,6 +1605,9 @@ - fprintf_unfiltered (file, - "gdbarch_dump: unwind_sp = <0x%lx>\n", - (long) current_gdbarch->unwind_sp); -+ fprintf_unfiltered (file, -+ "gdbarch_dump: use_get_offsets = %s\n", -+ paddr_d (current_gdbarch->use_get_offsets)); - #ifdef VALUE_TO_REGISTER - fprintf_unfiltered (file, - "gdbarch_dump: %s # %s\n", -@@ -3683,6 +3690,23 @@ - gdbarch->regset_from_core_section = regset_from_core_section; - } - -+int -+gdbarch_use_get_offsets (struct gdbarch *gdbarch) -+{ -+ gdb_assert (gdbarch != NULL); -+ /* Skip verify of use_get_offsets, invalid_p == 0 */ -+ if (gdbarch_debug >= 2) -+ fprintf_unfiltered (gdb_stdlog, "gdbarch_use_get_offsets called\n"); -+ return gdbarch->use_get_offsets; -+} -+ -+void -+set_gdbarch_use_get_offsets (struct gdbarch *gdbarch, -+ int use_get_offsets) -+{ -+ gdbarch->use_get_offsets = use_get_offsets; -+} -+ - - /* Keep a registry of per-architecture data-pointers required by GDB - modules. */ -diff -Naur gdb-6.5.orig/gdb/gdbarch.h gdb-6.5/gdb/gdbarch.h ---- gdb-6.5.orig/gdb/gdbarch.h 2006-04-18 21:20:06.000000000 +0200 -+++ gdb-6.5/gdb/gdbarch.h 2009-01-22 08:19:21.000000000 +0100 -@@ -1404,6 +1404,11 @@ - extern const struct regset * gdbarch_regset_from_core_section (struct gdbarch *gdbarch, const char *sect_name, size_t sect_size); - extern void set_gdbarch_regset_from_core_section (struct gdbarch *gdbarch, gdbarch_regset_from_core_section_ftype *regset_from_core_section); - -+/* Query the remote side for the text, data and bss offsets */ -+ -+extern int gdbarch_use_get_offsets (struct gdbarch *gdbarch); -+extern void set_gdbarch_use_get_offsets (struct gdbarch *gdbarch, int use_get_offsets); -+ - extern struct gdbarch_tdep *gdbarch_tdep (struct gdbarch *gdbarch); - - -diff -Naur gdb-6.5.orig/gdb/gdbarch.sh gdb-6.5/gdb/gdbarch.sh ---- gdb-6.5.orig/gdb/gdbarch.sh 2006-04-18 21:20:06.000000000 +0200 -+++ gdb-6.5/gdb/gdbarch.sh 2009-01-22 08:19:21.000000000 +0100 -@@ -662,6 +662,8 @@ - # Return the appropriate register set for a core file section with - # name SECT_NAME and size SECT_SIZE. - M::const struct regset *:regset_from_core_section:const char *sect_name, size_t sect_size:sect_name, sect_size -+# Query the remote side for the text, data and bss offsets -+v::int:use_get_offsets:::1:1::0 - EOF - } - -diff -Naur gdb-6.5.orig/gdb/gdbserver/configure.srv gdb-6.5/gdb/gdbserver/configure.srv ---- gdb-6.5.orig/gdb/gdbserver/configure.srv 2006-05-09 17:21:19.000000000 +0200 -+++ gdb-6.5/gdb/gdbserver/configure.srv 2009-01-22 08:19:21.000000000 +0100 -@@ -23,6 +23,11 @@ - srv_linux_usrregs=yes - srv_linux_thread_db=yes - ;; -+ bfin-*-*) srv_regobj=reg-bfin.o -+ srv_tgtobj="linux-low.o linux-bfin-low.o" -+ srv_linux_usrregs=yes -+ srv_linux_thread_db=yes -+ ;; - crisv32-*-linux*) srv_regobj=reg-crisv32.o - srv_tgtobj="linux-low.o linux-crisv32-low.o" - srv_linux_regsets=yes -diff -Naur gdb-6.5.orig/gdb/gdbserver/linux-bfin-low.c gdb-6.5/gdb/gdbserver/linux-bfin-low.c ---- gdb-6.5.orig/gdb/gdbserver/linux-bfin-low.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/gdbserver/linux-bfin-low.c 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,101 @@ -+/* GNU/Linux/BFIN specific low level interface, for the remote server for GDB. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+#include "server.h" -+#include "linux-low.h" -+#include <asm/asm-offsets.h> -+ -+static int bfin_regmap[] = -+{ -+ PT_R0, PT_R1, PT_R2, PT_R3, PT_R4, PT_R5, PT_R6, PT_R7, -+ PT_P0, PT_P1, PT_P2, PT_P3, PT_P4, PT_P5, PT_USP, PT_FP, -+ PT_I0, PT_I1, PT_I2, PT_I3, PT_M0, PT_M1, PT_M2, PT_M3, -+ PT_B0, PT_B1, PT_B2, PT_B3, PT_L0, PT_L1, PT_L2, PT_L3, -+ PT_A0X, PT_A0W, PT_A1X, PT_A1W, PT_ASTAT, PT_RETS, -+ PT_LC0, PT_LT0, PT_LB0, PT_LC1, PT_LT1, PT_LB1, -+ -1 /* PT_CYCLES */, -1 /* PT_CYCLES2 */, -+ -1 /* PT_USP */, PT_SEQSTAT, PT_SYSCFG, PT_PC, PT_RETX, PT_RETN, PT_RETE, -+ PT_PC, -1 /* PT_CC */, PT_EXTRA1, PT_EXTRA2, PT_EXTRA3, -+ PT_FDPIC_EXEC, PT_FDPIC_INTERP, -+ PT_IPEND -+}; -+ -+#define bfin_num_regs (sizeof(bfin_regmap) / sizeof(bfin_regmap[0])) -+ -+static int -+bfin_cannot_store_register (int regno) -+{ -+ return (regno >= bfin_num_regs); -+} -+ -+static int -+bfin_cannot_fetch_register (int regno) -+{ -+ return (regno >= bfin_num_regs); -+} -+ -+static CORE_ADDR -+bfin_get_pc () -+{ -+ unsigned long pc; -+ collect_register_by_name ("pc", &pc); -+ return pc; -+} -+ -+static void -+bfin_set_pc (CORE_ADDR pc) -+{ -+ unsigned long newpc = pc; -+ supply_register_by_name ("pc", &newpc); -+} -+ -+#define bfin_breakpoint_len 2 -+static const unsigned char bfin_breakpoint[bfin_breakpoint_len]={0xa1, 0x00}; -+ -+static int -+bfin_breakpoint_at (CORE_ADDR where) -+{ -+ unsigned char insn[bfin_breakpoint_len]; -+ -+ read_inferior_memory(where, insn, bfin_breakpoint_len); -+ if (insn[0] == bfin_breakpoint[0] -+ && insn[1] == bfin_breakpoint[1]) -+ return 1; -+ -+ /* If necessary, recognize more trap instructions here. GDB only uses the -+ one. */ -+ return 0; -+} -+ -+struct linux_target_ops the_low_target = { -+ bfin_num_regs, -+ bfin_regmap, -+ bfin_cannot_fetch_register, -+ bfin_cannot_store_register, -+ bfin_get_pc, -+ bfin_set_pc, -+ bfin_breakpoint, -+ bfin_breakpoint_len, -+ 0, -+ 0, -+ bfin_breakpoint_at, -+}; -diff -Naur gdb-6.5.orig/gdb/gdbserver/Makefile.in gdb-6.5/gdb/gdbserver/Makefile.in ---- gdb-6.5.orig/gdb/gdbserver/Makefile.in 2006-03-15 17:26:02.000000000 +0100 -+++ gdb-6.5/gdb/gdbserver/Makefile.in 2009-01-22 08:19:21.000000000 +0100 -@@ -119,9 +119,9 @@ - $(srcdir)/mem-break.c $(srcdir)/proc-service.c $(srcdir)/regcache.c \ - $(srcdir)/remote-utils.c $(srcdir)/server.c $(srcdir)/target.c \ - $(srcdir)/thread-db.c $(srcdir)/utils.c \ -- $(srcdir)/linux-arm-low.c $(srcdir)/linux-cris-low.c \ -- $(srcdir)/linux-crisv32-low.c $(srcdir)/linux-i386-low.c \ -- $(srcdir)/i387-fp.c \ -+ $(srcdir)/linux-arm-low.c $(srcdir)/linux-bfin-low.c \ -+ $(srcdir)/linux-cris-low.c $(srcdir)/linux-crisv32-low.c \ -+ $(srcdir)/linux-i386-low.c $(srcdir)/i387-fp.c \ - $(srcdir)/linux-ia64-low.c $(srcdir)/linux-low.c \ - $(srcdir)/linux-m32r-low.c \ - $(srcdir)/linux-m68k-low.c $(srcdir)/linux-mips-low.c \ -@@ -206,6 +206,7 @@ - rm -f reg-arm.c reg-i386.c reg-ia64.c reg-m32r.c reg-m68k.c reg-mips.c - rm -f reg-ppc.c reg-sh.c reg-x86-64.c reg-i386-linux.c - rm -f reg-cris.c reg-crisv32.c -+ rm -f reg-bfin.c - - maintainer-clean realclean distclean: clean - rm -f nm.h tm.h xm.h config.status config.h stamp-h config.log -@@ -270,6 +271,7 @@ - $(CC) -c $(CPPFLAGS) $(INTERNAL_CFLAGS) $< @USE_THREAD_DB@ - - linux-arm-low.o: linux-arm-low.c $(linux_low_h) $(server_h) -+linux-bfin-low.o: linux-bfin-low.c $(linux_low_h) $(server_h) - linux-cris-low.o: linux-cris-low.c $(linux_low_h) $(server_h) - linux-crisv32-low.o: linux-crisv32-low.c $(linux_low_h) $(server_h) - linux-i386-low.o: linux-i386-low.c $(linux_low_h) $(server_h) \ -@@ -288,6 +290,9 @@ - reg-arm.o : reg-arm.c $(regdef_h) - reg-arm.c : $(srcdir)/../regformats/reg-arm.dat $(regdat_sh) - sh $(regdat_sh) $(srcdir)/../regformats/reg-arm.dat reg-arm.c -+reg-bfin.o : reg-bfin.c $(regdef_h) -+reg-bfin.c : $(srcdir)/../regformats/reg-bfin.dat $(regdat_sh) -+ sh $(regdat_sh) $(srcdir)/../regformats/reg-bfin.dat reg-bfin.c - reg-cris.o : reg-cris.c $(regdef_h) - reg-cris.c : $(srcdir)/../regformats/reg-cris.dat $(regdat_sh) - sh $(regdat_sh) $(srcdir)/../regformats/reg-cris.dat reg-cris.c -diff -Naur gdb-6.5.orig/gdb/Makefile.in gdb-6.5/gdb/Makefile.in ---- gdb-6.5.orig/gdb/Makefile.in 2006-05-12 22:53:15.000000000 +0200 -+++ gdb-6.5/gdb/Makefile.in 2009-01-22 08:19:21.000000000 +0100 -@@ -581,6 +581,7 @@ - elf_sh_h = $(INCLUDE_DIR)/elf/sh.h - elf_arm_h = $(INCLUDE_DIR)/elf/arm.h $(elf_reloc_macros_h) - elf_bfd_h = $(BFD_SRC)/elf-bfd.h -+elf_bfin_h = $(INCLUDE_DIR)/elf/bfin.h $(elf_reloc_macros_h) - elf_frv_h = $(INCLUDE_DIR)/elf/frv.h $(elf_reloc_macros_h) - elf_m32c_h = $(INCLUDE_DIR)/elf/m32c.h $(elf_reloc_macros_h) - libaout_h = $(BFD_SRC)/libaout.h -@@ -597,6 +598,7 @@ - sh_opc_h = $(OPCODES_SRC)/sh-opc.h - gdb_callback_h = $(INCLUDE_DIR)/gdb/callback.h - gdb_sim_arm_h = $(INCLUDE_DIR)/gdb/sim-arm.h -+gdb_sim_bfin_h = $(INCLUDE_DIR)/gdb/sim-bfin.h - gdb_sim_d10v_h = $(INCLUDE_DIR)/gdb/sim-d10v.h - gdb_sim_frv_h = $(INCLUDE_DIR)/gdb/sim-frv.h - gdb_sim_m32c_h = $(INCLUDE_DIR)/gdb/sim-m32c.h -@@ -646,6 +648,7 @@ - ax_h = ax.h $(doublest_h) - bcache_h = bcache.h - bfd_target_h = bfd-target.h -+bfin_tdep_h = bfin-tdep.h - block_h = block.h - breakpoint_h = breakpoint.h $(frame_h) $(value_h) $(gdb_events_h) - bsd_kvm_h = bsd-kvm.h -@@ -1401,6 +1404,7 @@ - arm-linux-nat.c arm-linux-tdep.c arm-tdep.c \ - armnbsd-nat.c armnbsd-tdep.c \ - avr-tdep.c \ -+ bfin-tdep.c \ - bsd-uthread.c bsd-kvm.c \ - coff-solib.c \ - core-regset.c core-aout.c corelow.c \ -@@ -1782,6 +1786,11 @@ - $(gdb_assert_h) - bfd-target.o: bfd-target.c $(defs_h) $(target_h) $(bfd_target_h) \ - $(gdb_assert_h) $(gdb_string_h) -+bfin-tdep.o: bfin-tdep.c $(defs_h) $(frame_h) $(frame_base_h) \ -+ $(frame_unwind_h) $(dwarf2_frame_h) $(trad_frame_h) $(inferior_h) \ -+ $(gdbcore_h) $(dis_asm_h) $(regcache_h) $(arch_utils_h) \ -+ $(gdb_assert_h) $(sim_regno_h) $(bfin_tdep_h) $(gdb_sim_bfin_h) \ -+ $(elf_bfd_h) $(elf_bfin_h) $(infcall_h) - block.o: block.c $(defs_h) $(block_h) $(symtab_h) $(symfile_h) \ - $(gdb_obstack_h) $(cp_support_h) - blockframe.o: blockframe.c $(defs_h) $(symtab_h) $(bfd_h) $(objfiles_h) \ -@@ -2580,6 +2589,9 @@ - $(frame_h) $(gdb_regex_h) $(inferior_h) $(environ_h) $(language_h) \ - $(gdbcmd_h) $(completer_h) $(filenames_h) $(exec_h) $(solist_h) \ - $(observer_h) $(readline_h) -+solib-bfin.o: solib-bfin.c $(defs_h) $(gdb_string_h) $(inferior_h) \ -+ $(gdbcore_h) $(solist_h) $(bfin_tdep_h) $(objfiles_h) $(symtab_h) \ -+ $(language_h) $(command_h) $(gdbcmd_h) $(elf_bfin_h) - solib-frv.o: solib-frv.c $(defs_h) $(gdb_string_h) $(inferior_h) \ - $(gdbcore_h) $(solist_h) $(frv_tdep_h) $(objfiles_h) $(symtab_h) \ - $(language_h) $(command_h) $(gdbcmd_h) $(elf_frv_h) -diff -Naur gdb-6.5.orig/gdb/regformats/reg-bfin.dat gdb-6.5/gdb/regformats/reg-bfin.dat ---- gdb-6.5.orig/gdb/regformats/reg-bfin.dat 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/regformats/reg-bfin.dat 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,63 @@ -+name:bfin -+expedite:pc,sp,fp -+32:r0 -+32:r1 -+32:r2 -+32:r3 -+32:r4 -+32:r5 -+32:r6 -+32:r7 -+32:p0 -+32:p1 -+32:p2 -+32:p3 -+32:p4 -+32:p5 -+32:sp -+32:fp -+32:i0 -+32:i1 -+32:i2 -+32:i3 -+32:m0 -+32:m1 -+32:m2 -+32:m3 -+32:b0 -+32:b1 -+32:b2 -+32:b3 -+32:l0 -+32:l1 -+32:l2 -+32:l3 -+32:a0x -+32:a0w -+32:a1x -+32:a1w -+32:astat -+32:rets -+32:lc0 -+32:lt0 -+32:lb0 -+32:lc1 -+32:lt1 -+32:lb1 -+32:cycles -+32:cycles2 -+32:usp -+32:seqstat -+32:syscfg -+32:reti -+32:retx -+32:retn -+32:rete -+32:pc -+32:cc -+32:extra1 -+32:extra2 -+32:extra3 -+32:fdpic_exec -+32:fdpic_interp -+32:ipend -diff -Naur gdb-6.5.orig/gdb/remote.c gdb-6.5/gdb/remote.c ---- gdb-6.5.orig/gdb/remote.c 2006-05-05 22:08:45.000000000 +0200 -+++ gdb-6.5/gdb/remote.c 2009-01-22 08:19:21.000000000 +0100 -@@ -1912,7 +1912,9 @@ - - inferior_ptid = remote_current_thread (inferior_ptid); - -- get_offsets (); /* Get text, data & bss offsets. */ -+ /* Get text, data & bss offsets. */ -+ if (gdbarch_use_get_offsets (current_gdbarch)) -+ get_offsets (); - - putpkt ("?"); /* Initiate a query from remote machine. */ - immediate_quit--; -diff -Naur gdb-6.5.orig/gdb/solib-bfin.c gdb-6.5/gdb/solib-bfin.c ---- gdb-6.5.orig/gdb/solib-bfin.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/solib-bfin.c 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,1231 @@ -+/* Handle Blackfin (FDPIC) shared libraries for GDB, the GNU Debugger. -+ Copyright 2006 -+ Free Software Foundation, Inc. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, -+ Boston, MA 02111-1307, USA. */ -+ -+ -+#include "defs.h" -+#include "gdb_string.h" -+#include "inferior.h" -+#include "gdbcore.h" -+#include "solist.h" -+#include "bfin-tdep.h" -+#include "objfiles.h" -+#include "symtab.h" -+#include "language.h" -+#include "command.h" -+#include "gdbcmd.h" -+#include "elf/bfin.h" -+ -+/* Flag which indicates whether internal debug messages should be printed. */ -+static int solib_bfin_debug; -+ -+/* BFIN pointers are four bytes wide. */ -+enum { BFIN_PTR_SIZE = 4 }; -+ -+/* Representation of loadmap and related structs for the BFIN FDPIC ABI. */ -+ -+/* External versions; the size and alignment of the fields should be -+ the same as those on the target. When loaded, the placement of -+ the bits in each field will be the same as on the target. */ -+typedef gdb_byte ext_Elf32_Half[2]; -+typedef gdb_byte ext_Elf32_Addr[4]; -+typedef gdb_byte ext_Elf32_Word[4]; -+ -+struct ext_elf32_fdpic_loadseg -+{ -+ /* Core address to which the segment is mapped. */ -+ ext_Elf32_Addr addr; -+ /* VMA recorded in the program header. */ -+ ext_Elf32_Addr p_vaddr; -+ /* Size of this segment in memory. */ -+ ext_Elf32_Word p_memsz; -+}; -+ -+struct ext_elf32_fdpic_loadmap { -+ /* Protocol version number, must be zero. */ -+ ext_Elf32_Half version; -+ /* Number of segments in this map. */ -+ ext_Elf32_Half nsegs; -+ /* The actual memory map. */ -+ struct ext_elf32_fdpic_loadseg segs[1 /* nsegs, actually */]; -+}; -+ -+/* Internal versions; the types are GDB types and the data in each -+ of the fields is (or will be) decoded from the external struct -+ for ease of consumption. */ -+struct int_elf32_fdpic_loadseg -+{ -+ /* Core address to which the segment is mapped. */ -+ CORE_ADDR addr; -+ /* VMA recorded in the program header. */ -+ CORE_ADDR p_vaddr; -+ /* Size of this segment in memory. */ -+ long p_memsz; -+}; -+ -+struct int_elf32_fdpic_loadmap { -+ /* Protocol version number, must be zero. */ -+ int version; -+ /* Number of segments in this map. */ -+ int nsegs; -+ /* The actual memory map. */ -+ struct int_elf32_fdpic_loadseg segs[1 /* nsegs, actually */]; -+}; -+ -+/* Given address LDMADDR, fetch and decode the loadmap at that address. -+ Return NULL if there is a problem reading the target memory or if -+ there doesn't appear to be a loadmap at the given address. The -+ allocated space (representing the loadmap) returned by this -+ function may be freed via a single call to xfree(). */ -+ -+static struct int_elf32_fdpic_loadmap * -+fetch_loadmap (CORE_ADDR ldmaddr) -+{ -+ struct ext_elf32_fdpic_loadmap ext_ldmbuf_partial; -+ struct ext_elf32_fdpic_loadmap *ext_ldmbuf; -+ struct int_elf32_fdpic_loadmap *int_ldmbuf; -+ int ext_ldmbuf_size, int_ldmbuf_size; -+ int version, seg, nsegs; -+ -+ /* Fetch initial portion of the loadmap. */ -+ if (target_read_memory (ldmaddr, (gdb_byte *) &ext_ldmbuf_partial, -+ sizeof ext_ldmbuf_partial)) -+ { -+ /* Problem reading the target's memory. */ -+ return NULL; -+ } -+ -+ /* Extract the version. */ -+ version = extract_unsigned_integer (ext_ldmbuf_partial.version, -+ sizeof ext_ldmbuf_partial.version); -+ if (version != 0) -+ { -+ /* We only handle version 0. */ -+ return NULL; -+ } -+ -+ /* Extract the number of segments. */ -+ nsegs = extract_unsigned_integer (ext_ldmbuf_partial.nsegs, -+ sizeof ext_ldmbuf_partial.nsegs); -+ -+ /* Allocate space for the complete (external) loadmap. */ -+ ext_ldmbuf_size = sizeof (struct ext_elf32_fdpic_loadmap) -+ + (nsegs - 1) * sizeof (struct ext_elf32_fdpic_loadseg); -+ ext_ldmbuf = xmalloc (ext_ldmbuf_size); -+ -+ /* Copy over the portion of the loadmap that's already been read. */ -+ memcpy (ext_ldmbuf, &ext_ldmbuf_partial, sizeof ext_ldmbuf_partial); -+ -+ /* Read the rest of the loadmap from the target. */ -+ if (target_read_memory (ldmaddr + sizeof ext_ldmbuf_partial, -+ (gdb_byte *) ext_ldmbuf + sizeof ext_ldmbuf_partial, -+ ext_ldmbuf_size - sizeof ext_ldmbuf_partial)) -+ { -+ /* Couldn't read rest of the loadmap. */ -+ xfree (ext_ldmbuf); -+ return NULL; -+ } -+ -+ /* Allocate space into which to put information extract from the -+ external loadsegs. I.e, allocate the internal loadsegs. */ -+ int_ldmbuf_size = sizeof (struct int_elf32_fdpic_loadmap) -+ + (nsegs - 1) * sizeof (struct int_elf32_fdpic_loadseg); -+ int_ldmbuf = xmalloc (int_ldmbuf_size); -+ -+ /* Place extracted information in internal structs. */ -+ int_ldmbuf->version = version; -+ int_ldmbuf->nsegs = nsegs; -+ for (seg = 0; seg < nsegs; seg++) -+ { -+ int_ldmbuf->segs[seg].addr -+ = extract_unsigned_integer (ext_ldmbuf->segs[seg].addr, -+ sizeof (ext_ldmbuf->segs[seg].addr)); -+ int_ldmbuf->segs[seg].p_vaddr -+ = extract_unsigned_integer (ext_ldmbuf->segs[seg].p_vaddr, -+ sizeof (ext_ldmbuf->segs[seg].p_vaddr)); -+ int_ldmbuf->segs[seg].p_memsz -+ = extract_unsigned_integer (ext_ldmbuf->segs[seg].p_memsz, -+ sizeof (ext_ldmbuf->segs[seg].p_memsz)); -+ } -+ -+ xfree (ext_ldmbuf); -+ return int_ldmbuf; -+} -+ -+/* External link_map and elf32_fdpic_loadaddr struct definitions. */ -+ -+typedef gdb_byte ext_ptr[4]; -+ -+struct ext_elf32_fdpic_loadaddr -+{ -+ ext_ptr map; /* struct elf32_fdpic_loadmap *map; */ -+ ext_ptr got_value; /* void *got_value; */ -+}; -+ -+struct ext_link_map -+{ -+ struct ext_elf32_fdpic_loadaddr l_addr; -+ -+ /* Absolute file name object was found in. */ -+ ext_ptr l_name; /* char *l_name; */ -+ -+ /* Dynamic section of the shared object. */ -+ ext_ptr l_ld; /* ElfW(Dyn) *l_ld; */ -+ -+ /* Chain of loaded objects. */ -+ ext_ptr l_next, l_prev; /* struct link_map *l_next, *l_prev; */ -+}; -+ -+/* Link map info to include in an allocated so_list entry */ -+ -+struct lm_info -+ { -+ /* The loadmap, digested into an easier to use form. */ -+ struct int_elf32_fdpic_loadmap *map; -+ /* The GOT address for this link map entry. */ -+ CORE_ADDR got_value; -+ -+ /* Cached dynamic symbol table and dynamic relocs initialized and -+ used only by find_canonical_descriptor_in_load_object(). -+ -+ Note: kevinb/2004-02-26: It appears that calls to -+ bfd_canonicalize_dynamic_reloc() will use the same symbols as -+ those supplied to the first call to this function. Therefore, -+ it's important to NOT free the asymbol ** data structure -+ supplied to the first call. Thus the caching of the dynamic -+ symbols (dyn_syms) is critical for correct operation. The -+ caching of the dynamic relocations could be dispensed with. */ -+ asymbol **dyn_syms; -+ arelent **dyn_relocs; -+ int dyn_reloc_count; /* number of dynamic relocs. */ -+ -+ }; -+ -+/* The load map, got value, etc. are not available from the chain -+ of loaded shared objects. ``main_executable_lm_info'' provides -+ a way to get at this information so that it doesn't need to be -+ frequently recomputed. Initialized by bfin_relocate_main_executable(). */ -+static struct lm_info *main_executable_lm_info; -+ -+static void bfin_relocate_main_executable (void); -+static CORE_ADDR main_got (void); -+static int enable_break2 (void); -+ -+/* -+ -+ LOCAL FUNCTION -+ -+ bfd_lookup_symbol -- lookup the value for a specific symbol -+ -+ SYNOPSIS -+ -+ CORE_ADDR bfd_lookup_symbol (bfd *abfd, char *symname) -+ -+ DESCRIPTION -+ -+ An expensive way to lookup the value of a single symbol for -+ bfd's that are only temporary anyway. This is used by the -+ shared library support to find the address of the debugger -+ interface structures in the shared library. -+ -+ Note that 0 is specifically allowed as an error return (no -+ such symbol). -+ */ -+ -+static CORE_ADDR -+bfd_lookup_symbol (bfd *abfd, char *symname) -+{ -+ long storage_needed; -+ asymbol *sym; -+ asymbol **symbol_table; -+ unsigned int number_of_symbols; -+ unsigned int i; -+ struct cleanup *back_to; -+ CORE_ADDR symaddr = 0; -+ -+ storage_needed = bfd_get_symtab_upper_bound (abfd); -+ -+ if (storage_needed > 0) -+ { -+ symbol_table = (asymbol **) xmalloc (storage_needed); -+ back_to = make_cleanup (xfree, symbol_table); -+ number_of_symbols = bfd_canonicalize_symtab (abfd, symbol_table); -+ -+ for (i = 0; i < number_of_symbols; i++) -+ { -+ sym = *symbol_table++; -+ if (strcmp (sym->name, symname) == 0) -+ { -+ /* Bfd symbols are section relative. */ -+ symaddr = sym->value + sym->section->vma; -+ break; -+ } -+ } -+ do_cleanups (back_to); -+ } -+ -+ if (symaddr) -+ return symaddr; -+ -+ /* Look for the symbol in the dynamic string table too. */ -+ -+ storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd); -+ -+ if (storage_needed > 0) -+ { -+ symbol_table = (asymbol **) xmalloc (storage_needed); -+ back_to = make_cleanup (xfree, symbol_table); -+ number_of_symbols = bfd_canonicalize_dynamic_symtab (abfd, symbol_table); -+ -+ for (i = 0; i < number_of_symbols; i++) -+ { -+ sym = *symbol_table++; -+ if (strcmp (sym->name, symname) == 0) -+ { -+ /* Bfd symbols are section relative. */ -+ symaddr = sym->value + sym->section->vma; -+ break; -+ } -+ } -+ do_cleanups (back_to); -+ } -+ -+ return symaddr; -+} -+ -+ -+/* -+ -+ LOCAL FUNCTION -+ -+ open_symbol_file_object -+ -+ SYNOPSIS -+ -+ void open_symbol_file_object (void *from_tty) -+ -+ DESCRIPTION -+ -+ If no open symbol file, attempt to locate and open the main symbol -+ file. -+ -+ If FROM_TTYP dereferences to a non-zero integer, allow messages to -+ be printed. This parameter is a pointer rather than an int because -+ open_symbol_file_object() is called via catch_errors() and -+ catch_errors() requires a pointer argument. */ -+ -+static int -+open_symbol_file_object (void *from_ttyp) -+{ -+ /* Unimplemented. */ -+ return 0; -+} -+ -+/* Cached value for lm_base(), below. */ -+static CORE_ADDR lm_base_cache = 0; -+ -+/* Return the address from which the link map chain may be found. On -+ the BFIN, this may be found in a number of ways. Assuming that the -+ main executable has already been relocated, the easiest way to find -+ this value is to look up the address of _GLOBAL_OFFSET_TABLE_. A -+ pointer to the start of the link map will be located at the word found -+ at _GLOBAL_OFFSET_TABLE_ + 8. (This is part of the dynamic linker -+ reserve area mandated by the ABI.) */ -+ -+static CORE_ADDR -+lm_base (void) -+{ -+ struct minimal_symbol *got_sym; -+ CORE_ADDR addr; -+ gdb_byte buf[BFIN_PTR_SIZE]; -+ -+ /* If we already have a cached value, return it. */ -+ if (lm_base_cache) -+ return lm_base_cache; -+ -+ got_sym = lookup_minimal_symbol ("_GLOBAL_OFFSET_TABLE_", NULL, -+ symfile_objfile); -+ if (got_sym == 0) -+ { -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "lm_base: _GLOBAL_OFFSET_TABLE_ not found.\n"); -+ return 0; -+ } -+ -+ addr = SYMBOL_VALUE_ADDRESS (got_sym) + 8; -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "lm_base: _GLOBAL_OFFSET_TABLE_ + 8 = %s\n", -+ hex_string_custom (addr, 8)); -+ -+ if (target_read_memory (addr, buf, sizeof buf) != 0) -+ return 0; -+ lm_base_cache = extract_unsigned_integer (buf, sizeof buf); -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "lm_base: lm_base_cache = %s\n", -+ hex_string_custom (lm_base_cache, 8)); -+ -+ return lm_base_cache; -+} -+ -+ -+/* LOCAL FUNCTION -+ -+ bfin_current_sos -- build a list of currently loaded shared objects -+ -+ SYNOPSIS -+ -+ struct so_list *bfin_current_sos () -+ -+ DESCRIPTION -+ -+ Build a list of `struct so_list' objects describing the shared -+ objects currently loaded in the inferior. This list does not -+ include an entry for the main executable file. -+ -+ Note that we only gather information directly available from the -+ inferior --- we don't examine any of the shared library files -+ themselves. The declaration of `struct so_list' says which fields -+ we provide values for. */ -+ -+static struct so_list * -+bfin_current_sos (void) -+{ -+ CORE_ADDR lm_addr, mgot; -+ struct so_list *sos_head = NULL; -+ struct so_list **sos_next_ptr = &sos_head; -+ -+ mgot = main_got (); -+ -+ /* Locate the address of the first link map struct. */ -+ lm_addr = lm_base (); -+ -+ /* We have at least one link map entry. Fetch the the lot of them, -+ building the solist chain. */ -+ while (lm_addr) -+ { -+ struct ext_link_map lm_buf; -+ CORE_ADDR got_addr; -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "bfin_current_sos: reading link_map entry at %s\n", -+ hex_string_custom (lm_addr, 8)); -+ -+ if (target_read_memory (lm_addr, (gdb_byte *) &lm_buf, sizeof (lm_buf)) != 0) -+ { -+ warning ("bfin_current_sos: Unable to read link map entry. Shared object chain may be incomplete."); -+ break; -+ } -+ -+ got_addr -+ = extract_unsigned_integer (lm_buf.l_addr.got_value, -+ sizeof (lm_buf.l_addr.got_value)); -+ /* If the got_addr is the same as mgotr, then we're looking at the -+ entry for the main executable. By convention, we don't include -+ this in the list of shared objects. */ -+ if (got_addr != mgot) -+ { -+ int errcode; -+ char *name_buf; -+ struct int_elf32_fdpic_loadmap *loadmap; -+ struct so_list *sop; -+ CORE_ADDR addr; -+ -+ /* Fetch the load map address. */ -+ addr = extract_unsigned_integer (lm_buf.l_addr.map, -+ sizeof lm_buf.l_addr.map); -+ loadmap = fetch_loadmap (addr); -+ if (loadmap == NULL) -+ { -+ warning ("bfin_current_sos: Unable to fetch load map. Shared object chain may be incomplete."); -+ break; -+ } -+ -+ sop = xcalloc (1, sizeof (struct so_list)); -+ sop->lm_info = xcalloc (1, sizeof (struct lm_info)); -+ sop->lm_info->map = loadmap; -+ sop->lm_info->got_value = got_addr; -+ /* Fetch the name. */ -+ addr = extract_unsigned_integer (lm_buf.l_name, -+ sizeof (lm_buf.l_name)); -+ target_read_string (addr, &name_buf, SO_NAME_MAX_PATH_SIZE - 1, -+ &errcode); -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, "bfin_current_sos: name = %s\n", -+ name_buf); -+ -+ if (errcode != 0) -+ { -+ warning ("bfin_current_sos: Can't read pathname for link map entry: %s\n", -+ safe_strerror (errcode)); -+ } -+ else -+ { -+ strncpy (sop->so_name, name_buf, SO_NAME_MAX_PATH_SIZE - 1); -+ sop->so_name[SO_NAME_MAX_PATH_SIZE - 1] = '\0'; -+ xfree (name_buf); -+ strcpy (sop->so_original_name, sop->so_name); -+ } -+ -+ *sos_next_ptr = sop; -+ sos_next_ptr = &sop->next; -+ } -+ -+ lm_addr = extract_unsigned_integer (lm_buf.l_next, sizeof (lm_buf.l_next)); -+ } -+ -+ enable_break2 (); -+ -+ return sos_head; -+} -+ -+ -+/* Return 1 if PC lies in the dynamic symbol resolution code of the -+ run time loader. */ -+ -+static CORE_ADDR interp_text_sect_low; -+static CORE_ADDR interp_text_sect_high; -+static CORE_ADDR interp_plt_sect_low; -+static CORE_ADDR interp_plt_sect_high; -+ -+static int -+bfin_in_dynsym_resolve_code (CORE_ADDR pc) -+{ -+ return ((pc >= interp_text_sect_low && pc < interp_text_sect_high) -+ || (pc >= interp_plt_sect_low && pc < interp_plt_sect_high) -+ || in_plt_section (pc, NULL)); -+} -+ -+/* Given a loadmap and an address, return the displacement needed -+ to relocate the address. */ -+ -+CORE_ADDR -+displacement_from_map (struct int_elf32_fdpic_loadmap *map, -+ CORE_ADDR addr) -+{ -+ int seg; -+ -+ for (seg = 0; seg < map->nsegs; seg++) -+ { -+ if (map->segs[seg].p_vaddr <= addr -+ && addr < map->segs[seg].p_vaddr + map->segs[seg].p_memsz) -+ { -+ return map->segs[seg].addr - map->segs[seg].p_vaddr; -+ } -+ } -+ -+ return 0; -+} -+ -+/* Print a warning about being unable to set the dynamic linker -+ breakpoint. */ -+ -+static void -+enable_break_failure_warning (void) -+{ -+ warning ("Unable to find dynamic linker breakpoint function.\n" -+ "GDB will be unable to debug shared library initializers\n" -+ "and track explicitly loaded dynamic code."); -+} -+ -+/* -+ -+ LOCAL FUNCTION -+ -+ enable_break -- arrange for dynamic linker to hit breakpoint -+ -+ SYNOPSIS -+ -+ int enable_break (void) -+ -+ DESCRIPTION -+ -+ The dynamic linkers has, as part of its debugger interface, support -+ for arranging for the inferior to hit a breakpoint after mapping in -+ the shared libraries. This function enables that breakpoint. -+ -+ On the BFIN, using the shared library (FDPIC) ABI, the symbol -+ _dl_debug_addr points to the r_debug struct which contains -+ a field called r_brk. r_brk is the address of the function -+ descriptor upon which a breakpoint must be placed. Being a -+ function descriptor, we must extract the entry point in order -+ to set the breakpoint. -+ -+ Our strategy will be to get the .interp section from the -+ executable. This section will provide us with the name of the -+ interpreter. We'll open the interpreter and then look up -+ the address of _dl_debug_addr. We then relocate this address -+ using the interpreter's loadmap. Once the relocated address -+ is known, we fetch the value (address) corresponding to r_brk -+ and then use that value to fetch the entry point of the function -+ we're interested in. -+ -+ */ -+ -+static int enable_break1_done = 0; -+static int enable_break2_done = 0; -+ -+static int -+enable_break2 (void) -+{ -+ int success = 0; -+ char **bkpt_namep; -+ asection *interp_sect; -+ -+ if (!enable_break1_done || enable_break2_done) -+ return 1; -+ -+ enable_break2_done = 1; -+ -+ /* First, remove all the solib event breakpoints. Their addresses -+ may have changed since the last time we ran the program. */ -+ remove_solib_event_breakpoints (); -+ -+ interp_text_sect_low = interp_text_sect_high = 0; -+ interp_plt_sect_low = interp_plt_sect_high = 0; -+ -+ /* Find the .interp section; if not found, warn the user and drop -+ into the old breakpoint at symbol code. */ -+ interp_sect = bfd_get_section_by_name (exec_bfd, ".interp"); -+ if (interp_sect) -+ { -+ unsigned int interp_sect_size; -+ gdb_byte *buf; -+ bfd *tmp_bfd = NULL; -+ int tmp_fd = -1; -+ char *tmp_pathname = NULL; -+ int status; -+ CORE_ADDR addr, interp_loadmap_addr; -+ gdb_byte addr_buf[BFIN_PTR_SIZE]; -+ struct int_elf32_fdpic_loadmap *ldm; -+ -+ /* Read the contents of the .interp section into a local buffer; -+ the contents specify the dynamic linker this program uses. */ -+ interp_sect_size = bfd_section_size (exec_bfd, interp_sect); -+ buf = alloca (interp_sect_size); -+ bfd_get_section_contents (exec_bfd, interp_sect, -+ buf, 0, interp_sect_size); -+ -+ /* Now we need to figure out where the dynamic linker was -+ loaded so that we can load its symbols and place a breakpoint -+ in the dynamic linker itself. -+ -+ This address is stored on the stack. However, I've been unable -+ to find any magic formula to find it for Solaris (appears to -+ be trivial on GNU/Linux). Therefore, we have to try an alternate -+ mechanism to find the dynamic linker's base address. */ -+ -+ tmp_fd = solib_open (buf, &tmp_pathname); -+ if (tmp_fd >= 0) -+ tmp_bfd = bfd_fdopenr (tmp_pathname, gnutarget, tmp_fd); -+ -+ if (tmp_bfd == NULL) -+ { -+ enable_break_failure_warning (); -+ return 0; -+ } -+ -+ /* Make sure the dynamic linker is really a useful object. */ -+ if (!bfd_check_format (tmp_bfd, bfd_object)) -+ { -+ warning ("Unable to grok dynamic linker %s as an object file", buf); -+ enable_break_failure_warning (); -+ bfd_close (tmp_bfd); -+ return 0; -+ } -+ -+ status = bfin_fdpic_loadmap_addresses (current_gdbarch, -+ &interp_loadmap_addr, 0); -+ if (status < 0) -+ { -+ warning ("Unable to determine dynamic linker loadmap address\n"); -+ enable_break_failure_warning (); -+ bfd_close (tmp_bfd); -+ return 0; -+ } -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "enable_break: interp_loadmap_addr = %s\n", -+ hex_string_custom (interp_loadmap_addr, 8)); -+ -+ ldm = fetch_loadmap (interp_loadmap_addr); -+ if (ldm == NULL) -+ { -+ warning ("Unable to load dynamic linker loadmap at address %s\n", -+ hex_string_custom (interp_loadmap_addr, 8)); -+ enable_break_failure_warning (); -+ bfd_close (tmp_bfd); -+ return 0; -+ } -+ -+ /* Record the relocated start and end address of the dynamic linker -+ text and plt section for svr4_in_dynsym_resolve_code. */ -+ interp_sect = bfd_get_section_by_name (tmp_bfd, ".text"); -+ if (interp_sect) -+ { -+ interp_text_sect_low -+ = bfd_section_vma (tmp_bfd, interp_sect); -+ interp_text_sect_low -+ += displacement_from_map (ldm, interp_text_sect_low); -+ interp_text_sect_high -+ = interp_text_sect_low + bfd_section_size (tmp_bfd, interp_sect); -+ } -+ interp_sect = bfd_get_section_by_name (tmp_bfd, ".plt"); -+ if (interp_sect) -+ { -+ interp_plt_sect_low = -+ bfd_section_vma (tmp_bfd, interp_sect); -+ interp_plt_sect_low -+ += displacement_from_map (ldm, interp_plt_sect_low); -+ interp_plt_sect_high = -+ interp_plt_sect_low + bfd_section_size (tmp_bfd, interp_sect); -+ } -+ -+ addr = bfd_lookup_symbol (tmp_bfd, "__dl_debug_addr"); -+ if (addr == 0) -+ { -+ warning ("Could not find symbol _dl_debug_addr in dynamic linker"); -+ enable_break_failure_warning (); -+ bfd_close (tmp_bfd); -+ return 0; -+ } -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "enable_break: _dl_debug_addr (prior to relocation) = %s\n", -+ hex_string_custom (addr, 8)); -+ -+ addr += displacement_from_map (ldm, addr); -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "enable_break: _dl_debug_addr (after relocation) = %s\n", -+ hex_string_custom (addr, 8)); -+ -+ /* Fetch the address of the r_debug struct. */ -+ if (target_read_memory (addr, addr_buf, sizeof addr_buf) != 0) -+ { -+ warning ("Unable to fetch contents of _dl_debug_addr (at address %s) from dynamic linker", -+ hex_string_custom (addr, 8)); -+ } -+ addr = extract_unsigned_integer (addr_buf, sizeof addr_buf); -+ -+ /* Fetch the r_brk field. It's 8 bytes from the start of -+ _dl_debug_addr. */ -+ if (target_read_memory (addr + 8, addr_buf, sizeof addr_buf) != 0) -+ { -+ warning ("Unable to fetch _dl_debug_addr->r_brk (at address %s) from dynamic linker", -+ hex_string_custom (addr + 8, 8)); -+ enable_break_failure_warning (); -+ bfd_close (tmp_bfd); -+ return 0; -+ } -+ addr = extract_unsigned_integer (addr_buf, sizeof addr_buf); -+ -+ /* Now fetch the function entry point. */ -+ if (target_read_memory (addr, addr_buf, sizeof addr_buf) != 0) -+ { -+ warning ("Unable to fetch _dl_debug_addr->.r_brk entry point (at address %s) from dynamic linker", -+ hex_string_custom (addr, 8)); -+ enable_break_failure_warning (); -+ bfd_close (tmp_bfd); -+ return 0; -+ } -+ addr = extract_unsigned_integer (addr_buf, sizeof addr_buf); -+ -+ /* We're done with the temporary bfd. */ -+ bfd_close (tmp_bfd); -+ -+ /* We're also done with the loadmap. */ -+ xfree (ldm); -+ -+ /* Now (finally!) create the solib breakpoint. */ -+ create_solib_event_breakpoint (addr); -+ -+ return 1; -+ } -+ -+ /* Tell the user we couldn't set a dynamic linker breakpoint. */ -+ enable_break_failure_warning (); -+ -+ /* Failure return. */ -+ return 0; -+} -+ -+static int -+enable_break (void) -+{ -+ asection *interp_sect; -+ -+ /* Remove all the solib event breakpoints. Their addresses -+ may have changed since the last time we ran the program. */ -+ remove_solib_event_breakpoints (); -+ -+ /* Check for the presence of a .interp section. If there is no -+ such section, the executable is statically linked. */ -+ -+ interp_sect = bfd_get_section_by_name (exec_bfd, ".interp"); -+ -+ if (interp_sect) -+ { -+ enable_break1_done = 1; -+ create_solib_event_breakpoint (symfile_objfile->ei.entry_point); -+ -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "enable_break: solib event breakpoint placed at entry point: %s\n", -+ hex_string_custom -+ (symfile_objfile->ei.entry_point, 8)); -+ } -+ else -+ { -+ if (solib_bfin_debug) -+ fprintf_unfiltered (gdb_stdlog, -+ "enable_break: No .interp section found.\n"); -+ } -+ -+ return 1; -+} -+ -+/* -+ -+ LOCAL FUNCTION -+ -+ special_symbol_handling -- additional shared library symbol handling -+ -+ SYNOPSIS -+ -+ void special_symbol_handling () -+ -+ DESCRIPTION -+ -+ Once the symbols from a shared object have been loaded in the usual -+ way, we are called to do any system specific symbol handling that -+ is needed. -+ -+ */ -+ -+static void -+bfin_special_symbol_handling (void) -+{ -+ /* Nothing needed (yet) for FRV. */ -+} -+ -+static void -+bfin_relocate_main_executable (void) -+{ -+ int status; -+ CORE_ADDR exec_addr; -+ struct int_elf32_fdpic_loadmap *ldm; -+ struct cleanup *old_chain; -+ struct section_offsets *new_offsets; -+ int changed; -+ struct obj_section *osect; -+ -+ status = bfin_fdpic_loadmap_addresses (current_gdbarch, 0, &exec_addr); -+ -+ if (status < 0) -+ { -+ /* Not using FDPIC ABI, so do nothing. */ -+ return; -+ } -+ -+ /* Fetch the loadmap located at ``exec_addr''. */ -+ ldm = fetch_loadmap (exec_addr); -+ if (ldm == NULL) -+ error ("Unable to load the executable's loadmap."); -+ -+ if (main_executable_lm_info) -+ xfree (main_executable_lm_info); -+ main_executable_lm_info = xcalloc (1, sizeof (struct lm_info)); -+ main_executable_lm_info->map = ldm; -+ -+ new_offsets = xcalloc (symfile_objfile->num_sections, -+ sizeof (struct section_offsets)); -+ old_chain = make_cleanup (xfree, new_offsets); -+ changed = 0; -+ -+ ALL_OBJFILE_OSECTIONS (symfile_objfile, osect) -+ { -+ CORE_ADDR orig_addr, addr, offset; -+ int osect_idx; -+ int seg; -+ -+ osect_idx = osect->the_bfd_section->index; -+ -+ /* Current address of section. */ -+ addr = osect->addr; -+ /* Offset from where this section started. */ -+ offset = ANOFFSET (symfile_objfile->section_offsets, osect_idx); -+ /* Original address prior to any past relocations. */ -+ orig_addr = addr - offset; -+ -+ for (seg = 0; seg < ldm->nsegs; seg++) -+ { -+ if (ldm->segs[seg].p_vaddr <= orig_addr -+ && orig_addr < ldm->segs[seg].p_vaddr + ldm->segs[seg].p_memsz) -+ { -+ new_offsets->offsets[osect_idx] -+ = ldm->segs[seg].addr - ldm->segs[seg].p_vaddr; -+ -+ if (new_offsets->offsets[osect_idx] != offset) -+ changed = 1; -+ break; -+ } -+ } -+ } -+ -+ if (changed) -+ objfile_relocate (symfile_objfile, new_offsets); -+ -+ do_cleanups (old_chain); -+ -+ /* Now that symfile_objfile has been relocated, we can compute the -+ GOT value and stash it away. */ -+ main_executable_lm_info->got_value = main_got (); -+} -+ -+/* -+ -+ GLOBAL FUNCTION -+ -+ bfin_solib_create_inferior_hook -- shared library startup support -+ -+ SYNOPSIS -+ -+ void bfin_solib_create_inferior_hook() -+ -+ DESCRIPTION -+ -+ When gdb starts up the inferior, it nurses it along (through the -+ shell) until it is ready to execute it's first instruction. At this -+ point, this function gets called via expansion of the macro -+ SOLIB_CREATE_INFERIOR_HOOK. -+ -+ For the BFIN shared library ABI (FDPIC), the main executable -+ needs to be relocated. The shared library breakpoints also need -+ to be enabled. -+ */ -+ -+static void -+bfin_solib_create_inferior_hook (void) -+{ -+ /* Relocate main executable. */ -+ bfin_relocate_main_executable (); -+ -+ /* Enable shared library breakpoints. */ -+ if (!enable_break ()) -+ { -+ warning ("shared library handler failed to enable breakpoint"); -+ return; -+ } -+} -+ -+static void -+bfin_clear_solib (void) -+{ -+ lm_base_cache = 0; -+ enable_break1_done = 0; -+ enable_break2_done = 0; -+} -+ -+static void -+bfin_free_so (struct so_list *so) -+{ -+ xfree (so->lm_info->map); -+ xfree (so->lm_info->dyn_syms); -+ xfree (so->lm_info->dyn_relocs); -+ xfree (so->lm_info); -+} -+ -+static void -+bfin_relocate_section_addresses (struct so_list *so, -+ struct section_table *sec) -+{ -+ int seg; -+ struct int_elf32_fdpic_loadmap *map; -+ -+ map = so->lm_info->map; -+ -+ for (seg = 0; seg < map->nsegs; seg++) -+ { -+ if (map->segs[seg].p_vaddr <= sec->addr -+ && sec->addr < map->segs[seg].p_vaddr + map->segs[seg].p_memsz) -+ { -+ CORE_ADDR displ = map->segs[seg].addr - map->segs[seg].p_vaddr; -+ sec->addr += displ; -+ sec->endaddr += displ; -+ break; -+ } -+ } -+} -+ -+/* Return the GOT address associated with the main executable. Return -+ 0 if it can't be found. */ -+ -+static CORE_ADDR -+main_got (void) -+{ -+ struct minimal_symbol *got_sym; -+ -+ got_sym = lookup_minimal_symbol ("_GLOBAL_OFFSET_TABLE_", NULL, symfile_objfile); -+ if (got_sym == 0) -+ return 0; -+ -+ return SYMBOL_VALUE_ADDRESS (got_sym); -+} -+ -+/* Find the global pointer for the given function address ADDR. */ -+ -+CORE_ADDR -+bfin_fdpic_find_global_pointer (CORE_ADDR addr) -+{ -+ struct so_list *so; -+ -+ so = master_so_list (); -+ while (so) -+ { -+ int seg; -+ struct int_elf32_fdpic_loadmap *map; -+ -+ map = so->lm_info->map; -+ -+ for (seg = 0; seg < map->nsegs; seg++) -+ { -+ if (map->segs[seg].addr <= addr -+ && addr < map->segs[seg].addr + map->segs[seg].p_memsz) -+ return so->lm_info->got_value; -+ } -+ -+ so = so->next; -+ } -+ -+ /* Didn't find it it any of the shared objects. So assume it's in the -+ main executable. */ -+ return main_got (); -+} -+ -+/* Forward declarations for frv_fdpic_find_canonical_descriptor(). */ -+static CORE_ADDR find_canonical_descriptor_in_load_object -+ (CORE_ADDR, CORE_ADDR, char *, bfd *, struct lm_info *); -+ -+/* Given a function entry point, attempt to find the canonical descriptor -+ associated with that entry point. Return 0 if no canonical descriptor -+ could be found. */ -+ -+CORE_ADDR -+bfin_fdpic_find_canonical_descriptor (CORE_ADDR entry_point) -+{ -+ char *name; -+ CORE_ADDR addr; -+ CORE_ADDR got_value; -+ struct int_elf32_fdpic_loadmap *ldm = 0; -+ struct symbol *sym; -+ int status; -+ CORE_ADDR exec_loadmap_addr; -+ -+ /* Fetch the corresponding global pointer for the entry point. */ -+ got_value = bfin_fdpic_find_global_pointer (entry_point); -+ -+ /* Attempt to find the name of the function. If the name is available, -+ it'll be used as an aid in finding matching functions in the dynamic -+ symbol table. */ -+ sym = find_pc_function (entry_point); -+ if (sym == 0) -+ name = 0; -+ else -+ name = SYMBOL_LINKAGE_NAME (sym); -+ -+ /* Check the main executable. */ -+ addr = find_canonical_descriptor_in_load_object -+ (entry_point, got_value, name, symfile_objfile->obfd, -+ main_executable_lm_info); -+ -+ /* If descriptor not found via main executable, check each load object -+ in list of shared objects. */ -+ if (addr == 0) -+ { -+ struct so_list *so; -+ -+ so = master_so_list (); -+ while (so) -+ { -+ addr = find_canonical_descriptor_in_load_object -+ (entry_point, got_value, name, so->abfd, so->lm_info); -+ -+ if (addr != 0) -+ break; -+ -+ so = so->next; -+ } -+ } -+ -+ return addr; -+} -+ -+static CORE_ADDR -+find_canonical_descriptor_in_load_object -+ (CORE_ADDR entry_point, CORE_ADDR got_value, char *name, bfd *abfd, -+ struct lm_info *lm) -+{ -+ arelent *rel; -+ unsigned int i; -+ CORE_ADDR addr = 0; -+ -+ /* Nothing to do if no bfd. */ -+ if (abfd == 0) -+ return 0; -+ -+ /* We want to scan the dynamic relocs for R_BFIN_FUNCDESC relocations. -+ (More about this later.) But in order to fetch the relocs, we -+ need to first fetch the dynamic symbols. These symbols need to -+ be cached due to the way that bfd_canonicalize_dynamic_reloc() -+ works. (See the comments in the declaration of struct lm_info -+ for more information.) */ -+ if (lm->dyn_syms == NULL) -+ { -+ long storage_needed; -+ unsigned int number_of_symbols; -+ -+ /* Determine amount of space needed to hold the dynamic symbol table. */ -+ storage_needed = bfd_get_dynamic_symtab_upper_bound (abfd); -+ -+ /* If there are no dynamic symbols, there's nothing to do. */ -+ if (storage_needed <= 0) -+ return 0; -+ -+ /* Allocate space for the dynamic symbol table. */ -+ lm->dyn_syms = (asymbol **) xmalloc (storage_needed); -+ -+ /* Fetch the dynamic symbol table. */ -+ number_of_symbols = bfd_canonicalize_dynamic_symtab (abfd, lm->dyn_syms); -+ -+ if (number_of_symbols == 0) -+ return 0; -+ } -+ -+ /* Fetch the dynamic relocations if not already cached. */ -+ if (lm->dyn_relocs == NULL) -+ { -+ long storage_needed; -+ -+ /* Determine amount of space needed to hold the dynamic relocs. */ -+ storage_needed = bfd_get_dynamic_reloc_upper_bound (abfd); -+ -+ /* Bail out if there are no dynamic relocs. */ -+ if (storage_needed <= 0) -+ return 0; -+ -+ /* Allocate space for the relocs. */ -+ lm->dyn_relocs = (arelent **) xmalloc (storage_needed); -+ -+ /* Fetch the dynamic relocs. */ -+ lm->dyn_reloc_count -+ = bfd_canonicalize_dynamic_reloc (abfd, lm->dyn_relocs, lm->dyn_syms); -+ } -+ -+ /* Search the dynamic relocs. */ -+ for (i = 0; i < lm->dyn_reloc_count; i++) -+ { -+ rel = lm->dyn_relocs[i]; -+ -+ /* Relocs of interest are those which meet the following -+ criteria: -+ -+ - the names match (assuming the caller could provide -+ a name which matches ``entry_point''). -+ - the relocation type must be R_BFIN_FUNCDESC. Relocs -+ of this type are used (by the dynamic linker) to -+ look up the address of a canonical descriptor (allocating -+ it if need be) and initializing the GOT entry referred -+ to by the offset to the address of the descriptor. -+ -+ These relocs of interest may be used to obtain a -+ candidate descriptor by first adjusting the reloc's -+ address according to the link map and then dereferencing -+ this address (which is a GOT entry) to obtain a descriptor -+ address. */ -+ if ((name == 0 || strcmp (name, (*rel->sym_ptr_ptr)->name) == 0) -+ && rel->howto->type == R_BFIN_FUNCDESC) -+ { -+ gdb_byte buf[BFIN_PTR_SIZE]; -+ -+ /* Compute address of address of candidate descriptor. */ -+ addr = rel->address + displacement_from_map (lm->map, rel->address); -+ -+ /* Fetch address of candidate descriptor. */ -+ if (target_read_memory (addr, buf, sizeof buf) != 0) -+ continue; -+ addr = extract_unsigned_integer (buf, sizeof buf); -+ -+ /* Check for matching entry point. */ -+ if (target_read_memory (addr, buf, sizeof buf) != 0) -+ continue; -+ if (extract_unsigned_integer (buf, sizeof buf) != entry_point) -+ continue; -+ -+ /* Check for matching got value. */ -+ if (target_read_memory (addr + 4, buf, sizeof buf) != 0) -+ continue; -+ if (extract_unsigned_integer (buf, sizeof buf) != got_value) -+ continue; -+ -+ /* Match was successful! Exit loop. */ -+ break; -+ } -+ } -+ -+ return addr; -+} -+ -+static struct target_so_ops bfin_so_ops; -+ -+void -+_initialize_bfin_solib (void) -+{ -+ bfin_so_ops.relocate_section_addresses = bfin_relocate_section_addresses; -+ bfin_so_ops.free_so = bfin_free_so; -+ bfin_so_ops.clear_solib = bfin_clear_solib; -+ bfin_so_ops.solib_create_inferior_hook = bfin_solib_create_inferior_hook; -+ bfin_so_ops.special_symbol_handling = bfin_special_symbol_handling; -+ bfin_so_ops.current_sos = bfin_current_sos; -+ bfin_so_ops.open_symbol_file_object = open_symbol_file_object; -+ bfin_so_ops.in_dynsym_resolve_code = bfin_in_dynsym_resolve_code; -+ -+ /* FIXME: Don't do this here. *_gdbarch_init() should set so_ops. */ -+ current_target_so_ops = &bfin_so_ops; -+ -+ /* Debug this file's internals. */ -+ add_setshow_zinteger_cmd ("solib-bfin", class_maintenance, -+ &solib_bfin_debug, _("\ -+Set internal debugging of shared library code for BFIN."), _("\ -+Show internal debugging of shared library code for BFIN."), _("\ -+When non-zero, BFIN solib specific internal debugging is enabled."), -+ NULL, -+ NULL, /* FIXME: i18n: */ -+ &setdebuglist, &showdebuglist); -+} -diff -Naur gdb-6.5.orig/gdb/testsuite/gdb.asm/asm-source.exp gdb-6.5/gdb/testsuite/gdb.asm/asm-source.exp ---- gdb-6.5.orig/gdb/testsuite/gdb.asm/asm-source.exp 2006-05-02 00:21:35.000000000 +0200 -+++ gdb-6.5/gdb/testsuite/gdb.asm/asm-source.exp 2009-01-22 08:19:21.000000000 +0100 -@@ -51,6 +51,15 @@ - "xscale-*-*" { - set asm-arch arm - } -+ "bfin-*-elf" { -+ set asm-arch bfin -+ set debug-flags "-g" -+ } -+ "bfin-*-uclinux" { -+ set asm-arch bfin -+ set debug-flags "-g" -+ append link-flags " -Wl,-elf2flt" -+ } - "d10v-*-*" { - set asm-arch d10v - } -diff -Naur gdb-6.5.orig/gdb/testsuite/gdb.asm/bfin.inc gdb-6.5/gdb/testsuite/gdb.asm/bfin.inc ---- gdb-6.5.orig/gdb/testsuite/gdb.asm/bfin.inc 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/gdb/testsuite/gdb.asm/bfin.inc 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,44 @@ -+ comment "subroutine prologue" -+ .macro gdbasm_enter -+ LINK 12; -+ .endm -+ -+ comment "subroutine epilogue" -+ .macro gdbasm_leave -+ UNLINK; -+ RTS; -+ .endm -+ -+ .macro gdbasm_call subr -+ call \subr; -+ .endm -+ -+ .macro gdbasm_several_nops -+ mnop; -+ mnop; -+ mnop; -+ mnop; -+ .endm -+ -+ comment "exit (0)" -+ .macro gdbasm_exit0 -+ R0 = 0; -+ RAISE 0; -+ .endm -+ -+ comment "crt0 startup" -+ .macro gdbasm_startup -+ FP = 0; -+ .endm -+ -+ comment "Declare a data variable" -+ .purgem gdbasm_datavar -+ .macro gdbasm_datavar name value -+ .data -+ .align 4 -+ .type \name, @object -+ .size \name, 4 -+\name: -+ .long \value -+ .endm -+ -diff -Naur gdb-6.5.orig/include/gdb/sim-bfin.h gdb-6.5/include/gdb/sim-bfin.h ---- gdb-6.5.orig/include/gdb/sim-bfin.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/include/gdb/sim-bfin.h 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,84 @@ -+/* This file defines the interface between the Blackfin simulator and GDB. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of GDB. -+ -+ This program is free software; you can redistribute it and/or -+ modify it under the terms of the GNU General Public License as -+ published by the Free Software Foundation; either version 2 of the -+ License, or (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, but -+ WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+enum sim_bfin_regnum { -+ SIM_BFIN_R0_REGNUM = 0, -+ SIM_BFIN_R1_REGNUM, -+ SIM_BFIN_R2_REGNUM, -+ SIM_BFIN_R3_REGNUM, -+ SIM_BFIN_R4_REGNUM, -+ SIM_BFIN_R5_REGNUM, -+ SIM_BFIN_R6_REGNUM, -+ SIM_BFIN_R7_REGNUM, -+ SIM_BFIN_P0_REGNUM, -+ SIM_BFIN_P1_REGNUM, -+ SIM_BFIN_P2_REGNUM, -+ SIM_BFIN_P3_REGNUM, -+ SIM_BFIN_P4_REGNUM, -+ SIM_BFIN_P5_REGNUM, -+ SIM_BFIN_SP_REGNUM, -+ SIM_BFIN_FP_REGNUM, -+ SIM_BFIN_I0_REGNUM, -+ SIM_BFIN_I1_REGNUM, -+ SIM_BFIN_I2_REGNUM, -+ SIM_BFIN_I3_REGNUM, -+ SIM_BFIN_M0_REGNUM, -+ SIM_BFIN_M1_REGNUM, -+ SIM_BFIN_M2_REGNUM, -+ SIM_BFIN_M3_REGNUM, -+ SIM_BFIN_B0_REGNUM, -+ SIM_BFIN_B1_REGNUM, -+ SIM_BFIN_B2_REGNUM, -+ SIM_BFIN_B3_REGNUM, -+ SIM_BFIN_L0_REGNUM, -+ SIM_BFIN_L1_REGNUM, -+ SIM_BFIN_L2_REGNUM, -+ SIM_BFIN_L3_REGNUM, -+ SIM_BFIN_A0_DOT_X_REGNUM, -+ SIM_BFIN_AO_DOT_W_REGNUM, -+ SIM_BFIN_A1_DOT_X_REGNUM, -+ SIM_BFIN_A1_DOT_W_REGNUM, -+ SIM_BFIN_ASTAT_REGNUM, -+ SIM_BFIN_RETS_REGNUM, -+ SIM_BFIN_LC0_REGNUM, -+ SIM_BFIN_LT0_REGNUM, -+ SIM_BFIN_LB0_REGNUM, -+ SIM_BFIN_LC1_REGNUM, -+ SIM_BFIN_LT1_REGNUM, -+ SIM_BFIN_LB1_REGNUM, -+ SIM_BFIN_CYCLES_REGNUM, -+ SIM_BFIN_CYCLES2_REGNUM, -+ SIM_BFIN_USP_REGNUM, -+ SIM_BFIN_SEQSTAT_REGNUM, -+ SIM_BFIN_SYSCFG_REGNUM, -+ SIM_BFIN_RETI_REGNUM, -+ SIM_BFIN_RETX_REGNUM, -+ SIM_BFIN_RETN_REGNUM, -+ SIM_BFIN_RETE_REGNUM, -+ SIM_BFIN_PC_REGNUM, -+ SIM_BFIN_CC_REGNUM, -+ SIM_BFIN_EXTRA1, -+ SIM_BFIN_EXTRA2, -+ SIM_BFIN_EXTRA3, -+ SIM_BFIN_IPEND_REGNUM -+}; -+ -diff -Naur gdb-6.5.orig/sim/bfin/acconfig.h gdb-6.5/sim/bfin/acconfig.h ---- gdb-6.5.orig/sim/bfin/acconfig.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/acconfig.h 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,15 @@ -+ -+/* Define to 1 if NLS is requested. */ -+#undef ENABLE_NLS -+ -+/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -+#undef HAVE_CATGETS -+ -+/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -+#undef HAVE_GETTEXT -+ -+/* Define as 1 if you have the stpcpy function. */ -+#undef HAVE_STPCPY -+ -+/* Define if your locale.h file contains LC_MESSAGES. */ -+#undef HAVE_LC_MESSAGES -diff -Naur gdb-6.5.orig/sim/bfin/bfin-dis.c gdb-6.5/sim/bfin/bfin-dis.c ---- gdb-6.5.orig/sim/bfin/bfin-dis.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/bfin-dis.c 2009-01-22 08:21:17.000000000 +0100 -@@ -0,0 +1,3095 @@ -+/* Simulator for Analog Devices Blackfin processer. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of simulators. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+#include <stdio.h> -+#include <stdlib.h> -+#include <string.h> -+#include <signal.h> -+ -+#include "opcode/bfin.h" -+#include "bfin-sim.h" -+ -+/* HACK: Work around mingw32 lacking SIGTRAP */ -+#ifdef _WIN32 -+#ifndef SIGTRAP -+#define SIGTRAP 5 -+#endif -+#endif -+ -+#define M_S2RND 1 -+#define M_T 2 -+#define M_W32 3 -+#define M_FU 4 -+#define M_TFU 6 -+#define M_IS 8 -+#define M_ISS2 9 -+#define M_IH 11 -+#define M_IU 12 -+ -+#define HOST_LONG_WORD_SIZE (sizeof(long)*8) -+ -+#define SIGNEXTEND(v, n) (((bs32)v << (HOST_LONG_WORD_SIZE - (n))) >> (HOST_LONG_WORD_SIZE - (n))) -+ -+/* For dealing with parallel instructions, we must avoid changing our register -+ file until all parallel insns have been simulated. This queue of stores -+ can be used to delay a modification. -+ @@@ Should go and convert all 32 bit insns to use this. */ -+struct store { -+ bu32 *addr; -+ bu32 val; -+}; -+ -+struct store stores[10]; -+int n_stores; -+ -+#define STORE(X,Y) do { \ -+ stores[n_stores].addr = &(X); \ -+ stores[n_stores++].val = (Y); \ -+ } while (0) -+ -+static __attribute__ ((noreturn)) void -+unhandled_instruction (char *insn) -+{ -+ fprintf(stderr, "Unhandled instruction \"%s\" ... aborting\n", insn); -+ raise (SIGILL); -+ abort (); -+} -+ -+static __attribute__ ((noreturn)) void -+illegal_instruction () -+{ -+ fprintf(stderr, "Illegal instruction ... aborting\n"); -+ raise (SIGILL); -+ abort (); -+} -+ -+static void -+setflags_nz (bu32 val) -+{ -+ saved_state.az = val == 0; -+ saved_state.an = val >> 31; -+} -+ -+static void -+setflags_nz_2x16 (bu32 val) -+{ -+ saved_state.an = (bs16)val < 0 || (bs16)(val >> 16) < 0; -+ saved_state.az = (bs16)val == 0 || (bs16)(val >> 16) == 0; -+} -+ -+static void -+setflags_logical (bu32 val) -+{ -+ setflags_nz (val); -+ saved_state.ac0 = 0; -+ saved_state.v = 0; -+} -+ -+static int -+dagadd (int dagno, bs32 modify) -+{ -+ bs32 i, l, b, val; -+ -+ i = IREG (dagno); -+ l = LREG (dagno); -+ b = BREG (dagno); -+ val = i; -+ -+ if (l) -+ { -+ if (i + modify - b - l < 0 && modify > 0 -+ || i + modify - b >= 0 && modify < 0 -+ || modify == 0) -+ val = i + modify; -+ else if (i + modify - b - l >= 0 && modify > 0) -+ val = i + modify - l; -+ else if (i + modify - b < 0 && modify < 0) -+ val = i + modify + l; -+ } -+ else -+ val = i + modify; -+ -+ STORE (IREG (dagno), val); -+ return val; -+} -+ -+static int -+dagsub (int dagno, bs32 modify) -+{ -+ bs32 i, l, b, val; -+ -+ i = IREG (dagno); -+ l = LREG (dagno); -+ b = BREG (dagno); -+ val = i; -+ -+ if (l) -+ { -+ if (i - modify - b - l < 0 && modify < 0 -+ || i - modify - b >= 0 && modify > 0 -+ || modify == 0) -+ val = i - modify; -+ else if (i - modify - b - l >= 0 && modify < 0) -+ val = i - modify - l; -+ else if (i - modify - b < 0 && modify > 0) -+ val = i - modify + l; -+ } -+ else -+ val = i - modify; -+ -+ STORE (IREG (dagno), val); -+ return val; -+} -+ -+static bu32 -+ashiftrt (bu32 val, int cnt, int size) -+{ -+ int real_cnt = cnt > size ? size : cnt; -+ bu32 sgn = ~((val >> (size - 1)) - 1); -+ int sgncnt = size - real_cnt; -+ if (sgncnt > 16) -+ sgn <<= 16, sgncnt -= 16; -+ sgn <<= sgncnt; -+ if (real_cnt > 16) -+ val >>= 16, real_cnt -= 16; -+ val >>= real_cnt; -+ val |= sgn; -+ saved_state.an = val >> (size - 1); -+ saved_state.az = val == 0; -+ /* @@@ */ -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+lshiftrt (bu32 val, int cnt, int size) -+{ -+ int real_cnt = cnt > size ? size : cnt; -+ if (real_cnt > 16) -+ val >>= 16, real_cnt -= 16; -+ val >>= real_cnt; -+ saved_state.an = val >> (size - 1); -+ saved_state.az = val == 0; -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+lshift (bu32 val, int cnt, int size, int saturate) -+{ -+ int real_cnt = cnt > size ? size : cnt; -+ int mask_cnt = size - real_cnt; -+ bu32 sgn = ~((val >> (size - 1)) - 1); -+ bu32 masked; -+ bu32 mask = ~0; -+ if (mask_cnt > 16) -+ mask <<= 16, sgn <<= 16, mask_cnt -= 16; -+ mask <<= mask_cnt; -+ sgn <<= mask_cnt; -+ masked = val & mask; -+ -+ if (real_cnt > 16) -+ val <<= 16, real_cnt -= 16; -+ val <<= real_cnt; -+ if (saturate && sgn != masked) -+ { -+ if (size == 32) -+ val = sgn == 0 ? 0x7fffffff : 0x80000000; -+ else -+ val = sgn == 0 ? 0x7fff : 0x8000; -+ } -+ saved_state.an = val >> (size - 1); -+ saved_state.az = val == 0; -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+add32 (bu32 a, bu32 b, int carry, int sat) -+{ -+ int flgs = a >> 31; -+ int flgo = b >> 31; -+ bu32 v = a + b; -+ int flgn = v >> 31; -+ int overflow = (flgs ^ flgn) & (flgo ^ flgn); -+ if (sat && overflow) -+ { -+ v = flgn ? 0x7fffffff : 0x80000000; -+ /* Saturating insns are documented as not setting overflow. */ -+ overflow = 0; -+ } -+ saved_state.an = flgn; -+ saved_state.vs |= overflow; -+ saved_state.v = overflow; -+ saved_state.v_internal |= overflow; -+ saved_state.az = v == 0; -+ if (carry) -+ saved_state.ac0 = ~a < b; -+ return v; -+} -+ -+static bu32 -+sub32 (bu32 a, bu32 b, int carry, int sat) -+{ -+ int flgs = a >> 31; -+ int flgo = b >> 31; -+ bu32 v = a - b; -+ int flgn = v >> 31; -+ int overflow = (flgs ^ flgo) & (flgn ^ flgs); -+ if (sat && overflow) -+ { -+ v = flgn ? 0x7fffffff : 0x80000000; -+ /* Saturating insns are documented as not setting overflow. */ -+ overflow = 0; -+ } -+ saved_state.an = flgn; -+ saved_state.vs |= overflow; -+ saved_state.v = overflow; -+ saved_state.v_internal |= overflow; -+ saved_state.az = v == 0; -+ if (carry) -+ saved_state.ac0 = b <= a; -+ return v; -+} -+ -+static bu32 -+add16 (bu32 a, bu32 b, int *carry, int sat) -+{ -+ int flgs = (a >> 15) & 1; -+ int flgo = (b >> 15) & 1; -+ bu32 v = a + b; -+ int flgn = (v >> 15) & 1; -+ int overflow = (flgs ^ flgn) & (flgo ^ flgn); -+ if (sat && overflow) -+ { -+ v = flgn ? 0x7fff : 0x8000; -+ /* Saturating insns are documented as not setting overflow. */ -+ overflow = 0; -+ } -+ saved_state.an = flgn; -+ saved_state.vs |= overflow; -+ saved_state.v = overflow; -+ saved_state.v_internal |= overflow; -+ saved_state.az = v == 0; -+ if (carry) -+ *carry = (bu16)~a < (bu16)b; -+ return v & 0xffff; -+} -+ -+static bu32 -+sub16 (bu32 a, bu32 b, int *carry, int sat) -+{ -+ int flgs = (a >> 15) & 1; -+ int flgo = (b >> 15) & 1; -+ bu32 v = a - b; -+ int flgn = (v >> 15) & 1; -+ int overflow = (flgs ^ flgo) & (flgn ^ flgs); -+ if (sat && overflow) -+ { -+ v = flgn ? 0x7fff : 0x8000; -+ /* Saturating insns are documented as not setting overflow. */ -+ overflow = 0; -+ } -+ saved_state.an = flgn; -+ saved_state.vs |= overflow; -+ saved_state.v = overflow; -+ saved_state.v_internal |= overflow; -+ saved_state.az = v == 0; -+ if (carry) -+ *carry = (bu16)b <= (bu16)a; -+ return v; -+} -+ -+static bu32 -+addadd16 (bu32 a, bu32 b, int sat, int x) -+{ -+ int c0 = 0, c1 = 0; -+ bu32 x0, x1; -+ x0 = add16 ((a >> 16) & 0xffff, (b >> 16) & 0xffff, &c0, sat) & 0xffff; -+ x1 = add16 (a & 0xffff, b & 0xffff, &c1, sat) & 0xffff; -+ if (x == 0) -+ return (x0 << 16) | x1; -+ else -+ return (x1 << 16) | x0; -+} -+ -+static bu32 -+subsub16 (bu32 a, bu32 b, int sat, int x) -+{ -+ int c0 = 0, c1 = 0; -+ bu32 x0, x1; -+ x0 = sub16 ((a >> 16) & 0xffff, (b >> 16) & 0xffff, &c0, sat) & 0xffff; -+ x1 = sub16 (a & 0xffff, b & 0xffff, &c1, sat) & 0xffff; -+ if (x == 0) -+ return (x0 << 16) | x1; -+ else -+ return (x1 << 16) | x0; -+} -+ -+static bu32 -+min32 (bu32 a, bu32 b) -+{ -+ int val = a; -+ if ((bs32)a > (bs32)b) -+ val = b; -+ setflags_nz (val); -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+max32 (bu32 a, bu32 b) -+{ -+ int val = a; -+ if ((bs32)a < (bs32)b) -+ val = b; -+ setflags_nz (val); -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+min2x16 (bu32 a, bu32 b) -+{ -+ int val = a; -+ if ((bs16)a > (bs16)b) -+ val = (val & 0xFFFF0000) | (b & 0xFFFF); -+ if ((bs16)(a >> 16) > (bs16)(b >> 16)) -+ val = (val & 0xFFFF) | (b & 0xFFFF0000); -+ setflags_nz_2x16 (val); -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+max2x16 (bu32 a, bu32 b) -+{ -+ int val = a; -+ if ((bs16)a < (bs16)b) -+ val = (val & 0xFFFF0000) | (b & 0xFFFF); -+ if ((bs16)(a >> 16) < (bs16)(b >> 16)) -+ val = (val & 0xFFFF) | (b & 0xFFFF0000); -+ setflags_nz_2x16 (val); -+ saved_state.v = 0; -+ return val; -+} -+ -+static bu32 -+add_and_shift (bu32 a, bu32 b, int shift) -+{ -+ int v; -+ saved_state.v_internal = 0; -+ v = add32 (a, b, 0, 0); -+ while (shift-- > 0) -+ { -+ int x = v >> 30; -+ if (x == 1 || x == 2) -+ saved_state.v_internal = 1; -+ v <<= 1; -+ } -+ saved_state.v = saved_state.v_internal; -+ saved_state.vs |= saved_state.v; -+ return v; -+} -+ -+typedef enum -+{ -+ c_0, c_1, c_4, c_2, c_uimm2, c_uimm3, c_imm3, c_pcrel4, -+ c_imm4, c_uimm4s4, c_uimm4, c_uimm4s2, c_negimm5s4, c_imm5, c_uimm5, c_imm6, -+ c_imm7, c_imm8, c_uimm8, c_pcrel8, c_uimm8s4, c_pcrel8s4, c_lppcrel10, -+ c_pcrel10, -+ c_pcrel12, c_imm16s4, c_luimm16, c_imm16, c_huimm16, c_rimm16, c_imm16s2, -+ c_uimm16s4, -+ c_uimm16, c_pcrel24, -+} const_forms_t; -+ -+static struct -+{ -+ char *name; -+ int nbits; -+ char reloc; -+ char issigned; -+ char pcrel; -+ char scale; -+ char offset; -+ char negative; -+ char positive; -+} constant_formats[] = -+{ -+ { "0", 0, 0, 1, 0, 0, 0, 0, 0}, -+ { "1", 0, 0, 1, 0, 0, 0, 0, 0}, -+ { "4", 0, 0, 1, 0, 0, 0, 0, 0}, -+ { "2", 0, 0, 1, 0, 0, 0, 0, 0}, -+ { "uimm2", 2, 0, 0, 0, 0, 0, 0, 0}, -+ { "uimm3", 3, 0, 0, 0, 0, 0, 0, 0}, -+ { "imm3", 3, 0, 1, 0, 0, 0, 0, 0}, -+ { "pcrel4", 4, 1, 0, 1, 1, 0, 0, 0}, -+ { "imm4", 4, 0, 1, 0, 0, 0, 0, 0}, -+ { "uimm4s4", 4, 0, 0, 0, 2, 0, 0, 1}, -+ { "uimm4", 4, 0, 0, 0, 0, 0, 0, 0}, -+ { "uimm4s2", 4, 0, 0, 0, 1, 0, 0, 1}, -+ { "negimm5s4", 5, 0, 1, 0, 2, 0, 1, 0}, -+ { "imm5", 5, 0, 1, 0, 0, 0, 0, 0}, -+ { "uimm5", 5, 0, 0, 0, 0, 0, 0, 0}, -+ { "imm6", 6, 0, 1, 0, 0, 0, 0, 0}, -+ { "imm7", 7, 0, 1, 0, 0, 0, 0, 0}, -+ { "imm8", 8, 0, 1, 0, 0, 0, 0, 0}, -+ { "uimm8", 8, 0, 0, 0, 0, 0, 0, 0}, -+ { "pcrel8", 8, 1, 0, 1, 1, 0, 0, 0}, -+ { "uimm8s4", 8, 0, 0, 0, 2, 0, 0, 0}, -+ { "pcrel8s4", 8, 1, 1, 1, 2, 0, 0, 0}, -+ { "lppcrel10", 10, 1, 0, 1, 1, 0, 0, 0}, -+ { "pcrel10", 10, 1, 1, 1, 1, 0, 0, 0}, -+ { "pcrel12", 12, 1, 1, 1, 1, 0, 0, 0}, -+ { "imm16s4", 16, 0, 1, 0, 2, 0, 0, 0}, -+ { "luimm16", 16, 1, 0, 0, 0, 0, 0, 0}, -+ { "imm16", 16, 0, 1, 0, 0, 0, 0, 0}, -+ { "huimm16", 16, 1, 0, 0, 0, 0, 0, 0}, -+ { "rimm16", 16, 1, 1, 0, 0, 0, 0, 0}, -+ { "imm16s2", 16, 0, 1, 0, 1, 0, 0, 0}, -+ { "uimm16s4", 16, 0, 0, 0, 2, 0, 0, 0}, -+ { "uimm16", 16, 0, 0, 0, 0, 0, 0, 0}, -+ { "pcrel24", 24, 1, 1, 1, 1, 0, 0, 0},}; -+ -+static bu32 -+fmtconst (const_forms_t cf, bu32 x, bu32 pc) -+{ -+ if (0 && constant_formats[cf].reloc) -+ { -+ bu32 ea = (((constant_formats[cf].pcrel -+ ? SIGNEXTEND (x, constant_formats[cf].nbits) -+ : x) + constant_formats[cf].offset) -+ << constant_formats[cf].scale); -+ if (constant_formats[cf].pcrel) -+ ea += pc; -+ -+ return ea; -+ } -+ -+ /* Negative constants have an implied sign bit. */ -+ if (constant_formats[cf].negative) -+ { -+ int nb = constant_formats[cf].nbits + 1; -+ x = x | (1 << constant_formats[cf].nbits); -+ x = SIGNEXTEND (x, nb); -+ } -+ else if (constant_formats[cf].issigned) -+ x = SIGNEXTEND (x, constant_formats[cf].nbits); -+ -+ x += constant_formats[cf].offset; -+ x <<= constant_formats[cf].scale; -+ -+ return x; -+} -+ -+#define uimm16s4(x) fmtconst(c_uimm16s4, x, 0) -+#define pcrel4(x) fmtconst(c_pcrel4, x, pc) -+#define pcrel8(x) fmtconst(c_pcrel8, x, pc) -+#define pcrel8s4(x) fmtconst(c_pcrel8s4, x, pc) -+#define pcrel10(x) fmtconst(c_pcrel10, x, pc) -+#define pcrel12(x) fmtconst(c_pcrel12, x, pc) -+#define negimm5s4(x) fmtconst(c_negimm5s4, x, 0) -+#define rimm16(x) fmtconst(c_rimm16, x, 0) -+#define huimm16(x) fmtconst(c_huimm16, x, 0) -+#define imm16(x) fmtconst(c_imm16, x, 0) -+#define uimm2(x) fmtconst(c_uimm2, x, 0) -+#define uimm3(x) fmtconst(c_uimm3, x, 0) -+#define luimm16(x) fmtconst(c_luimm16, x, 0) -+#define uimm4(x) fmtconst(c_uimm4, x, 0) -+#define uimm5(x) fmtconst(c_uimm5, x, 0) -+#define imm16s2(x) fmtconst(c_imm16s2, x, 0) -+#define uimm8(x) fmtconst(c_uimm8, x, 0) -+#define imm16s4(x) fmtconst(c_imm16s4, x, 0) -+#define uimm4s2(x) fmtconst(c_uimm4s2, x, 0) -+#define uimm4s4(x) fmtconst(c_uimm4s4, x, 0) -+#define lppcrel10(x) fmtconst(c_lppcrel10, x, pc) -+#define imm3(x) fmtconst(c_imm3, x, 0) -+#define imm4(x) fmtconst(c_imm4, x, 0) -+#define uimm8s4(x) fmtconst(c_uimm8s4, x, 0) -+#define imm5(x) fmtconst(c_imm5, x, 0) -+#define imm6(x) fmtconst(c_imm6, x, 0) -+#define imm7(x) fmtconst(c_imm7, x, 0) -+#define imm8(x) fmtconst(c_imm8, x, 0) -+#define pcrel24(x) fmtconst(c_pcrel24, x, pc) -+#define uimm16(x) fmtconst(c_uimm16, x, 0) -+ -+static bu32 * -+get_allreg (int grp, int reg) -+{ -+ int fullreg = (grp << 3) | reg; -+ /* REG_R0, REG_R1, REG_R2, REG_R3, REG_R4, REG_R5, REG_R6, REG_R7, -+ REG_P0, REG_P1, REG_P2, REG_P3, REG_P4, REG_P5, REG_SP, REG_FP, -+ REG_I0, REG_I1, REG_I2, REG_I3, REG_M0, REG_M1, REG_M2, REG_M3, -+ REG_B0, REG_B1, REG_B2, REG_B3, REG_L0, REG_L1, REG_L2, REG_L3, -+ REG_A0x, REG_A0w, REG_A1x, REG_A1w, , , REG_ASTAT, REG_RETS, -+ , , , , , , , , -+ REG_LC0, REG_LT0, REG_LB0, REG_LC1, REG_LT1, REG_LB1, REG_CYCLES, -+ REG_CYCLES2, -+ REG_USP, REG_SEQSTAT, REG_SYSCFG, REG_RETI, REG_RETX, REG_RETN, REG_RETE, -+ REG_LASTREG */ -+ switch (fullreg >> 2) -+ { -+ case 0: case 1: return &DREG (reg); break; -+ case 2: case 3: return &PREG (reg); break; -+ case 4: return &IREG (reg & 3); break; -+ case 5: return &MREG (reg & 3); break; -+ case 6: return &BREG (reg & 3); break; -+ case 7: return &LREG (reg & 3); break; -+ default: -+ switch (fullreg) -+ { -+ case 32: return &saved_state.a0x; -+ case 33: return &saved_state.a0w; -+ case 34: return &saved_state.a1x; -+ case 35: return &saved_state.a1w; -+ case 39: return &saved_state.rets; -+ case 48: return &LC0REG; -+ case 49: return <0REG; -+ case 50: return &LB0REG; -+ case 51: return &LC1REG; -+ case 52: return <1REG; -+ case 53: return &LB1REG; -+ } -+ return 0; -+ } -+} -+ -+/* Perform a multiplication, sign- or zero-extending the result to 64 bit. */ -+static bu64 -+decode_multfunc (int h0, int h1, int src0, int src1, int mmod, int MM) -+{ -+ bu32 s0 = DREG (src0), s1 = DREG (src1); -+ bu32 sgn0, sgn1; -+ bu32 val; -+ bu64 val1; -+ -+ if (h0) -+ s0 >>= 16; -+ -+ if (h1) -+ s1 >>= 16; -+ -+ s0 &= 0xffff; -+ s1 &= 0xffff; -+ -+ sgn0 = -(s0 & 0x8000); -+ sgn1 = -(s1 & 0x8000); -+ -+ if (MM) -+ s0 |= sgn0; -+ else switch (mmod) -+ { -+ case 0: -+ case M_S2RND: -+ case M_T: -+ case M_IS: -+ case M_ISS2: -+ case M_IH: -+ s0 |= sgn0; -+ s1 |= sgn1; -+ break; -+ case M_FU: -+ case M_IU: -+ case M_TFU: -+ break; -+ default: -+ abort (); -+ } -+ -+ val = s0 * s1; -+ /* Perform shift correction if appropriate for the mode. */ -+ if (mmod == 0 || mmod == M_T || mmod == M_S2RND) -+ { -+ if (val == 0x40000000) -+ val = 0x7fffffff; -+ else -+ val <<= 1; -+ } -+ -+ val1 = val; -+ if (mmod == 0 || mmod == M_IS || mmod == M_T || mmod == M_S2RND -+ || mmod == M_ISS2 || mmod == M_IH) -+ val1 |= -(val1 & 0x80000000); -+ -+ return val1; -+} -+ -+static bu32 -+saturate_s32 (bu64 val) -+{ -+ if ((bs64)val < -0x80000000ll) -+ return 0x80000000; -+ if ((bs64)val > 0x7fffffff) -+ return 0x7fffffff; -+ return val; -+} -+ -+static bu32 -+saturate_s16 (bu64 val) -+{ -+ if ((bs64)val < -0x8000ll) -+ return 0x8000; -+ if ((bs64)val > 0x7fff) -+ return 0x7fff; -+ return val & 0xffff; -+} -+ -+static bu32 -+saturate_u32 (bu64 val) -+{ -+ if (val > 0xffffffff) -+ return 0xffffffff; -+ return val; -+} -+ -+static bu32 -+saturate_u16 (bu64 val) -+{ -+ if (val > 0xffff) -+ return 0xffff; -+ return val; -+} -+ -+static bu64 -+rnd16 (bu64 val) -+{ -+ bu64 sgnbits; -+ -+ /* FIXME: Should honour rounding mode. */ -+ if ((val & 0xffff) > 0x8000 -+ || ((val & 0xffff) == 0x8000 && (val & 0x10000))) -+ val += 0x8000; -+ -+ sgnbits = val & 0xffff000000000000ull; -+ val >>= 16; -+ return val | sgnbits; -+} -+ -+static bu64 -+trunc16 (bu64 val) -+{ -+ bu64 sgnbits = val & 0xffff000000000000ull; -+ val >>= 16; -+ return val | sgnbits; -+} -+ -+static int -+signbits (bu64 val, int size) -+{ -+ bu64 mask = (bu64)1 << (size - 1); -+ bu64 bit = val & mask; -+ int count = 0; -+ for (;;) -+ { -+ mask >>= 1; -+ bit >>= 1; -+ if (mask == 0) -+ return count; -+ if ((val & mask) != bit) -+ return count; -+ count++; -+ } -+} -+ -+/* Extract a 16 or 32 bit value from a 64 bit multiplication result. -+ These 64 bits must be sign- or zero-extended properly from the source -+ we want to extract, either a 32 bit multiply or a 40 bit accumulator. */ -+ -+static bu32 -+extract_mult (bu64 res, int mmod, int fullword) -+{ -+ if (fullword) -+ switch (mmod) -+ { -+ case 0: -+ case M_IS: -+ return saturate_s32 (res); -+ case M_FU: -+ return saturate_u32 (res); -+ case M_S2RND: -+ case M_ISS2: -+ return saturate_s32 (res << 1); -+ default: -+ abort (); -+ } -+ else -+ switch (mmod) -+ { -+ case 0: -+ case M_IH: -+ return saturate_s16 (rnd16 (res)); -+ case M_IS: -+ return saturate_s16 (res); -+ case M_FU: -+ return saturate_u16 (rnd16 (res)); -+ case M_IU: -+ return saturate_u16 (res); -+ -+ case M_T: -+ return saturate_s16 (trunc16 (res)); -+ case M_TFU: -+ return saturate_u16 (trunc16 (res)); -+ -+ case M_S2RND: -+ return saturate_s16 (rnd16 (res << 1)); -+ case M_ISS2: -+ return saturate_s16 (res << 1); -+ default: -+ abort (); -+ } -+} -+ -+static bu32 -+decode_macfunc (int which, int op, int h0, int h1, int src0, int src1, -+ int mmod, int MM, int fullword) -+{ -+ bu32 *ax, *aw; -+ bu64 acc; -+ -+ ax = which ? &A1XREG : &A0XREG; -+ aw = which ? &A1WREG : &A0WREG; -+ acc = (((bu64)*ax << 32) | ((bu64)*aw)) & 0xFFFFFFFFFFull; -+ -+ /* Sign extend accumulator if necessary. */ -+ if (mmod == 0 || mmod == M_T || mmod == M_IS || mmod == M_ISS2 -+ || mmod == M_S2RND) -+ acc |= -(acc & 0x80000000); -+ -+ if (op != 3) -+ { -+ bu64 res = decode_multfunc (h0, h1, src0, src1, mmod, MM); -+ -+ /* Perform accumulation. */ -+ switch (op) -+ { -+ case 0: -+ acc = res; -+ break; -+ case 1: -+ acc = acc + res; -+ break; -+ case 2: -+ acc = acc - res; -+ break; -+ } -+ -+ /* Saturate. */ -+ switch (mmod) -+ { -+ case 0: -+ case M_T: -+ case M_IS: -+ case M_ISS2: -+ case M_S2RND: -+ if ((bs64)acc < -0x8000000000ll) -+ acc = -0x8000000000ull; -+ else if ((bs64)acc >= 0x7fffffffffll) -+ acc = 0x7fffffffffull; -+ break; -+ case M_TFU: -+ case M_FU: -+ case M_IU: -+ if (acc > 0xFFFFFFFFFFull) -+ acc = 0xFFFFFFFFFFull; -+ break; -+ default: -+ abort (); -+ } -+ } -+ -+ if (which) -+ { -+ STORE (A1XREG, (acc >> 32) & 0xff); -+ STORE (A1WREG, acc & 0xffffffff); -+ } -+ else -+ { -+ STORE (A0XREG, (acc >> 32) & 0xff); -+ STORE (A0WREG, acc & 0xffffffff); -+ } -+ -+ return extract_mult (acc, mmod, fullword); -+} -+ -+static void -+decode_ProgCtrl_0 (bu16 iw0) -+{ -+ /* ProgCtrl -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |.prgfunc.......|.poprnd........| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int poprnd = ((iw0 >> 0) & 0xf); -+ int prgfunc = ((iw0 >> 4) & 0xf); -+ -+ if (prgfunc == 0 && poprnd == 0) -+ /* NOP */ -+ PCREG += 2; -+ else if (prgfunc == 1 && poprnd == 0) -+ /* RTS */ -+ PCREG = saved_state.rets; -+ else if (prgfunc == 1 && poprnd == 1) -+ unhandled_instruction ("RTI"); -+ else if (prgfunc == 1 && poprnd == 2) -+ unhandled_instruction ("RTX"); -+ else if (prgfunc == 1 && poprnd == 3) -+ unhandled_instruction ("RTN"); -+ else if (prgfunc == 1 && poprnd == 4) -+ unhandled_instruction ("RTE"); -+ else if (prgfunc == 2 && poprnd == 0) -+ unhandled_instruction ("IDLE"); -+ else if (prgfunc == 2 && poprnd == 3) -+ unhandled_instruction ("CSYNC"); -+ else if (prgfunc == 2 && poprnd == 4) -+ unhandled_instruction ("SSYNC"); -+ else if (prgfunc == 2 && poprnd == 5) -+ unhandled_instruction ("EMUEXCPT"); -+ else if (prgfunc == 3) -+ unhandled_instruction ("CLI dregs"); -+ else if (prgfunc == 4) -+ unhandled_instruction ("STI dregs"); -+ else if (prgfunc == 5) -+ { -+ /* JUMP (pregs) */ -+ PCREG = PREG (poprnd); -+ did_jump = 1; -+ } -+ else if (prgfunc == 6) -+ { -+ /* CALL (pregs) */ -+ saved_state.rets = PCREG + 2; -+ PCREG = PREG (poprnd); -+ did_jump = 1; -+ } -+ else if (prgfunc == 7) -+ { -+ /* CALL (PC + pregs) */ -+ saved_state.rets = PCREG + 2; -+ PCREG = PCREG + PREG (poprnd); -+ did_jump = 1; -+ } -+ else if (prgfunc == 8) -+ { -+ /* JUMP (PC + pregs) */ -+ PCREG = PCREG + PREG (poprnd); -+ did_jump = 1; -+ } -+ else if (prgfunc == 9) -+ { -+ /* RAISE uimm4 */ -+ bfin_trap (); -+ PCREG += 2; -+ } -+ else if (prgfunc == 10) -+ { -+ /* EXCPT uimm4 */ -+ if(uimm4 (poprnd) == 1) -+ raise_exception(SIGTRAP); -+ else -+ unhandled_instruction ("unhandled exception"); -+ } -+ else if (prgfunc == 11) -+ unhandled_instruction ("TESTSET"); -+ else -+ illegal_instruction (); -+} -+ -+static void -+decode_CaCTRL_0 (bu16 iw0) -+{ -+ /* CaCTRL -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 | 0 | 1 |.a.|.op....|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int a = ((iw0 >> 5) & 0x1); -+ int reg = ((iw0 >> 0) & 0x7); -+ int op = ((iw0 >> 3) & 0x3); -+ -+ if (a == 0 && op == 0) -+ unhandled_instruction ("PREFETCH [pregs]"); -+ else if (a == 0 && op == 1) -+ unhandled_instruction ("FLUSHINV [pregs]"); -+ else if (a == 0 && op == 2) -+ unhandled_instruction ("FLUSH [pregs]"); -+ else if (a == 0 && op == 3) -+ unhandled_instruction ("IFLUSH [pregs]"); -+ else if (a == 1 && op == 0) -+ unhandled_instruction ("PREFETCH [pregs++]"); -+ else if (a == 1 && op == 1) -+ unhandled_instruction ("FLUSHINV [pregs++]"); -+ else if (a == 1 && op == 2) -+ unhandled_instruction ("FLUSH [pregs++]"); -+ else if (a == 1 && op == 3) -+ unhandled_instruction ("IFLUSH [pregs++]"); -+ else -+ illegal_instruction (); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_PushPopReg_0 (bu16 iw0) -+{ -+ /* PushPopReg -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 |.W.|.grp.......|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int grp = ((iw0 >> 3) & 0x7); -+ int reg = ((iw0 >> 0) & 0x7); -+ int W = ((iw0 >> 6) & 0x1); -+ bu32 *whichreg = get_allreg (grp, reg); -+ -+ if (whichreg == 0) -+ unhandled_instruction ("push/pop"); -+ -+ if (W == 0) -+ { -+ /* allregs = [SP++] */ -+ *whichreg = get_long (saved_state.memory, PREG (6)); -+ PREG (6) += 4; -+ } -+ else -+ { -+ /* [--SP] = allregs */ -+ PREG (6) -= 4; -+ put_long (saved_state.memory, PREG (6), *whichreg); -+ } -+ PCREG += 2; -+} -+ -+static void -+decode_PushPopMultiple_0 (bu16 iw0) -+{ -+ /* PushPopMultiple -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 1 | 0 |.d.|.p.|.W.|.dr........|.pr........| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int p = ((iw0 >> 7) & 0x1); -+ int pr = ((iw0 >> 0) & 0x7); -+ int d = ((iw0 >> 8) & 0x1); -+ int dr = ((iw0 >> 3) & 0x7); -+ int W = ((iw0 >> 6) & 0x1); -+ int i; -+ bu32 sp = PREG (6); -+ -+ if ((d == 0 && p == 0) -+ || (p && imm5 (pr) > 5)) -+ illegal_instruction (); -+ -+ if (W == 1) -+ { -+ if (d) -+ for (i = dr; i < 8; i++) -+ { -+ sp -= 4; -+ put_long (saved_state.memory, sp, DREG (i)); -+ } -+ if (p) -+ for (i = pr; i < 6; i++) -+ { -+ sp -= 4; -+ put_long (saved_state.memory, sp, PREG (i)); -+ } -+ } -+ else -+ { -+ if (p) -+ for (i = 5; i >= pr; i--) -+ { -+ PREG (i) = get_long (saved_state.memory, sp); -+ sp += 4; -+ } -+ if (d) -+ for (i = 7; i >= dr; i--) -+ { -+ DREG (i) = get_long (saved_state.memory, sp); -+ sp += 4; -+ } -+ } -+ PREG (6) = sp; -+ PCREG += 2; -+} -+ -+static void -+decode_ccMV_0 (bu16 iw0) -+{ -+ /* ccMV -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 1 | 1 |.T.|.d.|.s.|.dst.......|.src.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src = ((iw0 >> 0) & 0x7); -+ int dst = ((iw0 >> 3) & 0x7); -+ int s = ((iw0 >> 6) & 0x1); -+ int d = ((iw0 >> 7) & 0x1); -+ int T = ((iw0 >> 8) & 0x1); -+ int cond = T ? CCREG : ! CCREG; -+ if (cond) -+ GREG (dst, d) = GREG (src, s); -+ PCREG += 2; -+} -+ -+static void -+decode_CCflag_0 (bu16 iw0) -+{ -+ /* CCflag -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 1 |.I.|.opc.......|.G.|.y.........|.x.........| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int x = ((iw0 >> 0) & 0x7); -+ int y = ((iw0 >> 3) & 0x7); -+ int I = ((iw0 >> 10) & 0x1); -+ int opc = ((iw0 >> 7) & 0x7); -+ int G = ((iw0 >> 6) & 0x1); -+ -+ if (opc > 4) -+ { -+ if (opc == 5 && I == 0 && G == 0) -+ unhandled_instruction ("CC = A0 == A1"); -+ else if (opc == 6 && I == 0 && G == 0) -+ unhandled_instruction ("CC = A0 < A1"); -+ else if (opc == 7 && I == 0 && G == 0) -+ unhandled_instruction ("CC = A0 <= A1"); -+ } -+ else -+ { -+ int issigned = opc < 3; -+ bu32 srcop = G ? PREG (x) : DREG (x); -+ bu32 dstop = I ? (issigned ? imm3 (y) : uimm3 (y)) : G ? PREG (y) : DREG (y); -+ int flgs = srcop >> 31; -+ int flgo = dstop >> 31; -+ -+ bu32 result = srcop - dstop; -+ int flgn = result >> 31; -+ int overflow = (flgs ^ flgo) & (flgn ^ flgs); -+ -+ saved_state.az = result == 0; -+ saved_state.an = flgn; -+ saved_state.ac0 = srcop < dstop; -+ switch (opc) -+ { -+ case 0: /* == */ -+ CCREG = saved_state.az; -+ break; -+ case 1: /* <, signed */ -+ CCREG = (flgn && !overflow) || (!flgn && overflow); -+ break; -+ case 2: /* <=, signed */ -+ CCREG = (flgn && !overflow) || (!flgn && overflow) || saved_state.az; -+ break; -+ case 3: /* <, unsigned */ -+ CCREG = saved_state.ac0; -+ break; -+ case 4: /* <=, unsigned */ -+ CCREG = saved_state.ac0 | saved_state.az; -+ break; -+ } -+ } -+ PCREG += 2; -+} -+ -+static void -+decode_CC2dreg_0 (bu16 iw0) -+{ -+ /* CC2dreg -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 | 0 | 0 | 0 |.op....|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int reg = ((iw0 >> 0) & 0x7); -+ int op = ((iw0 >> 3) & 0x3); -+ -+ if (op == 0) -+ /* dregs = CC */ -+ DREG (reg) = CCREG; -+ else if (op == 1) -+ /* CC = dregs */ -+ CCREG = DREG (reg) != 0; -+ else if (op == 3) -+ /* CC = !CC */ -+ CCREG = !CCREG; -+ else -+ illegal_instruction (); -+ PCREG += 2; -+} -+ -+static void -+decode_CC2stat_0 (bu16 iw0) -+{ -+ /* CC2stat -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 1 |.D.|.op....|.cbit..............| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int cbit = ((iw0 >> 0) & 0x1f); -+ int D = ((iw0 >> 7) & 0x1); -+ int op = ((iw0 >> 5) & 0x3); -+ int *pval; -+ -+ switch (cbit) -+ { -+ case 0: pval = &saved_state.az; break; -+ case 1: pval = &saved_state.an; break; -+ case 6: pval = &saved_state.aq; break; -+ case 12: pval = &saved_state.ac0; break; -+ case 13: pval = &saved_state.ac1; break; -+ case 16: pval = &saved_state.av0; break; -+ case 17: pval = &saved_state.av0s; break; -+ case 18: pval = &saved_state.av1; break; -+ case 19: pval = &saved_state.av1s; break; -+ case 24: pval = &saved_state.v; break; -+ case 25: pval = &saved_state.vs; break; -+ default: -+ illegal_instruction (); -+ } -+ -+ if (D == 0) -+ switch (op) -+ { -+ case 0: CCREG = *pval; break; -+ case 1: CCREG |= *pval; break; -+ case 2: CCREG &= *pval; break; -+ case 3: CCREG ^= *pval; break; -+ } -+ else -+ switch (op) -+ { -+ case 0: *pval = CCREG; break; -+ case 1: *pval |= CCREG; break; -+ case 2: *pval &= CCREG; break; -+ case 3: *pval ^= CCREG; break; -+ } -+ PCREG += 2; -+} -+ -+static void -+decode_BRCC_0 (bu16 iw0, bu32 pc) -+{ -+ /* BRCC -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 0 | 1 |.T.|.B.|.offset................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int B = ((iw0 >> 10) & 0x1); -+ int T = ((iw0 >> 11) & 0x1); -+ int offset = ((iw0 >> 0) & 0x3ff); -+ -+ /* B is just the branch predictor hint - we can ignore it. */ -+ -+ /* IF CC JUMP pcrel10 */ -+ if (CCREG == T) -+ { -+ PCREG += pcrel10 (offset); -+ did_jump = 1; -+ } -+ else -+ PCREG += 2; -+} -+ -+static void -+decode_UJUMP_0 (bu16 iw0, bu32 pc) -+{ -+ /* UJUMP -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 1 | 0 |.offset........................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int offset = ((iw0 >> 0) & 0xfff); -+ -+ /* JUMP.S pcrel12 */ -+ PCREG += pcrel12 (offset); -+ did_jump = 1; -+} -+ -+static void -+decode_REGMV_0 (bu16 iw0) -+{ -+ /* REGMV -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 0 | 1 | 1 |.gd........|.gs........|.dst.......|.src.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src = ((iw0 >> 0) & 0x7); -+ int gs = ((iw0 >> 6) & 0x7); -+ int dst = ((iw0 >> 3) & 0x7); -+ int gd = ((iw0 >> 9) & 0x7); -+ bu32 *srcreg = get_allreg (gs, src); -+ bu32 *dstreg = get_allreg (gd, dst); -+ -+ if (srcreg == 0 || dstreg == 0) -+ unhandled_instruction ("reg move"); -+ -+ *dstreg = *srcreg; -+ PCREG += 2; -+} -+ -+static void -+decode_ALU2op_0 (bu16 iw0) -+{ -+ /* ALU2op -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 1 | 0 | 0 | 0 | 0 |.opc...........|.src.......|.dst.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src = ((iw0 >> 3) & 0x7); -+ int opc = ((iw0 >> 6) & 0xf); -+ int dst = ((iw0 >> 0) & 0x7); -+ -+ if (opc == 0) -+ /* dregs >>>= dregs */ -+ DREG (dst) = ashiftrt (DREG (dst), DREG (src), 32); -+ else if (opc == 1) -+ /* dregs >>= dregs */ -+ DREG (dst) = lshiftrt (DREG (dst), DREG (src), 32); -+ else if (opc == 2) -+ /* dregs <<= dregs */ -+ DREG (dst) = lshift (DREG (dst), DREG (src), 32, 0); -+ else if (opc == 3) -+ /* dregs *= dregs */ -+ DREG (dst) *= DREG (src); -+ else if (opc == 4) -+ /* dregs = (dregs + dregs) << 1 */ -+ DREG (dst) = add_and_shift (DREG (dst), DREG (src), 1); -+ else if (opc == 5) -+ /* dregs = (dregs + dregs) << 2 */ -+ DREG (dst) = add_and_shift (DREG (dst), DREG (src), 2); -+ else if (opc == 8) -+ unhandled_instruction ("DIVQ (dregs , dregs)"); -+ else if (opc == 9) -+ unhandled_instruction ("DIVS (dregs , dregs)"); -+ else if (opc == 10) -+ { -+ /* dregs = dregs_lo (X) */ -+ DREG (dst) = (bs32) (bs16) DREG (src); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 11) -+ { -+ /* dregs = dregs_lo (Z) */ -+ DREG (dst) = (bu32) (bu16) DREG (src); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 12) -+ { -+ /* dregs = dregs_byte (X) */ -+ DREG (dst) = (bs32) (bs8) DREG (src); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 13) -+ { -+ /* dregs = dregs_byte (Z) */ -+ DREG (dst) = (bu32) (bu8) DREG (src); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 14) -+ { -+ /* dregs = - dregs */ -+ bu32 val = DREG (src); -+ DREG (dst) = -val; -+ setflags_nz (DREG (dst)); -+ if (val == 0x80000000) -+ saved_state.v = saved_state.vs = 1; -+ /* @@@ Documentation isn't entirely clear about av0 and av1. */ -+ } -+ else if (opc == 15) -+ { -+ /* dregs = ~ dregs */ -+ DREG (dst) = ~DREG (src); -+ setflags_logical (DREG (dst)); -+ } -+ else -+ illegal_instruction (); -+ PCREG += 2; -+} -+ -+static void -+decode_PTR2op_0 (bu16 iw0) -+{ -+ /* PTR2op -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 1 | 0 | 0 | 0 | 1 | 0 |.opc.......|.src.......|.dst.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src = ((iw0 >> 3) & 0x7); -+ int opc = ((iw0 >> 6) & 0x7); -+ int dst = ((iw0 >> 0) & 0x7); -+ -+ if (opc == 0) -+ PREG (dst) -= PREG (src); -+ else if (opc == 1) -+ PREG (dst) = PREG (src) << 2; -+ else if (opc == 3) -+ PREG (dst) = PREG (src) >> 2; -+ else if (opc == 4) -+ PREG (dst) = PREG (src) >> 1; -+ else if (opc == 5) -+ unhandled_instruction ("pregs += pregs ( BREV )"); -+ else if (opc == 6) -+ PREG (dst) = (PREG (dst) + PREG (src)) << 1; -+ else if (opc == 7) -+ PREG (dst) = (PREG (dst) + PREG (src)) << 2; -+ else -+ illegal_instruction (); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_LOGI2op_0 (bu16 iw0) -+{ -+ /* LOGI2op -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 1 | 0 | 0 | 1 |.opc.......|.src...............|.dst.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src = ((iw0 >> 3) & 0x1f); -+ int opc = ((iw0 >> 8) & 0x7); -+ int dst = ((iw0 >> 0) & 0x7); -+ -+ if (opc == 0) -+ /* CC = ! BITTST (dregs, uimm5) */ -+ CCREG = (~DREG (dst) >> uimm5 (src)) & 1; -+ else if (opc == 1) -+ /* CC = BITTST (dregs, uimm5) */ -+ CCREG = (DREG (dst) >> uimm5 (src)) & 1; -+ else if (opc == 2) -+ { -+ /* BITSET (dregs, uimm5) */ -+ DREG (dst) |= 1 << uimm5 (src); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 3) -+ { -+ /* BITTGL (dregs, uimm5) */ -+ DREG (dst) ^= 1 << uimm5 (src); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 4) -+ { -+ /* BITCLR (dregs, uimm5) */ -+ DREG (dst) &= ~(1 << uimm5 (src)); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 5) -+ /* dregs >>>= uimm5 */ -+ DREG (dst) = ashiftrt (DREG (dst), uimm5 (src), 32); -+ else if (opc == 6) -+ /* dregs >>= uimm5 */ -+ DREG (dst) = lshiftrt (DREG (dst), uimm5 (src), 32); -+ else if (opc == 7) -+ /* dregs <<= uimm5 */ -+ DREG (dst) = lshift (DREG (dst), uimm5 (src), 32, 0); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_COMP3op_0 (bu16 iw0) -+{ -+ /* COMP3op -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 1 | 0 | 1 |.opc.......|.dst.......|.src1......|.src0......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src0 = ((iw0 >> 0) & 0x7); -+ int src1 = ((iw0 >> 3) & 0x7); -+ int opc = ((iw0 >> 9) & 0x7); -+ int dst = ((iw0 >> 6) & 0x7); -+ -+ if (opc == 0) -+ /* dregs = dregs + dregs */ -+ DREG (dst) = add32 (DREG (src0), DREG (src1), 1, 0); -+ else if (opc == 1) -+ /* dregs = dregs - dregs */ -+ DREG (dst) = sub32 (DREG (src0), DREG (src1), 1, 0); -+ else if (opc == 2) -+ { -+ /* dregs = dregs & dregs */ -+ DREG (dst) = DREG (src0) & DREG (src1); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 3) -+ { -+ /* dregs = dregs | dregs */ -+ DREG (dst) = DREG (src0) | DREG (src1); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 4) -+ { -+ /* dregs = dregs ^ dregs */ -+ DREG (dst) = DREG (src0) ^ DREG (src1); -+ setflags_logical (DREG (dst)); -+ } -+ else if (opc == 5) -+ /* If src0 == src1 this is disassembled as a shift by 1, but this -+ distinction doesn't matter for our purposes. */ -+ PREG (dst) = PREG (src0) + PREG (src1); -+ else if (opc == 6) -+ PREG (dst) = PREG (src0) + (PREG (src1) << 1); -+ else if (opc == 7) -+ PREG (dst) = PREG (src0) + (PREG (src1) << 2); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_COMPI2opD_0 (bu16 iw0) -+{ -+ /* COMPI2opD -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 1 | 1 | 0 | 0 |.op|.isrc......................|.dst.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int isrc = ((iw0 >> 3) & 0x7f); -+ int dst = ((iw0 >> 0) & 0x7); -+ int op = ((iw0 >> 10) & 0x1); -+ -+ if (op == 0) -+ DREG (dst) = imm7 (isrc); -+ else if (op == 1) -+ DREG (dst) = add32 (DREG (dst), imm7 (isrc), 1, 0); -+ PCREG += 2; -+} -+ -+static void -+decode_COMPI2opP_0 (bu16 iw0) -+{ -+ /* COMPI2opP -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 0 | 1 | 1 | 0 | 1 |.op|.src.......................|.dst.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src = ((iw0 >> 3) & 0x7f); -+ int dst = ((iw0 >> 0) & 0x7); -+ int op = ((iw0 >> 10) & 0x1); -+ -+ if (op == 0) -+ PREG (dst) = imm7 (src); -+ else if (op == 1) -+ PREG (dst) += imm7 (src); -+ PCREG += 2; -+} -+ -+static void -+decode_LDSTpmod_0 (bu16 iw0) -+{ -+ /* LDSTpmod -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 0 | 0 |.W.|.aop...|.reg.......|.idx.......|.ptr.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int aop = ((iw0 >> 9) & 0x3); -+ int idx = ((iw0 >> 3) & 0x7); -+ int ptr = ((iw0 >> 0) & 0x7); -+ int reg = ((iw0 >> 6) & 0x7); -+ int W = ((iw0 >> 11) & 0x1); -+ bu32 addr, val; -+ -+ if (aop == 1 && W == 0 && idx == ptr) -+ { -+ /* dregs_lo = W[pregs] */ -+ addr = PREG (ptr); -+ val = get_word (saved_state.memory, addr); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF0000) | val); -+ } -+ else if (aop == 2 && W == 0 && idx == ptr) -+ { -+ /* dregs_hi = W[pregs] */ -+ addr = PREG (ptr); -+ val = get_word (saved_state.memory, addr); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF) | (val << 16)); -+ } -+ else if (aop == 1 && W == 1 && idx == ptr) -+ { -+ /* W[pregs] = dregs_lo */ -+ addr = PREG (ptr); -+ put_word (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 2 && W == 1 && idx == ptr) -+ { -+ /* W[pregs] = dregs_hi */ -+ addr = PREG (ptr); -+ put_word (saved_state.memory, addr, DREG (reg) >> 16); -+ } -+ else if (aop == 0 && W == 0) -+ { -+ /* dregs = [pregs ++ pregs] */ -+ addr = PREG (ptr); -+ val = get_long (saved_state.memory, addr); -+ STORE (DREG (reg), val); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 1 && W == 0) -+ { -+ /* dregs_lo = W[pregs ++ pregs] */ -+ addr = PREG (ptr); -+ val = get_word (saved_state.memory, addr); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF0000) | val); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 2 && W == 0) -+ { -+ /* dregs_hi = W[pregs ++ pregs] */ -+ addr = PREG (ptr); -+ val = get_word (saved_state.memory, addr); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF) | (val << 16)); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 3 && W == 0) -+ { -+ /* dregs = W[pregs ++ pregs] (Z) */ -+ addr = PREG (ptr); -+ val = get_word (saved_state.memory, addr); -+ STORE (DREG (reg), val); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 3 && W == 1) -+ { -+ /* dregs = W [ pregs ++ pregs ] (X) */ -+ addr = PREG (ptr); -+ val = get_word (saved_state.memory, addr); -+ STORE (DREG (reg), (bs32) (bs16) val); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 0 && W == 1) -+ { -+ /* [pregs ++ pregs] = dregs */ -+ addr = PREG (ptr); -+ put_long (saved_state.memory, addr, DREG (reg)); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 1 && W == 1) -+ { -+ /* W[pregs ++ pregs] = dregs_lo */ -+ addr = PREG (ptr); -+ put_word (saved_state.memory, addr, DREG (reg)); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else if (aop == 2 && W == 1) -+ { -+ /* W[pregs ++ pregs] = dregs_hi */ -+ addr = PREG (ptr); -+ put_word (saved_state.memory, addr, DREG (reg) >> 16); -+ STORE (PREG (ptr), addr + PREG (idx)); -+ } -+ else -+ illegal_instruction (); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_dagMODim_0 (bu16 iw0) -+{ -+ /* dagMODim -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 0 | 1 | 1 | 1 | 1 | 0 |.br| 1 | 1 |.op|.m.....|.i.....| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int i = ((iw0 >> 0) & 0x3); -+ int br = ((iw0 >> 7) & 0x1); -+ int m = ((iw0 >> 2) & 0x3); -+ int op = ((iw0 >> 4) & 0x1); -+ -+ if (op == 0 && br == 1) -+ unhandled_instruction ("iregs += mregs (BREV)"); -+ else if (op == 0) -+ /* iregs += mregs */ -+ dagadd (i, MREG (m)); -+ else if (op == 1) -+ /* iregs -= mregs */ -+ dagsub (i, MREG (m)); -+ else -+ illegal_instruction (); -+ PCREG += 2; -+} -+ -+static void -+decode_dagMODik_0 (bu16 iw0) -+{ -+ /* dagMODik -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 0 | 1 | 1 | 1 | 1 | 1 | 0 | 1 | 1 | 0 |.op....|.i.....| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int i = ((iw0 >> 0) & 0x3); -+ int op = ((iw0 >> 2) & 0x3); -+ -+ if (op == 0) -+ /* iregs += 2 */ -+ dagadd (i, 2); -+ else if (op == 1) -+ /* iregs -= 2 */ -+ dagsub (i, 2); -+ else if (op == 2) -+ /* iregs += 4 */ -+ dagadd (i, 4); -+ else if (op == 3) -+ /* iregs -= 4 */ -+ dagsub (i, 4); -+ else -+ illegal_instruction (); -+ PCREG += 2; -+} -+ -+static void -+decode_dspLDST_0 (bu16 iw0) -+{ -+ /* dspLDST -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 0 | 1 | 1 | 1 |.W.|.aop...|.m.....|.i.....|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int aop = ((iw0 >> 7) & 0x3); -+ int i = ((iw0 >> 3) & 0x3); -+ int m = ((iw0 >> 5) & 0x3); -+ int reg = ((iw0 >> 0) & 0x7); -+ int W = ((iw0 >> 9) & 0x1); -+ bu32 addr; -+ -+ if (aop == 0 && W == 0 && m == 0) -+ { -+ /* dregs = [iregs++] */ -+ addr = IREG (i); -+ dagadd (i, 4); -+ STORE (DREG (reg), get_long (saved_state.memory, addr)); -+ } -+ else if (aop == 0 && W == 0 && m == 1) -+ { -+ /* dregs_lo = W[iregs++] */ -+ addr = IREG (i); -+ dagadd (i, 2); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF0000) | get_word (saved_state.memory, addr)); -+ } -+ else if (aop == 0 && W == 0 && m == 2) -+ { -+ /* dregs_hi = W[iregs++] */ -+ addr = IREG (i); -+ dagadd (i, 2); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF) | (get_word (saved_state.memory, addr) << 16)); -+ } -+ else if (aop == 1 && W == 0 && m == 0) -+ { -+ /* dregs = [iregs--] */ -+ addr = IREG (i); -+ dagsub (i, 4); -+ STORE (DREG (reg), get_long (saved_state.memory, addr)); -+ } -+ else if (aop == 1 && W == 0 && m == 1) -+ { -+ /* dregs_lo = W[iregs--] */ -+ addr = IREG (i); -+ dagsub (i, 2); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF0000) | get_word (saved_state.memory, addr)); -+ } -+ else if (aop == 1 && W == 0 && m == 2) -+ { -+ /* dregs_hi = W[iregs--] */ -+ addr = IREG (i); -+ dagsub (i, 2); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF) | (get_word (saved_state.memory, addr) << 16)); -+ } -+ else if (aop == 2 && W == 0 && m == 0) -+ { -+ /* dregs = [iregs] */ -+ addr = IREG (i); -+ STORE (DREG (reg), get_long (saved_state.memory, addr)); -+ } -+ else if (aop == 2 && W == 0 && m == 1) -+ { -+ /* dregs_lo = W[iregs] */ -+ addr = IREG (i); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF0000) | get_word (saved_state.memory, addr)); -+ } -+ else if (aop == 2 && W == 0 && m == 2) -+ { -+ /* dregs_hi = W[iregs] */ -+ addr = IREG (i); -+ STORE (DREG (reg), (DREG (reg) & 0xFFFF) | (get_word (saved_state.memory, addr) << 16)); -+ } -+ else if (aop == 0 && W == 1 && m == 0) -+ { -+ /* [iregs++] = dregs */ -+ addr = IREG (i); -+ dagadd (i, 4); -+ put_long (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 0 && W == 1 && m == 1) -+ { -+ /* W[iregs++] = dregs_lo */ -+ addr = IREG (i); -+ dagadd (i, 2); -+ put_word (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 0 && W == 1 && m == 2) -+ { -+ /* W[iregs++] = dregs_hi */ -+ addr = IREG (i); -+ dagadd (i, 2); -+ put_word (saved_state.memory, addr, DREG (reg) >> 16); -+ } -+ else if (aop == 1 && W == 1 && m == 0) -+ { -+ /* [iregs--] = dregs */ -+ addr = IREG (i); -+ dagsub (i, 4); -+ put_long (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 1 && W == 1 && m == 1) -+ { -+ /* W[iregs--] = dregs_lo */ -+ addr = IREG (i); -+ dagsub (i, 2); -+ put_word (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 1 && W == 1 && m == 2) -+ { -+ /* W[iregs--] = dregs_hi */ -+ addr = IREG (i); -+ dagsub (i, 2); -+ put_word (saved_state.memory, addr, DREG (reg) >> 16); -+ } -+ else if (aop == 2 && W == 1 && m == 0) -+ { -+ /* [iregs] = dregs */ -+ addr = IREG (i); -+ put_long (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 2 && W == 1 && m == 1) -+ { -+ /* W[iregs] = dregs_lo */ -+ addr = IREG (i); -+ put_word (saved_state.memory, addr, DREG (reg)); -+ } -+ else if (aop == 2 && W == 1 && m == 2) -+ { -+ /* W[iregs] = dregs_hi */ -+ addr = IREG (i); -+ put_word (saved_state.memory, addr, DREG (reg) >> 16); -+ } -+ else if (aop == 3 && W == 0) -+ { -+ /* dregs = [iregs ++ mregs] */ -+ addr = IREG (i); -+ dagadd (i, MREG (m)); -+ STORE (DREG (reg), get_long (saved_state.memory, addr)); -+ } -+ else if (aop == 3 && W == 1) -+ { -+ /* [iregs ++ mregs] = dregs */ -+ addr = IREG (i); -+ dagadd(i, MREG (m)); -+ put_long (saved_state.memory, addr, DREG (reg)); -+ } -+ else -+ illegal_instruction (); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_LDST_0 (bu16 iw0) -+{ -+ /* LDST -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 0 | 1 |.sz....|.W.|.aop...|.Z.|.ptr.......|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int aop = ((iw0 >> 7) & 0x3); -+ int Z = ((iw0 >> 6) & 0x1); -+ int sz = ((iw0 >> 10) & 0x3); -+ int reg = ((iw0 >> 0) & 0x7); -+ int ptr = ((iw0 >> 3) & 0x7); -+ int W = ((iw0 >> 9) & 0x1); -+ -+ if (aop == 3) -+ illegal_instruction (); -+ -+ if (W == 0) -+ { -+ if (aop != 2 && sz == 0 && Z == 1 -+ && ptr == reg) -+ illegal_instruction (); -+ -+ if (sz == 0 && Z == 0) -+ /* dregs = [pregs] */ -+ DREG (reg) = get_long (saved_state.memory, PREG (ptr)); -+ else if (sz == 0 && Z == 1) -+ /* pregs = [pregs] */ -+ PREG (reg) = get_long (saved_state.memory, PREG (ptr)); -+ else if (sz == 1 && Z == 0) -+ /* dregs = W[pregs] (z) */ -+ DREG (reg) = get_word (saved_state.memory, PREG (ptr)); -+ else if (sz == 1 && Z == 1) -+ /* dregs = W[pregs] (X) */ -+ DREG (reg) = (bs32) (bs16) get_word (saved_state.memory, PREG (ptr)); -+ else if (sz == 2 && Z == 0) -+ /* dregs = B[pregs] (Z) */ -+ DREG (reg) = get_byte (saved_state.memory, PREG (ptr)); -+ else if (sz == 2 && Z == 1) -+ /* dregs = B[pregs] (X) */ -+ DREG (reg) = (bs32) (bs8) get_byte (saved_state.memory, PREG (ptr)); -+ -+ if (aop == 0) -+ PREG (ptr) += sz == 0 ? 4 : sz == 1 ? 2 : 1; -+ if (aop == 1) -+ PREG (ptr) -= sz == 0 ? 4 : sz == 1 ? 2 : 1; -+ } -+ else -+ { -+ if (sz != 0 && Z == 1) -+ illegal_instruction (); -+ -+ if (sz == 0 && Z == 0) -+ /* [pregs] = dregs */ -+ put_long (saved_state.memory, PREG (ptr), DREG (reg)); -+ else if (sz == 0 && Z == 1) -+ /* [pregs] = pregs */ -+ put_long (saved_state.memory, PREG (ptr), PREG (reg)); -+ else if (sz == 1 && Z == 0) -+ /* W[pregs] = dregs */ -+ put_word (saved_state.memory, PREG (ptr), DREG (reg)); -+ else if (sz == 2 && Z == 0) -+ /* B[pregs] = dregs */ -+ put_byte (saved_state.memory, PREG (ptr), DREG (reg)); -+ -+ if (aop == 0) -+ PREG (ptr) += sz == 0 ? 4 : sz == 1 ? 2 : 1; -+ if (aop == 1) -+ PREG (ptr) -= sz == 0 ? 4 : sz == 1 ? 2 : 1; -+ } -+ -+ PCREG += 2; -+} -+ -+static void -+decode_LDSTiiFP_0 (bu16 iw0) -+{ -+ /* LDSTiiFP -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 1 | 1 | 1 | 0 |.W.|.offset............|.reg...........| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int reg = ((iw0 >> 0) & 0xf); -+ int offset = ((iw0 >> 4) & 0x1f); -+ int W = ((iw0 >> 9) & 0x1); -+ bu32 ea = PREG (7) + negimm5s4 (offset); -+ -+ if (W == 0) -+ DPREG (reg) = get_long (saved_state.memory, ea); -+ else -+ put_long (saved_state.memory, ea, DPREG (reg)); -+ PCREG += 2; -+} -+ -+static void -+decode_LDSTii_0 (bu16 iw0) -+{ -+ /* LDSTii -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 0 | 1 |.W.|.op....|.offset........|.ptr.......|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int reg = ((iw0 >> 0) & 0x7); -+ int ptr = ((iw0 >> 3) & 0x7); -+ int offset = ((iw0 >> 6) & 0xf); -+ int op = ((iw0 >> 10) & 0x3); -+ int W = ((iw0 >> 12) & 0x1); -+ bu32 ea = PREG (ptr) + (op == 0 || op == 3 ? uimm4s4 (offset) -+ : uimm4s2 (offset)); -+ -+ if (W == 1 && op == 2) -+ illegal_instruction (); -+ -+ if (W == 0) -+ { -+ if (op == 0) -+ /* dregs = [pregs + uimm4s4] */ -+ DREG (reg) = get_long (saved_state.memory, ea); -+ else if (op == 1) -+ /* dregs = W[pregs + uimm4s2] (Z) */ -+ DREG (reg) = get_word (saved_state.memory, ea); -+ else if (op == 2) -+ /* dregs = W[pregs + uimm4s2] (X) */ -+ DREG (reg) = (bs32) (bs16) get_word (saved_state.memory, ea); -+ else if (op == 3) -+ /* pregs = [pregs + uimm4s4] */ -+ PREG (reg) = get_long (saved_state.memory, ea); -+ } -+ else -+ { -+ if (op == 0) -+ /* [pregs + uimm4s4] = dregs */ -+ put_long (saved_state.memory, ea, DREG (reg)); -+ else if (op == 1) -+ /* W[pregs + uimm4s2] = dregs */ -+ put_word (saved_state.memory, ea, DREG (reg)); -+ else if (op == 3) -+ /* [pregs + uimm4s4] = pregs */ -+ put_long (saved_state.memory, ea, PREG (reg)); -+ } -+ PCREG += 2; -+} -+ -+static void -+decode_LoopSetup_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* LoopSetup -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 0 | 0 | 0 | 0 | 0 | 1 |.rop...|.c.|.soffset.......| -+ |.reg...........| - | - |.eoffset...............................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int rop = ((iw0 >> 5) & 0x3); -+ int soffset = ((iw0 >> 0) & 0xf); -+ int c = ((iw0 >> 4) & 0x1); -+ int eoffset = ((iw1 >> 0) & 0x3ff); -+ int reg = ((iw1 >> 12) & 0xf); -+ -+ if (rop == 0) -+ { -+ /* LSETUP (pcrel4, lppcrel10) counters */ -+ saved_state.lt[c] = PCREG + pcrel4 (soffset); -+ saved_state.lb[c] = PCREG + lppcrel10 (eoffset); -+ } -+ else if (rop == 1) -+ { -+ /* LSETUP (pcrel4, lppcrel10) counters = pregs */ -+ saved_state.lt[c] = PCREG + pcrel4 (soffset); -+ saved_state.lb[c] = PCREG + lppcrel10 (eoffset); -+ saved_state.lc[c] = PREG (reg); -+ } -+ else if (rop == 3) -+ { -+ /* LSETUP (pcrel4, lppcrel10) counters = pregs >> 1 */ -+ saved_state.lt[c] = PCREG + pcrel4 (soffset); -+ saved_state.lb[c] = PCREG + lppcrel10 (eoffset); -+ saved_state.lc[c] = PREG (reg) >> 1; -+ } -+ else -+ illegal_instruction (); -+ -+ PCREG += 4; -+} -+ -+static void -+decode_LDIMMhalf_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* LDIMMhalf -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 0 | 0 | 0 | 0 | 1 |.Z.|.H.|.S.|.grp...|.reg.......| -+ |.hword.........................................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int H = ((iw0 >> 6) & 0x1); -+ int grp = ((iw0 >> 3) & 0x3); -+ int Z = ((iw0 >> 7) & 0x1); -+ int S = ((iw0 >> 5) & 0x1); -+ int hword = ((iw1 >> 0) & 0xffff); -+ int reg = ((iw0 >> 0) & 0x7); -+ -+ if (H == 0 && S == 1 && Z == 0) -+ { -+ bu32 *pval = get_allreg (grp, reg); -+ /* regs = imm16 (x) */ -+ *pval = imm16 (hword); -+ } -+ else if (H == 0 && S == 0 && Z == 1) -+ { -+ bu32 *pval = get_allreg (grp, reg); -+ /* regs = luimm16 (Z) */ -+ *pval = luimm16 (hword); -+ } -+ else if (H == 0 && S == 0 && Z == 0) -+ { -+ bu32 *pval = get_allreg (grp, reg); -+ /* regs_lo = luimm16 */ -+ *pval &= 0xFFFF0000; -+ *pval |= luimm16 (hword); -+ } -+ else if (H == 1 && S == 0 && Z == 0) -+ { -+ bu32 *pval = get_allreg (grp, reg); -+ /* regs_hi = huimm16 */ -+ *pval &= 0xFFFF; -+ *pval |= luimm16 (hword) << 16; -+ } -+ else -+ illegal_instruction (); -+ PCREG += 4; -+} -+ -+static void -+decode_CALLa_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* CALLa -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 0 | 0 | 0 | 1 |.S.|.msw...........................| -+ |.lsw...........................................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int S = ((iw0 >> 8) & 0x1); -+ int lsw = ((iw1 >> 0) & 0xffff); -+ int msw = ((iw0 >> 0) & 0xff); -+ -+ if (S == 1) -+ /* CALL pcrel24 */ -+ saved_state.rets = PCREG + 4; -+ /* JUMP.L pcrel24 */ -+ PCREG += pcrel24 (((msw) << 16) | (lsw)); -+} -+ -+static void -+decode_LDSTidxI_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* LDSTidxI -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 0 | 0 | 1 |.W.|.Z.|.sz....|.ptr.......|.reg.......| -+ |.offset........................................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int Z = ((iw0 >> 8) & 0x1); -+ int sz = ((iw0 >> 6) & 0x3); -+ int reg = ((iw0 >> 0) & 0x7); -+ int ptr = ((iw0 >> 3) & 0x7); -+ int offset = ((iw1 >> 0) & 0xffff); -+ int W = ((iw0 >> 9) & 0x1); -+ -+ if (sz == 3) -+ illegal_instruction (); -+ -+ if (W == 0) -+ { -+ if (sz == 0 && Z == 0) -+ /* dregs = [pregs + imm16s4] */ -+ DREG (reg) = get_long (saved_state.memory, PREG (ptr) + imm16s4 (offset)); -+ else if (sz == 0 && Z == 1) -+ /* pregs = [pregs + imm16s4] */ -+ PREG (reg) = get_long (saved_state.memory, PREG (ptr) + imm16s4 (offset)); -+ else if (sz == 1 && Z == 0) -+ /* dregs = W[pregs + imm16s2] (Z) */ -+ DREG (reg) = get_word (saved_state.memory, PREG (ptr) + imm16s2 (offset)); -+ else if (sz == 1 && Z == 1) -+ /* dregs = W[pregs + imm16s2] (X) */ -+ DREG (reg) = (bs32) (bs16) get_word (saved_state.memory, PREG (ptr) + imm16s2 (offset)); -+ else if (sz == 2 && Z == 0) -+ /* dregs = B[pregs + imm16] (Z) */ -+ DREG (reg) = get_byte (saved_state.memory, PREG (ptr) + imm16 (offset)); -+ else if (sz == 2 && Z == 1) -+ /* dregs = B[pregs + imm16] (X) */ -+ DREG (reg) = (bs32) (bs8) get_byte (saved_state.memory, PREG (ptr) + imm16 (offset)); -+ } -+ else -+ { -+ if (sz != 0 && Z != 0) -+ illegal_instruction (); -+ -+ if (sz == 0 && Z == 0) -+ /* [pregs + imm16s4] = dregs */ -+ put_long (saved_state.memory, PREG (ptr) + imm16s4 (offset), DREG (reg)); -+ else if (sz == 0 && Z == 1) -+ /* [pregs + imm16s4] = pregs */ -+ put_long (saved_state.memory, PREG (ptr) + imm16s4 (offset), PREG (reg)); -+ else if (sz == 1 && Z == 0) -+ /* W[pregs + imm16s2] = dregs */ -+ put_word (saved_state.memory, PREG (ptr) + imm16s2 (offset), DREG (reg)); -+ else if (sz == 2 && Z == 0) -+ /* B[pregs + imm16] = dregs */ -+ put_byte (saved_state.memory, PREG (ptr) + imm16 (offset), DREG (reg)); -+ } -+ PCREG += 4; -+} -+ -+static void -+decode_linkage_0 (bu16 iw0, bu16 iw1) -+{ -+ /* linkage -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 0 | 1 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |.R.| -+ |.framesize.....................................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int R = ((iw0 >> 0) & 0x1); -+ int framesize = ((iw1 >> 0) & 0xffff); -+ -+ if (R == 0) -+ { -+ bu32 sp = PREG (6); -+ /* LINK uimm16s4 */ -+ sp -= 4; -+ put_long (saved_state.memory, sp, saved_state.rets); -+ sp -= 4; -+ put_long (saved_state.memory, sp, PREG (7)); -+ PREG (7) = sp; -+ sp -= uimm16s4 (framesize); -+ PREG (6) = sp; -+ } -+ else -+ { -+ /* Restore SP from FP. */ -+ bu32 sp = PREG (7); -+ /* UNLINK */ -+ PREG (7) = get_long (saved_state.memory, sp); -+ sp += 4; -+ saved_state.rets = get_long (saved_state.memory, sp); -+ sp += 4; -+ PREG (6) = sp; -+ } -+ PCREG += 4; -+} -+ -+static void -+decode_dsp32mac_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* dsp32mac -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 0 | 0 |.M.| 0 | 0 |.mmod..........|.MM|.P.|.w1|.op1...| -+ |.h01|.h11|.w0|.op0...|.h00|.h10|.dst.......|.src0......|.src1......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int op1 = ((iw0 >> 0) & 0x3); -+ int w1 = ((iw0 >> 2) & 0x1); -+ int P = ((iw0 >> 3) & 0x1); -+ int MM = ((iw0 >> 4) & 0x1); -+ int mmod = ((iw0 >> 5) & 0xf); -+ int M = ((iw0 >> 11) & 0x1); -+ -+ int w0 = ((iw1 >> 13) & 0x1); -+ int src1 = ((iw1 >> 0) & 0x7); -+ int src0 = ((iw1 >> 3) & 0x7); -+ int dst = ((iw1 >> 6) & 0x7); -+ int h10 = ((iw1 >> 9) & 0x1); -+ int h00 = ((iw1 >> 10) & 0x1); -+ int op0 = ((iw1 >> 11) & 0x3); -+ int h11 = ((iw1 >> 14) & 0x1); -+ int h01 = ((iw1 >> 15) & 0x1); -+ -+ bu32 res0, res1; -+ -+ if (w0 == 0 && w1 == 0 && op1 == 3 && op0 == 3) -+ illegal_instruction (); -+ -+ if (op1 == 3 && MM) -+ illegal_instruction (); -+ -+ if (((1 << mmod) & (P ? 0x313 : 0x1b57)) == 0) -+ illegal_instruction (); -+ -+ if (w1 == 1 || op1 != 3) -+ res1 = decode_macfunc (1, op1, h01, h11, src0, src1, mmod, MM, P); -+ -+ if (w0 == 1 || op0 != 3) -+ res0 = decode_macfunc (0, op0, h00, h10, src0, src1, mmod, 0, P); -+ -+ if (w0) -+ { -+ if (P) -+ DREG (dst) = res0; -+ else -+ { -+ if (res0 & 0xffff0000) -+ abort (); -+ DREG (dst) = (DREG (dst) & 0xFFFF0000) | res0; -+ } -+ } -+ -+ if (w1) -+ { -+ if (P) -+ DREG (dst + 1) = res1; -+ else -+ { -+ if (res1 & 0xffff0000) -+ abort (); -+ DREG (dst) = (DREG (dst) & 0xFFFF) | (res1 << 16); -+ } -+ } -+ -+ PCREG += 4; -+} -+ -+static void -+decode_dsp32mult_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* dsp32mult -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 0 | 0 |.M.| 0 | 1 |.mmod..........|.MM|.P.|.w1|.op1...| -+ |.h01|.h11|.w0|.op0...|.h00|.h10|.dst.......|.src0......|.src1......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int op1 = ((iw0 >> 0) & 0x3); -+ int w1 = ((iw0 >> 2) & 0x1); -+ int P = ((iw0 >> 3) & 0x1); -+ int MM = ((iw0 >> 4) & 0x1); -+ int mmod = ((iw0 >> 5) & 0xf); -+ int M = ((iw0 >> 11) & 0x1); -+ -+ int src1 = ((iw1 >> 0) & 0x7); -+ int src0 = ((iw1 >> 3) & 0x7); -+ int dst = ((iw1 >> 6) & 0x7); -+ int h10 = ((iw1 >> 9) & 0x1); -+ int h00 = ((iw1 >> 10) & 0x1); -+ int op0 = ((iw1 >> 11) & 0x3); -+ int w0 = ((iw1 >> 13) & 0x1); -+ int h01 = ((iw1 >> 15) & 0x1); -+ int h11 = ((iw1 >> 14) & 0x1); -+ -+ bu32 res0, res1; -+ -+ if (w1 == 0 && w0 == 0) -+ illegal_instruction (); -+ if (((1 << mmod) & (P ? 0x313 : 0x1b57)) == 0) -+ illegal_instruction (); -+ -+ if (w1) -+ { -+ bu64 r = decode_multfunc (h01, h11, src0, src1, mmod, MM); -+ res1 = extract_mult (r, mmod, P); -+ } -+ -+ if (w0) -+ { -+ bu64 r = decode_multfunc (h00, h10, src0, src1, mmod, 0); -+ res0 = extract_mult (r, mmod, P); -+ } -+ -+ if (w0) -+ { -+ if (P) -+ DREG (dst) = res0; -+ else -+ { -+ if (res0 & 0xFFFF0000) -+ abort (); -+ DREG (dst) = (DREG (dst) & 0xFFFF0000) | res0; -+ } -+ } -+ -+ if (w1) -+ { -+ if (P) -+ DREG (dst + 1) = res1; -+ else -+ { -+ if (res1 & 0xFFFF0000) -+ abort (); -+ DREG (dst) = (DREG (dst) & 0xFFFF) | (res1 << 16); -+ } -+ } -+ -+ PCREG += 4; -+} -+ -+static void -+decode_dsp32alu_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* dsp32alu -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 0 | 0 |.M.| 1 | 0 | - | - | - |.HL|.aopcde............| -+ |.aop...|.s.|.x.|.dst0......|.dst1......|.src0......|.src1......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int aop = ((iw1 >> 14) & 0x3); -+ int s = ((iw1 >> 13) & 0x1); -+ int HL = ((iw0 >> 5) & 0x1); -+ int x = ((iw1 >> 12) & 0x1); -+ int src0 = ((iw1 >> 3) & 0x7); -+ int src1 = ((iw1 >> 0) & 0x7); -+ int dst0 = ((iw1 >> 9) & 0x7); -+ int aopcde = ((iw0 >> 0) & 0x1f); -+ int dst1 = ((iw1 >> 6) & 0x7); -+ int M = ((iw0 >> 11) & 0x1); -+ -+ if (aop == 0 && aopcde == 9 && HL == 0 && s == 0) -+ unhandled_instruction ("A0.L = dregs_lo"); -+ else if (aop == 2 && aopcde == 9 && HL == 1 && s == 0) -+ unhandled_instruction ("A1.H = dregs_hi"); -+ else if (aop == 2 && aopcde == 9 && HL == 0 && s == 0) -+ unhandled_instruction ("A1.L = dregs_lo"); -+ else if (aop == 0 && aopcde == 9 && HL == 1 && s == 0) -+ unhandled_instruction ("A0.H = dregs_hi"); -+ else if (x == 1 && HL == 1 && aop == 3 && aopcde == 5) -+ unhandled_instruction ("dregs_hi = dregs - dregs (RND20)"); -+ else if (x == 1 && HL == 1 && aop == 2 && aopcde == 5) -+ unhandled_instruction ("dregs_hi = dregs + dregs (RND20)"); -+ else if (x == 0 && HL == 0 && aop == 1 && aopcde == 5) -+ unhandled_instruction ("dregs_lo = dregs - dregs (RND12)"); -+ else if (x == 0 && HL == 0 && aop == 0 && aopcde == 5) -+ unhandled_instruction ("dregs_lo = dregs + dregs (RND12)"); -+ else if (x == 1 && HL == 0 && aop == 3 && aopcde == 5) -+ unhandled_instruction ("dregs_lo = dregs - dregs (RND20)"); -+ else if (x == 0 && HL == 1 && aop == 0 && aopcde == 5) -+ unhandled_instruction ("dregs_hi = dregs + dregs (RND12)"); -+ else if (x == 1 && HL == 0 && aop == 2 && aopcde == 5) -+ unhandled_instruction ("dregs_lo = dregs + dregs (RND20)"); -+ else if (x == 0 && HL == 1 && aop == 1 && aopcde == 5) -+ unhandled_instruction ("dregs_hi = dregs - dregs (RND12)"); -+ else if (aopcde == 2 || aopcde == 3) -+ { -+ bu32 s1 = DREG (src0); -+ bu32 s2 = DREG (src1); -+ bu16 val; -+ if (aop & 1) -+ s2 >>= 16; -+ if (aop & 2) -+ s1 >>= 16; -+ if (aopcde == 2) -+ val = add16 (s1, s2, &saved_state.ac0, s); -+ else -+ val = sub16 (s1, s2, &saved_state.ac0, s); -+ if (HL) -+ DREG (dst0) = (DREG (dst0) & 0xFFFF) | (val << 16); -+ else -+ DREG (dst0) = (DREG (dst0) & 0xFFFF0000) | val; -+ } -+ else if (aop == 0 && aopcde == 9 && s == 1) -+ { -+ saved_state.a0w = DREG (src0); -+ saved_state.a0x = -(saved_state.a1w >> 31); -+ } -+ else if (aop == 1 && aopcde == 9 && s == 0) -+ saved_state.a0x = (bs32)(bs8)DREG (src0); -+ else if (aop == 2 && aopcde == 9 && s == 1) -+ { -+ saved_state.a1w = DREG (src0); -+ saved_state.a1x = -(saved_state.a1w >> 31); -+ } -+ else if (aop == 3 && aopcde == 9 && s == 0) -+ saved_state.a1x = (bs32)(bs8)DREG (src0); -+ else if (aop == 3 && aopcde == 11 && s == 0) -+ unhandled_instruction ("A0 -= A1"); -+ else if (aop == 3 && aopcde == 11 && s == 1) -+ unhandled_instruction ("A0 -= A1 (W32)"); -+ else if (aop == 3 && aopcde == 22 && HL == 1) -+ unhandled_instruction ("dregs = BYTEOP2M (dregs_pair, dregs_pair) (TH,R)"); -+ else if (aop == 3 && aopcde == 22 && HL == 0) -+ unhandled_instruction ("dregs = BYTEOP2M (dregs_pair, dregs_pair) (TL,R)"); -+ else if (aop == 2 && aopcde == 22 && HL == 1) -+ unhandled_instruction ("dregs = BYTEOP2M (dregs_pair, dregs_pair) (RNDH,R)"); -+ else if (aop == 2 && aopcde == 22 && HL == 0) -+ unhandled_instruction ("dregs = BYTEOP2M (dregs_pair, dregs_pair) (RNDL,R)"); -+ else if (aop == 1 && aopcde == 22 && HL == 1) -+ unhandled_instruction ("dregs = BYTEOP2P (dregs_pair, dregs_pair) (TH ,R)"); -+ else if (aop == 1 && aopcde == 22 && HL == 0) -+ unhandled_instruction ("dregs = BYTEOP2P (dregs_pair, dregs_pair) (TL ,R)"); -+ else if (aop == 0 && aopcde == 22 && HL == 1) -+ unhandled_instruction ("dregs = BYTEOP2P (dregs_pair, dregs_pair) (RNDH,R)"); -+ else if (aop == 0 && aopcde == 22 && HL == 0) -+ unhandled_instruction ("dregs = BYTEOP2P (dregs_pair, dregs_pair) (RNDL,aligndir)"); -+ else if (aop == 0 && s == 0 && aopcde == 8) -+ { -+ /* A0 = 0 */ -+ saved_state.a0x = 0; -+ saved_state.a0w = 0; -+ } -+ else if (aop == 0 && s == 1 && aopcde == 8) -+ saved_state.a0x = -(saved_state.a0w >> 31); -+ else if (aop == 1 && s == 0 && aopcde == 8) -+ { -+ /* A1 = 0 */ -+ saved_state.a1x = 0; -+ saved_state.a1w = 0; -+ } -+ else if (aop == 1 && s == 1 && aopcde == 8) -+ saved_state.a1x = -(saved_state.a1w >> 31); -+ else if (aop == 2 && s == 0 && aopcde == 8) -+ { -+ /* A1 = A0 = 0 */ -+ saved_state.a1x = saved_state.a0x = 0; -+ saved_state.a1w = saved_state.a0w = 0; -+ } -+ else if (aop == 2 && s == 1 && aopcde == 8) -+ { -+ saved_state.a0x = -(saved_state.a0w >> 31); -+ saved_state.a1x = -(saved_state.a1w >> 31); -+ } -+ else if (aop == 3 && s == 0 && aopcde == 8) -+ { -+ saved_state.a0x = saved_state.a1x; -+ saved_state.a0w = saved_state.a1w; -+ } -+ else if (aop == 3 && s == 1 && aopcde == 8) -+ { -+ saved_state.a1x = saved_state.a0x; -+ saved_state.a1w = saved_state.a0w; -+ } -+ else if (aop == 1 && HL == 0 && aopcde == 11) -+ unhandled_instruction ("dregs_lo = (A0 += A1)"); -+ else if (aop == 3 && HL == 0 && aopcde == 16) -+ unhandled_instruction ("A1 = ABS A1, A0 = ABS A0"); -+ else if (aop == 0 && aopcde == 23 && HL == 1) -+ unhandled_instruction ("dregs = BYTEOP3P (dregs_pair, dregs_pair) (HI,R)"); -+ else if (aop == 1 && HL == 1 && aopcde == 16) -+ unhandled_instruction ("A1 = ABS A1"); -+ else if (aop == 0 && HL == 1 && aopcde == 16) -+ unhandled_instruction ("A1 = ABS A0"); -+ else if (HL == 0 && aop == 3 && aopcde == 12) -+ unhandled_instruction ("dregs_lo = dregs (RND)"); -+ else if (aop == 1 && HL == 0 && aopcde == 16) -+ unhandled_instruction ("A0 = ABS A1"); -+ else if (aop == 0 && HL == 0 && aopcde == 16) -+ unhandled_instruction ("A0 = ABS A0"); -+ else if (aop == 3 && HL == 0 && aopcde == 15) -+ { -+ /* Vector NEG. */ -+ bu32 hi = (-(bs16)(DREG (src0) >> 16)) << 16; -+ bu32 lo = (-(bs16)(DREG (src0) & 0xFFFF)) & 0xFFFF; -+ DREG (dst0) = hi | lo; -+ setflags_nz_2x16 (DREG (dst0)); -+ saved_state.v = 0; -+ } -+ else if (aop == 1 && HL == 1 && aopcde == 11) -+ unhandled_instruction ("dregs_hi = (A0 += A1)"); -+ else if (aop == 2 && aopcde == 11 && s == 0) -+ unhandled_instruction ("A0 += A1"); -+ else if (aop == 2 && aopcde == 11 && s == 1) -+ unhandled_instruction ("A0 += A1 (W32)"); -+ else if (aop == 3 && HL == 0 && aopcde == 14) -+ unhandled_instruction ("A1 = - A1 , A0 = - A0"); -+ else if (HL == 1 && aop == 3 && aopcde == 12) -+ unhandled_instruction ("dregs_hi = dregs (RND)"); -+ else if (aop == 0 && aopcde == 23 && HL == 0) -+ unhandled_instruction ("dregs = BYTEOP3P (dregs_pair, dregs_pair) (LO,R)"); -+ else if (aop == 0 && HL == 0 && aopcde == 14) -+ unhandled_instruction ("A0 = - A0"); -+ else if (aop == 1 && HL == 0 && aopcde == 14) -+ unhandled_instruction ("A0 = - A1"); -+ else if (aop == 0 && HL == 1 && aopcde == 14) -+ unhandled_instruction ("A1 = - A0"); -+ else if (aop == 1 && HL == 1 && aopcde == 14) -+ unhandled_instruction ("A1 = - A1"); -+ else if (aop == 0 && aopcde == 12) -+ unhandled_instruction ("dregs_hi=dregs_lo=SIGN(dregs_hi)*dregs_hi + SIGN(dregs_lo)*dregs_lo)"); -+ else if (aopcde == 0) -+ { -+ /* dregs = dregs +-|+- dregs amod0 */ -+ bu32 s0 = DREG (src0); -+ bu32 s1 = DREG (src1); -+ bu32 s0h = s0 >> 16; -+ bu32 s0l = s0 & 0xFFFF; -+ bu32 s1h = s1 >> 16; -+ bu32 s1l = s1 & 0xFFFF; -+ bu32 t0, t1; -+ if (aop & 2) -+ t0 = sub16 (s0h, s1h, &saved_state.ac1, s); -+ else -+ t0 = add16 (s0h, s1h, &saved_state.ac1, s); -+ if (aop & 1) -+ t1 = sub16 (s0l, s1l, &saved_state.ac0, s); -+ else -+ t1 = add16 (s0l, s1l, &saved_state.ac0, s); -+ t0 &= 0xFFFF; -+ t1 &= 0xFFFF; -+ if (x) -+ DREG (dst0) = (t1 << 16) | t0; -+ else -+ DREG (dst0) = (t0 << 16) | t1; -+ } -+ else if (aop == 1 && aopcde == 12) -+ unhandled_instruction ("dregs = A1.L + A1.H , dregs = A0.L + A0.H"); -+ else if (HL == 0 && aopcde == 1) -+ { -+ if (aop == 0) -+ { -+ /* dregs = dregs +|+ dregs, dregs = dregs -|- dregs (amod0) */ -+ bu32 d0, d1; -+ d1 = addadd16 (DREG (src0), DREG (src1), s, 0); -+ d0 = subsub16 (DREG (src0), DREG (src1), s, x); -+ STORE (DREG (dst0), d0); -+ STORE (DREG (dst1), d1); -+ } -+ else -+ unhandled_instruction -+ ("dregs = dregs +|+ dregs, dregs = dregs -|- dregs (amod0, amod2)"); -+ } -+ else if (aop == 0 && aopcde == 11) -+ unhandled_instruction ("dregs = (A0 += A1)"); -+ else if (aop == 0 && aopcde == 10) -+ { -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= saved_state.a0x & 0xFFFF; -+ } -+ else if (aop == 1 && aopcde == 10) -+ { -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= saved_state.a1x & 0xFFFF; -+ } -+ else if (aop == 0 && aopcde == 4) -+ DREG (dst0) = add32 (DREG (src0), DREG (src1), 1, s); -+ else if (aop == 1 && aopcde == 4) -+ DREG (dst0) = sub32 (DREG (src0), DREG (src1), 1, s); -+ else if (aop == 2 && aopcde == 4) -+ unhandled_instruction ("dregs = dregs + dregs , dregs = dregs - dregs amod1"); -+ else if (aop == 0 && aopcde == 17) -+ unhandled_instruction ("dregs = A1 + A0, dregs = A1 - A0 amod1"); -+ else if (aop == 1 && aopcde == 17) -+ unhandled_instruction ("dregs = A0 + A1, dregs = A0 - A1 amod1"); -+ else if (aop == 0 && aopcde == 18) -+ unhandled_instruction ("SAA (dregs_pair, dregs_pair) aligndir"); -+ else if (aop == 3 && aopcde == 18) -+ unhandled_instruction ("DISALGNEXCPT"); -+ else if (aop == 0 && aopcde == 20) -+ unhandled_instruction ("dregs = BYTEOP1P (dregs_pair, dregs_pair) aligndir"); -+ else if (aop == 1 && aopcde == 20) -+ unhandled_instruction ("dregs = BYTEOP1P (dregs_pair, dregs_pair) (T, R)"); -+ else if (aop == 0 && aopcde == 21) -+ unhandled_instruction ("(dregs, dregs) = BYTEOP16P (dregs_pair, dregs_pair) aligndir"); -+ else if (aop == 1 && aopcde == 21) -+ unhandled_instruction ("(dregs, dregs) = BYTEOP16M (dregs_pair, dregs_pair) aligndir"); -+ else if (aop == 1 && aopcde == 7) -+ /* dregs = MIN (dregs, dregs) */ -+ DREG (dst0) = min32 (DREG (src0), DREG (src1)); -+ else if (aop == 0 && aopcde == 7) -+ /* dregs = MAX (dregs, dregs) */ -+ DREG (dst0) = max32 (DREG (src0), DREG (src1)); -+ else if (aop == 2 && aopcde == 7) -+ { -+ bu32 val = DREG (src0); -+ /* dregs = ABS dregs */ -+ if (val >> 31) -+ val = -val; -+ /* @@@ The manual is talking about saturation. Check what the hardware -+ does when it gets 0x80000000. */ -+ setflags_logical (val); -+ DREG (dst0) = val; -+ } -+ else if (aop == 3 && aopcde == 7) -+ { -+ bu32 val = DREG (src0); -+ /* dregs = - dregs (opt_sat) */ -+ saved_state.v = val == 0x8000; -+ if (saved_state.v) -+ saved_state.vs = 1; -+ if (val == 0x80000000) -+ val = 0x7fffffff; -+ else -+ val = -val; -+ setflags_logical (val); -+ DREG (dst0) = val; -+ } -+ else if (aop == 2 && aopcde == 6) -+ { -+ /* Vector ABS. */ -+ bu32 in = DREG (src0); -+ bu32 hi = (in & 0x80000000 ? -(bs16)(in >> 16) : in >> 16) << 16; -+ bu32 lo = (in & 0x8000 ? -(bs16)(in & 0xFFFF) : in) & 0xFFFF; -+ DREG (dst0) = hi | lo; -+ setflags_nz_2x16 (DREG (dst0)); -+ saved_state.v = 0; -+ } -+ else if (aop == 1 && aopcde == 6) -+ DREG (dst0) = min2x16 (DREG (src0), DREG (src1)); -+ else if (aop == 0 && aopcde == 6) -+ DREG (dst0) = max2x16 (DREG (src0), DREG (src1)); -+ else if (HL == 1 && aopcde == 1) -+ unhandled_instruction ("dregs = dregs +|- dregs, dregs = dregs -|+ dregs (amod0, amod2)"); -+ else if (aop == 0 && aopcde == 24) -+ unhandled_instruction ("dregs = BYTEPACK (dregs, dregs)"); -+ else if (aop == 1 && aopcde == 24) -+ unhandled_instruction ("(dregs, dregs) = BYTEUNPACK dregs_pair aligndir"); -+ else if (aopcde == 13) -+ unhandled_instruction ("(dregs, dregs) = SEARCH dregs (searchmod)"); -+ else -+ illegal_instruction (); -+ PCREG += 4; -+} -+ -+static void -+decode_dsp32shift_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* dsp32shift -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 0 | 0 |.M.| 1 | 1 | 0 | 0 | - | - |.sopcde............| -+ |.sop...|.HLs...|.dst0......| - | - | - |.src0......|.src1......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src0 = ((iw1 >> 3) & 0x7); -+ int src1 = ((iw1 >> 0) & 0x7); -+ int sop = ((iw1 >> 14) & 0x3); -+ int dst0 = ((iw1 >> 9) & 0x7); -+ int M = ((iw0 >> 11) & 0x1); -+ int sopcde = ((iw0 >> 0) & 0x1f); -+ int HLs = ((iw1 >> 12) & 0x3); -+ -+ if (HLs == 0 && sop == 0 && sopcde == 0) -+ unhandled_instruction ("dregs_lo = ASHIFT dregs_lo BY dregs_lo"); -+ else if (HLs == 1 && sop == 0 && sopcde == 0) -+ unhandled_instruction ("dregs_lo = ASHIFT dregs_hi BY dregs_lo"); -+ else if (HLs == 2 && sop == 0 && sopcde == 0) -+ unhandled_instruction ("dregs_hi = ASHIFT dregs_lo BY dregs_lo"); -+ else if (HLs == 3 && sop == 0 && sopcde == 0) -+ unhandled_instruction ("dregs_hi = ASHIFT dregs_hi BY dregs_lo"); -+ else if (HLs == 0 && sop == 1 && sopcde == 0) -+ unhandled_instruction ("dregs_lo = ASHIFT dregs_lo BY dregs_lo (S)"); -+ else if (HLs == 1 && sop == 1 && sopcde == 0) -+ unhandled_instruction ("dregs_lo = ASHIFT dregs_hi BY dregs_lo (S)"); -+ else if (HLs == 2 && sop == 1 && sopcde == 0) -+ unhandled_instruction ("dregs_hi = ASHIFT dregs_lo BY dregs_lo (S)"); -+ else if (HLs == 3 && sop == 1 && sopcde == 0) -+ unhandled_instruction ("dregs_hi = ASHIFT dregs_hi BY dregs_lo (S)"); -+ else if (HLs == 0 && sop == 2 && sopcde == 0) -+ unhandled_instruction ("dregs_lo = LSHIFT dregs_lo BY dregs_lo"); -+ else if (HLs == 1 && sop == 2 && sopcde == 0) -+ unhandled_instruction ("dregs_lo = LSHIFT dregs_hi BY dregs_lo"); -+ else if (HLs == 2 && sop == 2 && sopcde == 0) -+ unhandled_instruction ("dregs_hi = LSHIFT dregs_lo BY dregs_lo"); -+ else if (HLs == 3 && sop == 2 && sopcde == 0) -+ unhandled_instruction ("dregs_hi = LSHIFT dregs_hi BY dregs_lo"); -+ else if (sop == 2 && sopcde == 3 && HLs == 1) -+ unhandled_instruction ("A1 = ROT A1 BY dregs_lo"); -+ else if (sop == 0 && sopcde == 3 && HLs == 0) -+ unhandled_instruction ("A0 = ASHIFT A0 BY dregs_lo"); -+ else if (sop == 0 && sopcde == 3 && HLs == 1) -+ unhandled_instruction ("A1 = ASHIFT A1 BY dregs_lo"); -+ else if (sop == 1 && sopcde == 3 && HLs == 0) -+ unhandled_instruction ("A0 = LSHIFT A0 BY dregs_lo"); -+ else if (sop == 1 && sopcde == 3 && HLs == 1) -+ unhandled_instruction ("A1 = LSHIFT A1 BY dregs_lo"); -+ else if (sop == 2 && sopcde == 3 && HLs == 0) -+ unhandled_instruction ("A0 = ROT A0 BY dregs_lo"); -+ else if (sop == 1 && sopcde == 1) -+ unhandled_instruction ("dregs = ASHIFT dregs BY dregs_lo (V,S)"); -+ else if (sop == 0 && sopcde == 1) -+ unhandled_instruction ("dregs = ASHIFT dregs BY dregs_lo (V)"); -+ else if ((sop == 0 || sop == 1 || sop == 2) && sopcde == 2) -+ { -+ /* dregs = [LA]SHIFT dregs BY dregs_lo (opt_S) */ -+ bu32 v = DREG (src1); -+ bs32 shft = (bs16)DREG (src0); -+ if (shft < 0) -+ { -+ if (sop == 2) -+ DREG (dst0) = lshiftrt (v, -shft, 32); -+ else -+ DREG (dst0) = ashiftrt (v, -shft, 32); -+ } -+ else -+ { -+ DREG (dst0) = lshift (v, shft, 32, sop == 1); -+ } -+ } -+ else if (sop == 3 && sopcde == 2) -+ unhandled_instruction ("dregs = ROT dregs BY dregs_lo"); -+ else if (sop == 2 && sopcde == 1) -+ unhandled_instruction ("dregs = SHIFT dregs BY dregs_lo (V)"); -+ else if (sop == 0 && sopcde == 4) -+ unhandled_instruction ("dregs = PACK (dregs_lo, dregs_lo)"); -+ else if (sop == 1 && sopcde == 4) -+ unhandled_instruction ("dregs = PACK (dregs_lo, dregs_hi)"); -+ else if (sop == 2 && sopcde == 4) -+ unhandled_instruction ("dregs = PACK (dregs_hi, dregs_lo)"); -+ else if (sop == 3 && sopcde == 4) -+ unhandled_instruction ("dregs = PACK (dregs_hi, dregs_hi)"); -+ else if (sop == 0 && sopcde == 5) -+ { -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= signbits (DREG (src0), 32); -+ } -+ else if (sop == 1 && sopcde == 5) -+ { -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= signbits (DREG (src0), 16); -+ } -+ else if (sop == 2 && sopcde == 5) -+ { -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= signbits (DREG (src0) >> 16, 16); -+ } -+ else if (sop == 0 && sopcde == 6) -+ { -+ bu64 acc0 = saved_state.a0x; -+ acc0 <<= 32; -+ acc0 |= saved_state.a0w; -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= signbits (acc0, 40); -+ } -+ else if (sop == 1 && sopcde == 6) -+ { -+ bu64 acc1 = saved_state.a1x; -+ acc1 <<= 32; -+ acc1 |= saved_state.a1w; -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= signbits (acc1, 40); -+ } -+ else if (sop == 3 && sopcde == 6) -+ unhandled_instruction ("dregs_lo = ONES dregs"); -+ else if (sop == 0 && sopcde == 7) -+ unhandled_instruction ("dregs_lo = EXPADJ (dregs, dregs_lo)"); -+ else if (sop == 1 && sopcde == 7) -+ unhandled_instruction ("dregs_lo = EXPADJ (dregs, dregs_lo) (V)"); -+ else if (sop == 2 && sopcde == 7) -+ unhandled_instruction ("dregs_lo = EXPADJ (dregs_lo, dregs_lo)"); -+ else if (sop == 3 && sopcde == 7) -+ unhandled_instruction ("dregs_lo = EXPADJ (dregs_hi, dregs_lo)"); -+ else if (sop == 0 && sopcde == 8) -+ unhandled_instruction ("BITMUX (dregs, dregs, A0) (ASR)"); -+ else if (sop == 1 && sopcde == 8) -+ unhandled_instruction ("BITMUX (dregs, dregs, A0) (ASL)"); -+ else if (sop == 0 && sopcde == 9) -+ unhandled_instruction ("dregs_lo = VIT_MAX (dregs) (ASL)"); -+ else if (sop == 1 && sopcde == 9) -+ unhandled_instruction ("dregs_lo = VIT_MAX (dregs) (ASR)"); -+ else if (sop == 2 && sopcde == 9) -+ unhandled_instruction ("dregs = VIT_MAX (dregs, dregs) (ASL)"); -+ else if (sop == 3 && sopcde == 9) -+ unhandled_instruction ("dregs = VIT_MAX (dregs, dregs) (ASR)"); -+ else if (sop == 0 && sopcde == 10) -+ { -+ /* dregs = EXTRACT (dregs, dregs_lo) (Z) */ -+ bu32 v = DREG (src0); -+ bu32 x = DREG (src1); -+ bu32 mask = (1 << (v & 0x1f)) - 1; -+ x >>= ((v >> 8) & 0x1f); -+ DREG (dst0) = x & mask; -+ setflags_logical (DREG (dst0)); -+ } -+ else if (sop == 1 && sopcde == 10) -+ { -+ /* dregs = EXTRACT (dregs, dregs_lo) (X) */ -+ bu32 v = DREG (src0); -+ bu32 x = DREG (src1); -+ bu32 sgn = (1 << (v & 0x1f)) >> 1; -+ bu32 mask = (1 << (v & 0x1f)) - 1; -+ x >>= ((v >> 8) & 0x1f); -+ x &= mask; -+ if (x & sgn) -+ x |= ~mask; -+ DREG (dst0) = x; -+ setflags_logical (DREG (dst0)); -+ } -+ else if (sop == 2 && sopcde == 10) -+ { -+ /* dregs = DEPOSIT (dregs, dregs) */ -+ bu32 v = DREG (src0); -+ bu32 x = DREG (src1); -+ bu32 mask = (1 << (v & 0x1f)) - 1; -+ bu32 fgnd = (v >> 16) & mask; -+ int shft = ((v >> 8) & 0x1f); -+ fgnd <<= shft; -+ mask <<= shft; -+ x &= ~mask; -+ DREG (dst0) = x | fgnd; -+ setflags_logical (DREG (dst0)); -+ } -+ else if (sop == 3 && sopcde == 10) -+ { -+ /* dregs = DEPOSIT (dregs, dregs) */ -+ bu32 v = DREG (src0); -+ bu32 x = DREG (src1); -+ bu32 mask = (1 << (v & 0x1f)) - 1; -+ bu32 fgnd = ((bs32)(bs16)(v >> 16)) & mask; -+ int shft = ((v >> 8) & 0x1f); -+ fgnd <<= shft; -+ mask <<= shft; -+ x &= ~mask; -+ DREG (dst0) = x | fgnd; -+ setflags_logical (DREG (dst0)); -+ } -+ else if (sop == 0 && sopcde == 11) -+ unhandled_instruction ("dregs_lo = CC = BXORSHIFT (A0, dregs)"); -+ else if (sop == 1 && sopcde == 11) -+ unhandled_instruction ("dregs_lo = CC = BXOR (A0, dregs)"); -+ else if (sop == 0 && sopcde == 12) -+ unhandled_instruction ("A0 = BXORSHIFT (A0, A1, CC)"); -+ else if (sop == 1 && sopcde == 12) -+ unhandled_instruction ("dregs_lo = CC = BXOR (A0, A1, CC)"); -+ else if (sop == 0 && sopcde == 13) -+ /* dregs = ALIGN8 (dregs, dregs) */ -+ DREG (dst0) = (DREG (src1) << 24) | (DREG (src0) >> 8); -+ else if (sop == 1 && sopcde == 13) -+ /* dregs = ALIGN16 (dregs, dregs) */ -+ DREG (dst0) = (DREG (src1) << 16) | (DREG (src0) >> 16); -+ else if (sop == 2 && sopcde == 13) -+ /* dregs = ALIGN24 (dregs , dregs) */ -+ DREG (dst0) = (DREG (src1) << 8) | (DREG (src0) >> 24); -+ else -+ illegal_instruction (); -+ PCREG += 4; -+} -+ -+static void -+decode_dsp32shiftimm_0 (bu16 iw0, bu16 iw1, bu32 pc) -+{ -+ /* dsp32shiftimm -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 0 | 0 |.M.| 1 | 1 | 0 | 1 | - | - |.sopcde............| -+ |.sop...|.HLs...|.dst0......|.immag.................|.src1......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int src1 = ((iw1 >> 0) & 0x7); -+ int sop = ((iw1 >> 14) & 0x3); -+ int immag = ((iw1 >> 3) & 0x3f); -+ int newimmag = (-(iw1 >> 3) & 0x3f); -+ int dst0 = ((iw1 >> 9) & 0x7); -+ int M = ((iw0 >> 11) & 0x1); -+ int sopcde = ((iw0 >> 0) & 0x1f); -+ int HLs = ((iw1 >> 12) & 0x3); -+ int bit8 = immag >> 5; -+ -+ if (sopcde == 0) -+ { -+ bu16 in = DREG (src1) >> ((HLs & 1) ? 16 : 0); -+ bu16 result; -+ if (sop == 0 && bit8) -+ result = ashiftrt (in, newimmag, 16); -+ else if (sop == 1 && bit8) -+ result = lshift (in, immag, 16, 1); -+ else if (sop == 2 && bit8) -+ result = lshiftrt (in, newimmag, 16); -+ else if (sop == 2) -+ result = lshift (in, immag, 16, 0); -+ else -+ unhandled_instruction ("illegal DSP shift"); -+ if (HLs & 2) -+ { -+ DREG (dst0) &= 0xFFFF; -+ DREG (dst0) |= result << 16; -+ } -+ else -+ { -+ DREG (dst0) &= 0xFFFF0000; -+ DREG (dst0) |= result; -+ } -+ } -+ else if (sop == 2 && sopcde == 3 && HLs == 1) -+ unhandled_instruction ("A1 = ROT A1 BY imm6"); -+ else if (sop == 0 && sopcde == 3 && HLs == 0) -+ unhandled_instruction ("A0 = A0 << imm6"); -+ else if (sop == 0 && sopcde == 3 && HLs == 1) -+ unhandled_instruction ("A1 = A1 << imm6"); -+ else if (sop == 1 && sopcde == 3 && HLs == 0) -+ unhandled_instruction ("A0 = A0 >> imm6"); -+ else if (sop == 1 && sopcde == 3 && HLs == 1) -+ unhandled_instruction ("A1 = A1 >> imm6"); -+ else if (sop == 2 && sopcde == 3 && HLs == 0) -+ unhandled_instruction ("A0 = ROT A0 BY imm6"); -+ else if (sop == 1 && sopcde == 1) -+ unhandled_instruction ("dregs = dregs >>> uimm5 (V,S)"); -+ else if (sop == 2 && sopcde == 1) -+ unhandled_instruction ("dregs = dregs >> uimm5 (V)"); -+ else if (sop == 0 && sopcde == 1) -+ unhandled_instruction ("dregs = dregs << imm5 (V)"); -+ else if (sop == 1 && sopcde == 2) -+ unhandled_instruction ("dregs = dregs << imm6 (S)"); -+ else if (sop == 2 && sopcde == 2) -+ { -+ int count = imm6 (newimmag); -+ /* dregs = dregs >> imm6 */ -+ if (count < 0) -+ DREG (dst0) = lshift (DREG (src1), -count, 32, 0); -+ else -+ DREG (dst0) = lshiftrt (DREG (src1), count, 32); -+ } -+ else if (sop == 3 && sopcde == 2) -+ { -+ int t = imm6 (immag); -+ /* dregs = ROT dregs BY imm6 */ -+ -+ /* Reduce everything to rotate left. */ -+ if (t < 0) -+ t += 33; -+ -+ if (t > 0) -+ { -+ int oldcc = CCREG; -+ bu32 srcval = DREG (src1); -+ bu32 result; -+ result = t == 32 ? 0 : srcval << t; -+ result |= t == 1 ? 0 : srcval >> (33 - t); -+ result |= oldcc << (t - 1); -+ DREG (dst0) = result; -+ CCREG = (srcval >> (32 - t)) & 1; -+ } -+ } -+ else if (sop == 0 && sopcde == 2) -+ { -+ int count = imm6 (newimmag); -+ /* dregs = dregs >>> imm6 */ -+ if (count < 0) -+ DREG (dst0) = lshift (DREG (src1), -count, 32, 0); -+ else -+ DREG (dst0) = ashiftrt (DREG (src1), count, 32); -+ } -+ else -+ illegal_instruction (); -+ -+ PCREG += 4; -+} -+ -+static void -+decode_psedoDEBUG_0 (bu16 iw0) -+{ -+ /* psedoDEBUG -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 0 |.fn....|.grp.......|.reg.......| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int grp = ((iw0 >> 3) & 0x7); -+ int fn = ((iw0 >> 6) & 0x3); -+ int reg = ((iw0 >> 0) & 0x7); -+ -+ if (reg == 0 && fn == 3) -+ unhandled_instruction ("DBG A0"); -+ else if (reg == 1 && fn == 3) -+ unhandled_instruction ("DBG A1"); -+ else if (reg == 3 && fn == 3) -+ unhandled_instruction ("ABORT"); -+ else if (reg == 4 && fn == 3) -+ unhandled_instruction ("HLT"); -+ else if (reg == 5 && fn == 3) -+ unhandled_instruction ("DBGHALT"); -+ else if (reg == 6 && fn == 3) -+ unhandled_instruction ("DBGCMPLX (dregs)"); -+ else if (reg == 7 && fn == 3) -+ unhandled_instruction ("DBG"); -+ else if (grp == 0 && fn == 2) -+ unhandled_instruction ("OUTC dregs"); -+ else if (fn == 0) -+ unhandled_instruction ("DBG allregs"); -+ else if (fn == 1) -+ unhandled_instruction ("PRNT allregs"); -+ else -+ illegal_instruction (); -+ -+ PCREG += 2; -+} -+ -+static void -+decode_psedoOChar_0 (bu16 iw0) -+{ -+ /* psedoOChar -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 1 | 1 | 0 | 0 | 1 |.ch............................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int ch = ((iw0 >> 0) & 0xff); -+ -+ unhandled_instruction ("OUTC uimm8"); -+ PCREG += 2; -+} -+ -+static void -+decode_psedodbg_assert_0 (bu16 iw0, bu16 iw1) -+{ -+ /* psedodbg_assert -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ -+ | 1 | 1 | 1 | 1 | 0 | - | - | - | - | - |.dbgop.....|.regtest...| -+ |.expected......................................................| -+ +---+---+---+---|---+---+---+---|---+---+---+---|---+---+---+---+ */ -+ int expected = ((iw1 >> 0) & 0xffff); -+ int dbgop = ((iw0 >> 3) & 0x7); -+ int regtest = ((iw0 >> 0) & 0x7); -+ -+ if (dbgop == 0) -+ unhandled_instruction ("DBGA ( dregs_lo , uimm16 )"); -+ else if (dbgop == 1) -+ unhandled_instruction ("DBGA ( dregs_hi , uimm16 )"); -+ else if (dbgop == 2) -+ unhandled_instruction ("DBGAL ( dregs , uimm16 )"); -+ else if (dbgop == 3) -+ unhandled_instruction ("DBGAH ( dregs , uimm16 )"); -+ else -+ illegal_instruction (); -+ PCREG += 4; -+} -+ -+static void -+_interp_insn_bfin (bu32 pc) -+{ -+ bu8 buf[4]; -+ bu16 iw0 = get_word (saved_state.memory, pc); -+ bu16 iw1 = get_word (saved_state.memory, pc + 2); -+ -+ if ((iw0 & 0xf7ff) == 0xc003 && iw1 == 0x1800) -+ { -+ /* MNOP. */ -+ PCREG += 4; -+ return; -+ } -+ if ((iw0 & 0xFF00) == 0x0000) -+ decode_ProgCtrl_0 (iw0); -+ else if ((iw0 & 0xFFC0) == 0x0240) -+ decode_CaCTRL_0 (iw0); -+ else if ((iw0 & 0xFF80) == 0x0100) -+ decode_PushPopReg_0 (iw0); -+ else if ((iw0 & 0xFE00) == 0x0400) -+ decode_PushPopMultiple_0 (iw0); -+ else if ((iw0 & 0xFE00) == 0x0600) -+ decode_ccMV_0 (iw0); -+ else if ((iw0 & 0xF800) == 0x0800) -+ decode_CCflag_0 (iw0); -+ else if ((iw0 & 0xFFE0) == 0x0200) -+ decode_CC2dreg_0 (iw0); -+ else if ((iw0 & 0xFF00) == 0x0300) -+ decode_CC2stat_0 (iw0); -+ else if ((iw0 & 0xF000) == 0x1000) -+ decode_BRCC_0 (iw0, pc); -+ else if ((iw0 & 0xF000) == 0x2000) -+ decode_UJUMP_0 (iw0, pc); -+ else if ((iw0 & 0xF000) == 0x3000) -+ decode_REGMV_0 (iw0); -+ else if ((iw0 & 0xFC00) == 0x4000) -+ decode_ALU2op_0 (iw0); -+ else if ((iw0 & 0xFE00) == 0x4400) -+ decode_PTR2op_0 (iw0); -+ else if (((iw0 & 0xF800) == 0x4800)) -+ decode_LOGI2op_0 (iw0); -+ else if (((iw0 & 0xF000) == 0x5000)) -+ decode_COMP3op_0 (iw0); -+ else if (((iw0 & 0xF800) == 0x6000)) -+ decode_COMPI2opD_0 (iw0); -+ else if (((iw0 & 0xF800) == 0x6800)) -+ decode_COMPI2opP_0 (iw0); -+ else if (((iw0 & 0xF000) == 0x8000)) -+ decode_LDSTpmod_0 (iw0); -+ else if (((iw0 & 0xFF60) == 0x9E60)) -+ decode_dagMODim_0 (iw0); -+ else if (((iw0 & 0xFFF0) == 0x9F60)) -+ decode_dagMODik_0 (iw0); -+ else if (((iw0 & 0xFC00) == 0x9C00)) -+ decode_dspLDST_0 (iw0); -+ else if (((iw0 & 0xF000) == 0x9000)) -+ decode_LDST_0 (iw0); -+ else if (((iw0 & 0xFC00) == 0xB800)) -+ decode_LDSTiiFP_0 (iw0); -+ else if (((iw0 & 0xE000) == 0xA000)) -+ decode_LDSTii_0 (iw0); -+ else if (((iw0 & 0xFF80) == 0xE080) && ((iw1 & 0x0C00) == 0x0000)) -+ decode_LoopSetup_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xFF00) == 0xE100) && ((iw1 & 0x0000) == 0x0000)) -+ decode_LDIMMhalf_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xFE00) == 0xE200) && ((iw1 & 0x0000) == 0x0000)) -+ decode_CALLa_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xFC00) == 0xE400) && ((iw1 & 0x0000) == 0x0000)) -+ decode_LDSTidxI_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xFFFE) == 0xE800) && ((iw1 & 0x0000) == 0x0000)) -+ decode_linkage_0 (iw0, iw1); -+ else if (((iw0 & 0xF600) == 0xC000) && ((iw1 & 0x0000) == 0x0000)) -+ decode_dsp32mac_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xF600) == 0xC200) && ((iw1 & 0x0000) == 0x0000)) -+ decode_dsp32mult_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xF7C0) == 0xC400) && ((iw1 & 0x0000) == 0x0000)) -+ decode_dsp32alu_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xF7E0) == 0xC600) && ((iw1 & 0x01C0) == 0x0000)) -+ decode_dsp32shift_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xF7E0) == 0xC680) && ((iw1 & 0x0000) == 0x0000)) -+ decode_dsp32shiftimm_0 (iw0, iw1, pc); -+ else if (((iw0 & 0xFF00) == 0xF800)) -+ decode_psedoDEBUG_0 (iw0); -+ else if (((iw0 & 0xFF00) == 0xF900)) -+ decode_psedoOChar_0 (iw0); -+ else if (((iw0 & 0xFFC0) == 0xF000) && ((iw1 & 0x0000) == 0x0000)) -+ decode_psedodbg_assert_0 (iw0, iw1); -+ else -+ illegal_instruction (); -+} -+ -+void -+interp_insn_bfin (bu32 pc) -+{ -+ int i; -+ bu16 iw0 = get_word (saved_state.memory, pc); -+ -+ int is_multiinsn = ((iw0 & 0xc000) == 0xc000 && (iw0 & BIT_MULTI_INS) -+ && ((iw0 & 0xe800) != 0xe800 /* not linkage */)); -+ -+ n_stores = 0; -+ -+ _interp_insn_bfin (pc); -+ -+ /* Proper display of multiple issue instructions. */ -+ if (is_multiinsn) -+ { -+ _interp_insn_bfin (pc + 4); -+ _interp_insn_bfin (pc + 6); -+ } -+ for (i = 0; i < n_stores; i++) -+ *stores[i].addr = stores[i].val; -+} -diff -Naur gdb-6.5.orig/sim/bfin/bfin-sim.h gdb-6.5/sim/bfin/bfin-sim.h ---- gdb-6.5.orig/sim/bfin/bfin-sim.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/bfin-sim.h 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,124 @@ -+/* Simulator for Analog Devices Blackfin processer. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of simulators. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+#include "sysdep.h" -+#include "gdb/callback.h" -+#include "gdb/remote-sim.h" -+#include "sim-config.h" -+#include "sim-types.h" -+ -+typedef unsigned8 bu8; -+typedef unsigned16 bu16; -+typedef unsigned32 bu32; -+typedef unsigned64 bu64; -+typedef signed8 bs8; -+typedef signed16 bs16; -+typedef signed32 bs32; -+typedef signed64 bs64; -+ -+typedef struct -+{ -+ bu32 dpregs[16], iregs[4], mregs[4], bregs[4], lregs[4]; -+ bu32 a0x, a0w, a1x, a1w; -+ bu32 lt[2], lc[2], lb[2]; -+ int ac0, ac0_copy, ac1, an, aq; -+ int av0, av0s, av1, av1s, az, cc, v, v_copy, vs; -+ int v_internal; -+ bu32 pc, rets; -+ -+ int ticks; -+ int insts; -+ -+ int exception; -+ -+ int end_of_registers; -+ -+ int msize; -+ unsigned char *memory; -+ unsigned long bfd_mach; -+} saved_state_type; -+ -+extern saved_state_type saved_state; -+ -+#define GREG(x,i) DPREG ((x) | (i << 3)) -+#define DPREG(x) (saved_state.dpregs[x]) -+#define DREG(x) (saved_state.dpregs[x]) -+#define PREG(x) (saved_state.dpregs[x + 8]) -+#define SPREG PREG (6) -+#define FPREG PREG (7) -+#define IREG(x) (saved_state.iregs[x]) -+#define MREG(x) (saved_state.mregs[x]) -+#define BREG(x) (saved_state.bregs[x]) -+#define LREG(x) (saved_state.lregs[x]) -+#define A0XREG (saved_state.a0x) -+#define A0WREG (saved_state.a0w) -+#define A1XREG (saved_state.a1x) -+#define A1WREG (saved_state.a1w) -+#define CCREG (saved_state.cc) -+#define LC0REG (saved_state.lc[0]) -+#define LT0REG (saved_state.lt[0]) -+#define LB0REG (saved_state.lb[0]) -+#define LC1REG (saved_state.lc[1]) -+#define LT1REG (saved_state.lt[1]) -+#define LB1REG (saved_state.lb[1]) -+#define RETSREG (saved_state.rets) -+#define PCREG (saved_state.pc) -+ -+extern int did_jump; -+ -+static inline void put_byte (unsigned char *memory, bu32 addr, bu8 v) -+{ -+ memory[addr] = v; -+} -+ -+static inline void put_word (unsigned char *memory, bu32 addr, bu16 v) -+{ -+ memory[addr] = v; -+ memory[addr + 1] = v >> 8; -+} -+ -+static inline void put_long (unsigned char *memory, bu32 addr, bu32 v) -+{ -+ memory[addr] = v; -+ memory[addr + 1] = v >> 8; -+ memory[addr + 2] = v >> 16; -+ memory[addr + 3] = v >> 24; -+} -+ -+static inline bu8 get_byte (unsigned char *memory, bu32 addr) -+{ -+ return memory[addr]; -+} -+ -+static inline bu16 get_word (unsigned char *memory, bu32 addr) -+{ -+ return (memory[addr] | (memory[addr + 1] << 8)); -+} -+ -+static inline bu32 get_long (unsigned char *memory, bu32 addr) -+{ -+ return (memory[addr] | (memory[addr + 1] << 8) -+ | (memory[addr + 2] << 16) | (memory[addr + 3] << 24)); -+} -+ -+extern void interp_insn_bfin (bu32); -+ -diff -Naur gdb-6.5.orig/sim/bfin/config.in gdb-6.5/sim/bfin/config.in ---- gdb-6.5.orig/sim/bfin/config.in 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/config.in 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,158 @@ -+/* config.in. Generated automatically from configure.in by autoheader. */ -+ -+/* Define if using alloca.c. */ -+#undef C_ALLOCA -+ -+/* Define to empty if the keyword does not work. */ -+#undef const -+ -+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. -+ This function is required for alloca.c support on those systems. */ -+#undef CRAY_STACKSEG_END -+ -+/* Define if you have alloca, as a function or macro. */ -+#undef HAVE_ALLOCA -+ -+/* Define if you have <alloca.h> and it should be used (not on Ultrix). */ -+#undef HAVE_ALLOCA_H -+ -+/* Define if you have a working `mmap' system call. */ -+#undef HAVE_MMAP -+ -+/* Define as __inline if that's what the C compiler calls it. */ -+#undef inline -+ -+/* Define to `long' if <sys/types.h> doesn't define. */ -+#undef off_t -+ -+/* Define if you need to in order for stat and other things to work. */ -+#undef _POSIX_SOURCE -+ -+/* Define as the return type of signal handlers (int or void). */ -+#undef RETSIGTYPE -+ -+/* Define to `unsigned' if <sys/types.h> doesn't define. */ -+#undef size_t -+ -+/* If using the C implementation of alloca, define if you know the -+ direction of stack growth for your system; otherwise it will be -+ automatically deduced at run-time. -+ STACK_DIRECTION > 0 => grows toward higher addresses -+ STACK_DIRECTION < 0 => grows toward lower addresses -+ STACK_DIRECTION = 0 => direction of growth unknown -+ */ -+#undef STACK_DIRECTION -+ -+/* Define if you have the ANSI C header files. */ -+#undef STDC_HEADERS -+ -+/* Define to 1 if NLS is requested. */ -+#undef ENABLE_NLS -+ -+/* Define as 1 if you have gettext and don't want to use GNU gettext. */ -+#undef HAVE_GETTEXT -+ -+/* Define as 1 if you have the stpcpy function. */ -+#undef HAVE_STPCPY -+ -+/* Define if your locale.h file contains LC_MESSAGES. */ -+#undef HAVE_LC_MESSAGES -+ -+/* Define if you have the __argz_count function. */ -+#undef HAVE___ARGZ_COUNT -+ -+/* Define if you have the __argz_next function. */ -+#undef HAVE___ARGZ_NEXT -+ -+/* Define if you have the __argz_stringify function. */ -+#undef HAVE___ARGZ_STRINGIFY -+ -+/* Define if you have the __setfpucw function. */ -+#undef HAVE___SETFPUCW -+ -+/* Define if you have the dcgettext function. */ -+#undef HAVE_DCGETTEXT -+ -+/* Define if you have the getcwd function. */ -+#undef HAVE_GETCWD -+ -+/* Define if you have the getpagesize function. */ -+#undef HAVE_GETPAGESIZE -+ -+/* Define if you have the getrusage function. */ -+#undef HAVE_GETRUSAGE -+ -+/* Define if you have the munmap function. */ -+#undef HAVE_MUNMAP -+ -+/* Define if you have the putenv function. */ -+#undef HAVE_PUTENV -+ -+/* Define if you have the setenv function. */ -+#undef HAVE_SETENV -+ -+/* Define if you have the setlocale function. */ -+#undef HAVE_SETLOCALE -+ -+/* Define if you have the sigaction function. */ -+#undef HAVE_SIGACTION -+ -+/* Define if you have the stpcpy function. */ -+#undef HAVE_STPCPY -+ -+/* Define if you have the strcasecmp function. */ -+#undef HAVE_STRCASECMP -+ -+/* Define if you have the strchr function. */ -+#undef HAVE_STRCHR -+ -+/* Define if you have the time function. */ -+#undef HAVE_TIME -+ -+/* Define if you have the <argz.h> header file. */ -+#undef HAVE_ARGZ_H -+ -+/* Define if you have the <fcntl.h> header file. */ -+#undef HAVE_FCNTL_H -+ -+/* Define if you have the <fpu_control.h> header file. */ -+#undef HAVE_FPU_CONTROL_H -+ -+/* Define if you have the <limits.h> header file. */ -+#undef HAVE_LIMITS_H -+ -+/* Define if you have the <locale.h> header file. */ -+#undef HAVE_LOCALE_H -+ -+/* Define if you have the <malloc.h> header file. */ -+#undef HAVE_MALLOC_H -+ -+/* Define if you have the <nl_types.h> header file. */ -+#undef HAVE_NL_TYPES_H -+ -+/* Define if you have the <stdlib.h> header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define if you have the <string.h> header file. */ -+#undef HAVE_STRING_H -+ -+/* Define if you have the <strings.h> header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define if you have the <sys/param.h> header file. */ -+#undef HAVE_SYS_PARAM_H -+ -+/* Define if you have the <sys/resource.h> header file. */ -+#undef HAVE_SYS_RESOURCE_H -+ -+/* Define if you have the <sys/time.h> header file. */ -+#undef HAVE_SYS_TIME_H -+ -+/* Define if you have the <time.h> header file. */ -+#undef HAVE_TIME_H -+ -+/* Define if you have the <unistd.h> header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define if you have the <values.h> header file. */ -+#undef HAVE_VALUES_H -diff -Naur gdb-6.5.orig/sim/bfin/configure gdb-6.5/sim/bfin/configure ---- gdb-6.5.orig/sim/bfin/configure 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/configure 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,8672 @@ -+#! /bin/sh -+# Guess values for system-dependent variables and create Makefiles. -+# Generated by GNU Autoconf 2.59. -+# -+# Copyright (C) 2003 Free Software Foundation, Inc. -+# This configure script is free software; the Free Software Foundation -+# gives unlimited permission to copy, distribute and modify it. -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be Bourne compatible -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -+ set -o posix -+fi -+DUALCASE=1; export DUALCASE # for MKS sh -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)$' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -+ /^X\/\(\/\/\)$/{ s//\1/; q; } -+ /^X\/\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ -+ -+# PATH needs CR, and LINENO needs CR and PATH. -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x$as_lineno_3" = "x$as_lineno_2" || { -+ # Find who we are. Look in the path if we contain no path at all -+ # relative or not. -+ case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+ -+ ;; -+ esac -+ # We did not find ourselves, most probably we were run as `sh COMMAND' -+ # in which case we are not to be found in the path. -+ if test "x$as_myself" = x; then -+ as_myself=$0 -+ fi -+ if test ! -f "$as_myself"; then -+ { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -+ { (exit 1); exit 1; }; } -+ fi -+ case $CONFIG_SHELL in -+ '') -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for as_base in sh bash ksh sh5; do -+ case $as_dir in -+ /*) -+ if ("$as_dir/$as_base" -c ' -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -+ CONFIG_SHELL=$as_dir/$as_base -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$0" ${1+"$@"} -+ fi;; -+ esac -+ done -+done -+;; -+ esac -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line before each line; the second 'sed' does the real -+ # work. The second script uses 'N' to pair each line-number line -+ # with the numbered line, and appends trailing '-' during -+ # substitution so that $LINENO is not a special case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -+ sed '=' <$as_myself | -+ sed ' -+ N -+ s,$,-, -+ : loop -+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ t loop -+ s,-$,, -+ s,^['$as_cr_digits']*\n,, -+ ' >$as_me.lineno && -+ chmod +x $as_me.lineno || -+ { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensible to this). -+ . ./$as_me.lineno -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -+ *c*,-n*) ECHO_N= ECHO_C=' -+' ECHO_T=' ' ;; -+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+esac -+ -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ # We could just check for DJGPP; but this test a) works b) is more generic -+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -+ if test -f conf$$.exe; then -+ # Don't use ln at all; we don't have any links -+ as_ln_s='cp -p' -+ else -+ as_ln_s='ln -s' -+ fi -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.file -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+as_executable_p="test -f" -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. -+as_nl=' -+' -+IFS=" $as_nl" -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+# Name of the host. -+# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, -+# so uname gets run too. -+ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` -+ -+exec 6>&1 -+ -+# -+# Initializations. -+# -+ac_default_prefix=/usr/local -+ac_config_libobj_dir=. -+cross_compiling=no -+subdirs= -+MFLAGS= -+MAKEFLAGS= -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+# Maximum number of lines to put in a shell here document. -+# This variable seems obsolete. It should probably be removed, and -+# only ac_max_sed_lines should be used. -+: ${ac_max_here_lines=38} -+ -+# Identity of this package. -+PACKAGE_NAME= -+PACKAGE_TARNAME= -+PACKAGE_VERSION= -+PACKAGE_STRING= -+PACKAGE_BUGREPORT= -+ -+ac_unique_file="Makefile.in" -+# Factoring default headers for most tests. -+ac_includes_default="\ -+#include <stdio.h> -+#if HAVE_SYS_TYPES_H -+# include <sys/types.h> -+#endif -+#if HAVE_SYS_STAT_H -+# include <sys/stat.h> -+#endif -+#if STDC_HEADERS -+# include <stdlib.h> -+# include <stddef.h> -+#else -+# if HAVE_STDLIB_H -+# include <stdlib.h> -+# endif -+#endif -+#if HAVE_STRING_H -+# if !STDC_HEADERS && HAVE_MEMORY_H -+# include <memory.h> -+# endif -+# include <string.h> -+#endif -+#if HAVE_STRINGS_H -+# include <strings.h> -+#endif -+#if HAVE_INTTYPES_H -+# include <inttypes.h> -+#else -+# if HAVE_STDINT_H -+# include <stdint.h> -+# endif -+#endif -+#if HAVE_UNISTD_H -+# include <unistd.h> -+#endif" -+ -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB SET_MAKE CPP EGREP ALLOCA USE_NLS MSGFMT GMSGFMT XGETTEXT USE_INCLUDED_LIBINTL CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLDEPS INTLLIBS INTLOBJS POFILES POSUB INCLUDE_LOCALE_H GT_NO GT_YES MKINSTALLDIRS l MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile cgen_breaks LIBOBJS LTLIBOBJS' -+ac_subst_files='' -+ -+# Initialize some variables set by options. -+ac_init_help= -+ac_init_version=false -+# The variables have the same names as the options, with -+# dashes changed to underlines. -+cache_file=/dev/null -+exec_prefix=NONE -+no_create= -+no_recursion= -+prefix=NONE -+program_prefix=NONE -+program_suffix=NONE -+program_transform_name=s,x,x, -+silent= -+site= -+srcdir= -+verbose= -+x_includes=NONE -+x_libraries=NONE -+ -+# Installation directory options. -+# These are left unexpanded so users can "make install exec_prefix=/foo" -+# and all the variables that are supposed to be based on exec_prefix -+# by default will actually change. -+# Use braces instead of parens because sh, perl, etc. also accept them. -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datadir='${prefix}/share' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+libdir='${exec_prefix}/lib' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+infodir='${prefix}/info' -+mandir='${prefix}/man' -+ -+ac_prev= -+for ac_option -+do -+ # If the previous option needs an argument, assign it. -+ if test -n "$ac_prev"; then -+ eval "$ac_prev=\$ac_option" -+ ac_prev= -+ continue -+ fi -+ -+ ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ -+ # Accept the important Cygnus configure options, so we can diagnose typos. -+ -+ case $ac_option in -+ -+ -bindir | --bindir | --bindi | --bind | --bin | --bi) -+ ac_prev=bindir ;; -+ -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) -+ bindir=$ac_optarg ;; -+ -+ -build | --build | --buil | --bui | --bu) -+ ac_prev=build_alias ;; -+ -build=* | --build=* | --buil=* | --bui=* | --bu=*) -+ build_alias=$ac_optarg ;; -+ -+ -cache-file | --cache-file | --cache-fil | --cache-fi \ -+ | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) -+ ac_prev=cache_file ;; -+ -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ -+ | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) -+ cache_file=$ac_optarg ;; -+ -+ --config-cache | -C) -+ cache_file=config.cache ;; -+ -+ -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ ac_prev=datadir ;; -+ -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -+ | --da=*) -+ datadir=$ac_optarg ;; -+ -+ -disable-* | --disable-*) -+ ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ { (exit 1); exit 1; }; } -+ ac_feature=`echo $ac_feature | sed 's/-/_/g'` -+ eval "enable_$ac_feature=no" ;; -+ -+ -enable-* | --enable-*) -+ ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -+ { (exit 1); exit 1; }; } -+ ac_feature=`echo $ac_feature | sed 's/-/_/g'` -+ case $ac_option in -+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ *) ac_optarg=yes ;; -+ esac -+ eval "enable_$ac_feature='$ac_optarg'" ;; -+ -+ -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ -+ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -+ | --exec | --exe | --ex) -+ ac_prev=exec_prefix ;; -+ -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ -+ | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ -+ | --exec=* | --exe=* | --ex=*) -+ exec_prefix=$ac_optarg ;; -+ -+ -gas | --gas | --ga | --g) -+ # Obsolete; use --with-gas. -+ with_gas=yes ;; -+ -+ -help | --help | --hel | --he | -h) -+ ac_init_help=long ;; -+ -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) -+ ac_init_help=recursive ;; -+ -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) -+ ac_init_help=short ;; -+ -+ -host | --host | --hos | --ho) -+ ac_prev=host_alias ;; -+ -host=* | --host=* | --hos=* | --ho=*) -+ host_alias=$ac_optarg ;; -+ -+ -includedir | --includedir | --includedi | --included | --include \ -+ | --includ | --inclu | --incl | --inc) -+ ac_prev=includedir ;; -+ -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ -+ | --includ=* | --inclu=* | --incl=* | --inc=*) -+ includedir=$ac_optarg ;; -+ -+ -infodir | --infodir | --infodi | --infod | --info | --inf) -+ ac_prev=infodir ;; -+ -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) -+ infodir=$ac_optarg ;; -+ -+ -libdir | --libdir | --libdi | --libd) -+ ac_prev=libdir ;; -+ -libdir=* | --libdir=* | --libdi=* | --libd=*) -+ libdir=$ac_optarg ;; -+ -+ -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ -+ | --libexe | --libex | --libe) -+ ac_prev=libexecdir ;; -+ -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ -+ | --libexe=* | --libex=* | --libe=*) -+ libexecdir=$ac_optarg ;; -+ -+ -localstatedir | --localstatedir | --localstatedi | --localstated \ -+ | --localstate | --localstat | --localsta | --localst \ -+ | --locals | --local | --loca | --loc | --lo) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -+ | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ localstatedir=$ac_optarg ;; -+ -+ -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -+ ac_prev=mandir ;; -+ -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) -+ mandir=$ac_optarg ;; -+ -+ -nfp | --nfp | --nf) -+ # Obsolete; use --without-fp. -+ with_fp=no ;; -+ -+ -no-create | --no-create | --no-creat | --no-crea | --no-cre \ -+ | --no-cr | --no-c | -n) -+ no_create=yes ;; -+ -+ -no-recursion | --no-recursion | --no-recursio | --no-recursi \ -+ | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) -+ no_recursion=yes ;; -+ -+ -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ -+ | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ -+ | --oldin | --oldi | --old | --ol | --o) -+ ac_prev=oldincludedir ;; -+ -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ -+ | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ -+ | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) -+ oldincludedir=$ac_optarg ;; -+ -+ -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) -+ ac_prev=prefix ;; -+ -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) -+ prefix=$ac_optarg ;; -+ -+ -program-prefix | --program-prefix | --program-prefi | --program-pref \ -+ | --program-pre | --program-pr | --program-p) -+ ac_prev=program_prefix ;; -+ -program-prefix=* | --program-prefix=* | --program-prefi=* \ -+ | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) -+ program_prefix=$ac_optarg ;; -+ -+ -program-suffix | --program-suffix | --program-suffi | --program-suff \ -+ | --program-suf | --program-su | --program-s) -+ ac_prev=program_suffix ;; -+ -program-suffix=* | --program-suffix=* | --program-suffi=* \ -+ | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) -+ program_suffix=$ac_optarg ;; -+ -+ -program-transform-name | --program-transform-name \ -+ | --program-transform-nam | --program-transform-na \ -+ | --program-transform-n | --program-transform- \ -+ | --program-transform | --program-transfor \ -+ | --program-transfo | --program-transf \ -+ | --program-trans | --program-tran \ -+ | --progr-tra | --program-tr | --program-t) -+ ac_prev=program_transform_name ;; -+ -program-transform-name=* | --program-transform-name=* \ -+ | --program-transform-nam=* | --program-transform-na=* \ -+ | --program-transform-n=* | --program-transform-=* \ -+ | --program-transform=* | --program-transfor=* \ -+ | --program-transfo=* | --program-transf=* \ -+ | --program-trans=* | --program-tran=* \ -+ | --progr-tra=* | --program-tr=* | --program-t=*) -+ program_transform_name=$ac_optarg ;; -+ -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ silent=yes ;; -+ -+ -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) -+ ac_prev=sbindir ;; -+ -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ -+ | --sbi=* | --sb=*) -+ sbindir=$ac_optarg ;; -+ -+ -sharedstatedir | --sharedstatedir | --sharedstatedi \ -+ | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ -+ | --sharedst | --shareds | --shared | --share | --shar \ -+ | --sha | --sh) -+ ac_prev=sharedstatedir ;; -+ -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ -+ | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ -+ | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ -+ | --sha=* | --sh=*) -+ sharedstatedir=$ac_optarg ;; -+ -+ -site | --site | --sit) -+ ac_prev=site ;; -+ -site=* | --site=* | --sit=*) -+ site=$ac_optarg ;; -+ -+ -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) -+ ac_prev=srcdir ;; -+ -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) -+ srcdir=$ac_optarg ;; -+ -+ -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ -+ | --syscon | --sysco | --sysc | --sys | --sy) -+ ac_prev=sysconfdir ;; -+ -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ -+ | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) -+ sysconfdir=$ac_optarg ;; -+ -+ -target | --target | --targe | --targ | --tar | --ta | --t) -+ ac_prev=target_alias ;; -+ -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) -+ target_alias=$ac_optarg ;; -+ -+ -v | -verbose | --verbose | --verbos | --verbo | --verb) -+ verbose=yes ;; -+ -+ -version | --version | --versio | --versi | --vers | -V) -+ ac_init_version=: ;; -+ -+ -with-* | --with-*) -+ ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ { (exit 1); exit 1; }; } -+ ac_package=`echo $ac_package| sed 's/-/_/g'` -+ case $ac_option in -+ *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -+ *) ac_optarg=yes ;; -+ esac -+ eval "with_$ac_package='$ac_optarg'" ;; -+ -+ -without-* | --without-*) -+ ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid package name: $ac_package" >&2 -+ { (exit 1); exit 1; }; } -+ ac_package=`echo $ac_package | sed 's/-/_/g'` -+ eval "with_$ac_package=no" ;; -+ -+ --x) -+ # Obsolete; use --with-x. -+ with_x=yes ;; -+ -+ -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ -+ | --x-incl | --x-inc | --x-in | --x-i) -+ ac_prev=x_includes ;; -+ -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ -+ | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) -+ x_includes=$ac_optarg ;; -+ -+ -x-libraries | --x-libraries | --x-librarie | --x-librari \ -+ | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) -+ ac_prev=x_libraries ;; -+ -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ -+ | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) -+ x_libraries=$ac_optarg ;; -+ -+ -*) { echo "$as_me: error: unrecognized option: $ac_option -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } -+ ;; -+ -+ *=*) -+ ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` -+ # Reject names that are not valid shell variable names. -+ expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -+ { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -+ { (exit 1); exit 1; }; } -+ ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -+ eval "$ac_envvar='$ac_optarg'" -+ export $ac_envvar ;; -+ -+ *) -+ # FIXME: should be removed in autoconf 3.0. -+ echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -+ echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} -+ ;; -+ -+ esac -+done -+ -+if test -n "$ac_prev"; then -+ ac_option=--`echo $ac_prev | sed 's/_/-/g'` -+ { echo "$as_me: error: missing argument to $ac_option" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ -+# Be sure to have absolute paths. -+for ac_var in exec_prefix prefix -+do -+ eval ac_val=$`echo $ac_var` -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; };; -+ esac -+done -+ -+# Be sure to have absolute paths. -+for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -+ localstatedir libdir includedir oldincludedir infodir mandir -+do -+ eval ac_val=$`echo $ac_var` -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) ;; -+ *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; };; -+ esac -+done -+ -+# There might be people who depend on the old broken behavior: `$host' -+# used to hold the argument of --host etc. -+# FIXME: To remove some day. -+build=$build_alias -+host=$host_alias -+target=$target_alias -+ -+# FIXME: To remove some day. -+if test "x$host_alias" != x; then -+ if test "x$build_alias" = x; then -+ cross_compiling=maybe -+ echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ If a cross compiler is detected then cross compile mode will be used." >&2 -+ elif test "x$build_alias" != "x$host_alias"; then -+ cross_compiling=yes -+ fi -+fi -+ -+ac_tool_prefix= -+test -n "$host_alias" && ac_tool_prefix=$host_alias- -+ -+test "$silent" = yes && exec 6>/dev/null -+ -+ -+# Find the source files, if location was not specified. -+if test -z "$srcdir"; then -+ ac_srcdir_defaulted=yes -+ # Try the directory containing this script, then its parent. -+ ac_confdir=`(dirname "$0") 2>/dev/null || -+$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$0" : 'X\(//\)[^/]' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$0" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ srcdir=$ac_confdir -+ if test ! -r $srcdir/$ac_unique_file; then -+ srcdir=.. -+ fi -+else -+ ac_srcdir_defaulted=no -+fi -+if test ! -r $srcdir/$ac_unique_file; then -+ if test "$ac_srcdir_defaulted" = yes; then -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -+ { (exit 1); exit 1; }; } -+ else -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { (exit 1); exit 1; }; } -+ fi -+fi -+(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -+ { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -+ { (exit 1); exit 1; }; } -+srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` -+ac_env_build_alias_set=${build_alias+set} -+ac_env_build_alias_value=$build_alias -+ac_cv_env_build_alias_set=${build_alias+set} -+ac_cv_env_build_alias_value=$build_alias -+ac_env_host_alias_set=${host_alias+set} -+ac_env_host_alias_value=$host_alias -+ac_cv_env_host_alias_set=${host_alias+set} -+ac_cv_env_host_alias_value=$host_alias -+ac_env_target_alias_set=${target_alias+set} -+ac_env_target_alias_value=$target_alias -+ac_cv_env_target_alias_set=${target_alias+set} -+ac_cv_env_target_alias_value=$target_alias -+ac_env_CC_set=${CC+set} -+ac_env_CC_value=$CC -+ac_cv_env_CC_set=${CC+set} -+ac_cv_env_CC_value=$CC -+ac_env_CFLAGS_set=${CFLAGS+set} -+ac_env_CFLAGS_value=$CFLAGS -+ac_cv_env_CFLAGS_set=${CFLAGS+set} -+ac_cv_env_CFLAGS_value=$CFLAGS -+ac_env_LDFLAGS_set=${LDFLAGS+set} -+ac_env_LDFLAGS_value=$LDFLAGS -+ac_cv_env_LDFLAGS_set=${LDFLAGS+set} -+ac_cv_env_LDFLAGS_value=$LDFLAGS -+ac_env_CPPFLAGS_set=${CPPFLAGS+set} -+ac_env_CPPFLAGS_value=$CPPFLAGS -+ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} -+ac_cv_env_CPPFLAGS_value=$CPPFLAGS -+ac_env_CPP_set=${CPP+set} -+ac_env_CPP_value=$CPP -+ac_cv_env_CPP_set=${CPP+set} -+ac_cv_env_CPP_value=$CPP -+ -+# -+# Report the --help message. -+# -+if test "$ac_init_help" = "long"; then -+ # Omit some internal or obsolete options to make the list less imposing. -+ # This message is too long to be a string in the A/UX 3.1 sh. -+ cat <<_ACEOF -+\`configure' configures this package to adapt to many kinds of systems. -+ -+Usage: $0 [OPTION]... [VAR=VALUE]... -+ -+To assign environment variables (e.g., CC, CFLAGS...), specify them as -+VAR=VALUE. See below for descriptions of some of the useful variables. -+ -+Defaults for the options are specified in brackets. -+ -+Configuration: -+ -h, --help display this help and exit -+ --help=short display options specific to this package -+ --help=recursive display the short help of all the included packages -+ -V, --version display version information and exit -+ -q, --quiet, --silent do not print \`checking...' messages -+ --cache-file=FILE cache test results in FILE [disabled] -+ -C, --config-cache alias for \`--cache-file=config.cache' -+ -n, --no-create do not create output files -+ --srcdir=DIR find the sources in DIR [configure dir or \`..'] -+ -+_ACEOF -+ -+ cat <<_ACEOF -+Installation directories: -+ --prefix=PREFIX install architecture-independent files in PREFIX -+ [$ac_default_prefix] -+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -+ [PREFIX] -+ -+By default, \`make install' will install all the files in -+\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -+an installation prefix other than \`$ac_default_prefix' using \`--prefix', -+for instance \`--prefix=\$HOME'. -+ -+For better control, use the options below. -+ -+Fine tuning of the installation directories: -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --datadir=DIR read-only architecture-independent data [PREFIX/share] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --infodir=DIR info documentation [PREFIX/info] -+ --mandir=DIR man documentation [PREFIX/man] -+_ACEOF -+ -+ cat <<\_ACEOF -+ -+Program names: -+ --program-prefix=PREFIX prepend PREFIX to installed program names -+ --program-suffix=SUFFIX append SUFFIX to installed program names -+ --program-transform-name=PROGRAM run sed PROGRAM on installed program names -+ -+System types: -+ --build=BUILD configure for building on BUILD [guessed] -+ --host=HOST cross-compile to build programs to run on HOST [BUILD] -+ --target=TARGET configure for building compilers for TARGET [HOST] -+_ACEOF -+fi -+ -+if test -n "$ac_init_help"; then -+ -+ cat <<\_ACEOF -+ -+Optional Features: -+ --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) -+ --enable-FEATURE[=ARG] include FEATURE [ARG=yes] -+ --disable-nls do not use Native Language Support -+ --enable-maintainer-mode Enable developer functionality. -+ --enable-sim-bswap Use Host specific BSWAP instruction. -+ --enable-sim-cflags=opts Extra CFLAGS for use in building simulator -+ --enable-sim-debug=opts Enable debugging flags -+ --enable-sim-stdio Specify whether to use stdio for console input/output. -+ --enable-sim-trace=opts Enable tracing flags -+ --enable-sim-profile=opts Enable profiling flags -+ -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-included-gettext use the GNU gettext library included here -+ -+Some influential environment variables: -+ CC C compiler command -+ CFLAGS C compiler flags -+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a -+ nonstandard directory <lib dir> -+ CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -+ headers in a nonstandard directory <include dir> -+ CPP C preprocessor -+ -+Use these variables to override the choices made by `configure' or to help -+it to find libraries and programs with nonstandard names/locations. -+ -+_ACEOF -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ ac_popdir=`pwd` -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d $ac_dir || continue -+ ac_builddir=. -+ -+if test "$ac_dir" != .; then -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+else -+ ac_dir_suffix= ac_top_builddir= -+fi -+ -+case $srcdir in -+ .) # No --srcdir option. We are building in place. -+ ac_srcdir=. -+ if test -z "$ac_top_builddir"; then -+ ac_top_srcdir=. -+ else -+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -+ fi ;; -+ [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir ;; -+ *) # Relative path. -+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_builddir$srcdir ;; -+esac -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac -+ -+ cd $ac_dir -+ # Check for guested configure; otherwise get Cygnus style configure. -+ if test -f $ac_srcdir/configure.gnu; then -+ echo -+ $SHELL $ac_srcdir/configure.gnu --help=recursive -+ elif test -f $ac_srcdir/configure; then -+ echo -+ $SHELL $ac_srcdir/configure --help=recursive -+ elif test -f $ac_srcdir/configure.ac || -+ test -f $ac_srcdir/configure.in; then -+ echo -+ $ac_configure --help -+ else -+ echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi -+ cd $ac_popdir -+ done -+fi -+ -+test -n "$ac_init_help" && exit 0 -+if $ac_init_version; then -+ cat <<\_ACEOF -+ -+Copyright (C) 2003 Free Software Foundation, Inc. -+This configure script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it. -+_ACEOF -+ exit 0 -+fi -+exec 5>config.log -+cat >&5 <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by $as_me, which was -+generated by GNU Autoconf 2.59. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+hostinfo = `(hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ echo "PATH: $as_dir" -+done -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. -+# Also quote any args containing shell meta-characters. -+# Make two passes to allow for proper duplicate-argument suppression. -+ac_configure_args= -+ac_configure_args0= -+ac_configure_args1= -+ac_sep= -+ac_must_keep_next=false -+for ac_pass in 1 2 -+do -+ for ac_arg -+ do -+ case $ac_arg in -+ -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil) -+ continue ;; -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ case $ac_pass in -+ 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 2) -+ ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ if test $ac_must_keep_next = true; then -+ ac_must_keep_next=false # Got value, back to normal. -+ else -+ case $ac_arg in -+ *=* | --config-cache | -C | -disable-* | --disable-* \ -+ | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ -+ | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ -+ | -with-* | --with-* | -without-* | --without-* | --x) -+ case "$ac_configure_args0 " in -+ "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; -+ esac -+ ;; -+ -* ) ac_must_keep_next=true ;; -+ esac -+ fi -+ ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -+ # Get rid of the leading space. -+ ac_sep=" " -+ ;; -+ esac -+ done -+done -+$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } -+$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+ -+# When interrupted or exit'd, cleanup temporary files, and complete -+# config.log. We remove comments because anyway the quotes in there -+# would cause problems or look ugly. -+# WARNING: Be sure not to use single quotes in there, as some shells, -+# such as our DU 5.0 friend, will then `close' the trap. -+trap 'exit_status=$? -+ # Save into config.log some information that might help in debugging. -+ { -+ echo -+ -+ cat <<\_ASBOX -+## ---------------- ## -+## Cache variables. ## -+## ---------------- ## -+_ASBOX -+ echo -+ # The following way of writing the cache mishandles newlines in values, -+{ -+ (set) 2>&1 | -+ case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ sed -n \ -+ "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -+ ;; -+ *) -+ sed -n \ -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ ;; -+ esac; -+} -+ echo -+ -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------- ## -+## Output files. ## -+## ------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=$`echo $ac_var` -+ echo "$ac_var='"'"'$ac_val'"'"'" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+## ----------- ## -+## confdefs.h. ## -+## ----------- ## -+_ASBOX -+ echo -+ sed "/^$/d" confdefs.h | sort -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ echo "$as_me: caught signal $ac_signal" -+ echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core && -+ rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ exit $exit_status -+ ' 0 -+for ac_signal in 1 2 13 15; do -+ trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+done -+ac_signal=0 -+ -+# confdefs.h avoids OS command line length limits that DEFS can exceed. -+rm -rf conftest* confdefs.h -+# AIX cpp loses on an empty file, so make sure it contains at least a newline. -+echo >confdefs.h -+ -+# Predefined preprocessor variables. -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_NAME "$PACKAGE_NAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_TARNAME "$PACKAGE_TARNAME" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_VERSION "$PACKAGE_VERSION" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_STRING "$PACKAGE_STRING" -+_ACEOF -+ -+ -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -+_ACEOF -+ -+ -+# Let the site file select an alternate cache file if it wants to. -+# Prefer explicitly selected file to automatically selected ones. -+if test -z "$CONFIG_SITE"; then -+ if test "x$prefix" != xNONE; then -+ CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -+ else -+ CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -+ fi -+fi -+for ac_site_file in $CONFIG_SITE; do -+ if test -r "$ac_site_file"; then -+ { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 -+echo "$as_me: loading site script $ac_site_file" >&6;} -+ sed 's/^/| /' "$ac_site_file" >&5 -+ . "$ac_site_file" -+ fi -+done -+ -+if test -r "$cache_file"; then -+ # Some versions of bash will fail to source /dev/null (special -+ # files actually), so we avoid doing that. -+ if test -f "$cache_file"; then -+ { echo "$as_me:$LINENO: loading cache $cache_file" >&5 -+echo "$as_me: loading cache $cache_file" >&6;} -+ case $cache_file in -+ [\\/]* | ?:[\\/]* ) . $cache_file;; -+ *) . ./$cache_file;; -+ esac -+ fi -+else -+ { echo "$as_me:$LINENO: creating cache $cache_file" >&5 -+echo "$as_me: creating cache $cache_file" >&6;} -+ >$cache_file -+fi -+ -+# Check that the precious variables saved in the cache have kept the same -+# value. -+ac_cache_corrupted=false -+for ac_var in `(set) 2>&1 | -+ sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+ eval ac_old_set=\$ac_cv_env_${ac_var}_set -+ eval ac_new_set=\$ac_env_${ac_var}_set -+ eval ac_old_val="\$ac_cv_env_${ac_var}_value" -+ eval ac_new_val="\$ac_env_${ac_var}_value" -+ case $ac_old_set,$ac_new_set in -+ set,) -+ { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,set) -+ { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 -+echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ ac_cache_corrupted=: ;; -+ ,);; -+ *) -+ if test "x$ac_old_val" != "x$ac_new_val"; then -+ { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 -+echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 -+echo "$as_me: former value: $ac_old_val" >&2;} -+ { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 -+echo "$as_me: current value: $ac_new_val" >&2;} -+ ac_cache_corrupted=: -+ fi;; -+ esac -+ # Pass precious variables to config.status. -+ if test "$ac_new_set" = set; then -+ case $ac_new_val in -+ *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -+ ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *) ac_arg=$ac_var=$ac_new_val ;; -+ esac -+ case " $ac_configure_args " in -+ *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -+ *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ esac -+ fi -+done -+if $ac_cache_corrupted; then -+ { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 -+echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 -+echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ ac_config_headers="$ac_config_headers config.h:config.in" -+ -+ -+# This file contains common code used by all simulators. -+# -+# SIM_AC_COMMON invokes AC macros used by all simulators and by the common -+# directory. It is intended to be invoked before any target specific stuff. -+# SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate the Makefile. -+# It is intended to be invoked last. -+# -+# The simulator's configure.in should look like: -+# -+# dnl Process this file with autoconf to produce a configure script. -+# sinclude(../common/aclocal.m4) -+# AC_PREREQ(2.5)dnl -+# AC_INIT(Makefile.in) -+# -+# SIM_AC_COMMON -+# -+# ... target specific stuff ... -+# -+# SIM_AC_OUTPUT -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+sim_inline="-DDEFAULT_INLINE=0" -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+# This file is derived from `gettext.m4'. The difference is that the -+# included macros assume Cygnus-style source and build trees. -+ -+# Macro to add for using GNU gettext. -+# Ulrich Drepper <drepper@cygnus.com>, 1995. -+# -+# This file file be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+ -+# serial 3 -+ -+ -+ -+ -+ -+# Search path for a program which passes the given test. -+# Ulrich Drepper <drepper@cygnus.com>, 1996. -+# -+# This file file be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+ -+# serial 1 -+ -+ -+ -+# Check whether LC_MESSAGES is available in <locale.h>. -+# Ulrich Drepper <drepper@cygnus.com>, 1995. -+# -+# This file file be copied and used freely without restrictions. It can -+# be used in projects which are not available under the GNU Public License -+# but which still want to provide support for the GNU gettext functionality. -+# Please note that the actual code is *not* freely available. -+ -+# serial 1 -+ -+ -+ -+ -+ -+ -+ -+# This file contains common code used by all simulators. -+# -+# common.m4 invokes AC macros used by all simulators and by the common -+# directory. It is intended to be included before any target specific -+# stuff. SIM_AC_OUTPUT is a cover function to AC_OUTPUT to generate -+# the Makefile. It is intended to be invoked last. -+# -+# The simulator's configure.in should look like: -+# -+# dnl Process this file with autoconf to produce a configure script. -+# AC_PREREQ(2.5)dnl -+# AC_INIT(Makefile.in) -+# AC_CONFIG_HEADER(config.h:config.in) -+# -+# sinclude(../common/aclocal.m4) -+# sinclude(../common/common.m4) -+# -+# ... target specific stuff ... -+ -+ac_aux_dir= -+for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -+ if test -f $ac_dir/install-sh; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install-sh -c" -+ break -+ elif test -f $ac_dir/install.sh; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/install.sh -c" -+ break -+ elif test -f $ac_dir/shtool; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/shtool install -c" -+ break -+ fi -+done -+if test -z "$ac_aux_dir"; then -+ { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 -+echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" -+ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ -+# Make sure we can run config.sub. -+$ac_config_sub sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 -+echo "$as_me: error: cannot run $ac_config_sub" >&2;} -+ { (exit 1); exit 1; }; } -+ -+echo "$as_me:$LINENO: checking build system type" >&5 -+echo $ECHO_N "checking build system type... $ECHO_C" >&6 -+if test "${ac_cv_build+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_build_alias=$build_alias -+test -z "$ac_cv_build_alias" && -+ ac_cv_build_alias=`$ac_config_guess` -+test -z "$ac_cv_build_alias" && -+ { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 -+echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -+ { (exit 1); exit 1; }; } -+ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 -+echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_build" >&5 -+echo "${ECHO_T}$ac_cv_build" >&6 -+build=$ac_cv_build -+build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ -+ -+echo "$as_me:$LINENO: checking host system type" >&5 -+echo $ECHO_N "checking host system type... $ECHO_C" >&6 -+if test "${ac_cv_host+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_host_alias=$host_alias -+test -z "$ac_cv_host_alias" && -+ ac_cv_host_alias=$ac_cv_build_alias -+ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 -+echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6 -+host=$ac_cv_host -+host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ -+ -+echo "$as_me:$LINENO: checking target system type" >&5 -+echo $ECHO_N "checking target system type... $ECHO_C" >&6 -+if test "${ac_cv_target+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_target_alias=$target_alias -+test "x$ac_cv_target_alias" = "x" && -+ ac_cv_target_alias=$ac_cv_host_alias -+ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -+ { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 -+echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -+echo "${ECHO_T}$ac_cv_target" >&6 -+target=$ac_cv_target -+target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` -+target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` -+target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ -+ -+# The aliases save the names the user supplied, while $host etc. -+# will get canonicalized. -+test -n "$target_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && -+ program_prefix=${target_alias}- -+test "$program_prefix" != NONE && -+ program_transform_name="s,^,$program_prefix,;$program_transform_name" -+# Use a double $ so make ignores it. -+test "$program_suffix" != NONE && -+ program_transform_name="s,\$,$program_suffix,;$program_transform_name" -+# Double any \ or $. echo might interpret backslashes. -+# By default was `s,x,x', remove it if useless. -+cat <<\_ACEOF >conftest.sed -+s/[\\$]/&&/g;s/;s,x,x,$// -+_ACEOF -+program_transform_name=`echo $program_transform_name | sed -f conftest.sed` -+rm conftest.sed -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}gcc; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="${ac_tool_prefix}gcc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "gcc", so it can be a program name with args. -+set dummy gcc; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_CC="gcc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ CC=$ac_ct_CC -+else -+ CC="$ac_cv_prog_CC" -+fi -+ -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+set dummy ${ac_tool_prefix}cc; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="${ac_tool_prefix}cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_CC"; then -+ ac_ct_CC=$CC -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_CC="cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ CC=$ac_ct_CC -+else -+ CC="$ac_cv_prog_CC" -+fi -+ -+fi -+if test -z "$CC"; then -+ # Extract the first word of "cc", so it can be a program name with args. -+set dummy cc; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+ ac_prog_rejected=no -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then -+ ac_prog_rejected=yes -+ continue -+ fi -+ ac_cv_prog_CC="cc" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+if test $ac_prog_rejected = yes; then -+ # We found a bogon in the path, so make sure we never use it. -+ set dummy $ac_cv_prog_CC -+ shift -+ if test $# != 0; then -+ # We chose a different compiler from the bogus one. -+ # However, it has the same basename, so the bogon will be chosen -+ # first if we set CC to just the basename; use the full file name. -+ shift -+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@" -+ fi -+fi -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$CC"; then -+ if test -n "$ac_tool_prefix"; then -+ for ac_prog in cl -+ do -+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. -+set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$CC"; then -+ ac_cv_prog_CC="$CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+CC=$ac_cv_prog_CC -+if test -n "$CC"; then -+ echo "$as_me:$LINENO: result: $CC" >&5 -+echo "${ECHO_T}$CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ test -n "$CC" && break -+ done -+fi -+if test -z "$CC"; then -+ ac_ct_CC=$CC -+ for ac_prog in cl -+do -+ # Extract the first word of "$ac_prog", so it can be a program name with args. -+set dummy $ac_prog; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_CC"; then -+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_CC="$ac_prog" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+ac_ct_CC=$ac_cv_prog_ac_ct_CC -+if test -n "$ac_ct_CC"; then -+ echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 -+echo "${ECHO_T}$ac_ct_CC" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ test -n "$ac_ct_CC" && break -+done -+ -+ CC=$ac_ct_CC -+fi -+ -+fi -+ -+ -+test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&5 -+echo "$as_me: error: no acceptable C compiler found in \$PATH -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+ -+# Provide some information about the compiler. -+echo "$as_me:$LINENO:" \ -+ "checking for C compiler version" >&5 -+ac_compiler=`set X $ac_compile; echo $2` -+{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -+ (eval $ac_compiler --version </dev/null >&5) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -+ (eval $ac_compiler -v </dev/null >&5) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -+ (eval $ac_compiler -V </dev/null >&5) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } -+ -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files a.out a.exe b.out" -+# Try to create an executable without -o first, disregard a.out. -+# It will help us diagnose broken compilers, and finding out an intuition -+# of exeext. -+echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 -+echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 -+ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -+ (eval $ac_link_default) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # Find the output, starting from the most likely. This scheme is -+# not robust to junk in `.', hence go to wildcards (a.*) only as a last -+# resort. -+ -+# Be careful to initialize this variable, since it used to be cached. -+# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. -+ac_cv_exeext= -+# b.out is created by i960 compilers. -+for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -+ ;; -+ conftest.$ac_ext ) -+ # This is the source file. -+ ;; -+ [ab].out ) -+ # We found the default executable, but exeext='' is most -+ # certainly right. -+ break;; -+ *.* ) -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ # FIXME: I believe we export ac_cv_exeext for Libtool, -+ # but it would be cool to find out if it's true. Does anybody -+ # maintain Libtool? --akim. -+ export ac_cv_exeext -+ break;; -+ * ) -+ break;; -+ esac -+done -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { echo "$as_me:$LINENO: error: C compiler cannot create executables -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C compiler cannot create executables -+See \`config.log' for more details." >&2;} -+ { (exit 77); exit 77; }; } -+fi -+ -+ac_exeext=$ac_cv_exeext -+echo "$as_me:$LINENO: result: $ac_file" >&5 -+echo "${ECHO_T}$ac_file" >&6 -+ -+# Check the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+echo "$as_me:$LINENO: checking whether the C compiler works" >&5 -+echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 -+# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 -+# If not cross compiling, check that we can run a simple program. -+if test "$cross_compiling" != yes; then -+ if { ac_try='./$ac_file' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { echo "$as_me:$LINENO: error: cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ fi -+fi -+echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ -+rm -f a.out a.exe conftest$ac_cv_exeext b.out -+ac_clean_files=$ac_clean_files_save -+# Check the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 -+echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 -+echo "$as_me:$LINENO: result: $cross_compiling" >&5 -+echo "${ECHO_T}$cross_compiling" >&6 -+ -+echo "$as_me:$LINENO: checking for suffix of executables" >&5 -+echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ # If both `conftest.exe' and `conftest' are `present' (well, observable) -+# catch `conftest.exe'. For instance with Cygwin, `ls conftest' will -+# work properly (i.e., refer to `conftest.exe'), while it won't with -+# `rm'. -+for ac_file in conftest.exe conftest conftest.*; do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ export ac_cv_exeext -+ break;; -+ * ) break;; -+ esac -+done -+else -+ { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+rm -f conftest$ac_cv_exeext -+echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 -+echo "${ECHO_T}$ac_cv_exeext" >&6 -+ -+rm -f conftest.$ac_ext -+EXEEXT=$ac_cv_exeext -+ac_exeext=$EXEEXT -+echo "$as_me:$LINENO: checking for suffix of object files" >&5 -+echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 -+if test "${ac_cv_objext+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.o conftest.obj -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` -+ break;; -+ esac -+done -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&5 -+echo "$as_me: error: cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+rm -f conftest.$ac_cv_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 -+echo "${ECHO_T}$ac_cv_objext" >&6 -+OBJEXT=$ac_cv_objext -+ac_objext=$OBJEXT -+echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 -+echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 -+if test "${ac_cv_c_compiler_gnu+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+#ifndef __GNUC__ -+ choke me -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_compiler_gnu=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_compiler_gnu=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_cv_c_compiler_gnu=$ac_compiler_gnu -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 -+echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 -+GCC=`test $ac_compiler_gnu = yes && echo yes` -+ac_test_CFLAGS=${CFLAGS+set} -+ac_save_CFLAGS=$CFLAGS -+CFLAGS="-g" -+echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 -+echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 -+if test "${ac_cv_prog_cc_g+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_prog_cc_g=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_prog_cc_g=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+if test "$ac_test_CFLAGS" = set; then -+ CFLAGS=$ac_save_CFLAGS -+elif test $ac_cv_prog_cc_g = yes; then -+ if test "$GCC" = yes; then -+ CFLAGS="-g -O2" -+ else -+ CFLAGS="-g" -+ fi -+else -+ if test "$GCC" = yes; then -+ CFLAGS="-O2" -+ else -+ CFLAGS= -+ fi -+fi -+echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 -+echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 -+if test "${ac_cv_prog_cc_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_prog_cc_stdc=no -+ac_save_CC=$CC -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdarg.h> -+#include <stdio.h> -+#include <sys/types.h> -+#include <sys/stat.h> -+/* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ -+struct buf { int x; }; -+FILE * (*rcsopen) (struct buf *, struct stat *, int); -+static char *e (p, i) -+ char **p; -+ int i; -+{ -+ return p[i]; -+} -+static char *f (char * (*g) (char **, int), char **p, ...) -+{ -+ char *s; -+ va_list v; -+ va_start (v,p); -+ s = g (p, va_arg (v,int)); -+ va_end (v); -+ return s; -+} -+ -+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has -+ function prototypes and stuff, but not '\xHH' hex character constants. -+ These don't provoke an error unfortunately, instead are silently treated -+ as 'x'. The following induces an error, until -std1 is added to get -+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an -+ array size at least. It's necessary to write '\x00'==0 to get something -+ that's true only with -std1. */ -+int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -+ -+int test (int i, double x); -+struct s1 {int (*f) (int a);}; -+struct s2 {int (*f) (double a);}; -+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int); -+int argc; -+char **argv; -+int -+main () -+{ -+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; -+ ; -+ return 0; -+} -+_ACEOF -+# Don't try gcc -ansi; that turns off useful extensions and -+# breaks some systems' header files. -+# AIX -qlanglvl=ansi -+# Ultrix and OSF/1 -std1 -+# HP-UX 10.20 and later -Ae -+# HP-UX older versions -Aa -D_HPUX_SOURCE -+# SVR4 -Xc -D__EXTENSIONS__ -+for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+do -+ CC="$ac_save_CC $ac_arg" -+ rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_prog_cc_stdc=$ac_arg -+break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext -+done -+rm -f conftest.$ac_ext conftest.$ac_objext -+CC=$ac_save_CC -+ -+fi -+ -+case "x$ac_cv_prog_cc_stdc" in -+ x|xno) -+ echo "$as_me:$LINENO: result: none needed" >&5 -+echo "${ECHO_T}none needed" >&6 ;; -+ *) -+ echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 -+echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -+ CC="$CC $ac_cv_prog_cc_stdc" ;; -+esac -+ -+# Some people use a C++ compiler to compile C. Since we use `exit', -+# in C++ we need to declare it. In case someone uses the same compiler -+# for both compiling C and C++ we need to have the C++ compiler decide -+# the declaration of exit, since it's the most demanding environment. -+cat >conftest.$ac_ext <<_ACEOF -+#ifndef __cplusplus -+ choke me -+#endif -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ for ac_declaration in \ -+ '' \ -+ 'extern "C" void std::exit (int) throw (); using std::exit;' \ -+ 'extern "C" void std::exit (int); using std::exit;' \ -+ 'extern "C" void exit (int) throw ();' \ -+ 'extern "C" void exit (int);' \ -+ 'void exit (int);' -+do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_declaration -+#include <stdlib.h> -+int -+main () -+{ -+exit (42); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+continue -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_declaration -+int -+main () -+{ -+exit (42); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+rm -f conftest* -+if test -n "$ac_declaration"; then -+ echo '#ifdef __cplusplus' >>confdefs.h -+ echo $ac_declaration >>confdefs.h -+ echo '#endif' >>confdefs.h -+fi -+ -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+# Find a good install program. We prefer a C program (faster), -+# so one script is as good as another. But avoid the broken or -+# incompatible versions: -+# SysV /etc/install, /usr/sbin/install -+# SunOS /usr/etc/install -+# IRIX /sbin/install -+# AIX /bin/install -+# AmigaOS /C/install, which installs bootblocks on floppy discs -+# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag -+# AFS /usr/afsws/bin/install, which mishandles nonexistent args -+# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" -+# OS/2's system install, which has a completely different semantic -+# ./install, which can be erroneously created by make from ./install.sh. -+echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 -+echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+if test -z "$INSTALL"; then -+if test "${ac_cv_path_install+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in -+ ./ | .// | /cC/* | \ -+ /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -+ ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ /usr/ucb/* ) ;; -+ *) -+ # OSF1 and SCO ODT 3.0 have their own names for install. -+ # Don't use installbsd from OSF since it installs stuff as root -+ # by default. -+ for ac_prog in ginstall scoinst install; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if test $ac_prog = install && -+ grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # AIX install. It has an incompatible calling convention. -+ : -+ elif test $ac_prog = install && -+ grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then -+ # program-specific install script used by HP pwplus--don't use. -+ : -+ else -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi -+ fi -+ done -+ done -+ ;; -+esac -+done -+ -+ -+fi -+ if test "${ac_cv_path_install+set}" = set; then -+ INSTALL=$ac_cv_path_install -+ else -+ # As a last resort, use the slow shell script. We don't cache a -+ # path for INSTALL within a source directory, because that will -+ # break other packages using the cache if that directory is -+ # removed, or if the path is relative. -+ INSTALL=$ac_install_sh -+ fi -+fi -+echo "$as_me:$LINENO: result: $INSTALL" >&5 -+echo "${ECHO_T}$INSTALL" >&6 -+ -+# Use test -z because SunOS4 sh mishandles braces in ${var-val}. -+# It thinks the first close brace ends the variable substitution. -+test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' -+ -+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ -+test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -+ -+ -+# Put a plausible default for CC_FOR_BUILD in Makefile. -+if test "x$cross_compiling" = "xno"; then -+ CC_FOR_BUILD='$(CC)' -+else -+ CC_FOR_BUILD=gcc -+fi -+ -+ -+ -+ -+AR=${AR-ar} -+ -+if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. -+set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+fi -+fi -+RANLIB=$ac_cv_prog_RANLIB -+if test -n "$RANLIB"; then -+ echo "$as_me:$LINENO: result: $RANLIB" >&5 -+echo "${ECHO_T}$RANLIB" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+fi -+if test -z "$ac_cv_prog_RANLIB"; then -+ ac_ct_RANLIB=$RANLIB -+ # Extract the first word of "ranlib", so it can be a program name with args. -+set dummy ranlib; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$ac_ct_RANLIB"; then -+ ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -+else -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_prog_ac_ct_RANLIB="ranlib" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" -+fi -+fi -+ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB -+if test -n "$ac_ct_RANLIB"; then -+ echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 -+echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ RANLIB=$ac_ct_RANLIB -+else -+ RANLIB="$ac_cv_prog_RANLIB" -+fi -+ -+ -+ALL_LINGUAS= -+echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 -+echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6 -+set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'` -+if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.make <<\_ACEOF -+all: -+ @echo 'ac_maketemp="$(MAKE)"' -+_ACEOF -+# GNU make sometimes prints "make[1]: Entering...", which would confuse us. -+eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=` -+if test -n "$ac_maketemp"; then -+ eval ac_cv_prog_make_${ac_make}_set=yes -+else -+ eval ac_cv_prog_make_${ac_make}_set=no -+fi -+rm -f conftest.make -+fi -+if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then -+ echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6 -+ SET_MAKE= -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+ SET_MAKE="MAKE=${MAKE-make}" -+fi -+ -+ -+echo "$as_me:$LINENO: checking for library containing strerror" >&5 -+echo $ECHO_N "checking for library containing strerror... $ECHO_C" >&6 -+if test "${ac_cv_search_strerror+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_func_search_save_LIBS=$LIBS -+ac_cv_search_strerror=no -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char strerror (); -+int -+main () -+{ -+strerror (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_search_strerror="none required" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+if test "$ac_cv_search_strerror" = no; then -+ for ac_lib in cposix; do -+ LIBS="-l$ac_lib $ac_func_search_save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char strerror (); -+int -+main () -+{ -+strerror (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_search_strerror="-l$ac_lib" -+break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ done -+fi -+LIBS=$ac_func_search_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_search_strerror" >&5 -+echo "${ECHO_T}$ac_cv_search_strerror" >&6 -+if test "$ac_cv_search_strerror" != no; then -+ test "$ac_cv_search_strerror" = "none required" || LIBS="$ac_cv_search_strerror $LIBS" -+ -+fi -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 -+echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+ if test "${ac_cv_prog_CPP+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ # Double quotes because CPP needs to be expanded -+ for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -+ do -+ ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether non-existent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ # Broken: success on invalid input. -+continue -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ break -+fi -+ -+ done -+ ac_cv_prog_CPP=$CPP -+ -+fi -+ CPP=$ac_cv_prog_CPP -+else -+ ac_cv_prog_CPP=$CPP -+fi -+echo "$as_me:$LINENO: result: $CPP" >&5 -+echo "${ECHO_T}$CPP" >&6 -+ac_preproc_ok=false -+for ac_c_preproc_warn_flag in '' yes -+do -+ # Use a header file that comes with gcc, so configuring glibc -+ # with a fresh cross-compiler works. -+ # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ # <limits.h> exists even on freestanding compilers. -+ # On the NeXT, cc -E runs the code through the compiler's parser, -+ # not just through cpp. "Syntax error" is here to catch this case. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ Syntax error -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ : -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Broken: fails on valid input. -+continue -+fi -+rm -f conftest.err conftest.$ac_ext -+ -+ # OK, works on sane cases. Now check whether non-existent headers -+ # can be detected and how. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ac_nonexistent.h> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ # Broken: success on invalid input. -+continue -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ # Passes both tests. -+ac_preproc_ok=: -+break -+fi -+rm -f conftest.err conftest.$ac_ext -+ -+done -+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. -+rm -f conftest.err conftest.$ac_ext -+if $ac_preproc_ok; then -+ : -+else -+ { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&5 -+echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+ac_ext=c -+ac_cpp='$CPP $CPPFLAGS' -+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -+ac_compiler_gnu=$ac_cv_c_compiler_gnu -+ -+ -+echo "$as_me:$LINENO: checking for egrep" >&5 -+echo $ECHO_N "checking for egrep... $ECHO_C" >&6 -+if test "${ac_cv_prog_egrep+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 -+echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -+ EGREP=$ac_cv_prog_egrep -+ -+ -+echo "$as_me:$LINENO: checking for ANSI C header files" >&5 -+echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 -+if test "${ac_cv_header_stdc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> -+#include <stdarg.h> -+#include <string.h> -+#include <float.h> -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_header_stdc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_header_stdc=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+ -+if test $ac_cv_header_stdc = yes; then -+ # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <string.h> -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "memchr" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <stdlib.h> -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "free" >/dev/null 2>&1; then -+ : -+else -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <ctype.h> -+#if ((' ' & 0x0FF) == 0x020) -+# define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#else -+# define ISLOWER(c) \ -+ (('a' <= (c) && (c) <= 'i') \ -+ || ('j' <= (c) && (c) <= 'r') \ -+ || ('s' <= (c) && (c) <= 'z')) -+# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c)) -+#endif -+ -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int -+main () -+{ -+ int i; -+ for (i = 0; i < 256; i++) -+ if (XOR (islower (i), ISLOWER (i)) -+ || toupper (i) != TOUPPER (i)) -+ exit(2); -+ exit (0); -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ : -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_header_stdc=no -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 -+echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+if test $ac_cv_header_stdc = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define STDC_HEADERS 1 -+_ACEOF -+ -+fi -+ -+echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5 -+echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6 -+if test "${ac_cv_c_const+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+/* FIXME: Include the comments suggested by Paul. */ -+#ifndef __cplusplus -+ /* Ultrix mips cc rejects this. */ -+ typedef int charset[2]; -+ const charset x; -+ /* SunOS 4.1.1 cc rejects this. */ -+ char const *const *ccp; -+ char **p; -+ /* NEC SVR4.0.2 mips cc rejects this. */ -+ struct point {int x, y;}; -+ static struct point const zero = {0,0}; -+ /* AIX XL C 1.02.0.0 rejects this. -+ It does not let you subtract one const X* pointer from another in -+ an arm of an if-expression whose if-part is not a constant -+ expression */ -+ const char *g = "string"; -+ ccp = &g + (g ? g-g : 0); -+ /* HPUX 7.0 cc rejects these. */ -+ ++ccp; -+ p = (char**) ccp; -+ ccp = (char const *const *) p; -+ { /* SCO 3.2v4 cc rejects this. */ -+ char *t; -+ char const *s = 0 ? (char *) 0 : (char const *) 0; -+ -+ *t++ = 0; -+ } -+ { /* Someone thinks the Sun supposedly-ANSI compiler will reject this. */ -+ int x[] = {25, 17}; -+ const int *foo = &x[0]; -+ ++foo; -+ } -+ { /* Sun SC1.0 ANSI compiler rejects this -- but not the above. */ -+ typedef const int *iptr; -+ iptr p = 0; -+ ++p; -+ } -+ { /* AIX XL C 1.02.0.0 rejects this saying -+ "k.c", line 2.27: 1506-025 (S) Operand must be a modifiable lvalue. */ -+ struct s { int j; const int *ap[3]; }; -+ struct s *b; b->j = 5; -+ } -+ { /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+ } -+#endif -+ -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_const=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_c_const=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_c_const" >&5 -+echo "${ECHO_T}$ac_cv_c_const" >&6 -+if test $ac_cv_c_const = no; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define const -+_ACEOF -+ -+fi -+ -+echo "$as_me:$LINENO: checking for inline" >&5 -+echo $ECHO_N "checking for inline... $ECHO_C" >&6 -+if test "${ac_cv_c_inline+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_c_inline=no -+for ac_kw in inline __inline__ __inline; do -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifndef __cplusplus -+typedef int foo_t; -+static $ac_kw foo_t static_foo () {return 0; } -+$ac_kw foo_t foo () {return 0; } -+#endif -+ -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_inline=$ac_kw; break -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+done -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_c_inline" >&5 -+echo "${ECHO_T}$ac_cv_c_inline" >&6 -+ -+ -+case $ac_cv_c_inline in -+ inline | yes) ;; -+ *) -+ case $ac_cv_c_inline in -+ no) ac_val=;; -+ *) ac_val=$ac_cv_c_inline;; -+ esac -+ cat >>confdefs.h <<_ACEOF -+#ifndef __cplusplus -+#define inline $ac_val -+#endif -+_ACEOF -+ ;; -+esac -+ -+# On IRIX 5.3, sys/types and inttypes.h are conflicting. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ -+ inttypes.h stdint.h unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+ -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_Header=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_Header=no" -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+echo "$as_me:$LINENO: checking for off_t" >&5 -+echo $ECHO_N "checking for off_t... $ECHO_C" >&6 -+if test "${ac_cv_type_off_t+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if ((off_t *) 0) -+ return 0; -+if (sizeof (off_t)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_type_off_t=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_type_off_t=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_type_off_t" >&5 -+echo "${ECHO_T}$ac_cv_type_off_t" >&6 -+if test $ac_cv_type_off_t = yes; then -+ : -+else -+ -+cat >>confdefs.h <<_ACEOF -+#define off_t long -+_ACEOF -+ -+fi -+ -+echo "$as_me:$LINENO: checking for size_t" >&5 -+echo $ECHO_N "checking for size_t... $ECHO_C" >&6 -+if test "${ac_cv_type_size_t+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+int -+main () -+{ -+if ((size_t *) 0) -+ return 0; -+if (sizeof (size_t)) -+ return 0; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_type_size_t=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_type_size_t=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_type_size_t" >&5 -+echo "${ECHO_T}$ac_cv_type_size_t" >&6 -+if test $ac_cv_type_size_t = yes; then -+ : -+else -+ -+cat >>confdefs.h <<_ACEOF -+#define size_t unsigned -+_ACEOF -+ -+fi -+ -+# The Ultrix 4.2 mips builtin alloca declared by alloca.h only works -+# for constant arguments. Useless! -+echo "$as_me:$LINENO: checking for working alloca.h" >&5 -+echo $ECHO_N "checking for working alloca.h... $ECHO_C" >&6 -+if test "${ac_cv_working_alloca_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <alloca.h> -+int -+main () -+{ -+char *p = (char *) alloca (2 * sizeof (int)); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_working_alloca_h=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_working_alloca_h=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_working_alloca_h" >&5 -+echo "${ECHO_T}$ac_cv_working_alloca_h" >&6 -+if test $ac_cv_working_alloca_h = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_ALLOCA_H 1 -+_ACEOF -+ -+fi -+ -+echo "$as_me:$LINENO: checking for alloca" >&5 -+echo $ECHO_N "checking for alloca... $ECHO_C" >&6 -+if test "${ac_cv_func_alloca_works+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#ifdef __GNUC__ -+# define alloca __builtin_alloca -+#else -+# ifdef _MSC_VER -+# include <malloc.h> -+# define alloca _alloca -+# else -+# if HAVE_ALLOCA_H -+# include <alloca.h> -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca /* predefined by HP cc +Olibcalls */ -+char *alloca (); -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+int -+main () -+{ -+char *p = (char *) alloca (1); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_alloca_works=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_func_alloca_works=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_alloca_works" >&5 -+echo "${ECHO_T}$ac_cv_func_alloca_works" >&6 -+ -+if test $ac_cv_func_alloca_works = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_ALLOCA 1 -+_ACEOF -+ -+else -+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions -+# that cause trouble. Some versions do not even contain alloca or -+# contain a buggy version. If you still want to use their alloca, -+# use ar to extract alloca.o from them instead of compiling alloca.c. -+ -+ALLOCA=alloca.$ac_objext -+ -+cat >>confdefs.h <<\_ACEOF -+#define C_ALLOCA 1 -+_ACEOF -+ -+ -+echo "$as_me:$LINENO: checking whether \`alloca.c' needs Cray hooks" >&5 -+echo $ECHO_N "checking whether \`alloca.c' needs Cray hooks... $ECHO_C" >&6 -+if test "${ac_cv_os_cray+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#if defined(CRAY) && ! defined(CRAY2) -+webecray -+#else -+wenotbecray -+#endif -+ -+_ACEOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ $EGREP "webecray" >/dev/null 2>&1; then -+ ac_cv_os_cray=yes -+else -+ ac_cv_os_cray=no -+fi -+rm -f conftest* -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_os_cray" >&5 -+echo "${ECHO_T}$ac_cv_os_cray" >&6 -+if test $ac_cv_os_cray = yes; then -+ for ac_func in _getb67 GETB67 getb67; do -+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ -+cat >>confdefs.h <<_ACEOF -+#define CRAY_STACKSEG_END $ac_func -+_ACEOF -+ -+ break -+fi -+ -+ done -+fi -+ -+echo "$as_me:$LINENO: checking stack direction for C alloca" >&5 -+echo $ECHO_N "checking stack direction for C alloca... $ECHO_C" >&6 -+if test "${ac_cv_c_stack_direction+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_c_stack_direction=0 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+int -+find_stack_direction () -+{ -+ static char *addr = 0; -+ auto char dummy; -+ if (addr == 0) -+ { -+ addr = &dummy; -+ return find_stack_direction (); -+ } -+ else -+ return (&dummy > addr) ? 1 : -1; -+} -+ -+int -+main () -+{ -+ exit (find_stack_direction () < 0); -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_c_stack_direction=1 -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_c_stack_direction=-1 -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_c_stack_direction" >&5 -+echo "${ECHO_T}$ac_cv_c_stack_direction" >&6 -+ -+cat >>confdefs.h <<_ACEOF -+#define STACK_DIRECTION $ac_cv_c_stack_direction -+_ACEOF -+ -+ -+fi -+ -+ -+ -+for ac_header in stdlib.h unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+for ac_func in getpagesize -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+echo "$as_me:$LINENO: checking for working mmap" >&5 -+echo $ECHO_N "checking for working mmap... $ECHO_C" >&6 -+if test "${ac_cv_func_mmap_fixed_mapped+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_func_mmap_fixed_mapped=no -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+/* malloc might have been renamed as rpl_malloc. */ -+#undef malloc -+ -+/* Thanks to Mike Haertel and Jim Avera for this test. -+ Here is a matrix of mmap possibilities: -+ mmap private not fixed -+ mmap private fixed at somewhere currently unmapped -+ mmap private fixed at somewhere already mapped -+ mmap shared not fixed -+ mmap shared fixed at somewhere currently unmapped -+ mmap shared fixed at somewhere already mapped -+ For private mappings, we should verify that changes cannot be read() -+ back from the file, nor mmap's back from the file at a different -+ address. (There have been systems where private was not correctly -+ implemented like the infamous i386 svr4.0, and systems where the -+ VM page cache was not coherent with the file system buffer cache -+ like early versions of FreeBSD and possibly contemporary NetBSD.) -+ For shared mappings, we should conversely verify that changes get -+ propagated back to all the places they're supposed to be. -+ -+ Grep wants private fixed already mapped. -+ The main things grep needs to know about mmap are: -+ * does it exist and is it safe to write into the mmap'd area -+ * how to use it (BSD variants) */ -+ -+#include <fcntl.h> -+#include <sys/mman.h> -+ -+#if !STDC_HEADERS && !HAVE_STDLIB_H -+char *malloc (); -+#endif -+ -+/* This mess was copied from the GNU getpagesize.h. */ -+#if !HAVE_GETPAGESIZE -+/* Assume that all systems that can run configure have sys/param.h. */ -+# if !HAVE_SYS_PARAM_H -+# define HAVE_SYS_PARAM_H 1 -+# endif -+ -+# ifdef _SC_PAGESIZE -+# define getpagesize() sysconf(_SC_PAGESIZE) -+# else /* no _SC_PAGESIZE */ -+# if HAVE_SYS_PARAM_H -+# include <sys/param.h> -+# ifdef EXEC_PAGESIZE -+# define getpagesize() EXEC_PAGESIZE -+# else /* no EXEC_PAGESIZE */ -+# ifdef NBPG -+# define getpagesize() NBPG * CLSIZE -+# ifndef CLSIZE -+# define CLSIZE 1 -+# endif /* no CLSIZE */ -+# else /* no NBPG */ -+# ifdef NBPC -+# define getpagesize() NBPC -+# else /* no NBPC */ -+# ifdef PAGESIZE -+# define getpagesize() PAGESIZE -+# endif /* PAGESIZE */ -+# endif /* no NBPC */ -+# endif /* no NBPG */ -+# endif /* no EXEC_PAGESIZE */ -+# else /* no HAVE_SYS_PARAM_H */ -+# define getpagesize() 8192 /* punt totally */ -+# endif /* no HAVE_SYS_PARAM_H */ -+# endif /* no _SC_PAGESIZE */ -+ -+#endif /* no HAVE_GETPAGESIZE */ -+ -+int -+main () -+{ -+ char *data, *data2, *data3; -+ int i, pagesize; -+ int fd; -+ -+ pagesize = getpagesize (); -+ -+ /* First, make a file with some known garbage in it. */ -+ data = (char *) malloc (pagesize); -+ if (!data) -+ exit (1); -+ for (i = 0; i < pagesize; ++i) -+ *(data + i) = rand (); -+ umask (0); -+ fd = creat ("conftest.mmap", 0600); -+ if (fd < 0) -+ exit (1); -+ if (write (fd, data, pagesize) != pagesize) -+ exit (1); -+ close (fd); -+ -+ /* Next, try to mmap the file at a fixed address which already has -+ something else allocated at it. If we can, also make sure that -+ we see the same garbage. */ -+ fd = open ("conftest.mmap", O_RDWR); -+ if (fd < 0) -+ exit (1); -+ data2 = (char *) malloc (2 * pagesize); -+ if (!data2) -+ exit (1); -+ data2 += (pagesize - ((long) data2 & (pagesize - 1))) & (pagesize - 1); -+ if (data2 != mmap (data2, pagesize, PROT_READ | PROT_WRITE, -+ MAP_PRIVATE | MAP_FIXED, fd, 0L)) -+ exit (1); -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data2 + i)) -+ exit (1); -+ -+ /* Finally, make sure that changes to the mapped area do not -+ percolate back to the file as seen by read(). (This is a bug on -+ some variants of i386 svr4.0.) */ -+ for (i = 0; i < pagesize; ++i) -+ *(data2 + i) = *(data2 + i) + 1; -+ data3 = (char *) malloc (pagesize); -+ if (!data3) -+ exit (1); -+ if (read (fd, data3, pagesize) != pagesize) -+ exit (1); -+ for (i = 0; i < pagesize; ++i) -+ if (*(data + i) != *(data3 + i)) -+ exit (1); -+ close (fd); -+ exit (0); -+} -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_func_mmap_fixed_mapped=yes -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_func_mmap_fixed_mapped=no -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+fi -+echo "$as_me:$LINENO: result: $ac_cv_func_mmap_fixed_mapped" >&5 -+echo "${ECHO_T}$ac_cv_func_mmap_fixed_mapped" >&6 -+if test $ac_cv_func_mmap_fixed_mapped = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_MMAP 1 -+_ACEOF -+ -+fi -+rm -f conftest.mmap -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_header in argz.h limits.h locale.h nl_types.h malloc.h string.h \ -+unistd.h values.h sys/param.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+for ac_func in getcwd munmap putenv setenv setlocale strchr strcasecmp \ -+__argz_count __argz_stringify __argz_next -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ -+ if test "${ac_cv_func_stpcpy+set}" != "set"; then -+ -+for ac_func in stpcpy -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ fi -+ if test "${ac_cv_func_stpcpy}" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_STPCPY 1 -+_ACEOF -+ -+ fi -+ -+ if test $ac_cv_header_locale_h = yes; then -+ echo "$as_me:$LINENO: checking for LC_MESSAGES" >&5 -+echo $ECHO_N "checking for LC_MESSAGES... $ECHO_C" >&6 -+if test "${am_cv_val_LC_MESSAGES+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <locale.h> -+int -+main () -+{ -+return LC_MESSAGES -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ am_cv_val_LC_MESSAGES=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+am_cv_val_LC_MESSAGES=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5 -+echo "${ECHO_T}$am_cv_val_LC_MESSAGES" >&6 -+ if test $am_cv_val_LC_MESSAGES = yes; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_LC_MESSAGES 1 -+_ACEOF -+ -+ fi -+ fi -+ echo "$as_me:$LINENO: checking whether NLS is requested" >&5 -+echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 -+ # Check whether --enable-nls or --disable-nls was given. -+if test "${enable_nls+set}" = set; then -+ enableval="$enable_nls" -+ USE_NLS=$enableval -+else -+ USE_NLS=yes -+fi; -+ echo "$as_me:$LINENO: result: $USE_NLS" >&5 -+echo "${ECHO_T}$USE_NLS" >&6 -+ -+ -+ USE_INCLUDED_LIBINTL=no -+ -+ if test "$USE_NLS" = "yes"; then -+ echo "$as_me:$LINENO: checking whether included gettext is requested" >&5 -+echo $ECHO_N "checking whether included gettext is requested... $ECHO_C" >&6 -+ -+# Check whether --with-included-gettext or --without-included-gettext was given. -+if test "${with_included_gettext+set}" = set; then -+ withval="$with_included_gettext" -+ nls_cv_force_use_gnu_gettext=$withval -+else -+ nls_cv_force_use_gnu_gettext=no -+fi; -+ echo "$as_me:$LINENO: result: $nls_cv_force_use_gnu_gettext" >&5 -+echo "${ECHO_T}$nls_cv_force_use_gnu_gettext" >&6 -+ -+ nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" -+ if test "$nls_cv_force_use_gnu_gettext" != "yes"; then -+ nls_cv_header_intl= -+ nls_cv_header_libgt= -+ CATOBJEXT= -+ -+ if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -+if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking libintl.h usability" >&5 -+echo $ECHO_N "checking libintl.h usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <libintl.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking libintl.h presence" >&5 -+echo $ECHO_N "checking libintl.h presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <libintl.h> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: libintl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: libintl.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: libintl.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: libintl.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: libintl.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: libintl.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: libintl.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: libintl.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: libintl.h: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for libintl.h" >&5 -+echo $ECHO_N "checking for libintl.h... $ECHO_C" >&6 -+if test "${ac_cv_header_libintl_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_libintl_h=$ac_header_preproc -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_libintl_h" >&5 -+echo "${ECHO_T}$ac_cv_header_libintl_h" >&6 -+ -+fi -+if test $ac_cv_header_libintl_h = yes; then -+ echo "$as_me:$LINENO: checking for gettext in libc" >&5 -+echo $ECHO_N "checking for gettext in libc... $ECHO_C" >&6 -+if test "${gt_cv_func_gettext_libc+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <libintl.h> -+int -+main () -+{ -+return (int) gettext ("") -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ gt_cv_func_gettext_libc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+gt_cv_func_gettext_libc=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libc" >&5 -+echo "${ECHO_T}$gt_cv_func_gettext_libc" >&6 -+ -+ if test "$gt_cv_func_gettext_libc" != "yes"; then -+ echo "$as_me:$LINENO: checking for bindtextdomain in -lintl" >&5 -+echo $ECHO_N "checking for bindtextdomain in -lintl... $ECHO_C" >&6 -+if test "${ac_cv_lib_intl_bindtextdomain+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lintl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char bindtextdomain (); -+int -+main () -+{ -+bindtextdomain (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_intl_bindtextdomain=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_intl_bindtextdomain=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_intl_bindtextdomain" >&5 -+echo "${ECHO_T}$ac_cv_lib_intl_bindtextdomain" >&6 -+if test $ac_cv_lib_intl_bindtextdomain = yes; then -+ echo "$as_me:$LINENO: checking for gettext in libintl" >&5 -+echo $ECHO_N "checking for gettext in libintl... $ECHO_C" >&6 -+if test "${gt_cv_func_gettext_libintl+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+return (int) gettext ("") -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ gt_cv_func_gettext_libintl=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+gt_cv_func_gettext_libintl=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $gt_cv_func_gettext_libintl" >&5 -+echo "${ECHO_T}$gt_cv_func_gettext_libintl" >&6 -+fi -+ -+ fi -+ -+ if test "$gt_cv_func_gettext_libc" = "yes" \ -+ || test "$gt_cv_func_gettext_libintl" = "yes"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define HAVE_GETTEXT 1 -+_ACEOF -+ -+ # Extract the first word of "msgfmt", so it can be a program name with args. -+set dummy msgfmt; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_MSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$MSGFMT" in -+ /*) -+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -+ ac_cv_path_MSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" -+ ;; -+esac -+fi -+MSGFMT="$ac_cv_path_MSGFMT" -+if test -n "$MSGFMT"; then -+ echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ if test "$MSGFMT" != "no"; then -+ -+for ac_func in dcgettext -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ # Extract the first word of "gmsgfmt", so it can be a program name with args. -+set dummy gmsgfmt; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_GMSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $GMSGFMT in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -+ ;; -+esac -+fi -+GMSGFMT=$ac_cv_path_GMSGFMT -+ -+if test -n "$GMSGFMT"; then -+ echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ # Extract the first word of "xgettext", so it can be a program name with args. -+set dummy xgettext; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_XGETTEXT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$XGETTEXT" in -+ /*) -+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -+ ;; -+esac -+fi -+XGETTEXT="$ac_cv_path_XGETTEXT" -+if test -n "$XGETTEXT"; then -+ echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+echo "${ECHO_T}$XGETTEXT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ CATOBJEXT=.gmo -+ DATADIRNAME=share -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+CATOBJEXT=.mo -+ DATADIRNAME=lib -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ INSTOBJEXT=.mo -+ fi -+ fi -+ -+fi -+ -+ -+ -+ -+ if test x"$CATOBJEXT" = x && test -d $srcdir/../intl; then -+ # Neither gettext nor catgets in included in the C library. -+ # Fall back on GNU gettext library (assuming it is present). -+ nls_cv_use_gnu_gettext=yes -+ fi -+ fi -+ -+ if test "$nls_cv_use_gnu_gettext" = "yes"; then -+ INTLOBJS="\$(GETTOBJS)" -+ # Extract the first word of "msgfmt", so it can be a program name with args. -+set dummy msgfmt; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_MSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$MSGFMT" in -+ /*) -+ ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then -+ ac_cv_path_MSGFMT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="msgfmt" -+ ;; -+esac -+fi -+MSGFMT="$ac_cv_path_MSGFMT" -+if test -n "$MSGFMT"; then -+ echo "$as_me:$LINENO: result: $MSGFMT" >&5 -+echo "${ECHO_T}$MSGFMT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ # Extract the first word of "gmsgfmt", so it can be a program name with args. -+set dummy gmsgfmt; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_GMSGFMT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case $GMSGFMT in -+ [\\/]* | ?:[\\/]*) -+ ac_cv_path_GMSGFMT="$GMSGFMT" # Let the user override the test with a path. -+ ;; -+ *) -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_path_GMSGFMT" && ac_cv_path_GMSGFMT="$MSGFMT" -+ ;; -+esac -+fi -+GMSGFMT=$ac_cv_path_GMSGFMT -+ -+if test -n "$GMSGFMT"; then -+ echo "$as_me:$LINENO: result: $GMSGFMT" >&5 -+echo "${ECHO_T}$GMSGFMT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ # Extract the first word of "xgettext", so it can be a program name with args. -+set dummy xgettext; ac_word=$2 -+echo "$as_me:$LINENO: checking for $ac_word" >&5 -+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -+if test "${ac_cv_path_XGETTEXT+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ case "$XGETTEXT" in -+ /*) -+ ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" -+ for ac_dir in $PATH; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ if test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"; then -+ ac_cv_path_XGETTEXT="$ac_dir/$ac_word" -+ break -+ fi -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT=":" -+ ;; -+esac -+fi -+XGETTEXT="$ac_cv_path_XGETTEXT" -+if test -n "$XGETTEXT"; then -+ echo "$as_me:$LINENO: result: $XGETTEXT" >&5 -+echo "${ECHO_T}$XGETTEXT" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ -+ USE_INCLUDED_LIBINTL=yes -+ CATOBJEXT=.gmo -+ INSTOBJEXT=.mo -+ DATADIRNAME=share -+ INTLDEPS='$(top_builddir)/../intl/libintl.a' -+ INTLLIBS=$INTLDEPS -+ LIBS=`echo $LIBS | sed -e 's/-lintl//'` -+ nls_cv_header_intl=libintl.h -+ nls_cv_header_libgt=libgettext.h -+ fi -+ -+ if test "$XGETTEXT" != ":"; then -+ if $XGETTEXT --omit-header /dev/null 2> /dev/null; then -+ : ; -+ else -+ echo "$as_me:$LINENO: result: found xgettext programs is not GNU xgettext; ignore it" >&5 -+echo "${ECHO_T}found xgettext programs is not GNU xgettext; ignore it" >&6 -+ XGETTEXT=":" -+ fi -+ fi -+ -+ # We need to process the po/ directory. -+ POSUB=po -+ else -+ DATADIRNAME=share -+ nls_cv_header_intl=libintl.h -+ nls_cv_header_libgt=libgettext.h -+ fi -+ -+ # If this is used in GNU gettext we have to set USE_NLS to `yes' -+ # because some of the sources are only built for this goal. -+ if test "$PACKAGE" = gettext; then -+ USE_NLS=yes -+ USE_INCLUDED_LIBINTL=yes -+ fi -+ -+ for lang in $ALL_LINGUAS; do -+ GMOFILES="$GMOFILES $lang.gmo" -+ POFILES="$POFILES $lang.po" -+ done -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ if test "x$CATOBJEXT" != "x"; then -+ -+cat >>confdefs.h <<\_ACEOF -+#define ENABLE_NLS 1 -+_ACEOF -+ -+ fi -+ -+ -+ if test "x$CATOBJEXT" != "x"; then -+ if test "x$ALL_LINGUAS" = "x"; then -+ LINGUAS= -+ else -+ echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 -+echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 -+ NEW_LINGUAS= -+ for lang in ${LINGUAS=$ALL_LINGUAS}; do -+ case "$ALL_LINGUAS" in -+ *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; -+ esac -+ done -+ LINGUAS=$NEW_LINGUAS -+ echo "$as_me:$LINENO: result: $LINGUAS" >&5 -+echo "${ECHO_T}$LINGUAS" >&6 -+ fi -+ -+ if test -n "$LINGUAS"; then -+ for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done -+ fi -+ fi -+ -+ if test $ac_cv_header_locale_h = yes; then -+ INCLUDE_LOCALE_H="#include <locale.h>" -+ else -+ INCLUDE_LOCALE_H="\ -+/* The system does not provide the header <locale.h>. Take care yourself. */" -+ fi -+ -+ -+ if test -f $srcdir/po2tbl.sed.in; then -+ if test "$CATOBJEXT" = ".cat"; then -+ if test "${ac_cv_header_linux_version_h+set}" = set; then -+ echo "$as_me:$LINENO: checking for linux/version.h" >&5 -+echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 -+if test "${ac_cv_header_linux_version_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 -+echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking linux/version.h usability" >&5 -+echo $ECHO_N "checking linux/version.h usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <linux/version.h> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking linux/version.h presence" >&5 -+echo $ECHO_N "checking linux/version.h presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <linux/version.h> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: linux/version.h: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: linux/version.h: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: linux/version.h: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: linux/version.h: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: linux/version.h: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: linux/version.h: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: linux/version.h: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: linux/version.h: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: linux/version.h: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for linux/version.h" >&5 -+echo $ECHO_N "checking for linux/version.h... $ECHO_C" >&6 -+if test "${ac_cv_header_linux_version_h+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_cv_header_linux_version_h=$ac_header_preproc -+fi -+echo "$as_me:$LINENO: result: $ac_cv_header_linux_version_h" >&5 -+echo "${ECHO_T}$ac_cv_header_linux_version_h" >&6 -+ -+fi -+if test $ac_cv_header_linux_version_h = yes; then -+ msgformat=linux -+else -+ msgformat=xopen -+fi -+ -+ -+ -+ sed -e '/^#/d' $srcdir/$msgformat-msg.sed > po2msg.sed -+ fi -+ sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ -+ $srcdir/po2tbl.sed.in > po2tbl.sed -+ fi -+ -+ if test "$PACKAGE" = "gettext"; then -+ GT_NO="#NO#" -+ GT_YES= -+ else -+ GT_NO= -+ GT_YES="#YES#" -+ fi -+ -+ -+ -+ MKINSTALLDIRS="\$(srcdir)/../../mkinstalldirs" -+ -+ -+ l= -+ -+ -+ if test -f $srcdir/po/POTFILES.in; then -+ test -d po || mkdir po -+ if test "x$srcdir" != "x."; then -+ if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then -+ posrcprefix="$srcdir/" -+ else -+ posrcprefix="../$srcdir/" -+ fi -+ else -+ posrcprefix="../" -+ fi -+ rm -f po/POTFILES -+ sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ -+ < $srcdir/po/POTFILES.in > po/POTFILES -+ fi -+ -+ -+# Check for common headers. -+# FIXME: Seems to me this can cause problems for i386-windows hosts. -+# At one point there were hardcoded AC_DEFINE's if ${host} = i386-*-windows*. -+ -+ -+ -+ -+ -+for ac_header in stdlib.h string.h strings.h unistd.h time.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+for ac_header in sys/time.h sys/resource.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+for ac_header in fcntl.h fpu_control.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+ -+for ac_header in dlfcn.h errno.h sys/stat.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+ -+ -+for ac_func in getrusage time sigaction __setfpucw -+do -+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -+echo "$as_me:$LINENO: checking for $ac_func" >&5 -+echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_var+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $ac_func innocuous_$ac_func -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $ac_func (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $ac_func -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+{ -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+char (*f) () = $ac_func; -+#endif -+#ifdef __cplusplus -+} -+#endif -+ -+int -+main () -+{ -+return f != $ac_func; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ eval "$as_ac_var=yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+eval "$as_ac_var=no" -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -+if test `eval echo '${'$as_ac_var'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+done -+ -+ -+# Check for socket libraries -+ -+echo "$as_me:$LINENO: checking for bind in -lsocket" >&5 -+echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6 -+if test "${ac_cv_lib_socket_bind+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lsocket $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char bind (); -+int -+main () -+{ -+bind (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_socket_bind=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_socket_bind=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5 -+echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6 -+if test $ac_cv_lib_socket_bind = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBSOCKET 1 -+_ACEOF -+ -+ LIBS="-lsocket $LIBS" -+ -+fi -+ -+ -+echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 -+echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ ac_check_lib_save_LIBS=$LIBS -+LIBS="-lnsl $LIBS" -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char gethostbyname (); -+int -+main () -+{ -+gethostbyname (); -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_lib_nsl_gethostbyname=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_lib_nsl_gethostbyname=no -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+LIBS=$ac_check_lib_save_LIBS -+fi -+echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 -+if test $ac_cv_lib_nsl_gethostbyname = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_LIBNSL 1 -+_ACEOF -+ -+ LIBS="-lnsl $LIBS" -+ -+fi -+ -+ -+. ${srcdir}/../../bfd/configure.host -+ -+ -+ -+USE_MAINTAINER_MODE=no -+# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then -+ enableval="$enable_maintainer_mode" -+ case "${enableval}" in -+ yes) MAINT="" USE_MAINTAINER_MODE=yes ;; -+ no) MAINT="#" ;; -+ *) { { echo "$as_me:$LINENO: error: \"--enable-maintainer-mode does not take a value\"" >&5 -+echo "$as_me: error: \"--enable-maintainer-mode does not take a value\"" >&2;} -+ { (exit 1); exit 1; }; }; MAINT="#" ;; -+esac -+if test x"$silent" != x"yes" && test x"$MAINT" = x""; then -+ echo "Setting maintainer mode" 6>&1 -+fi -+else -+ MAINT="#" -+fi; -+ -+ -+# Check whether --enable-sim-bswap or --disable-sim-bswap was given. -+if test "${enable_sim_bswap+set}" = set; then -+ enableval="$enable_sim_bswap" -+ case "${enableval}" in -+ yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";; -+ no) sim_bswap="-DWITH_BSWAP=0";; -+ *) { { echo "$as_me:$LINENO: error: \"--enable-sim-bswap does not take a value\"" >&5 -+echo "$as_me: error: \"--enable-sim-bswap does not take a value\"" >&2;} -+ { (exit 1); exit 1; }; }; sim_bswap="";; -+esac -+if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then -+ echo "Setting bswap flags = $sim_bswap" 6>&1 -+fi -+else -+ sim_bswap="" -+fi; -+ -+ -+# Check whether --enable-sim-cflags or --disable-sim-cflags was given. -+if test "${enable_sim_cflags+set}" = set; then -+ enableval="$enable_sim_cflags" -+ case "${enableval}" in -+ yes) sim_cflags="-O2 -fomit-frame-pointer";; -+ trace) { { echo "$as_me:$LINENO: error: \"Please use --enable-sim-debug instead.\"" >&5 -+echo "$as_me: error: \"Please use --enable-sim-debug instead.\"" >&2;} -+ { (exit 1); exit 1; }; }; sim_cflags="";; -+ no) sim_cflags="";; -+ *) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;; -+esac -+if test x"$silent" != x"yes" && test x"$sim_cflags" != x""; then -+ echo "Setting sim cflags = $sim_cflags" 6>&1 -+fi -+else -+ sim_cflags="" -+fi; -+ -+ -+# Check whether --enable-sim-debug or --disable-sim-debug was given. -+if test "${enable_sim_debug+set}" = set; then -+ enableval="$enable_sim_debug" -+ case "${enableval}" in -+ yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; -+ no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; -+ *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; -+esac -+if test x"$silent" != x"yes" && test x"$sim_debug" != x""; then -+ echo "Setting sim debug = $sim_debug" 6>&1 -+fi -+else -+ sim_debug="" -+fi; -+ -+ -+# Check whether --enable-sim-stdio or --disable-sim-stdio was given. -+if test "${enable_sim_stdio+set}" = set; then -+ enableval="$enable_sim_stdio" -+ case "${enableval}" in -+ yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; -+ no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; -+ *) { { echo "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&5 -+echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&2;} -+ { (exit 1); exit 1; }; }; sim_stdio="";; -+esac -+if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then -+ echo "Setting stdio flags = $sim_stdio" 6>&1 -+fi -+else -+ sim_stdio="" -+fi; -+ -+ -+# Check whether --enable-sim-trace or --disable-sim-trace was given. -+if test "${enable_sim_trace+set}" = set; then -+ enableval="$enable_sim_trace" -+ case "${enableval}" in -+ yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";; -+ no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";; -+ [-0-9]*) -+ sim_trace="-DTRACE='(${enableval})' -DWITH_TRACE='(${enableval})'";; -+ [a-z]*) -+ sim_trace="" -+ for x in `echo "$enableval" | sed -e "s/,/ /g"`; do -+ if test x"$sim_trace" = x; then -+ sim_trace="-DWITH_TRACE='(TRACE_$x" -+ else -+ sim_trace="${sim_trace}|TRACE_$x" -+ fi -+ done -+ sim_trace="$sim_trace)'" ;; -+esac -+if test x"$silent" != x"yes" && test x"$sim_trace" != x""; then -+ echo "Setting sim trace = $sim_trace" 6>&1 -+fi -+else -+ sim_trace="" -+fi; -+ -+ -+# Check whether --enable-sim-profile or --disable-sim-profile was given. -+if test "${enable_sim_profile+set}" = set; then -+ enableval="$enable_sim_profile" -+ case "${enableval}" in -+ yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; -+ no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; -+ [-0-9]*) -+ sim_profile="-DPROFILE='(${enableval})' -DWITH_PROFILE='(${enableval})'";; -+ [a-z]*) -+ sim_profile="" -+ for x in `echo "$enableval" | sed -e "s/,/ /g"`; do -+ if test x"$sim_profile" = x; then -+ sim_profile="-DWITH_PROFILE='(PROFILE_$x" -+ else -+ sim_profile="${sim_profile}|PROFILE_$x" -+ fi -+ done -+ sim_profile="$sim_profile)'" ;; -+esac -+if test x"$silent" != x"yes" && test x"$sim_profile" != x""; then -+ echo "Setting sim profile = $sim_profile" 6>&1 -+fi -+else -+ sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" -+fi; -+ -+ -+echo "$as_me:$LINENO: checking return type of signal handlers" >&5 -+echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 -+if test "${ac_cv_type_signal+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <sys/types.h> -+#include <signal.h> -+#ifdef signal -+# undef signal -+#endif -+#ifdef __cplusplus -+extern "C" void (*signal (int, void (*)(int)))(int); -+#else -+void (*signal ()) (); -+#endif -+ -+int -+main () -+{ -+int i; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_type_signal=void -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_type_signal=int -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 -+echo "${ECHO_T}$ac_cv_type_signal" >&6 -+ -+cat >>confdefs.h <<_ACEOF -+#define RETSIGTYPE $ac_cv_type_signal -+_ACEOF -+ -+ -+ -+ -+ -+sim_link_files= -+sim_link_links= -+ -+sim_link_links=tconfig.h -+if test -f ${srcdir}/tconfig.in -+then -+ sim_link_files=tconfig.in -+else -+ sim_link_files=../common/tconfig.in -+fi -+ -+# targ-vals.def points to the libc macro description file. -+case "${target}" in -+*-*-*) TARG_VALS_DEF=../common/nltvals.def ;; -+esac -+sim_link_files="${sim_link_files} ${TARG_VALS_DEF}" -+sim_link_links="${sim_link_links} targ-vals.def" -+ -+ -+ -+for ac_header in unistd.h -+do -+as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+else -+ # Is the header compilable? -+echo "$as_me:$LINENO: checking $ac_header usability" >&5 -+echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+$ac_includes_default -+#include <$ac_header> -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_header_compiler=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_header_compiler=no -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 -+echo "${ECHO_T}$ac_header_compiler" >&6 -+ -+# Is the header present? -+echo "$as_me:$LINENO: checking $ac_header presence" >&5 -+echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 -+cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+#include <$ac_header> -+_ACEOF -+if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } >/dev/null; then -+ if test -s conftest.err; then -+ ac_cpp_err=$ac_c_preproc_warn_flag -+ ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -+ else -+ ac_cpp_err= -+ fi -+else -+ ac_cpp_err=yes -+fi -+if test -z "$ac_cpp_err"; then -+ ac_header_preproc=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 -+echo "${ECHO_T}$ac_header_preproc" >&6 -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -+ yes:no: ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 -+echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -+ ac_header_preproc=yes -+ ;; -+ no:yes:* ) -+ { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 -+echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 -+echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 -+echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 -+echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 -+echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -+ { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 -+echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -+ ( -+ cat <<\_ASBOX -+## ------------------------------------------ ## -+## Report this to the AC_PACKAGE_NAME lists. ## -+## ------------------------------------------ ## -+_ASBOX -+ ) | -+ sed "s/^/$as_me: WARNING: /" >&2 -+ ;; -+esac -+echo "$as_me:$LINENO: checking for $ac_header" >&5 -+echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 -+if eval "test \"\${$as_ac_Header+set}\" = set"; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ eval "$as_ac_Header=\$ac_header_preproc" -+fi -+echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 -+echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -+ -+fi -+if test `eval echo '${'$as_ac_Header'}'` = yes; then -+ cat >>confdefs.h <<_ACEOF -+#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+_ACEOF -+ -+fi -+ -+done -+ -+ -+ -+ac_sources="$sim_link_files" -+ac_dests="$sim_link_links" -+while test -n "$ac_sources"; do -+ set $ac_dests; ac_dest=$1; shift; ac_dests=$* -+ set $ac_sources; ac_source=$1; shift; ac_sources=$* -+ ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source" -+done -+ ac_config_links="$ac_config_links $ac_config_links_1" -+ -+cgen_breaks="" -+if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then -+cgen_breaks="break cgen_rtx_error"; -+fi -+ -+ ac_config_files="$ac_config_files Makefile.sim:Makefile.in" -+ -+ ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in" -+ -+ ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in" -+ -+ ac_config_commands="$ac_config_commands Makefile" -+ -+ ac_config_commands="$ac_config_commands stamp-h" -+ -+cat >confcache <<\_ACEOF -+# This file is a shell script that caches the results of configure -+# tests run on this system so they can be shared between configure -+# scripts and configure runs, see configure's option --config-cache. -+# It is not useful on other systems. If it contains results you don't -+# want to keep, you may remove or edit it. -+# -+# config.status only pays attention to the cache file if you give it -+# the --recheck option to rerun configure. -+# -+# `ac_cv_env_foo' variables (set or unset) will be overridden when -+# loading this file, other *unset* `ac_cv_foo' will be assigned the -+# following values. -+ -+_ACEOF -+ -+# The following way of writing the cache mishandles newlines in values, -+# but we know of no workaround that is simple, portable, and efficient. -+# So, don't put newlines in cache variables' values. -+# Ultrix sh set writes to stderr and can't be redirected directly, -+# and sets the high bit in the cache file unless we assign to the vars. -+{ -+ (set) 2>&1 | -+ case `(ac_space=' '; set | grep ac_space) 2>&1` in -+ *ac_space=\ *) -+ # `set' does not quote correctly, so add quotes (double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \). -+ sed -n \ -+ "s/'/'\\\\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -+ ;; -+ *) -+ # `set' quotes correctly as required by POSIX, so do not add quotes. -+ sed -n \ -+ "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ ;; -+ esac; -+} | -+ sed ' -+ t clear -+ : clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ : end' >>confcache -+if diff $cache_file confcache >/dev/null 2>&1; then :; else -+ if test -w $cache_file; then -+ test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ cat confcache >$cache_file -+ else -+ echo "not updating unwritable cache $cache_file" -+ fi -+fi -+rm -f confcache -+ -+test "x$prefix" = xNONE && prefix=$ac_default_prefix -+# Let make expand exec_prefix. -+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' -+ -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/; -+s/:*\${srcdir}:*/:/; -+s/:*@srcdir@:*/:/; -+s/^\([^=]*=[ ]*\):*/\1/; -+s/:*$//; -+s/^[^=]*=[ ]*$//; -+}' -+fi -+ -+DEFS=-DHAVE_CONFIG_H -+ -+ac_libobjs= -+ac_ltlibobjs= -+for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue -+ # 1. Remove the extension, and $U if already installed. -+ ac_i=`echo "$ac_i" | -+ sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -+ # 2. Add them. -+ ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+done -+LIBOBJS=$ac_libobjs -+ -+LTLIBOBJS=$ac_ltlibobjs -+ -+ -+ -+: ${CONFIG_STATUS=./config.status} -+ac_clean_files_save=$ac_clean_files -+ac_clean_files="$ac_clean_files $CONFIG_STATUS" -+{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 -+echo "$as_me: creating $CONFIG_STATUS" >&6;} -+cat >$CONFIG_STATUS <<_ACEOF -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate the current configuration. -+# Compiler output produced by configure, useful for debugging -+# configure, is in config.log if it exists. -+ -+debug=false -+ac_cs_recheck=false -+ac_cs_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+## --------------------- ## -+## M4sh Initialization. ## -+## --------------------- ## -+ -+# Be Bourne compatible -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+ emulate sh -+ NULLCMD=: -+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '${1+"$@"}'='"$@"' -+elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -+ set -o posix -+fi -+DUALCASE=1; export DUALCASE # for MKS sh -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+$as_unset ENV MAIL MAILPATH -+PS1='$ ' -+PS2='> ' -+PS4='+ ' -+ -+# NLS nuisances. -+for as_var in \ -+ LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -+ LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -+ LC_TELEPHONE LC_TIME -+do -+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -+ eval $as_var=C; export $as_var -+ else -+ $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+ as_basename=basename -+else -+ as_basename=false -+fi -+ -+ -+# Name of the executable. -+as_me=`$as_basename "$0" || -+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ -+ X"$0" : 'X\(//\)$' \| \ -+ X"$0" : 'X\(/\)$' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -+ /^X\/\(\/\/\)$/{ s//\1/; q; } -+ /^X\/\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ -+ -+# PATH needs CR, and LINENO needs CR and PATH. -+# Avoid depending upon Character Ranges. -+as_cr_letters='abcdefghijklmnopqrstuvwxyz' -+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -+as_cr_Letters=$as_cr_letters$as_cr_LETTERS -+as_cr_digits='0123456789' -+as_cr_alnum=$as_cr_Letters$as_cr_digits -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ echo "#! /bin/sh" >conf$$.sh -+ echo "exit 0" >>conf$$.sh -+ chmod +x conf$$.sh -+ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -+ PATH_SEPARATOR=';' -+ else -+ PATH_SEPARATOR=: -+ fi -+ rm -f conf$$.sh -+fi -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x$as_lineno_3" = "x$as_lineno_2" || { -+ # Find who we are. Look in the path if we contain no path at all -+ # relative or not. -+ case $0 in -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+done -+ -+ ;; -+ esac -+ # We did not find ourselves, most probably we were run as `sh COMMAND' -+ # in which case we are not to be found in the path. -+ if test "x$as_myself" = x; then -+ as_myself=$0 -+ fi -+ if test ! -f "$as_myself"; then -+ { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 -+echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ case $CONFIG_SHELL in -+ '') -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for as_base in sh bash ksh sh5; do -+ case $as_dir in -+ /*) -+ if ("$as_dir/$as_base" -c ' -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -+ $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -+ $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -+ CONFIG_SHELL=$as_dir/$as_base -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$0" ${1+"$@"} -+ fi;; -+ esac -+ done -+done -+;; -+ esac -+ -+ # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -+ # uniformly replaced by the line number. The first 'sed' inserts a -+ # line-number line before each line; the second 'sed' does the real -+ # work. The second script uses 'N' to pair each line-number line -+ # with the numbered line, and appends trailing '-' during -+ # substitution so that $LINENO is not a special case at line end. -+ # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -+ # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -+ sed '=' <$as_myself | -+ sed ' -+ N -+ s,$,-, -+ : loop -+ s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ t loop -+ s,-$,, -+ s,^['$as_cr_digits']*\n,, -+ ' >$as_me.lineno && -+ chmod +x $as_me.lineno || -+ { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 -+echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -+ { (exit 1); exit 1; }; } -+ -+ # Don't try to exec as it changes $[0], causing all sort of problems -+ # (the dirname of $[0] is not the place where we might find the -+ # original and so on. Autoconf is especially sensible to this). -+ . ./$as_me.lineno -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -+ *c*,-n*) ECHO_N= ECHO_C=' -+' ECHO_T=' ' ;; -+ *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -+ *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+esac -+ -+if expr a : '\(a\)' >/dev/null 2>&1; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+echo >conf$$.file -+if ln -s conf$$.file conf$$ 2>/dev/null; then -+ # We could just check for DJGPP; but this test a) works b) is more generic -+ # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -+ if test -f conf$$.exe; then -+ # Don't use ln at all; we don't have any links -+ as_ln_s='cp -p' -+ else -+ as_ln_s='ln -s' -+ fi -+elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+else -+ as_ln_s='cp -p' -+fi -+rm -f conf$$ conf$$.exe conf$$.file -+ -+if mkdir -p . 2>/dev/null; then -+ as_mkdir_p=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+as_executable_p="test -f" -+ -+# Sed expression to map a string onto a valid CPP name. -+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+# IFS -+# We need space, tab and new line, in precisely that order. -+as_nl=' -+' -+IFS=" $as_nl" -+ -+# CDPATH. -+$as_unset CDPATH -+ -+exec 6>&1 -+ -+# Open the log real soon, to keep \$[0] and so on meaningful, and to -+# report actual input values of CONFIG_FILES etc. instead of their -+# values after options handling. Logging --version etc. is OK. -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+} >&5 -+cat >&5 <<_CSEOF -+ -+This file was extended by $as_me, which was -+generated by GNU Autoconf 2.59. Invocation command line was -+ -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ -+ -+_CSEOF -+echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 -+echo >&5 -+_ACEOF -+ -+# Files that config.status was made for. -+if test -n "$ac_config_files"; then -+ echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS -+fi -+ -+if test -n "$ac_config_headers"; then -+ echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS -+fi -+ -+if test -n "$ac_config_links"; then -+ echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS -+fi -+ -+if test -n "$ac_config_commands"; then -+ echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS -+fi -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -+ac_cs_usage="\ -+\`$as_me' instantiates files from templates according to the -+current configuration. -+ -+Usage: $0 [OPTIONS] [FILE]... -+ -+ -h, --help print this help, then exit -+ -V, --version print version number, then exit -+ -q, --quiet do not print progress messages -+ -d, --debug don't remove temporary files -+ --recheck update $as_me by reconfiguring in the same conditions -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE -+ -+Configuration files: -+$config_files -+ -+Configuration headers: -+$config_headers -+ -+Configuration links: -+$config_links -+ -+Configuration commands: -+$config_commands -+ -+Report bugs to <bug-autoconf@gnu.org>." -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+ac_cs_version="\\ -+config.status -+configured by $0, generated by GNU Autoconf 2.59, -+ with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+ -+Copyright (C) 2003 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." -+srcdir=$srcdir -+INSTALL="$INSTALL" -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+# If no file are specified by the user, then we need to provide default -+# value. By we need to know if files were specified by the user. -+ac_need_defaults=: -+while test $# != 0 -+do -+ case $1 in -+ --*=*) -+ ac_option=`expr "x$1" : 'x\([^=]*\)='` -+ ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ ac_shift=: -+ ;; -+ -*) -+ ac_option=$1 -+ ac_optarg=$2 -+ ac_shift=shift -+ ;; -+ *) # This is not an option, so the user has probably given explicit -+ # arguments. -+ ac_option=$1 -+ ac_need_defaults=false;; -+ esac -+ -+ case $ac_option in -+ # Handling of the options. -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; -+ --version | --vers* | -V ) -+ echo "$ac_cs_version"; exit 0 ;; -+ --he | --h) -+ # Conflict between --help and --header -+ { { echo "$as_me:$LINENO: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&5 -+echo "$as_me: error: ambiguous option: $1 -+Try \`$0 --help' for more information." >&2;} -+ { (exit 1); exit 1; }; };; -+ --help | --hel | -h ) -+ echo "$ac_cs_usage"; exit 0 ;; -+ --debug | --d* | -d ) -+ debug=: ;; -+ --file | --fil | --fi | --f ) -+ $ac_shift -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ ac_need_defaults=false;; -+ --header | --heade | --head | --hea ) -+ $ac_shift -+ CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ ac_need_defaults=false;; -+ -q | -quiet | --quiet | --quie | --qui | --qu | --q \ -+ | -silent | --silent | --silen | --sile | --sil | --si | --s) -+ ac_cs_silent=: ;; -+ -+ # This is an error. -+ -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&5 -+echo "$as_me: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2;} -+ { (exit 1); exit 1; }; } ;; -+ -+ *) ac_config_targets="$ac_config_targets $1" ;; -+ -+ esac -+ shift -+done -+ -+ac_configure_extra_args= -+ -+if $ac_cs_silent; then -+ exec 6>/dev/null -+ ac_configure_extra_args="$ac_configure_extra_args --silent" -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+if \$ac_cs_recheck; then -+ echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+fi -+ -+_ACEOF -+ -+ -+ -+ -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+for ac_config_target in $ac_config_targets -+do -+ case "$ac_config_target" in -+ # Handling of arguments. -+ "Makefile.sim" ) CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;; -+ "Make-common.sim" ) CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;; -+ ".gdbinit" ) CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;; -+ "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;; -+ "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; -+ "stamp-h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;; -+ "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; -+ *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 -+echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+done -+ -+# If the user did not use the arguments to specify the items to instantiate, -+# then the envvar interface is used. Set only those that are not. -+# We use the long form for the default assignment because of an extremely -+# bizarre bug on SunOS 4.1.3. -+if $ac_need_defaults; then -+ test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files -+ test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers -+ test "${CONFIG_LINKS+set}" = set || CONFIG_LINKS=$config_links -+ test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands -+fi -+ -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason to put it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# Create a temporary directory, and hook for its removal unless debugging. -+$debug || -+{ -+ trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -+ trap '{ (exit 1); exit 1; }' 1 2 13 15 -+} -+ -+# Create a (secure) tmp directory for tmp files. -+ -+{ -+ tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ test -n "$tmp" && test -d "$tmp" -+} || -+{ -+ tmp=./confstat$$-$RANDOM -+ (umask 077 && mkdir $tmp) -+} || -+{ -+ echo "$me: cannot create a temporary directory in ." >&2 -+ { (exit 1); exit 1; } -+} -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+ -+# -+# CONFIG_FILES section. -+# -+ -+# No need to generate the scripts if there are no CONFIG_FILES. -+# This happens for instance when ./config.status config.h -+if test -n "\$CONFIG_FILES"; then -+ # Protect against being on the right side of a sed subst in config.status. -+ sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -+ s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF -+s,@SHELL@,$SHELL,;t t -+s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t -+s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t -+s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t -+s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t -+s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t -+s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t -+s,@exec_prefix@,$exec_prefix,;t t -+s,@prefix@,$prefix,;t t -+s,@program_transform_name@,$program_transform_name,;t t -+s,@bindir@,$bindir,;t t -+s,@sbindir@,$sbindir,;t t -+s,@libexecdir@,$libexecdir,;t t -+s,@datadir@,$datadir,;t t -+s,@sysconfdir@,$sysconfdir,;t t -+s,@sharedstatedir@,$sharedstatedir,;t t -+s,@localstatedir@,$localstatedir,;t t -+s,@libdir@,$libdir,;t t -+s,@includedir@,$includedir,;t t -+s,@oldincludedir@,$oldincludedir,;t t -+s,@infodir@,$infodir,;t t -+s,@mandir@,$mandir,;t t -+s,@build_alias@,$build_alias,;t t -+s,@host_alias@,$host_alias,;t t -+s,@target_alias@,$target_alias,;t t -+s,@DEFS@,$DEFS,;t t -+s,@ECHO_C@,$ECHO_C,;t t -+s,@ECHO_N@,$ECHO_N,;t t -+s,@ECHO_T@,$ECHO_T,;t t -+s,@LIBS@,$LIBS,;t t -+s,@sim_environment@,$sim_environment,;t t -+s,@sim_alignment@,$sim_alignment,;t t -+s,@sim_assert@,$sim_assert,;t t -+s,@sim_bitsize@,$sim_bitsize,;t t -+s,@sim_endian@,$sim_endian,;t t -+s,@sim_hostendian@,$sim_hostendian,;t t -+s,@sim_float@,$sim_float,;t t -+s,@sim_scache@,$sim_scache,;t t -+s,@sim_default_model@,$sim_default_model,;t t -+s,@sim_hw_cflags@,$sim_hw_cflags,;t t -+s,@sim_hw_objs@,$sim_hw_objs,;t t -+s,@sim_hw@,$sim_hw,;t t -+s,@sim_inline@,$sim_inline,;t t -+s,@sim_packages@,$sim_packages,;t t -+s,@sim_regparm@,$sim_regparm,;t t -+s,@sim_reserved_bits@,$sim_reserved_bits,;t t -+s,@sim_smp@,$sim_smp,;t t -+s,@sim_stdcall@,$sim_stdcall,;t t -+s,@sim_xor_endian@,$sim_xor_endian,;t t -+s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t -+s,@WERROR_CFLAGS@,$WERROR_CFLAGS,;t t -+s,@build@,$build,;t t -+s,@build_cpu@,$build_cpu,;t t -+s,@build_vendor@,$build_vendor,;t t -+s,@build_os@,$build_os,;t t -+s,@host@,$host,;t t -+s,@host_cpu@,$host_cpu,;t t -+s,@host_vendor@,$host_vendor,;t t -+s,@host_os@,$host_os,;t t -+s,@target@,$target,;t t -+s,@target_cpu@,$target_cpu,;t t -+s,@target_vendor@,$target_vendor,;t t -+s,@target_os@,$target_os,;t t -+s,@CC@,$CC,;t t -+s,@CFLAGS@,$CFLAGS,;t t -+s,@LDFLAGS@,$LDFLAGS,;t t -+s,@CPPFLAGS@,$CPPFLAGS,;t t -+s,@ac_ct_CC@,$ac_ct_CC,;t t -+s,@EXEEXT@,$EXEEXT,;t t -+s,@OBJEXT@,$OBJEXT,;t t -+s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t -+s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t -+s,@INSTALL_DATA@,$INSTALL_DATA,;t t -+s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t -+s,@HDEFINES@,$HDEFINES,;t t -+s,@AR@,$AR,;t t -+s,@RANLIB@,$RANLIB,;t t -+s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t -+s,@SET_MAKE@,$SET_MAKE,;t t -+s,@CPP@,$CPP,;t t -+s,@EGREP@,$EGREP,;t t -+s,@ALLOCA@,$ALLOCA,;t t -+s,@USE_NLS@,$USE_NLS,;t t -+s,@MSGFMT@,$MSGFMT,;t t -+s,@GMSGFMT@,$GMSGFMT,;t t -+s,@XGETTEXT@,$XGETTEXT,;t t -+s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t -+s,@CATALOGS@,$CATALOGS,;t t -+s,@CATOBJEXT@,$CATOBJEXT,;t t -+s,@DATADIRNAME@,$DATADIRNAME,;t t -+s,@GMOFILES@,$GMOFILES,;t t -+s,@INSTOBJEXT@,$INSTOBJEXT,;t t -+s,@INTLDEPS@,$INTLDEPS,;t t -+s,@INTLLIBS@,$INTLLIBS,;t t -+s,@INTLOBJS@,$INTLOBJS,;t t -+s,@POFILES@,$POFILES,;t t -+s,@POSUB@,$POSUB,;t t -+s,@INCLUDE_LOCALE_H@,$INCLUDE_LOCALE_H,;t t -+s,@GT_NO@,$GT_NO,;t t -+s,@GT_YES@,$GT_YES,;t t -+s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t -+s,@l@,$l,;t t -+s,@MAINT@,$MAINT,;t t -+s,@sim_bswap@,$sim_bswap,;t t -+s,@sim_cflags@,$sim_cflags,;t t -+s,@sim_debug@,$sim_debug,;t t -+s,@sim_stdio@,$sim_stdio,;t t -+s,@sim_trace@,$sim_trace,;t t -+s,@sim_profile@,$sim_profile,;t t -+s,@cgen_breaks@,$cgen_breaks,;t t -+s,@LIBOBJS@,$LIBOBJS,;t t -+s,@LTLIBOBJS@,$LTLIBOBJS,;t t -+CEOF -+ -+_ACEOF -+ -+ cat >>$CONFIG_STATUS <<\_ACEOF -+ # Split the substitutions into bite-sized pieces for seds with -+ # small command number limits, like on Digital OSF/1 and HP-UX. -+ ac_max_sed_lines=48 -+ ac_sed_frag=1 # Number of current file. -+ ac_beg=1 # First line for current file. -+ ac_end=$ac_max_sed_lines # Line after last line for current file. -+ ac_more_lines=: -+ ac_sed_cmds= -+ while $ac_more_lines; do -+ if test $ac_beg -gt 1; then -+ sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -+ else -+ sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -+ fi -+ if test ! -s $tmp/subs.frag; then -+ ac_more_lines=false -+ else -+ # The purpose of the label and of the branching condition is to -+ # speed up the sed processing (if there are no `@' at all, there -+ # is no need to browse any of the substitutions). -+ # These are the two extra sed commands mentioned above. -+ (echo ':t -+ /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -+ else -+ ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -+ fi -+ ac_sed_frag=`expr $ac_sed_frag + 1` -+ ac_beg=$ac_end -+ ac_end=`expr $ac_end + $ac_max_sed_lines` -+ fi -+ done -+ if test -z "$ac_sed_cmds"; then -+ ac_sed_cmds=cat -+ fi -+fi # test -n "$CONFIG_FILES" -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ case $ac_file in -+ - | *:- | *:-:* ) # input from stdin -+ cat >$tmp/stdin -+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ * ) ac_file_in=$ac_file.in ;; -+ esac -+ -+ # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -+ ac_dir=`(dirname "$ac_file") 2>/dev/null || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } -+ -+ ac_builddir=. -+ -+if test "$ac_dir" != .; then -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+else -+ ac_dir_suffix= ac_top_builddir= -+fi -+ -+case $srcdir in -+ .) # No --srcdir option. We are building in place. -+ ac_srcdir=. -+ if test -z "$ac_top_builddir"; then -+ ac_top_srcdir=. -+ else -+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -+ fi ;; -+ [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir ;; -+ *) # Relative path. -+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_builddir$srcdir ;; -+esac -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac -+ -+ -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -+ esac -+ -+ if test x"$ac_file" != x-; then -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ rm -f "$ac_file" -+ fi -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ if test x"$ac_file" = x-; then -+ configure_input= -+ else -+ configure_input="$ac_file. " -+ fi -+ configure_input=$configure_input"Generated from `echo $ac_file_in | -+ sed 's,.*/,,'` by configure." -+ -+ # First look for the input files in the build tree, otherwise in the -+ # src tree. -+ ac_file_inputs=`IFS=: -+ for f in $ac_file_in; do -+ case $f in -+ -) echo $tmp/stdin ;; -+ [\\/$]*) -+ # Absolute (can't be DOS-style, as IFS=:) -+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+echo "$as_me: error: cannot find input file: $f" >&2;} -+ { (exit 1); exit 1; }; } -+ echo "$f";; -+ *) # Relative -+ if test -f "$f"; then -+ # Build tree -+ echo "$f" -+ elif test -f "$srcdir/$f"; then -+ # Source tree -+ echo "$srcdir/$f" -+ else -+ # /dev/null tree -+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+echo "$as_me: error: cannot find input file: $f" >&2;} -+ { (exit 1); exit 1; }; } -+ fi;; -+ esac -+ done` || { (exit 1); exit 1; } -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ sed "$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s,@configure_input@,$configure_input,;t t -+s,@srcdir@,$ac_srcdir,;t t -+s,@abs_srcdir@,$ac_abs_srcdir,;t t -+s,@top_srcdir@,$ac_top_srcdir,;t t -+s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t -+s,@builddir@,$ac_builddir,;t t -+s,@abs_builddir@,$ac_abs_builddir,;t t -+s,@top_builddir@,$ac_top_builddir,;t t -+s,@abs_top_builddir@,$ac_abs_top_builddir,;t t -+s,@INSTALL@,$ac_INSTALL,;t t -+" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -+ rm -f $tmp/stdin -+ if test x"$ac_file" != x-; then -+ mv $tmp/out $ac_file -+ else -+ cat $tmp/out -+ rm -f $tmp/out -+ fi -+ -+done -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# -+# CONFIG_HEADER section. -+# -+ -+# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where -+# NAME is the cpp macro being defined and VALUE is the value it is being given. -+# -+# ac_d sets the value in "#define NAME VALUE" lines. -+ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' -+ac_dB='[ ].*$,\1#\2' -+ac_dC=' ' -+ac_dD=',;t' -+# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". -+ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' -+ac_uB='$,\1#\2define\3' -+ac_uC=' ' -+ac_uD=',;t' -+ -+for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -+ # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -+ case $ac_file in -+ - | *:- | *:-:* ) # input from stdin -+ cat >$tmp/stdin -+ ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -+ * ) ac_file_in=$ac_file.in ;; -+ esac -+ -+ test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ -+ # First look for the input files in the build tree, otherwise in the -+ # src tree. -+ ac_file_inputs=`IFS=: -+ for f in $ac_file_in; do -+ case $f in -+ -) echo $tmp/stdin ;; -+ [\\/$]*) -+ # Absolute (can't be DOS-style, as IFS=:) -+ test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+echo "$as_me: error: cannot find input file: $f" >&2;} -+ { (exit 1); exit 1; }; } -+ # Do quote $f, to prevent DOS paths from being IFS'd. -+ echo "$f";; -+ *) # Relative -+ if test -f "$f"; then -+ # Build tree -+ echo "$f" -+ elif test -f "$srcdir/$f"; then -+ # Source tree -+ echo "$srcdir/$f" -+ else -+ # /dev/null tree -+ { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 -+echo "$as_me: error: cannot find input file: $f" >&2;} -+ { (exit 1); exit 1; }; } -+ fi;; -+ esac -+ done` || { (exit 1); exit 1; } -+ # Remove the trailing spaces. -+ sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -+ -+_ACEOF -+ -+# Transform confdefs.h into two sed scripts, `conftest.defines' and -+# `conftest.undefs', that substitutes the proper values into -+# config.h.in to produce config.h. The first handles `#define' -+# templates, and the second `#undef' templates. -+# And first: Protect against being on the right side of a sed subst in -+# config.status. Protect against being in an unquoted here document -+# in config.status. -+rm -f conftest.defines conftest.undefs -+# Using a here document instead of a string reduces the quoting nightmare. -+# Putting comments in sed scripts is not portable. -+# -+# `end' is used to avoid that the second main sed command (meant for -+# 0-ary CPP macros) applies to n-ary macro definitions. -+# See the Autoconf documentation for `clear'. -+cat >confdef2sed.sed <<\_ACEOF -+s/[\\&,]/\\&/g -+s,[\\$`],\\&,g -+t clear -+: clear -+s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp -+t end -+s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp -+: end -+_ACEOF -+# If some macros were called several times there might be several times -+# the same #defines, which is useless. Nevertheless, we may not want to -+# sort them, since we want the *last* AC-DEFINE to be honored. -+uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines -+sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs -+rm -f confdef2sed.sed -+ -+# This sed command replaces #undef with comments. This is necessary, for -+# example, in the case of _POSIX_SOURCE, which is predefined and required -+# on some systems where configure will not decide to define it. -+cat >>conftest.undefs <<\_ACEOF -+s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, -+_ACEOF -+ -+# Break up conftest.defines because some shells have a limit on the size -+# of here documents, and old seds have small limits too (100 cmds). -+echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS -+echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS -+echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS -+echo ' :' >>$CONFIG_STATUS -+rm -f conftest.tail -+while grep . conftest.defines >/dev/null -+do -+ # Write a limited-size here document to $tmp/defines.sed. -+ echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS -+ # Speed up: don't consider the non `#define' lines. -+ echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -+ # Work around the forget-to-reset-the-flag bug. -+ echo 't clr' >>$CONFIG_STATUS -+ echo ': clr' >>$CONFIG_STATUS -+ sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -+ echo 'CEOF -+ sed -f $tmp/defines.sed $tmp/in >$tmp/out -+ rm -f $tmp/in -+ mv $tmp/out $tmp/in -+' >>$CONFIG_STATUS -+ sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -+ rm -f conftest.defines -+ mv conftest.tail conftest.defines -+done -+rm -f conftest.defines -+echo ' fi # grep' >>$CONFIG_STATUS -+echo >>$CONFIG_STATUS -+ -+# Break up conftest.undefs because some shells have a limit on the size -+# of here documents, and old seds have small limits too (100 cmds). -+echo ' # Handle all the #undef templates' >>$CONFIG_STATUS -+rm -f conftest.tail -+while grep . conftest.undefs >/dev/null -+do -+ # Write a limited-size here document to $tmp/undefs.sed. -+ echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS -+ # Speed up: don't consider the non `#undef' -+ echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -+ # Work around the forget-to-reset-the-flag bug. -+ echo 't clr' >>$CONFIG_STATUS -+ echo ': clr' >>$CONFIG_STATUS -+ sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -+ echo 'CEOF -+ sed -f $tmp/undefs.sed $tmp/in >$tmp/out -+ rm -f $tmp/in -+ mv $tmp/out $tmp/in -+' >>$CONFIG_STATUS -+ sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -+ rm -f conftest.undefs -+ mv conftest.tail conftest.undefs -+done -+rm -f conftest.undefs -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ if test x"$ac_file" = x-; then -+ echo "/* Generated by configure. */" >$tmp/config.h -+ else -+ echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -+ fi -+ cat $tmp/in >>$tmp/config.h -+ rm -f $tmp/in -+ if test x"$ac_file" != x-; then -+ if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -+ { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 -+echo "$as_me: $ac_file is unchanged" >&6;} -+ else -+ ac_dir=`(dirname "$ac_file") 2>/dev/null || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } -+ -+ rm -f $ac_file -+ mv $tmp/config.h $ac_file -+ fi -+ else -+ cat $tmp/config.h -+ rm -f $tmp/config.h -+ fi -+done -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# -+# CONFIG_LINKS section. -+# -+ -+for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue -+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ -+ { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5 -+echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;} -+ -+ if test ! -r $srcdir/$ac_source; then -+ { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5 -+echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;} -+ { (exit 1); exit 1; }; } -+ fi -+ rm -f $ac_dest -+ -+ # Make relative symlinks. -+ ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null || -+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_dest" : 'X\(//\)[^/]' \| \ -+ X"$ac_dest" : 'X\(//\)$' \| \ -+ X"$ac_dest" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$ac_dest" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dest_dir" -+ else -+ as_dir="$ac_dest_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } -+ -+ ac_builddir=. -+ -+if test "$ac_dest_dir" != .; then -+ ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'` -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+else -+ ac_dir_suffix= ac_top_builddir= -+fi -+ -+case $srcdir in -+ .) # No --srcdir option. We are building in place. -+ ac_srcdir=. -+ if test -z "$ac_top_builddir"; then -+ ac_top_srcdir=. -+ else -+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -+ fi ;; -+ [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir ;; -+ *) # Relative path. -+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_builddir$srcdir ;; -+esac -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dest_dir";; -+*) -+ case "$ac_dest_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dest_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac -+ -+ -+ case $srcdir in -+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;; -+ *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;; -+ esac -+ -+ # Try a symlink, then a hard link, then a copy. -+ ln -s $ac_rel_source $ac_dest 2>/dev/null || -+ ln $srcdir/$ac_source $ac_dest 2>/dev/null || -+ cp -p $srcdir/$ac_source $ac_dest || -+ { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5 -+echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;} -+ { (exit 1); exit 1; }; } -+done -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# -+# CONFIG_COMMANDS section. -+# -+for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -+ ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -+ ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -+ ac_dir=`(dirname "$ac_dest") 2>/dev/null || -+$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_dest" : 'X\(//\)[^/]' \| \ -+ X"$ac_dest" : 'X\(//\)$' \| \ -+ X"$ac_dest" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$ac_dest" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ { if $as_mkdir_p; then -+ mkdir -p "$ac_dir" -+ else -+ as_dir="$ac_dir" -+ as_dirs= -+ while test ! -d "$as_dir"; do -+ as_dirs="$as_dir $as_dirs" -+ as_dir=`(dirname "$as_dir") 2>/dev/null || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| \ -+ . : '\(.\)' 2>/dev/null || -+echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -+ /^X\(\/\/\)[^/].*/{ s//\1/; q; } -+ /^X\(\/\/\)$/{ s//\1/; q; } -+ /^X\(\/\).*/{ s//\1/; q; } -+ s/.*/./; q'` -+ done -+ test ! -n "$as_dirs" || mkdir $as_dirs -+ fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 -+echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -+ { (exit 1); exit 1; }; }; } -+ -+ ac_builddir=. -+ -+if test "$ac_dir" != .; then -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A "../" for each directory in $ac_dir_suffix. -+ ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+else -+ ac_dir_suffix= ac_top_builddir= -+fi -+ -+case $srcdir in -+ .) # No --srcdir option. We are building in place. -+ ac_srcdir=. -+ if test -z "$ac_top_builddir"; then -+ ac_top_srcdir=. -+ else -+ ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -+ fi ;; -+ [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_srcdir=$srcdir$ac_dir_suffix; -+ ac_top_srcdir=$srcdir ;; -+ *) # Relative path. -+ ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_builddir$srcdir ;; -+esac -+ -+# Do not use `cd foo && pwd` to compute absolute paths, because -+# the directories may not exist. -+case `pwd` in -+.) ac_abs_builddir="$ac_dir";; -+*) -+ case "$ac_dir" in -+ .) ac_abs_builddir=`pwd`;; -+ [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -+ *) ac_abs_builddir=`pwd`/"$ac_dir";; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_builddir=${ac_top_builddir}.;; -+*) -+ case ${ac_top_builddir}. in -+ .) ac_abs_top_builddir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -+ *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_srcdir=$ac_srcdir;; -+*) -+ case $ac_srcdir in -+ .) ac_abs_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -+ *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -+ esac;; -+esac -+case $ac_abs_builddir in -+.) ac_abs_top_srcdir=$ac_top_srcdir;; -+*) -+ case $ac_top_srcdir in -+ .) ac_abs_top_srcdir=$ac_abs_builddir;; -+ [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -+ *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -+ esac;; -+esac -+ -+ -+ { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 -+echo "$as_me: executing $ac_dest commands" >&6;} -+ case $ac_dest in -+ Makefile ) echo "Merging Makefile.sim+Make-common.sim into Makefile ..." -+ rm -f Makesim1.tmp Makesim2.tmp Makefile -+ sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp -+ sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp -+ sed -e '/^## COMMON_PRE_/ r Makesim1.tmp' \ -+ -e '/^## COMMON_POST_/ r Makesim2.tmp' \ -+ <Makefile.sim >Makefile -+ rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp -+ ;; -+ stamp-h ) echo > stamp-h ;; -+ esac -+done -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -+{ (exit 0); exit 0; } -+_ACEOF -+chmod +x $CONFIG_STATUS -+ac_clean_files=$ac_clean_files_save -+ -+ -+# configure is writing to config.log, and then calls config.status. -+# config.status does its own redirection, appending to config.log. -+# Unfortunately, on DOS this fails, as config.log is still kept open -+# by configure, so config.status won't be able to write to it; its -+# output is simply discarded. So we exec the FD to /dev/null, -+# effectively closing config.log, so it can be properly (re)opened and -+# appended to by config.status. When coming back to configure, we -+# need to make the FD available again. -+if test "$no_create" != yes; then -+ ac_cs_success=: -+ ac_config_status_args= -+ test "$silent" = yes && -+ ac_config_status_args="$ac_config_status_args --quiet" -+ exec 5>/dev/null -+ $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false -+ exec 5>>config.log -+ # Use ||, not &&, to avoid exiting from the if with $? = 1, which -+ # would make configure fail if this is the last instruction. -+ $ac_cs_success || { (exit 1); exit 1; } -+fi -+ -+ -diff -Naur gdb-6.5.orig/sim/bfin/configure.ac gdb-6.5/sim/bfin/configure.ac ---- gdb-6.5.orig/sim/bfin/configure.ac 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/configure.ac 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,12 @@ -+dnl Process this file with autoconf to produce a configure script. -+AC_PREREQ(2.59)dnl -+AC_INIT(Makefile.in) -+AC_CONFIG_HEADER(config.h:config.in) -+ -+sinclude(../common/aclocal.m4) -+ -+sinclude(../common/common.m4) -+ -+AC_CHECK_HEADERS(unistd.h) -+ -+SIM_AC_OUTPUT -diff -Naur gdb-6.5.orig/sim/bfin/interp.c gdb-6.5/sim/bfin/interp.c ---- gdb-6.5.orig/sim/bfin/interp.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/interp.c 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,651 @@ -+/* Simulator for Analog Devices Blackfin processer. -+ -+ Copyright (C) 2005 Free Software Foundation, Inc. -+ Contributed by Analog Devices. -+ -+ This file is part of simulators. -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ Boston, MA 02110-1301, USA. */ -+ -+#include "config.h" -+ -+#include <signal.h> -+#ifdef HAVE_UNISTD_H -+#include <unistd.h> -+#endif -+ -+#include "sysdep.h" -+#include "bfd.h" -+#include "gdb/callback.h" -+#include "bfin-sim.h" -+#include "gdb/sim-bfin.h" -+ -+/* This file is local - if newlib changes, then so should this. */ -+#include "syscall.h" -+ -+#include <math.h> -+ -+#ifdef _WIN32 -+#include <float.h> /* Needed for _isnan(). */ -+#define isnan _isnan -+#endif -+ -+#ifndef SIGBUS -+#define SIGBUS SIGSEGV -+#endif -+ -+#ifndef SIGQUIT -+#define SIGQUIT SIGTERM -+#endif -+ -+#ifndef SIGTRAP -+#define SIGTRAP 5 -+#endif -+ -+/* Define the rate at which the simulator should poll the host -+ for a quit. */ -+#define POLL_QUIT_INTERVAL 0x60000 -+ -+saved_state_type saved_state; -+ -+static char **prog_argv; -+static SIM_OPEN_KIND sim_kind; -+static char *myname; -+static int tracing = 0; -+static host_callback *callback; -+ -+#if defined(__GO32__) || defined(_WIN32) -+int sim_memory_size = 19; -+#else -+int sim_memory_size = 24; -+#endif -+ -+ -+/* Count the number of arguments in an argv. */ -+static int -+count_argc (char **argv) -+{ -+ int i; -+ -+ if (! argv) -+ return -1; -+ -+ for (i = 0; argv[i] != NULL; ++i) -+ continue; -+ return i; -+} -+ -+/* This function exists mainly for the purpose of setting a breakpoint to -+ catch simulated bus errors when running the simulator under GDB. */ -+ -+void -+raise_exception (int x) -+{ -+ saved_state.exception = x; -+} -+ -+void -+raise_buserror () -+{ -+ raise_exception (SIGBUS); -+} -+ -+static int -+get_now () -+{ -+ return time ((long *) 0); -+} -+ -+static int -+now_persec () -+{ -+ return 1; -+} -+ -+/* Simulate a monitor trap, put the result into r0 and errno into r1 -+ return offset by which to adjust pc. */ -+ -+void -+bfin_trap () -+{ -+ int reason = DREG (2); -+ int sys = DREG (0); -+ bu32 args = DREG (1); -+ -+ switch (sys) -+ { -+ case SYS_exit: -+ saved_state.exception = SIGQUIT; -+ DREG (0) = get_long (saved_state.memory, args); -+ return; -+ case SYS_open: -+ { -+ char *arg0 = (char *)(saved_state.memory + get_long (saved_state.memory, args)); -+ bu32 arg1 = get_long (saved_state.memory, args + 4); -+ bu32 arg2 = get_long (saved_state.memory, args + 8); -+ if (strcmp (arg0, ":tt") == 0) -+ DREG (0) = arg2 == 4 ? 0 : 1; -+ else -+ DREG (0) = callback->open (callback, arg0, arg1); -+ } -+ return; -+ -+ case SYS_write: -+ { -+ bu32 arg0 = get_long (saved_state.memory, args); -+ char *arg1 = (char *)(saved_state.memory + get_long (saved_state.memory, args + 4)); -+ bu32 arg2 = get_long (saved_state.memory, args + 8); -+ DREG (0) = callback->write (callback, arg0, arg1, arg2); -+ } -+ return; -+ -+ case SYS_read: -+ { -+ bu32 arg0 = get_long (saved_state.memory, args); -+ char *arg1 = (char *)(saved_state.memory + get_long (saved_state.memory, args + 4)); -+ bu32 arg2 = get_long (saved_state.memory, args + 8); -+ DREG (0) = callback->read (callback, arg0, arg1, arg2); -+ } -+ return; -+ -+ case SYS_kill: -+ printf ("Killing with signal %d\n", get_long (saved_state.memory, args + 4)); -+ raise (SIGABRT); -+ -+ case SYS_close: -+ DREG (0) = callback->close (callback, get_long (saved_state.memory, args)); -+ return; -+ case SYS_argc: -+ DREG (0) = count_argc (prog_argv); -+ break; -+ case SYS_argnlen: -+ { -+ bu32 arg0 = get_long (saved_state.memory, args); -+ if (arg0 < count_argc (prog_argv)) -+ DREG (0) = strlen (prog_argv[arg0]); -+ else -+ DREG (0) = -1; -+ } -+ return; -+ case SYS_argn: -+ { -+ bu32 arg0 = get_long (saved_state.memory, args); -+ char *arg1 = (char *)(saved_state.memory + get_long (saved_state.memory, args + 4)); -+ if (arg0 < count_argc (prog_argv)) -+ { -+ /* Include the termination byte. */ -+ int i = strlen (prog_argv[arg0]) + 1; -+ DREG (0) = get_long (saved_state.memory, args + 4); -+ memcpy (arg1, prog_argv[arg0], i); -+ } -+ else -+ DREG (0) = -1; -+ } -+ return; -+ case SYS_time: -+ DREG (0) = get_now (); -+ return; -+ default: -+ abort (); -+ } -+} -+ -+void -+control_c (int sig) -+{ -+ raise_exception (SIGINT); -+} -+ -+/* Set the memory size to the power of two provided. */ -+ -+void -+sim_size (int power) -+{ -+ saved_state.msize = 1 << power; -+ -+ sim_memory_size = power; -+ -+ if (saved_state.memory) -+ free (saved_state.memory); -+ -+ saved_state.memory = -+ (unsigned char *) calloc (64, saved_state.msize / 64); -+ -+ if (!saved_state.memory) -+ { -+ fprintf (stderr, -+ "Not enough VM for simulation of %d bytes of RAM\n", -+ saved_state.msize); -+ -+ saved_state.msize = 1; -+ saved_state.memory = (unsigned char *) calloc (1, 1); -+ } -+} -+ -+static void -+init_pointers () -+{ -+ if (saved_state.msize != 1 << sim_memory_size) -+ sim_size (sim_memory_size); -+} -+ -+#define MMASKB ((saved_state.msize -1) & ~0) -+ -+int -+sim_stop (SIM_DESC sd) -+{ -+ raise_exception (SIGINT); -+ return 1; -+} -+ -+/* Set by an instruction emulation function if we performed a jump. */ -+int did_jump; -+ -+/* Execute a single instruction. */ -+ -+static void -+step_once (SIM_DESC sd) -+{ -+ bu32 oldpc = PCREG; -+ -+ if (tracing) -+ fprintf (stderr, "PC: %08x, insn: %04x\n", PCREG, -+ get_word (saved_state.memory, PCREG)); -+ -+ did_jump = 0; -+ interp_insn_bfin (PCREG); -+ -+ /* @@@ Not sure how the hardware really behaves when the last insn -+ of a loop is a jump. */ -+ if (!did_jump) -+ { -+ if (LC1REG && oldpc == LB1REG && --LC1REG) -+ PCREG = LT1REG; -+ else if (LC0REG && oldpc == LB0REG && --LC0REG) -+ PCREG = LT0REG; -+ } -+} -+ -+void -+sim_resume (SIM_DESC sd, int step, int siggnal) -+{ -+ register int insts = 0; -+ -+ int tick_start = get_now (); -+ void (*prev) () = signal (SIGINT, control_c); -+ void (*prev_fpe) () = signal (SIGFPE, SIG_IGN); -+ -+ init_pointers (); -+ -+ /* clear exceptions else it will stop */ -+ saved_state.exception = 0; -+ -+ if(step) -+ { -+ while(step && saved_state.exception == 0) -+ { -+ /* not clear if this will be > 1. Potential problem area */ -+ step_once(sd); -+ step--; -+ } -+ /* Emulate a hardware single step ... raise an exception */ -+ saved_state.exception = SIGTRAP; -+ } -+ else -+ while (saved_state.exception == 0) -+ step_once(sd); -+ -+ saved_state.ticks += get_now () - tick_start; -+ saved_state.insts += insts; -+ -+ signal (SIGFPE, prev_fpe); -+ signal (SIGINT, prev); -+} -+ -+int -+sim_write (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size) -+{ -+ int i; -+ -+ init_pointers (); -+ -+ for (i = 0; i < size; i++) -+ saved_state.memory[(MMASKB & (addr + i))] = buffer[i]; -+ -+ return size; -+} -+ -+int -+sim_read (SIM_DESC sd, SIM_ADDR addr, unsigned char *buffer, int size) -+{ -+ int i; -+ -+ init_pointers (); -+ -+ for (i = 0; i < size; i++) -+ buffer[i] = saved_state.memory[(MMASKB & (addr + i))]; -+ -+ return size; -+} -+ -+int -+sim_trace (SIM_DESC sd) -+{ -+ tracing = 1; -+ sim_resume (sd, 0, 0); -+ tracing = 0; -+ return 1; -+} -+ -+void -+sim_stop_reason (SIM_DESC sd, enum sim_stop *reason, int *sigrc) -+{ -+ if (saved_state.exception == SIGQUIT) -+ { -+ *reason = sim_exited; -+ *sigrc = DREG (0); -+ } -+ else -+ { -+ *reason = sim_stopped; -+ *sigrc = saved_state.exception; -+ } -+} -+ -+void -+sim_info (SIM_DESC sd, int verbose) -+{ -+ double timetaken = -+ (double) saved_state.ticks / (double) now_persec (); -+ -+ callback->printf_filtered (callback, "\n\n# instructions executed %10d\n", -+ saved_state.insts); -+ callback->printf_filtered (callback, "# real time taken %10.4f\n", -+ timetaken); -+} -+ -+static void -+parse_and_set_memory_size (char *str) -+{ -+ int n; -+ -+ n = strtol (str, NULL, 10); -+ if (n > 0 && n <= 24) -+ sim_memory_size = n; -+ else -+ callback->printf_filtered (callback, -+ "Bad memory size %d; must be 1 to 24, inclusive\n", n); -+} -+ -+SIM_DESC -+sim_open (SIM_OPEN_KIND kind, host_callback *cb, -+ struct bfd *abfd, char **argv) -+{ -+ char **p; -+ -+ sim_kind = kind; -+ myname = argv[0]; -+ callback = cb; -+ -+ for (p = argv + 1; *p != NULL; ++p) -+ if (isdigit (**p)) -+ parse_and_set_memory_size (*p); -+ -+ /* fudge our descriptor for now */ -+ return (SIM_DESC) 1; -+} -+ -+void -+sim_close (SIM_DESC sd, int quitting) -+{ -+ /* Nothing to do. */ -+} -+ -+SIM_RC -+sim_load (SIM_DESC sd, char *prog, bfd *abfd, int from_tty) -+{ -+ extern bfd *sim_load_file (); /* ??? Don't know where this should live. */ -+ bfd *prog_bfd; -+ -+ prog_bfd = sim_load_file (sd, myname, callback, prog, abfd, -+ sim_kind == SIM_OPEN_DEBUG, -+ 0, sim_write); -+ -+ /* Set the bfd machine type. */ -+ if (prog_bfd) -+ saved_state.bfd_mach = bfd_get_mach (prog_bfd); -+ else if (abfd) -+ saved_state.bfd_mach = bfd_get_mach (abfd); -+ else -+ saved_state.bfd_mach = 0; -+ -+ if (prog_bfd == NULL) -+ return SIM_RC_FAIL; -+ if (abfd == NULL) -+ bfd_close (prog_bfd); -+ return SIM_RC_OK; -+} -+ -+SIM_RC -+sim_create_inferior (SIM_DESC sd, struct bfd *prog_bfd, -+ char **argv, char **env) -+{ -+ /* Clear the registers. */ -+ memset (&saved_state, 0, -+ (char*) &saved_state.end_of_registers - (char*) &saved_state); -+ -+ /* Set the PC. */ -+ if (prog_bfd != NULL) -+ saved_state.pc = bfd_get_start_address (prog_bfd); -+ -+ SPREG = saved_state.msize; -+ /* Set the bfd machine type. */ -+ if (prog_bfd != NULL) -+ saved_state.bfd_mach = bfd_get_mach (prog_bfd); -+ -+ /* Record the program's arguments. */ -+ prog_argv = argv; -+ -+ return SIM_RC_OK; -+} -+ -+void -+sim_do_command (SIM_DESC sd, char *cmd) -+{ -+ char *sms_cmd = "set-memory-size"; -+ int cmdsize; -+ -+ if (cmd == NULL || *cmd == '\0') -+ cmd = "help"; -+ -+ cmdsize = strlen (sms_cmd); -+ if (strncmp (cmd, sms_cmd, cmdsize) == 0 -+ && strchr (" \t", cmd[cmdsize]) != NULL) -+ parse_and_set_memory_size (cmd + cmdsize + 1); -+ else if (strcmp (cmd, "help") == 0) -+ { -+ (callback->printf_filtered) (callback, -+ "List of Blackfin simulator commands:\n\n"); -+ (callback->printf_filtered) (callback, "help <n> -- Display this information\n"); -+ (callback->printf_filtered) (callback, "set-memory-size <n> -- Set the number of address bits to use\n"); -+ (callback->printf_filtered) (callback, "\n"); -+ } -+ else -+ (callback->printf_filtered) (callback, "Error: \"%s\" is not a valid Blackfin simulator command.\n", cmd); -+} -+ -+void -+sim_set_callbacks (host_callback *p) -+{ -+ callback = p; -+} -+ -+static bu32 -+bfin_extract_unsigned_integer (unsigned char *addr, int len) -+{ -+ bu32 retval; -+ unsigned char * p; -+ unsigned char * startaddr = (unsigned char *)addr; -+ unsigned char * endaddr = startaddr + len; -+ -+ retval = 0; -+ -+ for (p = endaddr; p > startaddr;) -+ retval = (retval << 8) | *--p; -+ -+ return retval; -+} -+ -+static void -+bfin_store_unsigned_integer (unsigned char *addr, int len, bu32 val) -+{ -+ unsigned char *p; -+ unsigned char *startaddr = addr; -+ unsigned char *endaddr = startaddr + len; -+ -+ for (p = startaddr; p < endaddr;) -+ { -+ *p++ = val & 0xff; -+ val >>= 8; -+ } -+} -+ -+int -+sim_fetch_register (SIM_DESC sd, int rn, unsigned char *memory, int length) -+{ -+ bu32 value; -+ -+ init_pointers (); -+ switch (rn) -+ { -+ case SIM_BFIN_R0_REGNUM : value = DREG(0); break; -+ case SIM_BFIN_R1_REGNUM : value = DREG(1); break; -+ case SIM_BFIN_R2_REGNUM : value = DREG(2); break; -+ case SIM_BFIN_R3_REGNUM : value = DREG(3); break; -+ case SIM_BFIN_R4_REGNUM : value = DREG(4); break; -+ case SIM_BFIN_R5_REGNUM : value = DREG(5); break; -+ case SIM_BFIN_R6_REGNUM : value = DREG(6); break; -+ case SIM_BFIN_R7_REGNUM : value = DREG(7); break; -+ case SIM_BFIN_P0_REGNUM : value = PREG(0); break; -+ case SIM_BFIN_P1_REGNUM : value = PREG(1); break; -+ case SIM_BFIN_P2_REGNUM : value = PREG(2); break; -+ case SIM_BFIN_P3_REGNUM : value = PREG(3); break; -+ case SIM_BFIN_P4_REGNUM : value = PREG(4); break; -+ case SIM_BFIN_P5_REGNUM : value = PREG(5); break; -+ case SIM_BFIN_SP_REGNUM : value = SPREG; break; -+ case SIM_BFIN_FP_REGNUM : value = FPREG; break; -+ case SIM_BFIN_I0_REGNUM : value = IREG(0); break; -+ case SIM_BFIN_I1_REGNUM : value = IREG(1); break; -+ case SIM_BFIN_I2_REGNUM : value = IREG(2); break; -+ case SIM_BFIN_I3_REGNUM : value = IREG(3); break; -+ case SIM_BFIN_M0_REGNUM : value = MREG(0); break; -+ case SIM_BFIN_M1_REGNUM : value = MREG(1); break; -+ case SIM_BFIN_M2_REGNUM : value = MREG(2); break; -+ case SIM_BFIN_M3_REGNUM : value = MREG(3); break; -+ case SIM_BFIN_B0_REGNUM : value = BREG(0); break; -+ case SIM_BFIN_B1_REGNUM : value = BREG(1); break; -+ case SIM_BFIN_B2_REGNUM : value = BREG(2); break; -+ case SIM_BFIN_B3_REGNUM : value = BREG(3); break; -+ case SIM_BFIN_L0_REGNUM : value = LREG(0); break; -+ case SIM_BFIN_L1_REGNUM : value = LREG(1); break; -+ case SIM_BFIN_L2_REGNUM : value = LREG(2); break; -+ case SIM_BFIN_L3_REGNUM : value = LREG(3); break; -+ case SIM_BFIN_RETS_REGNUM : value = RETSREG; break; -+ case SIM_BFIN_A0_DOT_X_REGNUM : value = A0XREG; break; -+ case SIM_BFIN_AO_DOT_W_REGNUM : value = A0WREG; break; -+ case SIM_BFIN_A1_DOT_X_REGNUM : value = A1XREG; break; -+ case SIM_BFIN_A1_DOT_W_REGNUM : value = A1WREG; break; -+ case SIM_BFIN_LC0_REGNUM : value = LC0REG; break; -+ case SIM_BFIN_LT0_REGNUM : value = LT0REG; break; -+ case SIM_BFIN_LB0_REGNUM : value = LB0REG; break; -+ case SIM_BFIN_LC1_REGNUM : value = LC1REG; break; -+ case SIM_BFIN_LT1_REGNUM : value = LT1REG; break; -+ case SIM_BFIN_LB1_REGNUM : value = LB1REG; break; -+ case SIM_BFIN_PC_REGNUM : value = PCREG; break; -+ case SIM_BFIN_CC_REGNUM : value = CCREG; break; -+ default : -+ return 0; // will be an error in gdb -+ break; -+ } -+ -+ bfin_store_unsigned_integer (memory, 4, value); -+ -+ return -1; // disables size checking in gdb -+} -+ -+int -+sim_store_register (SIM_DESC sd, int rn, unsigned char *memory, int length) -+{ -+ bu32 value; -+ -+ value = bfin_extract_unsigned_integer (memory, 4); -+ -+ init_pointers (); -+ switch (rn) -+ { -+ case SIM_BFIN_R0_REGNUM : DREG(0) = value; break; -+ case SIM_BFIN_R1_REGNUM : DREG(1) = value; break; -+ case SIM_BFIN_R2_REGNUM : DREG(2) = value; break; -+ case SIM_BFIN_R3_REGNUM : DREG(3) = value; break; -+ case SIM_BFIN_R4_REGNUM : DREG(4) = value; break; -+ case SIM_BFIN_R5_REGNUM : DREG(5) = value; break; -+ case SIM_BFIN_R6_REGNUM : DREG(6) = value; break; -+ case SIM_BFIN_R7_REGNUM : DREG(7) = value; break; -+ case SIM_BFIN_P0_REGNUM : PREG(0) = value; break; -+ case SIM_BFIN_P1_REGNUM : PREG(1) = value; break; -+ case SIM_BFIN_P2_REGNUM : PREG(2) = value; break; -+ case SIM_BFIN_P3_REGNUM : PREG(3) = value; break; -+ case SIM_BFIN_P4_REGNUM : PREG(4) = value; break; -+ case SIM_BFIN_P5_REGNUM : PREG(5) = value; break; -+ case SIM_BFIN_SP_REGNUM : SPREG = value; break; -+ case SIM_BFIN_FP_REGNUM : FPREG = value; break; -+ case SIM_BFIN_I0_REGNUM : IREG(0) = value; break; -+ case SIM_BFIN_I1_REGNUM : IREG(1) = value; break; -+ case SIM_BFIN_I2_REGNUM : IREG(2) = value; break; -+ case SIM_BFIN_I3_REGNUM : IREG(3) = value; break; -+ case SIM_BFIN_M0_REGNUM : MREG(0) = value; break; -+ case SIM_BFIN_M1_REGNUM : MREG(1) = value; break; -+ case SIM_BFIN_M2_REGNUM : MREG(2) = value; break; -+ case SIM_BFIN_M3_REGNUM : MREG(3) = value; break; -+ case SIM_BFIN_B0_REGNUM : BREG(0) = value; break; -+ case SIM_BFIN_B1_REGNUM : BREG(1) = value; break; -+ case SIM_BFIN_B2_REGNUM : BREG(2) = value; break; -+ case SIM_BFIN_B3_REGNUM : BREG(3) = value; break; -+ case SIM_BFIN_L0_REGNUM : LREG(0) = value; break; -+ case SIM_BFIN_L1_REGNUM : LREG(1) = value; break; -+ case SIM_BFIN_L2_REGNUM : LREG(2) = value; break; -+ case SIM_BFIN_L3_REGNUM : LREG(3) = value; break; -+ case SIM_BFIN_RETS_REGNUM : RETSREG = value; break; -+ case SIM_BFIN_A0_DOT_X_REGNUM : A0XREG = value; break; -+ case SIM_BFIN_AO_DOT_W_REGNUM : A0WREG = value; break; -+ case SIM_BFIN_A1_DOT_X_REGNUM : A1XREG = value; break; -+ case SIM_BFIN_A1_DOT_W_REGNUM : A1WREG = value; break; -+ case SIM_BFIN_LC0_REGNUM : LC0REG = value; break; -+ case SIM_BFIN_LT0_REGNUM : LT0REG = value; break; -+ case SIM_BFIN_LB0_REGNUM : LB0REG = value; break; -+ case SIM_BFIN_LC1_REGNUM : LC1REG = value; break; -+ case SIM_BFIN_LT1_REGNUM : LT1REG = value; break; -+ case SIM_BFIN_LB1_REGNUM : LB1REG = value; break; -+ case SIM_BFIN_PC_REGNUM : PCREG = value; break; -+ case SIM_BFIN_CC_REGNUM : CCREG = value; break; -+ default : -+ return 0; // will be an error in gdb -+ break; -+ } -+ -+ return -1; // disables size checking in gdb -+} -+ -diff -Naur gdb-6.5.orig/sim/bfin/Makefile.in gdb-6.5/sim/bfin/Makefile.in ---- gdb-6.5.orig/sim/bfin/Makefile.in 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/Makefile.in 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,29 @@ -+# Makefile template for Configure for the Blackfin simulator. -+# Copyright (C) 2005 Free Software Foundation, Inc. -+# Written by Analog Devices, Inc. -+# -+# This program is free software; you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation; either version 2 of the License, or -+# (at your option) any later version. -+# -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with this program; if not, write to the Free Software -+# Foundation, Inc., 51 Franklin Street, Fifth Floor, -+# Boston, MA 02110-1301, USA. -+ -+## COMMON_PRE_CONFIG_FRAG -+ -+SIM_OBJS = interp.o bfin-dis.o sim-load.o -+ -+INCLUDE = bfin-sim.h -+ -+## COMMON_POST_CONFIG_FRAG -+ -+interp.o: interp.c $(INCLUDE) -+bfin-dis.o: bfin-dis.c $(INCLUDE) -diff -Naur gdb-6.5.orig/sim/bfin/syscall.h gdb-6.5/sim/bfin/syscall.h ---- gdb-6.5.orig/sim/bfin/syscall.h 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.5/sim/bfin/syscall.h 2009-01-22 08:19:21.000000000 +0100 -@@ -0,0 +1,41 @@ -+/* This file is copied from newlib. Do not edit this alone. */ -+ -+#define SYS_exit 1 -+#define SYS_fork 2 -+#define SYS_read 3 -+#define SYS_write 4 -+#define SYS_open 5 -+#define SYS_close 6 -+#define SYS_wait4 7 -+#define SYS_creat 8 -+#define SYS_link 9 -+#define SYS_unlink 10 -+#define SYS_execv 11 -+#define SYS_chdir 12 -+ -+#define SYS_mknod 14 -+#define SYS_chmod 15 -+#define SYS_chown 16 -+ -+#define SYS_lseek 19 -+#define SYS_getpid 20 -+#define SYS_isatty 21 -+#define SYS_fstat 22 -+#define SYS_time 23 -+#define SYS_kill 24 -+ -+#define SYS_stat 38 -+ -+#define SYS_pipe 42 -+ -+#define SYS_execve 59 -+ -+#define SYS_truncate 129 -+#define SYS_ftruncate 130 -+ -+#define SYS_argc 172 -+#define SYS_argnlen 173 -+#define SYS_argn 174 -+ -+#define SYS_utime 201 -+#define SYS_wait 202 -diff -Naur gdb-6.5.orig/sim/configure gdb-6.5/sim/configure ---- gdb-6.5.orig/sim/configure 2006-05-05 19:11:19.000000000 +0200 -+++ gdb-6.5/sim/configure 2009-01-22 08:19:21.000000000 +0100 -@@ -273,6 +273,7 @@ - - ac_unique_file="Makefile.in" - ac_subdirs_all="$ac_subdirs_all arm" -+ac_subdirs_all="$ac_subdirs_all bfin" - ac_subdirs_all="$ac_subdirs_all cris" - ac_subdirs_all="$ac_subdirs_all d10v" - ac_subdirs_all="$ac_subdirs_all frv" -@@ -3423,6 +3424,13 @@ - testsuite=yes - common=yes - ;; -+ bfin-*-*) -+ -+ -+subdirs="$subdirs bfin" -+ -+ common=yes -+ ;; - cris-*-* | crisv32-*-*) - - -diff -Naur gdb-6.5.orig/sim/configure.ac gdb-6.5/sim/configure.ac ---- gdb-6.5.orig/sim/configure.ac 2006-05-05 19:11:19.000000000 +0200 -+++ gdb-6.5/sim/configure.ac 2009-01-22 08:19:21.000000000 +0100 -@@ -52,6 +52,10 @@ - testsuite=yes - common=yes - ;; -+ bfin-*-*) -+ AC_CONFIG_SUBDIRS(bfin) -+ common=yes -+ ;; - cris-*-* | crisv32-*-*) - AC_CONFIG_SUBDIRS(cris) - testsuite=yes diff --git a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20080917.diff b/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20080917.diff deleted file mode 100644 index 09609a9cc7..0000000000 --- a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20080917.diff +++ /dev/null @@ -1,1740 +0,0 @@ -diff -Naur gdb-6.8.orig/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c ---- gdb-6.8.orig/gdb/breakpoint.c 2008-02-26 09:14:11.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.c 2008-09-17 16:32:32.000000000 +0200 -@@ -55,6 +55,7 @@ - #include "memattr.h" - #include "ada-lang.h" - #include "top.h" -+#include "wrapper.h" - - #include "gdb-events.h" - #include "mi/mi-common.h" -@@ -826,7 +827,65 @@ - || bpt->type == bp_access_watchpoint); - } - --/* Assuming that B is a hardware breakpoint: -+/* Find the current value of a watchpoint on EXP. Return the value in -+ *VALP and *RESULTP and the chain of intermediate and final values -+ in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does -+ not need them. -+ -+ If an error occurs while evaluating the expression, *RESULTP will -+ be set to NULL. *RESULTP may be a lazy value, if the result could -+ not be read from memory. It is used to determine whether a value -+ is user-specified (we should watch the whole value) or intermediate -+ (we should watch only the bit used to locate the final value). -+ -+ If the final value, or any intermediate value, could not be read -+ from memory, *VALP will be set to NULL. *VAL_CHAIN will still be -+ set to any referenced values. *VALP will never be a lazy value. -+ This is the value which we store in struct breakpoint. -+ -+ If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the -+ value chain. The caller must free the values individually. If -+ VAL_CHAIN is NULL, all generated values will be left on the value -+ chain. */ -+ -+static void -+fetch_watchpoint_value (struct expression *exp, struct value **valp, -+ struct value **resultp, struct value **val_chain) -+{ -+ struct value *mark, *new_mark, *result; -+ -+ *valp = NULL; -+ if (resultp) -+ *resultp = NULL; -+ if (val_chain) -+ *val_chain = NULL; -+ -+ /* Evaluate the expression. */ -+ mark = value_mark (); -+ result = NULL; -+ gdb_evaluate_expression (exp, &result); -+ new_mark = value_mark (); -+ if (mark == new_mark) -+ return; -+ if (resultp) -+ *resultp = result; -+ -+ /* Make sure it's not lazy, so that after the target stops again we -+ have a non-lazy previous value to compare with. */ -+ if (result != NULL -+ && (!value_lazy (result) || gdb_value_fetch_lazy (result))) -+ *valp = result; -+ -+ if (val_chain) -+ { -+ /* Return the chain of intermediate values. We use this to -+ decide which addresses to watch. */ -+ *val_chain = new_mark; -+ value_release_to_mark (mark); -+ } -+} -+ -+/* Assuming that B is a hardware watchpoint: - - Reparse watchpoint expression, is REPARSE is non-zero - - Evaluate expression and store the result in B->val - - Update the list of values that must be watched in B->loc. -@@ -837,7 +896,6 @@ - update_watchpoint (struct breakpoint *b, int reparse) - { - int within_current_scope; -- struct value *mark = value_mark (); - struct frame_id saved_frame_id; - struct bp_location *loc; - bpstat bs; -@@ -889,9 +947,9 @@ - to the user when the old value and the new value may actually - be completely different objects. */ - value_free (b->val); -- b->val = NULL; -+ b->val = NULL; -+ b->val_valid = 0; - } -- - - /* If we failed to parse the expression, for example because - it refers to a global variable in a not-yet-loaded shared library, -@@ -900,43 +958,37 @@ - is different from out-of-scope watchpoint. */ - if (within_current_scope && b->exp) - { -- struct value *v, *next; -+ struct value *val_chain, *v, *result, *next; -+ -+ fetch_watchpoint_value (b->exp, &v, &result, &val_chain); - -- /* Evaluate the expression and make sure it's not lazy, so that -- after target stops again, we have a non-lazy previous value -- to compare with. Also, making the value non-lazy will fetch -- intermediate values as needed, which we use to decide which -- addresses to watch. -- -- The value returned by evaluate_expression is stored in b->val. -- In addition, we look at all values which were created -- during evaluation, and set watchoints at addresses as needed. -- Those values are explicitly deleted here. */ -- v = evaluate_expression (b->exp); - /* Avoid setting b->val if it's already set. The meaning of - b->val is 'the last value' user saw, and we should update - it only if we reported that last value to user. As it - happens, the code that reports it updates b->val directly. */ -- if (b->val == NULL) -- b->val = v; -- value_contents (v); -- value_release_to_mark (mark); -+ if (!b->val_valid) -+ { -+ b->val = v; -+ b->val_valid = 1; -+ } - - /* Look at each value on the value chain. */ -- for (; v; v = next) -+ for (v = val_chain; v; v = next) - { - /* If it's a memory location, and GDB actually needed - its contents to evaluate the expression, then we -- must watch it. */ -+ must watch it. If the first value returned is -+ still lazy, that means an error occurred reading it; -+ watch it anyway in case it becomes readable. */ - if (VALUE_LVAL (v) == lval_memory -- && ! value_lazy (v)) -+ && (v == val_chain || ! value_lazy (v))) - { - struct type *vtype = check_typedef (value_type (v)); - - /* We only watch structs and arrays if user asked - for it explicitly, never if they just happen to - appear in the middle of some value chain. */ -- if (v == b->val -+ if (v == result - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT - && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) - { -@@ -1681,6 +1733,7 @@ - if (b->val) - value_free (b->val); - b->val = NULL; -+ b->val_valid = 0; - } - break; - default: -@@ -2103,6 +2156,17 @@ - do_cleanups (old_chain); - } - -+/* Print out the (old or new) value associated with a watchpoint. */ -+ -+static void -+watchpoint_value_print (struct value *val, struct ui_file *stream) -+{ -+ if (val == NULL) -+ fprintf_unfiltered (stream, _("<unreadable>")); -+ else -+ value_print (val, stream, 0, Val_pretty_default); -+} -+ - /* This is the normal print function for a bpstat. In the future, - much of this logic could (should?) be moved to bpstat_stop_status, - by having it set different print_it values. -@@ -2221,26 +2285,21 @@ - - case bp_watchpoint: - case bp_hardware_watchpoint: -- if (bs->old_val != NULL) -- { -- annotate_watchpoint (b->number); -- if (ui_out_is_mi_like_p (uiout)) -- ui_out_field_string -- (uiout, "reason", -- async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -- mention (b); -- ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -- ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "old", stb); -- ui_out_text (uiout, "\nNew value = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "new", stb); -- do_cleanups (ui_out_chain); -- ui_out_text (uiout, "\n"); -- value_free (bs->old_val); -- bs->old_val = NULL; -- } -+ annotate_watchpoint (b->number); -+ if (ui_out_is_mi_like_p (uiout)) -+ ui_out_field_string -+ (uiout, "reason", -+ async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -+ mention (b); -+ ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -+ ui_out_text (uiout, "\nOld value = "); -+ watchpoint_value_print (bs->old_val, stb->stream); -+ ui_out_field_stream (uiout, "old", stb); -+ ui_out_text (uiout, "\nNew value = "); -+ watchpoint_value_print (b->val, stb->stream); -+ ui_out_field_stream (uiout, "new", stb); -+ do_cleanups (ui_out_chain); -+ ui_out_text (uiout, "\n"); - /* More than one watchpoint may have been triggered. */ - return PRINT_UNKNOWN; - break; -@@ -2253,7 +2312,7 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "value", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2261,7 +2320,7 @@ - break; - - case bp_access_watchpoint: -- if (bs->old_val != NULL) -+ if (bs->old_val != NULL) - { - annotate_watchpoint (b->number); - if (ui_out_is_mi_like_p (uiout)) -@@ -2271,10 +2330,8 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (bs->old_val, stb->stream); - ui_out_field_stream (uiout, "old", stb); -- value_free (bs->old_val); -- bs->old_val = NULL; - ui_out_text (uiout, "\nNew value = "); - } - else -@@ -2287,7 +2344,7 @@ - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); - } -- value_print (b->val, stb->stream, 0,Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "new", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2574,13 +2631,20 @@ - we might be in the middle of evaluating a function call. */ - - struct value *mark = value_mark (); -- struct value *new_val = evaluate_expression (b->exp); -- if (!value_equal (b->val, new_val)) -+ struct value *new_val; -+ -+ fetch_watchpoint_value (b->exp, &new_val, NULL, NULL); -+ if ((b->val != NULL) != (new_val != NULL) -+ || (b->val != NULL && !value_equal (b->val, new_val))) - { -- release_value (new_val); -- value_free_to_mark (mark); -+ if (new_val != NULL) -+ { -+ release_value (new_val); -+ value_free_to_mark (mark); -+ } - bs->old_val = b->val; - b->val = new_val; -+ b->val_valid = 1; - /* We will stop here */ - return WP_VALUE_CHANGED; - } -@@ -5722,10 +5786,9 @@ - exp_end = arg; - exp_valid_block = innermost_block; - mark = value_mark (); -- val = evaluate_expression (exp); -- release_value (val); -- if (value_lazy (val)) -- value_fetch_lazy (val); -+ fetch_watchpoint_value (exp, &val, NULL, NULL); -+ if (val != NULL) -+ release_value (val); - - tok = arg; - while (*tok == ' ' || *tok == '\t') -@@ -5814,6 +5877,7 @@ - b->exp_valid_block = exp_valid_block; - b->exp_string = savestring (exp_start, exp_end - exp_start); - b->val = val; -+ b->val_valid = 1; - b->loc->cond = cond; - if (cond_start) - b->cond_string = savestring (cond_start, cond_end - cond_start); -@@ -7697,11 +7761,11 @@ - if (bpt->val) - value_free (bpt->val); - mark = value_mark (); -- bpt->val = evaluate_expression (bpt->exp); -- release_value (bpt->val); -- if (value_lazy (bpt->val)) -- value_fetch_lazy (bpt->val); -- -+ fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); -+ if (bpt->val) -+ release_value (bpt->val); -+ bpt->val_valid = 1; -+ - if (bpt->type == bp_hardware_watchpoint || - bpt->type == bp_read_watchpoint || - bpt->type == bp_access_watchpoint) -diff -Naur gdb-6.8.orig/gdb/breakpoint.h gdb-6.8/gdb/breakpoint.h ---- gdb-6.8.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.h 2008-09-17 16:32:32.000000000 +0200 -@@ -391,8 +391,13 @@ - /* The largest block within which it is valid, or NULL if it is - valid anywhere (e.g. consists just of global symbols). */ - struct block *exp_valid_block; -- /* Value of the watchpoint the last time we checked it. */ -+ /* Value of the watchpoint the last time we checked it, or NULL -+ when we do not know the value yet or the value was not -+ readable. VAL is never lazy. */ - struct value *val; -+ /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, -+ then an error occurred reading the value. */ -+ int val_valid; - - /* Holds the address of the related watchpoint_scope breakpoint - when using watchpoints on local variables (might the concept -diff -Naur gdb-6.8.orig/gdb/NEWS gdb-6.8/gdb/NEWS ---- gdb-6.8.orig/gdb/NEWS 2008-03-27 19:14:10.000000000 +0100 -+++ gdb-6.8/gdb/NEWS 2008-09-17 16:32:32.000000000 +0200 -@@ -1,6 +1,9 @@ - What has changed in GDB? - (Organized release by release) - -+* Watchpoints can now be set on unreadable memory locations, e.g. addresses -+which will be allocated using malloc later in program execution. -+ - *** Changes in GDB 6.8 - - * New native configurations -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c 2008-09-17 16:32:32.000000000 +0200 -@@ -39,6 +39,8 @@ - - int doread = 0; - -+char *global_ptr; -+ - void marker1 () - { - } -@@ -110,6 +112,14 @@ - return 73; - } - -+void -+func4 () -+{ -+ buf[0] = 3; -+ global_ptr = buf; -+ buf[0] = 7; -+} -+ - int main () - { - #ifdef usestubs -@@ -185,5 +195,7 @@ - - func3 (); - -+ func4 (); -+ - return 0; - } -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2008-09-17 16:32:32.000000000 +0200 -@@ -645,6 +645,30 @@ - } - } - -+proc test_inaccessible_watchpoint {} { -+ global gdb_prompt -+ -+ # This is a test for watchpoints on currently inaccessible (but later -+ # valid) memory. -+ -+ if [runto func4] then { -+ gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" -+ gdb_test "next" ".*global_ptr = buf.*" -+ gdb_test_multiple "next" "next over ptr init" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { -+ # We can not test for <unknown> here because NULL may be readable. -+ # This test does rely on *NULL != 3. -+ pass "next over ptr init" -+ } -+ } -+ gdb_test_multiple "next" "next over buffer set" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { -+ pass "next over buffer set" -+ } -+ } -+ } -+} -+ - # Start with a fresh gdb. - - gdb_exit -@@ -797,6 +821,8 @@ - } - } - -+ test_inaccessible_watchpoint -+ - # See above. - if [istarget "mips-idt-*"] then { - gdb_exit -diff -Naur gdb-6.8.orig/sim/common/aclocal.m4 gdb-6.8/sim/common/aclocal.m4 ---- gdb-6.8.orig/sim/common/aclocal.m4 2006-06-13 10:06:48.000000000 +0200 -+++ gdb-6.8/sim/common/aclocal.m4 2008-09-17 16:33:00.000000000 +0200 -@@ -18,7 +18,7 @@ - # - # SIM_AC_OUTPUT - --AC_DEFUN(SIM_AC_COMMON, -+AC_DEFUN([SIM_AC_COMMON], - [ - # autoconf.info says this should be called right after AC_INIT. - AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) -@@ -245,7 +245,7 @@ - dnl supported. - dnl ??? Until there is demonstrable value in doing something more complicated, - dnl let's not. --AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT, -+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], - [ - AC_ARG_ENABLE(sim-environment, - [ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], -@@ -269,7 +269,7 @@ - dnl Without this option all possible alignment restrictions are accommodated. - dnl arg[1] is hardwired target alignment - dnl arg[2] is default target alignment --AC_DEFUN(SIM_AC_OPTION_ALIGNMENT, -+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT], - wire_alignment="[$1]" - default_alignment="[$2]" - [ -@@ -318,7 +318,7 @@ - - - dnl Conditionally compile in assertion statements. --AC_DEFUN(SIM_AC_OPTION_ASSERT, -+AC_DEFUN([SIM_AC_OPTION_ASSERT], - [ - AC_ARG_ENABLE(sim-assert, - [ --enable-sim-assert Specify whether to perform random assertions.], -@@ -342,7 +342,7 @@ - dnl arg[3] is the number of bits in an address - dnl arg[4] is the number of bits in an OpenFirmware cell. - dnl FIXME: this information should be obtained from bfd/archure --AC_DEFUN(SIM_AC_OPTION_BITSIZE, -+AC_DEFUN([SIM_AC_OPTION_BITSIZE], - wire_word_bitsize="[$1]" - wire_word_msb="[$2]" - wire_address_bitsize="[$3]" -@@ -408,7 +408,7 @@ - dnl that support both big and little endian targets. - dnl arg[1] is hardwired target endianness. - dnl arg[2] is default target endianness. --AC_DEFUN(SIM_AC_OPTION_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_ENDIAN], - [ - wire_endian="[$1]" - default_endian="[$2]" -@@ -458,7 +458,7 @@ - dnl --enable-sim-hostendian is for users of the simulator when - dnl they find that AC_C_BIGENDIAN does not function correctly - dnl (for instance in a canadian cross) --AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN, -+AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], - [ - AC_ARG_ENABLE(sim-hostendian, - [ --enable-sim-hostendian=end Specify host byte endian orientation.], -@@ -490,7 +490,7 @@ - dnl And optionally the bitsize of the floating point register. - dnl arg[1] specifies the presence (or absence) of floating point hardware - dnl arg[2] specifies the number of bits in a floating point register --AC_DEFUN(SIM_AC_OPTION_FLOAT, -+AC_DEFUN([SIM_AC_OPTION_FLOAT], - [ - default_sim_float="[$1]" - default_sim_float_bitsize="[$2]" -@@ -519,7 +519,7 @@ - - - dnl The argument is the default cache size if none is specified. --AC_DEFUN(SIM_AC_OPTION_SCACHE, -+AC_DEFUN([SIM_AC_OPTION_SCACHE], - [ - default_sim_scache="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-scache, -@@ -539,7 +539,7 @@ - - - dnl The argument is the default model if none is specified. --AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL, -+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], - [ - default_sim_default_model="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-default-model, -@@ -559,7 +559,7 @@ - dnl arg[1] Enable sim-hw by default? ("yes" or "no") - dnl arg[2] is a space separated list of devices that override the defaults - dnl arg[3] is a space separated list of extra target specific devices. --AC_DEFUN(SIM_AC_OPTION_HARDWARE, -+AC_DEFUN([SIM_AC_OPTION_HARDWARE], - [ - if test x"[$1]" = x"yes"; then - sim_hw_p=yes -@@ -621,7 +621,7 @@ - dnl performance by inlining functions. - dnl Guarantee that unconfigured simulators do not do any inlining - sim_inline="-DDEFAULT_INLINE=0" --AC_DEFUN(SIM_AC_OPTION_INLINE, -+AC_DEFUN([SIM_AC_OPTION_INLINE], - [ - default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" - AC_ARG_ENABLE(sim-inline, -@@ -666,7 +666,7 @@ - AC_SUBST(sim_inline) - - --AC_DEFUN(SIM_AC_OPTION_PACKAGES, -+AC_DEFUN([SIM_AC_OPTION_PACKAGES], - [ - AC_ARG_ENABLE(sim-packages, - [ --enable-sim-packages=list Specify the packages to be included in the build.], -@@ -692,7 +692,7 @@ - AC_SUBST(sim_packages) - - --AC_DEFUN(SIM_AC_OPTION_REGPARM, -+AC_DEFUN([SIM_AC_OPTION_REGPARM], - [ - AC_ARG_ENABLE(sim-regparm, - [ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], -@@ -709,7 +709,7 @@ - AC_SUBST(sim_regparm) - - --AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS, -+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], - [ - default_sim_reserved_bits="ifelse([$1],,1,[$1])" - AC_ARG_ENABLE(sim-reserved-bits, -@@ -726,7 +726,7 @@ - AC_SUBST(sim_reserved_bits) - - --AC_DEFUN(SIM_AC_OPTION_SMP, -+AC_DEFUN([SIM_AC_OPTION_SMP], - [ - default_sim_smp="ifelse([$1],,5,[$1])" - AC_ARG_ENABLE(sim-smp, -@@ -746,7 +746,7 @@ - AC_SUBST(sim_smp) - - --AC_DEFUN(SIM_AC_OPTION_STDCALL, -+AC_DEFUN([SIM_AC_OPTION_STDCALL], - [ - AC_ARG_ENABLE(sim-stdcall, - [ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], -@@ -763,7 +763,7 @@ - AC_SUBST(sim_stdcall) - - --AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], - [ - default_sim_xor_endian="ifelse([$1],,8,[$1])" - AC_ARG_ENABLE(sim-xor-endian, -@@ -782,7 +782,7 @@ - - dnl --enable-build-warnings is for developers of the simulator. - dnl it enables extra GCC specific warnings. --AC_DEFUN(SIM_AC_OPTION_WARNINGS, -+AC_DEFUN([SIM_AC_OPTION_WARNINGS], - [ - # NOTE: Don't add -Wall or -Wunused, they both include - # -Wunused-parameter which reports bogus warnings. -@@ -866,7 +866,7 @@ - dnl one afterwards. The two pieces of the common fragment are inserted into - dnl the target's fragment at the appropriate points. - --AC_DEFUN(SIM_AC_OUTPUT, -+AC_DEFUN([SIM_AC_OUTPUT], - [ - AC_LINK_FILES($sim_link_files, $sim_link_links) - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. -@@ -895,7 +895,7 @@ - sinclude(../../config/gettext-sister.m4) - - dnl --enable-cgen-maint support --AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, -+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT], - [ - cgen_maint=no - dnl Default is to use one in build tree. -diff -Naur gdb-6.8.orig/sim/erc32/configure gdb-6.8/sim/erc32/configure ---- gdb-6.8.orig/sim/erc32/configure 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure 2008-09-17 16:33:00.000000000 +0200 -@@ -309,7 +309,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile READLINE READLINE_DEPS READLINE_CFLAGS cgen_breaks LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -858,6 +858,11 @@ - --enable-sim-trace=opts Enable tracing flags - --enable-sim-profile=opts Enable profiling flags - -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-system-readline use installed readline library -+ - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags -@@ -4493,57 +4498,36 @@ - done - - --# In the Cygwin environment, we need some additional flags. --echo "$as_me:$LINENO: checking for cygwin" >&5 --echo $ECHO_N "checking for cygwin... $ECHO_C" >&6 --if test "${sim_cv_os_cygwin+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --#ifdef __CYGWIN__ --lose --#endif --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then -- sim_cv_os_cygwin=yes --else -- sim_cv_os_cygwin=no --fi --rm -f conftest* -+# Check whether --with-system-readline or --without-system-readline was given. -+if test "${with_system_readline+set}" = set; then -+ withval="$with_system_readline" - --fi --echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5 --echo "${ECHO_T}$sim_cv_os_cygwin" >&6 -+fi; - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' --else -- echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 --echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 --if test "${ac_cv_lib_termcap_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+if test "$with_system_readline" = yes; then -+ echo "$as_me:$LINENO: checking for readline" >&5 -+echo $ECHO_N "checking for readline... $ECHO_C" >&6 -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -- -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char add_history (); - int - main () - { --main (); -+add_history (); - ; - return 0; - } -@@ -4570,41 +4554,13 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_termcap_main=yes -+ READLINE=-lreadline - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_termcap_main=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 --echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 --if test $ac_cv_lib_termcap_main = yes; then -- TERMCAP=-ltermcap --else -- TERMCAP="" --fi -- --fi -- -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ LIBS="-lreadline -lncurses $save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -4617,11 +4573,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char readline (); -+char add_history (); - int - main () - { --readline (); -+add_history (); - ; - return 0; - } -@@ -4648,28 +4604,34 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ READLINE="-lreadline -lncurses" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no -+{ { echo "$as_me:$LINENO: error: unable to detect readline" >&5 -+echo "$as_me: error: unable to detect readline" >&2;} -+ { (exit 1); exit 1; }; } - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- READLINE=-lreadline --else -- { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5 --echo "$as_me: error: the required \"readline\" library is missing" >&2;} -- { (exit 1); exit 1; }; } -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ echo "$as_me:$LINENO: result: $READLINE" >&5 -+echo "${ECHO_T}$READLINE" >&6 -+ READLINE_DEPS= -+ READLINE_CFLAGS= -+else -+ READLINE='$(READLINE_DIR)/libreadline.a' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - --fi -+ -+ - - - ac_sources="$sim_link_files" -@@ -5389,8 +5351,9 @@ - s,@sim_stdio@,$sim_stdio,;t t - s,@sim_trace@,$sim_trace,;t t - s,@sim_profile@,$sim_profile,;t t --s,@TERMCAP@,$TERMCAP,;t t - s,@READLINE@,$READLINE,;t t -+s,@READLINE_DEPS@,$READLINE_DEPS,;t t -+s,@READLINE_CFLAGS@,$READLINE_CFLAGS,;t t - s,@cgen_breaks@,$cgen_breaks,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t -diff -Naur gdb-6.8.orig/sim/erc32/configure.ac gdb-6.8/sim/erc32/configure.ac ---- gdb-6.8.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure.ac 2008-09-17 16:33:00.000000000 +0200 -@@ -11,27 +11,32 @@ - - AC_CHECK_HEADERS(stdlib.h) - --# In the Cygwin environment, we need some additional flags. --AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ --#ifdef __CYGWIN__ --lose --#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) -+AC_ARG_WITH([system-readline], -+ [AS_HELP_STRING([--with-system-readline], -+ [use installed readline library])]) - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -+if test "$with_system_readline" = yes; then -+ AC_MSG_CHECKING([for readline]) -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE=-lreadline], -+ [ LIBS="-lreadline -lncurses $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE="-lreadline -lncurses"], -+ [AC_MSG_ERROR([unable to detect readline])]) -+ ]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT($READLINE) -+ READLINE_DEPS= -+ READLINE_CFLAGS= - else -- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="") --fi --AC_SUBST(TERMCAP) -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- AC_CHECK_LIB(readline, readline, READLINE=-lreadline, -- AC_ERROR([the required "readline" library is missing]), $TERMCAP) -+ READLINE='$(READLINE_DIR)/libreadline.a' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - AC_SUBST(READLINE) -+AC_SUBST(READLINE_DEPS) -+AC_SUBST(READLINE_CFLAGS) -+ - SIM_AC_OUTPUT -diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8/sim/erc32/erc32.c ---- gdb-6.8.orig/sim/erc32/erc32.c 1999-04-16 03:35:00.000000000 +0200 -+++ gdb-6.8/sim/erc32/erc32.c 2008-09-17 16:33:00.000000000 +0200 -@@ -24,6 +24,7 @@ - - #include <sys/types.h> - #include <stdio.h> -+#include <string.h> - #include <termios.h> - #include <sys/fcntl.h> - #include <sys/file.h> -@@ -413,7 +414,7 @@ - if (rom8) mec_memcfg &= ~0x20000; - else mec_memcfg |= 0x20000; - -- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7); -+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7); - mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7); - - if (sparclite_board) { -@@ -1659,7 +1660,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz); -@@ -1736,7 +1737,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - if (mem_accprot) { -diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8/sim/erc32/exec.c ---- gdb-6.8.orig/sim/erc32/exec.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8/sim/erc32/exec.c 2008-09-17 16:33:00.000000000 +0200 -@@ -1713,7 +1713,7 @@ - sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1]; - sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1]; - default: -- ; -+ break; - } - #endif - -@@ -1886,7 +1886,7 @@ - sregs->fs[rd & ~1] = sregs->fdp[rd | 1]; - sregs->fs[rd | 1] = sregs->fdp[rd & ~1]; - default: -- ; -+ break; - } - #endif - if (sregs->fpstate == FP_EXC_PE) { -diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8/sim/erc32/Makefile.in ---- gdb-6.8.orig/sim/erc32/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8/sim/erc32/Makefile.in 2008-09-17 16:33:00.000000000 +0200 -@@ -18,12 +18,12 @@ - - ## COMMON_PRE_CONFIG_FRAG - --TERMCAP_LIB = @TERMCAP@ -+# TERMCAP_LIB = -lncurses - READLINE_LIB = @READLINE@ - - SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o - SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm --SIM_EXTRA_ALL = sis -+SIM_EXTRA_ALL = sis$(EXEEXT) - SIM_EXTRA_INSTALL = install-sis - SIM_EXTRA_CLEAN = clean-sis - -@@ -37,8 +37,8 @@ - # `sis' doesn't need interf.o. - SIS_OFILES = exec.o erc32.o func.o help.o float.o - --sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -- $(CC) $(ALL_CFLAGS) -o sis \ -+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) - - # FIXME: This computes the build host's endianness, doesn't it? -@@ -51,11 +51,11 @@ - - # Copy the files into directories where they will be run. - install-sis: installdirs -- n=`echo sis | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) -+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \ -+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n - - clean-sis: -- rm -f sis end end.h -+ rm -f sis$(EXEEXT) end end.h - - configure: - @echo "Rebuilding configure..." -diff -Naur gdb-6.8.orig/sim/ppc/configure.ac gdb-6.8/sim/ppc/configure.ac ---- gdb-6.8.orig/sim/ppc/configure.ac 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure.ac 2008-09-17 16:33:00.000000000 +0200 -@@ -209,10 +209,105 @@ - esac - ])dnl - -+AC_CACHE_CHECK([if union semun defined], -+ ac_cv_HAS_UNION_SEMUN, -+ [AC_TRY_COMPILE([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h>], -+[union semun arg ;], -+[ac_cv_has_union_semun="yes"], -+[ac_cv_has_union_semun="no"]) -+AC_MSG_RESULT($ac_cv_has_union_semun) -+]) -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+else # semun is not defined -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+fi -+ -+AC_CACHE_CHECK(whether System V shared memory is supported, -+ac_cv_sysv_shm, -+[ -+AC_TRY_RUN([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+], -+ac_cv_sysv_shm="yes", ac_cv_sysv_shm="no", :) -+]) -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ - - AC_ARG_ENABLE(sim-hardware, - [ --enable-sim-hardware=list Specify the hardware to be included in the build.], --[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";; -@@ -224,14 +319,13 @@ - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" --fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi])dnl - -- - AC_ARG_ENABLE(sim-hostbitsize, - [ --enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).], - [case "${enableval}" in -diff -Naur gdb-6.8.orig/sim/ppc/debug.c gdb-6.8/sim/ppc/debug.c ---- gdb-6.8.orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.c 2008-09-17 16:33:00.000000000 +0200 -@@ -70,6 +70,8 @@ - { trace_pass_device, "pass-device" }, - { trace_phb_device, "phb-device" }, - { trace_register_device, "register-device", "Device initializing registers" }, -+ { trace_sem_device, "sem-device" }, -+ { trace_shm_device, "shm-device" }, - { trace_stack_device, "stack-device" }, - { trace_vm_device, "vm-device" }, - /* packages */ -diff -Naur gdb-6.8.orig/sim/ppc/debug.h gdb-6.8/sim/ppc/debug.h ---- gdb-6.8.orig/sim/ppc/debug.h 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.h 2008-09-17 16:33:00.000000000 +0200 -@@ -51,6 +51,8 @@ - trace_pal_device, - trace_pass_device, - trace_phb_device, -+ trace_sem_device, -+ trace_shm_device, - trace_stack_device, - trace_register_device, - trace_vm_device, -diff -Naur gdb-6.8.orig/sim/ppc/hw_sem.c gdb-6.8/sim/ppc/hw_sem.c ---- gdb-6.8.orig/sim/ppc/hw_sem.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_sem.c 2008-09-17 16:33:00.000000000 +0200 -@@ -0,0 +1,301 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SEM_C_ -+#define _HW_SEM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/sem.h> -+ -+#include <errno.h> -+ -+/* DEVICE -+ -+ -+ sem - provide access to a unix semaphore -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an interface to a unix semaphore. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix semaphore. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the sem: -+ -+ | bash$ psim -t sem-device \ -+ -+ -+ Configure a UNIX semaphore using key 0x12345678 mapped into psim -+ address space at 0xfff00000: -+ -+ | -o '/sem@0xfff00000/reg 0xfff00000 0x80000' \ -+ | -o '/sem@0xfff00000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/sem@0xc0000000/reg 0xc0000000 0x80000' \ -+ -o '/sem@0xc0000000/key 0x12345678' ../psim-hello/hello -+ -+ REGISTERS -+ -+ offset 0 - lock count -+ offset 4 - lock operation -+ offset 8 - unlock operation -+ -+ All reads return the current or resulting count. -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_sem_device { -+ unsigned_word physical_address; -+ key_t key; -+ int id; -+ int initial; -+ int count; -+} hw_sem_device; -+ -+static void -+hw_sem_init_data(device *me) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ const device_unit *d; -+ int status; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* initialize the properties of the sem */ -+ -+ if (device_find_property(me, "key") == NULL) -+ error("sem_init_data() required key property is missing\n"); -+ -+ if (device_find_property(me, "value") == NULL) -+ error("sem_init_data() required value property is missing\n"); -+ -+ sem->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(sem, ("semaphore key (%d)\n", sem->key) ); -+ -+ sem->initial = (int) device_find_integer_property(me, "value"); -+ DTRACE(sem, ("semaphore initial value (%d)\n", sem->initial) ); -+ -+ d = device_unit_address(me); -+ sem->physical_address = d->cells[ d->nr_cells-1 ]; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", sem->physical_address)); -+ -+ /* Now to initialize the semaphore */ -+ -+ if ( sem->initial != -1 ) { -+ -+ sem->id = semget(sem->key, 1, IPC_CREAT | 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ -+ help.val = sem->initial; -+ status = semctl( sem->id, 0, SETVAL, help ); -+ if (status == -1) -+ error("hw_sem_init_data() semctl -- set value failed\n"); -+ -+ } else { -+ sem->id = semget(sem->key, 1, 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ } -+ -+ sem->count = semctl( sem->id, 0, GETVAL, help ); -+ if (sem->count == -1) -+ error("hw_sem_init_data() semctl -- get value failed\n"); -+ DTRACE(sem, ("semaphore OS value (%d)\n", sem->count) ); -+ -+ if (sizeof(int) != 4) -+ error("hw_sem_init_data() typing problem\n"); -+} -+ -+static void -+hw_sem_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ -+ if (space != 0) -+ error("sem_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 12) -+ error("sem_attach_address_callback() invalid size\n"); -+ -+ sem->physical_address = addr; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", addr)); -+} -+ -+static unsigned -+hw_sem_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ struct sembuf sb; -+ int status; -+ unsigned32 u32; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(sem, ("semaphore read addr=0x%x length=%d\n", addr, nr_bytes)); -+ -+ if (!(addr >= sem->physical_address && addr <= sem->physical_address + 11)) -+ error("hw_sem_io_read_buffer() invalid address - out of range\n"); -+ -+ if ((addr % 4) != 0) -+ error("hw_sem_io_read_buffer() invalid address - alignment\n"); -+ -+ if (nr_bytes != 4) -+ error("hw_sem_io_read_buffer() invalid length\n"); -+ -+ switch ( (addr - sem->physical_address) / 4 ) { -+ -+ case 0: /* OBTAIN CURRENT VALUE */ -+ break; -+ -+ case 1: /* LOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = -1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: lock" ); -+ error("hw_sem_io_read_buffer() sem lock\n"); -+ } -+ -+ DTRACE(sem, ("semaphore lock %d\n", sem->count)); -+ break; -+ -+ case 2: /* UNLOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = 1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: unlock" ); -+ error("hw_sem_io_read_buffer() sem unlock\n"); -+ } -+ DTRACE(sem, ("semaphore unlock %d\n", sem->count)); -+ break; -+ -+ default: -+ error("hw_sem_io_read_buffer() invalid address - unknown error\n"); -+ break; -+ } -+ -+ /* assume target is big endian */ -+ u32 = H2T_4(semctl( sem->id, 0, GETVAL, help )); -+ -+ DTRACE(sem, ("semaphore OS value (%d)\n", u32) ); -+ if (u32 == 0xffffffff) { -+ perror( "hw_sem.c: getval" ); -+ error("hw_sem_io_read_buffer() semctl -- get value failed\n"); -+ } -+ -+ memcpy(dest, &u32, nr_bytes); -+ return nr_bytes; -+ -+} -+ -+static device_callbacks const hw_sem_callbacks = { -+ { generic_device_init_address, hw_sem_init_data }, -+ { hw_sem_attach_address_callback, }, /* address */ -+ { hw_sem_io_read_buffer, NULL }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_sem_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_sem_device *sem = ZALLOC(hw_sem_device); -+ return sem; -+} -+ -+const device_descriptor hw_sem_device_descriptor[] = { -+ { "sem", hw_sem_create, &hw_sem_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SEM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/hw_shm.c gdb-6.8/sim/ppc/hw_shm.c ---- gdb-6.8.orig/sim/ppc/hw_shm.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_shm.c 2008-09-17 16:33:00.000000000 +0200 -@@ -0,0 +1,236 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SHM_C_ -+#define _HW_SHM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/shm.h> -+ -+ -+/* DEVICE -+ -+ -+ shm - map unix shared memory into psim address space -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an area of memory which is mapped into UNIX -+ shared memory. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ The SHM area is assumed to be of the same length. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix shared memory area. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the shm: -+ -+ | bash$ psim -t shm-device \ -+ -+ -+ Configure a 512 kilobytes of UNIX shared memory with the key 0x12345678 -+ mapped into psim address space at 0x0c000000. -+ -+ | -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ | -o '/shm@0x0c000000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ -o '/shm@0x0c000000/key 0x12345678' ../psim-hello/hello -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_shm_device { -+ unsigned_word physical_address; -+ char *shm_address; -+ unsigned sizeof_memory; -+ key_t key; -+ int id; -+} hw_shm_device; -+ -+static void -+hw_shm_init_data(device *me) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ const device_unit *d; -+ reg_property_spec reg; -+ int i; -+ -+ /* Obtain the Key Value */ -+ if (device_find_property(me, "key") == NULL) -+ error("shm_init_data() required key property is missing\n"); -+ -+ shm->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(shm, ("shm key (0x%08x)\n", shm->key) ); -+ -+ /* Figure out where this memory is in address space and how long it is */ -+ if ( !device_find_reg_array_property(me, "reg", 0, ®) ) -+ error("hw_shm_init_data() no address registered\n"); -+ -+ /* Determine the address and length being as paranoid as possible */ -+ shm->physical_address = 0xffffffff; -+ shm->sizeof_memory = 0xffffffff; -+ -+ for ( i=0 ; i<reg.address.nr_cells; i++ ) { -+ if (reg.address.cells[0] == 0 && reg.size.cells[0] == 0) -+ continue; -+ -+ if ( shm->physical_address != 0xffffffff ) -+ device_error(me, "Only single celled address ranges supported\n"); -+ -+ shm->physical_address = reg.address.cells[i]; -+ DTRACE(shm, ("shm physical_address=0x%x\n", shm->physical_address)); -+ -+ shm->sizeof_memory = reg.size.cells[i]; -+ DTRACE(shm, ("shm length=0x%x\n", shm->sizeof_memory)); -+ } -+ -+ if ( shm->physical_address == 0xffffffff ) -+ device_error(me, "Address not specified\n" ); -+ -+ if ( shm->sizeof_memory == 0xffffffff ) -+ device_error(me, "Length not specified\n" ); -+ -+ /* Now actually attach to or create the shared memory area */ -+ shm->id = shmget(shm->key, shm->sizeof_memory, IPC_CREAT | 0660); -+ if (shm->id == -1) -+ error("hw_shm_init_data() shmget failed\n"); -+ -+ shm->shm_address = shmat(shm->id, (char *)0, SHM_RND); -+ if (shm->shm_address == (void *)-1) -+ error("hw_shm_init_data() shmat failed\n"); -+} -+ -+static void -+hw_shm_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ if (space != 0) -+ error("shm_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 0) -+ error("shm_attach_address_callback() invalid size\n"); -+} -+ -+ -+static unsigned -+hw_shm_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("read %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(dest, &shm->shm_address[addr - shm->physical_address], nr_bytes); -+ return nr_bytes; -+} -+ -+ -+static unsigned -+hw_shm_io_write_buffer(device *me, -+ const void *source, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("write %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(&shm->shm_address[addr - shm->physical_address], source, nr_bytes); -+ return nr_bytes; -+} -+ -+static device_callbacks const hw_shm_callbacks = { -+ { generic_device_init_address, hw_shm_init_data }, -+ { hw_shm_attach_address_callback, }, /* address */ -+ { hw_shm_io_read_buffer, -+ hw_shm_io_write_buffer }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_shm_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_shm_device *shm = ZALLOC(hw_shm_device); -+ return shm; -+} -+ -+ -+ -+const device_descriptor hw_shm_device_descriptor[] = { -+ { "shm", hw_shm_create, &hw_shm_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SHM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/Makefile.in gdb-6.8/sim/ppc/Makefile.in ---- gdb-6.8.orig/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 -+++ gdb-6.8/sim/ppc/Makefile.in 2008-09-17 16:33:00.000000000 +0200 -@@ -834,6 +834,8 @@ - hw_pal.o: hw_pal.c $(DEVICE_TABLE_H) $(CPU_H) - hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) $(HW_PHB_H) $(COREFILE_H) - hw_register.o: hw_register.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_sem.o: hw_sem.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_shm.o: hw_shm.c $(DEVICE_TABLE_H) $(PSIM_H) - hw_trace.o: hw_trace.c $(DEVICE_TABLE_H) - hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) - # ignore this line, it stops make from getting confused -diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8/sim/ppc/ppc-instructions ---- gdb-6.8.orig/sim/ppc/ppc-instructions 2006-11-29 16:20:55.000000000 +0100 -+++ gdb-6.8/sim/ppc/ppc-instructions 2008-09-17 16:33:00.000000000 +0200 -@@ -3402,6 +3402,14 @@ - case spr_dec: - *rT = cpu_get_decrementer(processor); - break; -+ case spr_tbrl: -+ if (is_64bit_implementation) *rT = TB; -+ else *rT = EXTRACTED64(TB, 32, 63); -+ break; -+ case spr_tbru: -+ if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31); -+ else *rT = EXTRACTED64(TB, 0, 31); -+ break; - case spr_tbu: - case spr_tbl: - /* NOTE - these SPR's are not readable. Use mftb[ul] */ -diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8/sim/ppc/ppc-spr-table ---- gdb-6.8.orig/sim/ppc/ppc-spr-table 2003-06-22 18:48:12.000000000 +0200 -+++ gdb-6.8/sim/ppc/ppc-spr-table 2008-09-17 16:33:00.000000000 +0200 -@@ -32,6 +32,8 @@ - SRR0:26:0:0 - SRR1:27:0:0 - VRSAVE:256:0:0 -+TBRL:268:0:0 -+TBRU:269:0:0 - SPRG0:272:0:0 - SPRG1:273:0:0 - SPRG2:274:0:0 diff --git a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090312.diff b/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090312.diff deleted file mode 100644 index a949e1e745..0000000000 --- a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090312.diff +++ /dev/null @@ -1,2032 +0,0 @@ -diff -Naur gdb-6.8.orig/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c ---- gdb-6.8.orig/gdb/breakpoint.c 2008-02-26 09:14:11.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.c 2009-03-12 10:40:36.000000000 +0100 -@@ -55,6 +55,7 @@ - #include "memattr.h" - #include "ada-lang.h" - #include "top.h" -+#include "wrapper.h" - - #include "gdb-events.h" - #include "mi/mi-common.h" -@@ -826,7 +827,65 @@ - || bpt->type == bp_access_watchpoint); - } - --/* Assuming that B is a hardware breakpoint: -+/* Find the current value of a watchpoint on EXP. Return the value in -+ *VALP and *RESULTP and the chain of intermediate and final values -+ in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does -+ not need them. -+ -+ If an error occurs while evaluating the expression, *RESULTP will -+ be set to NULL. *RESULTP may be a lazy value, if the result could -+ not be read from memory. It is used to determine whether a value -+ is user-specified (we should watch the whole value) or intermediate -+ (we should watch only the bit used to locate the final value). -+ -+ If the final value, or any intermediate value, could not be read -+ from memory, *VALP will be set to NULL. *VAL_CHAIN will still be -+ set to any referenced values. *VALP will never be a lazy value. -+ This is the value which we store in struct breakpoint. -+ -+ If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the -+ value chain. The caller must free the values individually. If -+ VAL_CHAIN is NULL, all generated values will be left on the value -+ chain. */ -+ -+static void -+fetch_watchpoint_value (struct expression *exp, struct value **valp, -+ struct value **resultp, struct value **val_chain) -+{ -+ struct value *mark, *new_mark, *result; -+ -+ *valp = NULL; -+ if (resultp) -+ *resultp = NULL; -+ if (val_chain) -+ *val_chain = NULL; -+ -+ /* Evaluate the expression. */ -+ mark = value_mark (); -+ result = NULL; -+ gdb_evaluate_expression (exp, &result); -+ new_mark = value_mark (); -+ if (mark == new_mark) -+ return; -+ if (resultp) -+ *resultp = result; -+ -+ /* Make sure it's not lazy, so that after the target stops again we -+ have a non-lazy previous value to compare with. */ -+ if (result != NULL -+ && (!value_lazy (result) || gdb_value_fetch_lazy (result))) -+ *valp = result; -+ -+ if (val_chain) -+ { -+ /* Return the chain of intermediate values. We use this to -+ decide which addresses to watch. */ -+ *val_chain = new_mark; -+ value_release_to_mark (mark); -+ } -+} -+ -+/* Assuming that B is a hardware watchpoint: - - Reparse watchpoint expression, is REPARSE is non-zero - - Evaluate expression and store the result in B->val - - Update the list of values that must be watched in B->loc. -@@ -837,7 +896,6 @@ - update_watchpoint (struct breakpoint *b, int reparse) - { - int within_current_scope; -- struct value *mark = value_mark (); - struct frame_id saved_frame_id; - struct bp_location *loc; - bpstat bs; -@@ -889,9 +947,9 @@ - to the user when the old value and the new value may actually - be completely different objects. */ - value_free (b->val); -- b->val = NULL; -+ b->val = NULL; -+ b->val_valid = 0; - } -- - - /* If we failed to parse the expression, for example because - it refers to a global variable in a not-yet-loaded shared library, -@@ -900,43 +958,37 @@ - is different from out-of-scope watchpoint. */ - if (within_current_scope && b->exp) - { -- struct value *v, *next; -+ struct value *val_chain, *v, *result, *next; -+ -+ fetch_watchpoint_value (b->exp, &v, &result, &val_chain); - -- /* Evaluate the expression and make sure it's not lazy, so that -- after target stops again, we have a non-lazy previous value -- to compare with. Also, making the value non-lazy will fetch -- intermediate values as needed, which we use to decide which -- addresses to watch. -- -- The value returned by evaluate_expression is stored in b->val. -- In addition, we look at all values which were created -- during evaluation, and set watchoints at addresses as needed. -- Those values are explicitly deleted here. */ -- v = evaluate_expression (b->exp); - /* Avoid setting b->val if it's already set. The meaning of - b->val is 'the last value' user saw, and we should update - it only if we reported that last value to user. As it - happens, the code that reports it updates b->val directly. */ -- if (b->val == NULL) -- b->val = v; -- value_contents (v); -- value_release_to_mark (mark); -+ if (!b->val_valid) -+ { -+ b->val = v; -+ b->val_valid = 1; -+ } - - /* Look at each value on the value chain. */ -- for (; v; v = next) -+ for (v = val_chain; v; v = next) - { - /* If it's a memory location, and GDB actually needed - its contents to evaluate the expression, then we -- must watch it. */ -+ must watch it. If the first value returned is -+ still lazy, that means an error occurred reading it; -+ watch it anyway in case it becomes readable. */ - if (VALUE_LVAL (v) == lval_memory -- && ! value_lazy (v)) -+ && (v == val_chain || ! value_lazy (v))) - { - struct type *vtype = check_typedef (value_type (v)); - - /* We only watch structs and arrays if user asked - for it explicitly, never if they just happen to - appear in the middle of some value chain. */ -- if (v == b->val -+ if (v == result - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT - && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) - { -@@ -1681,6 +1733,7 @@ - if (b->val) - value_free (b->val); - b->val = NULL; -+ b->val_valid = 0; - } - break; - default: -@@ -2103,6 +2156,17 @@ - do_cleanups (old_chain); - } - -+/* Print out the (old or new) value associated with a watchpoint. */ -+ -+static void -+watchpoint_value_print (struct value *val, struct ui_file *stream) -+{ -+ if (val == NULL) -+ fprintf_unfiltered (stream, _("<unreadable>")); -+ else -+ value_print (val, stream, 0, Val_pretty_default); -+} -+ - /* This is the normal print function for a bpstat. In the future, - much of this logic could (should?) be moved to bpstat_stop_status, - by having it set different print_it values. -@@ -2221,26 +2285,21 @@ - - case bp_watchpoint: - case bp_hardware_watchpoint: -- if (bs->old_val != NULL) -- { -- annotate_watchpoint (b->number); -- if (ui_out_is_mi_like_p (uiout)) -- ui_out_field_string -- (uiout, "reason", -- async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -- mention (b); -- ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -- ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "old", stb); -- ui_out_text (uiout, "\nNew value = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "new", stb); -- do_cleanups (ui_out_chain); -- ui_out_text (uiout, "\n"); -- value_free (bs->old_val); -- bs->old_val = NULL; -- } -+ annotate_watchpoint (b->number); -+ if (ui_out_is_mi_like_p (uiout)) -+ ui_out_field_string -+ (uiout, "reason", -+ async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -+ mention (b); -+ ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -+ ui_out_text (uiout, "\nOld value = "); -+ watchpoint_value_print (bs->old_val, stb->stream); -+ ui_out_field_stream (uiout, "old", stb); -+ ui_out_text (uiout, "\nNew value = "); -+ watchpoint_value_print (b->val, stb->stream); -+ ui_out_field_stream (uiout, "new", stb); -+ do_cleanups (ui_out_chain); -+ ui_out_text (uiout, "\n"); - /* More than one watchpoint may have been triggered. */ - return PRINT_UNKNOWN; - break; -@@ -2253,7 +2312,7 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "value", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2261,7 +2320,7 @@ - break; - - case bp_access_watchpoint: -- if (bs->old_val != NULL) -+ if (bs->old_val != NULL) - { - annotate_watchpoint (b->number); - if (ui_out_is_mi_like_p (uiout)) -@@ -2271,10 +2330,8 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (bs->old_val, stb->stream); - ui_out_field_stream (uiout, "old", stb); -- value_free (bs->old_val); -- bs->old_val = NULL; - ui_out_text (uiout, "\nNew value = "); - } - else -@@ -2287,7 +2344,7 @@ - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); - } -- value_print (b->val, stb->stream, 0,Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "new", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2574,13 +2631,20 @@ - we might be in the middle of evaluating a function call. */ - - struct value *mark = value_mark (); -- struct value *new_val = evaluate_expression (b->exp); -- if (!value_equal (b->val, new_val)) -+ struct value *new_val; -+ -+ fetch_watchpoint_value (b->exp, &new_val, NULL, NULL); -+ if ((b->val != NULL) != (new_val != NULL) -+ || (b->val != NULL && !value_equal (b->val, new_val))) - { -- release_value (new_val); -- value_free_to_mark (mark); -+ if (new_val != NULL) -+ { -+ release_value (new_val); -+ value_free_to_mark (mark); -+ } - bs->old_val = b->val; - b->val = new_val; -+ b->val_valid = 1; - /* We will stop here */ - return WP_VALUE_CHANGED; - } -@@ -5722,10 +5786,9 @@ - exp_end = arg; - exp_valid_block = innermost_block; - mark = value_mark (); -- val = evaluate_expression (exp); -- release_value (val); -- if (value_lazy (val)) -- value_fetch_lazy (val); -+ fetch_watchpoint_value (exp, &val, NULL, NULL); -+ if (val != NULL) -+ release_value (val); - - tok = arg; - while (*tok == ' ' || *tok == '\t') -@@ -5814,6 +5877,7 @@ - b->exp_valid_block = exp_valid_block; - b->exp_string = savestring (exp_start, exp_end - exp_start); - b->val = val; -+ b->val_valid = 1; - b->loc->cond = cond; - if (cond_start) - b->cond_string = savestring (cond_start, cond_end - cond_start); -@@ -7697,11 +7761,11 @@ - if (bpt->val) - value_free (bpt->val); - mark = value_mark (); -- bpt->val = evaluate_expression (bpt->exp); -- release_value (bpt->val); -- if (value_lazy (bpt->val)) -- value_fetch_lazy (bpt->val); -- -+ fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); -+ if (bpt->val) -+ release_value (bpt->val); -+ bpt->val_valid = 1; -+ - if (bpt->type == bp_hardware_watchpoint || - bpt->type == bp_read_watchpoint || - bpt->type == bp_access_watchpoint) -diff -Naur gdb-6.8.orig/gdb/breakpoint.h gdb-6.8/gdb/breakpoint.h ---- gdb-6.8.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.h 2009-03-12 10:40:36.000000000 +0100 -@@ -391,8 +391,13 @@ - /* The largest block within which it is valid, or NULL if it is - valid anywhere (e.g. consists just of global symbols). */ - struct block *exp_valid_block; -- /* Value of the watchpoint the last time we checked it. */ -+ /* Value of the watchpoint the last time we checked it, or NULL -+ when we do not know the value yet or the value was not -+ readable. VAL is never lazy. */ - struct value *val; -+ /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, -+ then an error occurred reading the value. */ -+ int val_valid; - - /* Holds the address of the related watchpoint_scope breakpoint - when using watchpoints on local variables (might the concept -diff -Naur gdb-6.8.orig/gdb/NEWS gdb-6.8/gdb/NEWS ---- gdb-6.8.orig/gdb/NEWS 2008-03-27 19:14:10.000000000 +0100 -+++ gdb-6.8/gdb/NEWS 2009-03-12 10:40:36.000000000 +0100 -@@ -1,6 +1,9 @@ - What has changed in GDB? - (Organized release by release) - -+* Watchpoints can now be set on unreadable memory locations, e.g. addresses -+which will be allocated using malloc later in program execution. -+ - *** Changes in GDB 6.8 - - * New native configurations -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c 2009-03-12 10:40:36.000000000 +0100 -@@ -39,6 +39,8 @@ - - int doread = 0; - -+char *global_ptr; -+ - void marker1 () - { - } -@@ -110,6 +112,14 @@ - return 73; - } - -+void -+func4 () -+{ -+ buf[0] = 3; -+ global_ptr = buf; -+ buf[0] = 7; -+} -+ - int main () - { - #ifdef usestubs -@@ -185,5 +195,7 @@ - - func3 (); - -+ func4 (); -+ - return 0; - } -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2009-03-12 10:40:36.000000000 +0100 -@@ -645,6 +645,30 @@ - } - } - -+proc test_inaccessible_watchpoint {} { -+ global gdb_prompt -+ -+ # This is a test for watchpoints on currently inaccessible (but later -+ # valid) memory. -+ -+ if [runto func4] then { -+ gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" -+ gdb_test "next" ".*global_ptr = buf.*" -+ gdb_test_multiple "next" "next over ptr init" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { -+ # We can not test for <unknown> here because NULL may be readable. -+ # This test does rely on *NULL != 3. -+ pass "next over ptr init" -+ } -+ } -+ gdb_test_multiple "next" "next over buffer set" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { -+ pass "next over buffer set" -+ } -+ } -+ } -+} -+ - # Start with a fresh gdb. - - gdb_exit -@@ -797,6 +821,8 @@ - } - } - -+ test_inaccessible_watchpoint -+ - # See above. - if [istarget "mips-idt-*"] then { - gdb_exit -diff -Naur gdb-6.8.orig/sim/common/aclocal.m4 gdb-6.8/sim/common/aclocal.m4 ---- gdb-6.8.orig/sim/common/aclocal.m4 2006-06-13 10:06:48.000000000 +0200 -+++ gdb-6.8/sim/common/aclocal.m4 2009-03-12 10:40:36.000000000 +0100 -@@ -18,7 +18,7 @@ - # - # SIM_AC_OUTPUT - --AC_DEFUN(SIM_AC_COMMON, -+AC_DEFUN([SIM_AC_COMMON], - [ - # autoconf.info says this should be called right after AC_INIT. - AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) -@@ -245,7 +245,7 @@ - dnl supported. - dnl ??? Until there is demonstrable value in doing something more complicated, - dnl let's not. --AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT, -+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], - [ - AC_ARG_ENABLE(sim-environment, - [ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], -@@ -269,7 +269,7 @@ - dnl Without this option all possible alignment restrictions are accommodated. - dnl arg[1] is hardwired target alignment - dnl arg[2] is default target alignment --AC_DEFUN(SIM_AC_OPTION_ALIGNMENT, -+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT], - wire_alignment="[$1]" - default_alignment="[$2]" - [ -@@ -318,7 +318,7 @@ - - - dnl Conditionally compile in assertion statements. --AC_DEFUN(SIM_AC_OPTION_ASSERT, -+AC_DEFUN([SIM_AC_OPTION_ASSERT], - [ - AC_ARG_ENABLE(sim-assert, - [ --enable-sim-assert Specify whether to perform random assertions.], -@@ -342,7 +342,7 @@ - dnl arg[3] is the number of bits in an address - dnl arg[4] is the number of bits in an OpenFirmware cell. - dnl FIXME: this information should be obtained from bfd/archure --AC_DEFUN(SIM_AC_OPTION_BITSIZE, -+AC_DEFUN([SIM_AC_OPTION_BITSIZE], - wire_word_bitsize="[$1]" - wire_word_msb="[$2]" - wire_address_bitsize="[$3]" -@@ -408,7 +408,7 @@ - dnl that support both big and little endian targets. - dnl arg[1] is hardwired target endianness. - dnl arg[2] is default target endianness. --AC_DEFUN(SIM_AC_OPTION_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_ENDIAN], - [ - wire_endian="[$1]" - default_endian="[$2]" -@@ -458,7 +458,7 @@ - dnl --enable-sim-hostendian is for users of the simulator when - dnl they find that AC_C_BIGENDIAN does not function correctly - dnl (for instance in a canadian cross) --AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN, -+AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], - [ - AC_ARG_ENABLE(sim-hostendian, - [ --enable-sim-hostendian=end Specify host byte endian orientation.], -@@ -490,7 +490,7 @@ - dnl And optionally the bitsize of the floating point register. - dnl arg[1] specifies the presence (or absence) of floating point hardware - dnl arg[2] specifies the number of bits in a floating point register --AC_DEFUN(SIM_AC_OPTION_FLOAT, -+AC_DEFUN([SIM_AC_OPTION_FLOAT], - [ - default_sim_float="[$1]" - default_sim_float_bitsize="[$2]" -@@ -519,7 +519,7 @@ - - - dnl The argument is the default cache size if none is specified. --AC_DEFUN(SIM_AC_OPTION_SCACHE, -+AC_DEFUN([SIM_AC_OPTION_SCACHE], - [ - default_sim_scache="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-scache, -@@ -539,7 +539,7 @@ - - - dnl The argument is the default model if none is specified. --AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL, -+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], - [ - default_sim_default_model="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-default-model, -@@ -559,7 +559,7 @@ - dnl arg[1] Enable sim-hw by default? ("yes" or "no") - dnl arg[2] is a space separated list of devices that override the defaults - dnl arg[3] is a space separated list of extra target specific devices. --AC_DEFUN(SIM_AC_OPTION_HARDWARE, -+AC_DEFUN([SIM_AC_OPTION_HARDWARE], - [ - if test x"[$1]" = x"yes"; then - sim_hw_p=yes -@@ -621,7 +621,7 @@ - dnl performance by inlining functions. - dnl Guarantee that unconfigured simulators do not do any inlining - sim_inline="-DDEFAULT_INLINE=0" --AC_DEFUN(SIM_AC_OPTION_INLINE, -+AC_DEFUN([SIM_AC_OPTION_INLINE], - [ - default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" - AC_ARG_ENABLE(sim-inline, -@@ -666,7 +666,7 @@ - AC_SUBST(sim_inline) - - --AC_DEFUN(SIM_AC_OPTION_PACKAGES, -+AC_DEFUN([SIM_AC_OPTION_PACKAGES], - [ - AC_ARG_ENABLE(sim-packages, - [ --enable-sim-packages=list Specify the packages to be included in the build.], -@@ -692,7 +692,7 @@ - AC_SUBST(sim_packages) - - --AC_DEFUN(SIM_AC_OPTION_REGPARM, -+AC_DEFUN([SIM_AC_OPTION_REGPARM], - [ - AC_ARG_ENABLE(sim-regparm, - [ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], -@@ -709,7 +709,7 @@ - AC_SUBST(sim_regparm) - - --AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS, -+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], - [ - default_sim_reserved_bits="ifelse([$1],,1,[$1])" - AC_ARG_ENABLE(sim-reserved-bits, -@@ -726,7 +726,7 @@ - AC_SUBST(sim_reserved_bits) - - --AC_DEFUN(SIM_AC_OPTION_SMP, -+AC_DEFUN([SIM_AC_OPTION_SMP], - [ - default_sim_smp="ifelse([$1],,5,[$1])" - AC_ARG_ENABLE(sim-smp, -@@ -746,7 +746,7 @@ - AC_SUBST(sim_smp) - - --AC_DEFUN(SIM_AC_OPTION_STDCALL, -+AC_DEFUN([SIM_AC_OPTION_STDCALL], - [ - AC_ARG_ENABLE(sim-stdcall, - [ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], -@@ -763,7 +763,7 @@ - AC_SUBST(sim_stdcall) - - --AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], - [ - default_sim_xor_endian="ifelse([$1],,8,[$1])" - AC_ARG_ENABLE(sim-xor-endian, -@@ -782,7 +782,7 @@ - - dnl --enable-build-warnings is for developers of the simulator. - dnl it enables extra GCC specific warnings. --AC_DEFUN(SIM_AC_OPTION_WARNINGS, -+AC_DEFUN([SIM_AC_OPTION_WARNINGS], - [ - # NOTE: Don't add -Wall or -Wunused, they both include - # -Wunused-parameter which reports bogus warnings. -@@ -866,7 +866,7 @@ - dnl one afterwards. The two pieces of the common fragment are inserted into - dnl the target's fragment at the appropriate points. - --AC_DEFUN(SIM_AC_OUTPUT, -+AC_DEFUN([SIM_AC_OUTPUT], - [ - AC_LINK_FILES($sim_link_files, $sim_link_links) - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. -@@ -895,7 +895,7 @@ - sinclude(../../config/gettext-sister.m4) - - dnl --enable-cgen-maint support --AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, -+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT], - [ - cgen_maint=no - dnl Default is to use one in build tree. -diff -Naur gdb-6.8.orig/sim/erc32/configure gdb-6.8/sim/erc32/configure ---- gdb-6.8.orig/sim/erc32/configure 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure 2009-03-12 10:40:36.000000000 +0100 -@@ -309,7 +309,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile READLINE READLINE_DEPS READLINE_CFLAGS cgen_breaks LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -858,6 +858,11 @@ - --enable-sim-trace=opts Enable tracing flags - --enable-sim-profile=opts Enable profiling flags - -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-system-readline use installed readline library -+ - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags -@@ -4493,57 +4498,36 @@ - done - - --# In the Cygwin environment, we need some additional flags. --echo "$as_me:$LINENO: checking for cygwin" >&5 --echo $ECHO_N "checking for cygwin... $ECHO_C" >&6 --if test "${sim_cv_os_cygwin+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --#ifdef __CYGWIN__ --lose --#endif --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then -- sim_cv_os_cygwin=yes --else -- sim_cv_os_cygwin=no --fi --rm -f conftest* -+# Check whether --with-system-readline or --without-system-readline was given. -+if test "${with_system_readline+set}" = set; then -+ withval="$with_system_readline" - --fi --echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5 --echo "${ECHO_T}$sim_cv_os_cygwin" >&6 -+fi; - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' --else -- echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 --echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 --if test "${ac_cv_lib_termcap_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+if test "$with_system_readline" = yes; then -+ echo "$as_me:$LINENO: checking for readline" >&5 -+echo $ECHO_N "checking for readline... $ECHO_C" >&6 -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -- -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char add_history (); - int - main () - { --main (); -+add_history (); - ; - return 0; - } -@@ -4570,41 +4554,13 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_termcap_main=yes -+ READLINE=-lreadline - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_termcap_main=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 --echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 --if test $ac_cv_lib_termcap_main = yes; then -- TERMCAP=-ltermcap --else -- TERMCAP="" --fi -- --fi -- -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ LIBS="-lreadline -lncurses $save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -4617,11 +4573,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char readline (); -+char add_history (); - int - main () - { --readline (); -+add_history (); - ; - return 0; - } -@@ -4648,28 +4604,34 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ READLINE="-lreadline -lncurses" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no -+{ { echo "$as_me:$LINENO: error: unable to detect readline" >&5 -+echo "$as_me: error: unable to detect readline" >&2;} -+ { (exit 1); exit 1; }; } - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- READLINE=-lreadline --else -- { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5 --echo "$as_me: error: the required \"readline\" library is missing" >&2;} -- { (exit 1); exit 1; }; } -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ echo "$as_me:$LINENO: result: $READLINE" >&5 -+echo "${ECHO_T}$READLINE" >&6 -+ READLINE_DEPS= -+ READLINE_CFLAGS= -+else -+ READLINE='$(READLINE_DIR)/libreadline.a' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - --fi -+ -+ - - - ac_sources="$sim_link_files" -@@ -5389,8 +5351,9 @@ - s,@sim_stdio@,$sim_stdio,;t t - s,@sim_trace@,$sim_trace,;t t - s,@sim_profile@,$sim_profile,;t t --s,@TERMCAP@,$TERMCAP,;t t - s,@READLINE@,$READLINE,;t t -+s,@READLINE_DEPS@,$READLINE_DEPS,;t t -+s,@READLINE_CFLAGS@,$READLINE_CFLAGS,;t t - s,@cgen_breaks@,$cgen_breaks,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t -diff -Naur gdb-6.8.orig/sim/erc32/configure.ac gdb-6.8/sim/erc32/configure.ac ---- gdb-6.8.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure.ac 2009-03-12 10:40:36.000000000 +0100 -@@ -11,27 +11,32 @@ - - AC_CHECK_HEADERS(stdlib.h) - --# In the Cygwin environment, we need some additional flags. --AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ --#ifdef __CYGWIN__ --lose --#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) -+AC_ARG_WITH([system-readline], -+ [AS_HELP_STRING([--with-system-readline], -+ [use installed readline library])]) - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -+if test "$with_system_readline" = yes; then -+ AC_MSG_CHECKING([for readline]) -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE=-lreadline], -+ [ LIBS="-lreadline -lncurses $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE="-lreadline -lncurses"], -+ [AC_MSG_ERROR([unable to detect readline])]) -+ ]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT($READLINE) -+ READLINE_DEPS= -+ READLINE_CFLAGS= - else -- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="") --fi --AC_SUBST(TERMCAP) -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- AC_CHECK_LIB(readline, readline, READLINE=-lreadline, -- AC_ERROR([the required "readline" library is missing]), $TERMCAP) -+ READLINE='$(READLINE_DIR)/libreadline.a' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - AC_SUBST(READLINE) -+AC_SUBST(READLINE_DEPS) -+AC_SUBST(READLINE_CFLAGS) -+ - SIM_AC_OUTPUT -diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8/sim/erc32/erc32.c ---- gdb-6.8.orig/sim/erc32/erc32.c 1999-04-16 03:35:00.000000000 +0200 -+++ gdb-6.8/sim/erc32/erc32.c 2009-03-12 10:40:36.000000000 +0100 -@@ -24,6 +24,7 @@ - - #include <sys/types.h> - #include <stdio.h> -+#include <string.h> - #include <termios.h> - #include <sys/fcntl.h> - #include <sys/file.h> -@@ -413,7 +414,7 @@ - if (rom8) mec_memcfg &= ~0x20000; - else mec_memcfg |= 0x20000; - -- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7); -+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7); - mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7); - - if (sparclite_board) { -@@ -1659,7 +1660,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz); -@@ -1736,7 +1737,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - if (mem_accprot) { -diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8/sim/erc32/exec.c ---- gdb-6.8.orig/sim/erc32/exec.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8/sim/erc32/exec.c 2009-03-12 10:40:36.000000000 +0100 -@@ -1713,7 +1713,7 @@ - sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1]; - sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1]; - default: -- ; -+ break; - } - #endif - -@@ -1886,7 +1886,7 @@ - sregs->fs[rd & ~1] = sregs->fdp[rd | 1]; - sregs->fs[rd | 1] = sregs->fdp[rd & ~1]; - default: -- ; -+ break; - } - #endif - if (sregs->fpstate == FP_EXC_PE) { -diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8/sim/erc32/Makefile.in ---- gdb-6.8.orig/sim/erc32/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8/sim/erc32/Makefile.in 2009-03-12 10:40:36.000000000 +0100 -@@ -18,12 +18,12 @@ - - ## COMMON_PRE_CONFIG_FRAG - --TERMCAP_LIB = @TERMCAP@ -+# TERMCAP_LIB = -lncurses - READLINE_LIB = @READLINE@ - - SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o - SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm --SIM_EXTRA_ALL = sis -+SIM_EXTRA_ALL = sis$(EXEEXT) - SIM_EXTRA_INSTALL = install-sis - SIM_EXTRA_CLEAN = clean-sis - -@@ -37,8 +37,8 @@ - # `sis' doesn't need interf.o. - SIS_OFILES = exec.o erc32.o func.o help.o float.o - --sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -- $(CC) $(ALL_CFLAGS) -o sis \ -+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) - - # FIXME: This computes the build host's endianness, doesn't it? -@@ -51,11 +51,11 @@ - - # Copy the files into directories where they will be run. - install-sis: installdirs -- n=`echo sis | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) -+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \ -+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n - - clean-sis: -- rm -f sis end end.h -+ rm -f sis$(EXEEXT) end end.h - - configure: - @echo "Rebuilding configure..." -diff -Naur gdb-6.8.orig/sim/ppc/configure gdb-6.8/sim/ppc/configure ---- gdb-6.8.orig/sim/ppc/configure 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure 2009-03-12 10:40:52.000000000 +0100 -@@ -2709,10 +2709,263 @@ - - fi; - -+echo "$as_me:$LINENO: checking if union semun defined" >&5 -+echo $ECHO_N "checking if union semun defined... $ECHO_C" >&6 -+if test "${ac_cv_HAS_UNION_SEMUN+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h> -+int -+main () -+{ -+union semun arg ; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_has_union_semun="yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_has_union_semun="no" -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_cv_has_union_semun" >&5 -+echo "${ECHO_T}$ac_cv_has_union_semun" >&6 -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_HAS_UNION_SEMUN" >&5 -+echo "${ECHO_T}$ac_cv_HAS_UNION_SEMUN" >&6 -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+else # semun is not defined -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+fi -+ -+echo "$as_me:$LINENO: checking whether System V shared memory is supported" >&5 -+echo $ECHO_N "checking whether System V shared memory is supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_shm+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_shm="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_shm="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_shm" >&5 -+echo "${ECHO_T}$ac_cv_sysv_shm" >&6 -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ -+ - # Check whether --enable-sim-hardware or --disable-sim-hardware was given. - if test "${enable_sim_hardware+set}" = set; then - enableval="$enable_sim_hardware" -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) { { echo "$as_me:$LINENO: error: \"List of hardware must be specified for --enable-sim-hardware\"" >&5 -@@ -2728,14 +2981,13 @@ - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - else -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - fi; -- - # Check whether --enable-sim-hostbitsize or --disable-sim-hostbitsize was given. - if test "${enable_sim_hostbitsize+set}" = set; then - enableval="$enable_sim_hostbitsize" -@@ -2752,7 +3004,6 @@ - sim_hostbitsize="" - fi; - -- - # Check whether --enable-sim-hostendian or --disable-sim-hostendian was given. - if test "${enable_sim_hostendian+set}" = set; then - enableval="$enable_sim_hostendian" -diff -Naur gdb-6.8.orig/sim/ppc/configure.ac gdb-6.8/sim/ppc/configure.ac ---- gdb-6.8.orig/sim/ppc/configure.ac 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure.ac 2009-03-12 10:40:36.000000000 +0100 -@@ -209,10 +209,105 @@ - esac - ])dnl - -+AC_CACHE_CHECK([if union semun defined], -+ ac_cv_HAS_UNION_SEMUN, -+ [AC_TRY_COMPILE([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h>], -+[union semun arg ;], -+[ac_cv_has_union_semun="yes"], -+[ac_cv_has_union_semun="no"]) -+AC_MSG_RESULT($ac_cv_has_union_semun) -+]) -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+else # semun is not defined -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+fi -+ -+AC_CACHE_CHECK(whether System V shared memory is supported, -+ac_cv_sysv_shm, -+[ -+AC_TRY_RUN([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+], -+ac_cv_sysv_shm="yes", ac_cv_sysv_shm="no", :) -+]) -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ - - AC_ARG_ENABLE(sim-hardware, - [ --enable-sim-hardware=list Specify the hardware to be included in the build.], --[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";; -@@ -224,14 +319,13 @@ - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" --fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi])dnl - -- - AC_ARG_ENABLE(sim-hostbitsize, - [ --enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).], - [case "${enableval}" in -diff -Naur gdb-6.8.orig/sim/ppc/debug.c gdb-6.8/sim/ppc/debug.c ---- gdb-6.8.orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.c 2009-03-12 10:40:36.000000000 +0100 -@@ -70,6 +70,8 @@ - { trace_pass_device, "pass-device" }, - { trace_phb_device, "phb-device" }, - { trace_register_device, "register-device", "Device initializing registers" }, -+ { trace_sem_device, "sem-device" }, -+ { trace_shm_device, "shm-device" }, - { trace_stack_device, "stack-device" }, - { trace_vm_device, "vm-device" }, - /* packages */ -diff -Naur gdb-6.8.orig/sim/ppc/debug.h gdb-6.8/sim/ppc/debug.h ---- gdb-6.8.orig/sim/ppc/debug.h 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.h 2009-03-12 10:40:36.000000000 +0100 -@@ -51,6 +51,8 @@ - trace_pal_device, - trace_pass_device, - trace_phb_device, -+ trace_sem_device, -+ trace_shm_device, - trace_stack_device, - trace_register_device, - trace_vm_device, -diff -Naur gdb-6.8.orig/sim/ppc/hw_sem.c gdb-6.8/sim/ppc/hw_sem.c ---- gdb-6.8.orig/sim/ppc/hw_sem.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_sem.c 2009-03-12 10:40:36.000000000 +0100 -@@ -0,0 +1,301 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SEM_C_ -+#define _HW_SEM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/sem.h> -+ -+#include <errno.h> -+ -+/* DEVICE -+ -+ -+ sem - provide access to a unix semaphore -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an interface to a unix semaphore. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix semaphore. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the sem: -+ -+ | bash$ psim -t sem-device \ -+ -+ -+ Configure a UNIX semaphore using key 0x12345678 mapped into psim -+ address space at 0xfff00000: -+ -+ | -o '/sem@0xfff00000/reg 0xfff00000 0x80000' \ -+ | -o '/sem@0xfff00000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/sem@0xc0000000/reg 0xc0000000 0x80000' \ -+ -o '/sem@0xc0000000/key 0x12345678' ../psim-hello/hello -+ -+ REGISTERS -+ -+ offset 0 - lock count -+ offset 4 - lock operation -+ offset 8 - unlock operation -+ -+ All reads return the current or resulting count. -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_sem_device { -+ unsigned_word physical_address; -+ key_t key; -+ int id; -+ int initial; -+ int count; -+} hw_sem_device; -+ -+static void -+hw_sem_init_data(device *me) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ const device_unit *d; -+ int status; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* initialize the properties of the sem */ -+ -+ if (device_find_property(me, "key") == NULL) -+ error("sem_init_data() required key property is missing\n"); -+ -+ if (device_find_property(me, "value") == NULL) -+ error("sem_init_data() required value property is missing\n"); -+ -+ sem->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(sem, ("semaphore key (%d)\n", sem->key) ); -+ -+ sem->initial = (int) device_find_integer_property(me, "value"); -+ DTRACE(sem, ("semaphore initial value (%d)\n", sem->initial) ); -+ -+ d = device_unit_address(me); -+ sem->physical_address = d->cells[ d->nr_cells-1 ]; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", sem->physical_address)); -+ -+ /* Now to initialize the semaphore */ -+ -+ if ( sem->initial != -1 ) { -+ -+ sem->id = semget(sem->key, 1, IPC_CREAT | 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ -+ help.val = sem->initial; -+ status = semctl( sem->id, 0, SETVAL, help ); -+ if (status == -1) -+ error("hw_sem_init_data() semctl -- set value failed\n"); -+ -+ } else { -+ sem->id = semget(sem->key, 1, 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ } -+ -+ sem->count = semctl( sem->id, 0, GETVAL, help ); -+ if (sem->count == -1) -+ error("hw_sem_init_data() semctl -- get value failed\n"); -+ DTRACE(sem, ("semaphore OS value (%d)\n", sem->count) ); -+ -+ if (sizeof(int) != 4) -+ error("hw_sem_init_data() typing problem\n"); -+} -+ -+static void -+hw_sem_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ -+ if (space != 0) -+ error("sem_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 12) -+ error("sem_attach_address_callback() invalid size\n"); -+ -+ sem->physical_address = addr; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", addr)); -+} -+ -+static unsigned -+hw_sem_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ struct sembuf sb; -+ int status; -+ unsigned32 u32; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(sem, ("semaphore read addr=0x%x length=%d\n", addr, nr_bytes)); -+ -+ if (!(addr >= sem->physical_address && addr <= sem->physical_address + 11)) -+ error("hw_sem_io_read_buffer() invalid address - out of range\n"); -+ -+ if ((addr % 4) != 0) -+ error("hw_sem_io_read_buffer() invalid address - alignment\n"); -+ -+ if (nr_bytes != 4) -+ error("hw_sem_io_read_buffer() invalid length\n"); -+ -+ switch ( (addr - sem->physical_address) / 4 ) { -+ -+ case 0: /* OBTAIN CURRENT VALUE */ -+ break; -+ -+ case 1: /* LOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = -1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: lock" ); -+ error("hw_sem_io_read_buffer() sem lock\n"); -+ } -+ -+ DTRACE(sem, ("semaphore lock %d\n", sem->count)); -+ break; -+ -+ case 2: /* UNLOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = 1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: unlock" ); -+ error("hw_sem_io_read_buffer() sem unlock\n"); -+ } -+ DTRACE(sem, ("semaphore unlock %d\n", sem->count)); -+ break; -+ -+ default: -+ error("hw_sem_io_read_buffer() invalid address - unknown error\n"); -+ break; -+ } -+ -+ /* assume target is big endian */ -+ u32 = H2T_4(semctl( sem->id, 0, GETVAL, help )); -+ -+ DTRACE(sem, ("semaphore OS value (%d)\n", u32) ); -+ if (u32 == 0xffffffff) { -+ perror( "hw_sem.c: getval" ); -+ error("hw_sem_io_read_buffer() semctl -- get value failed\n"); -+ } -+ -+ memcpy(dest, &u32, nr_bytes); -+ return nr_bytes; -+ -+} -+ -+static device_callbacks const hw_sem_callbacks = { -+ { generic_device_init_address, hw_sem_init_data }, -+ { hw_sem_attach_address_callback, }, /* address */ -+ { hw_sem_io_read_buffer, NULL }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_sem_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_sem_device *sem = ZALLOC(hw_sem_device); -+ return sem; -+} -+ -+const device_descriptor hw_sem_device_descriptor[] = { -+ { "sem", hw_sem_create, &hw_sem_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SEM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/hw_shm.c gdb-6.8/sim/ppc/hw_shm.c ---- gdb-6.8.orig/sim/ppc/hw_shm.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_shm.c 2009-03-12 10:40:36.000000000 +0100 -@@ -0,0 +1,236 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SHM_C_ -+#define _HW_SHM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/shm.h> -+ -+ -+/* DEVICE -+ -+ -+ shm - map unix shared memory into psim address space -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an area of memory which is mapped into UNIX -+ shared memory. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ The SHM area is assumed to be of the same length. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix shared memory area. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the shm: -+ -+ | bash$ psim -t shm-device \ -+ -+ -+ Configure a 512 kilobytes of UNIX shared memory with the key 0x12345678 -+ mapped into psim address space at 0x0c000000. -+ -+ | -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ | -o '/shm@0x0c000000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ -o '/shm@0x0c000000/key 0x12345678' ../psim-hello/hello -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_shm_device { -+ unsigned_word physical_address; -+ char *shm_address; -+ unsigned sizeof_memory; -+ key_t key; -+ int id; -+} hw_shm_device; -+ -+static void -+hw_shm_init_data(device *me) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ const device_unit *d; -+ reg_property_spec reg; -+ int i; -+ -+ /* Obtain the Key Value */ -+ if (device_find_property(me, "key") == NULL) -+ error("shm_init_data() required key property is missing\n"); -+ -+ shm->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(shm, ("shm key (0x%08x)\n", shm->key) ); -+ -+ /* Figure out where this memory is in address space and how long it is */ -+ if ( !device_find_reg_array_property(me, "reg", 0, ®) ) -+ error("hw_shm_init_data() no address registered\n"); -+ -+ /* Determine the address and length being as paranoid as possible */ -+ shm->physical_address = 0xffffffff; -+ shm->sizeof_memory = 0xffffffff; -+ -+ for ( i=0 ; i<reg.address.nr_cells; i++ ) { -+ if (reg.address.cells[0] == 0 && reg.size.cells[0] == 0) -+ continue; -+ -+ if ( shm->physical_address != 0xffffffff ) -+ device_error(me, "Only single celled address ranges supported\n"); -+ -+ shm->physical_address = reg.address.cells[i]; -+ DTRACE(shm, ("shm physical_address=0x%x\n", shm->physical_address)); -+ -+ shm->sizeof_memory = reg.size.cells[i]; -+ DTRACE(shm, ("shm length=0x%x\n", shm->sizeof_memory)); -+ } -+ -+ if ( shm->physical_address == 0xffffffff ) -+ device_error(me, "Address not specified\n" ); -+ -+ if ( shm->sizeof_memory == 0xffffffff ) -+ device_error(me, "Length not specified\n" ); -+ -+ /* Now actually attach to or create the shared memory area */ -+ shm->id = shmget(shm->key, shm->sizeof_memory, IPC_CREAT | 0660); -+ if (shm->id == -1) -+ error("hw_shm_init_data() shmget failed\n"); -+ -+ shm->shm_address = shmat(shm->id, (char *)0, SHM_RND); -+ if (shm->shm_address == (void *)-1) -+ error("hw_shm_init_data() shmat failed\n"); -+} -+ -+static void -+hw_shm_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ if (space != 0) -+ error("shm_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 0) -+ error("shm_attach_address_callback() invalid size\n"); -+} -+ -+ -+static unsigned -+hw_shm_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("read %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(dest, &shm->shm_address[addr - shm->physical_address], nr_bytes); -+ return nr_bytes; -+} -+ -+ -+static unsigned -+hw_shm_io_write_buffer(device *me, -+ const void *source, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("write %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(&shm->shm_address[addr - shm->physical_address], source, nr_bytes); -+ return nr_bytes; -+} -+ -+static device_callbacks const hw_shm_callbacks = { -+ { generic_device_init_address, hw_shm_init_data }, -+ { hw_shm_attach_address_callback, }, /* address */ -+ { hw_shm_io_read_buffer, -+ hw_shm_io_write_buffer }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_shm_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_shm_device *shm = ZALLOC(hw_shm_device); -+ return shm; -+} -+ -+ -+ -+const device_descriptor hw_shm_device_descriptor[] = { -+ { "shm", hw_shm_create, &hw_shm_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SHM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/Makefile.in gdb-6.8/sim/ppc/Makefile.in ---- gdb-6.8.orig/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 -+++ gdb-6.8/sim/ppc/Makefile.in 2009-03-12 10:40:36.000000000 +0100 -@@ -834,6 +834,8 @@ - hw_pal.o: hw_pal.c $(DEVICE_TABLE_H) $(CPU_H) - hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) $(HW_PHB_H) $(COREFILE_H) - hw_register.o: hw_register.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_sem.o: hw_sem.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_shm.o: hw_shm.c $(DEVICE_TABLE_H) $(PSIM_H) - hw_trace.o: hw_trace.c $(DEVICE_TABLE_H) - hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) - # ignore this line, it stops make from getting confused -diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8/sim/ppc/ppc-instructions ---- gdb-6.8.orig/sim/ppc/ppc-instructions 2006-11-29 16:20:55.000000000 +0100 -+++ gdb-6.8/sim/ppc/ppc-instructions 2009-03-12 10:40:36.000000000 +0100 -@@ -3402,6 +3402,14 @@ - case spr_dec: - *rT = cpu_get_decrementer(processor); - break; -+ case spr_tbrl: -+ if (is_64bit_implementation) *rT = TB; -+ else *rT = EXTRACTED64(TB, 32, 63); -+ break; -+ case spr_tbru: -+ if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31); -+ else *rT = EXTRACTED64(TB, 0, 31); -+ break; - case spr_tbu: - case spr_tbl: - /* NOTE - these SPR's are not readable. Use mftb[ul] */ -diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8/sim/ppc/ppc-spr-table ---- gdb-6.8.orig/sim/ppc/ppc-spr-table 2003-06-22 18:48:12.000000000 +0200 -+++ gdb-6.8/sim/ppc/ppc-spr-table 2009-03-12 10:40:36.000000000 +0100 -@@ -32,6 +32,8 @@ - SRR0:26:0:0 - SRR1:27:0:0 - VRSAVE:256:0:0 -+TBRL:268:0:0 -+TBRU:269:0:0 - SPRG0:272:0:0 - SPRG1:273:0:0 - SPRG2:274:0:0 diff --git a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090721.diff b/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090721.diff deleted file mode 100644 index c19d7bbfc9..0000000000 --- a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090721.diff +++ /dev/null @@ -1,2151 +0,0 @@ -diff -Naur gdb-6.8.orig/bfd/config.bfd gdb-6.8-rtems4.10-20090312/bfd/config.bfd ---- gdb-6.8.orig/bfd/config.bfd 2008-02-14 16:20:24.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/bfd/config.bfd 2009-03-12 04:56:03.000000000 +0100 -@@ -712,7 +712,7 @@ - targ_defvec=bfd_elf32_iq2000_vec - ;; - -- m32c-*-elf) -+ m32c-*-elf | m32c-*-rtems*) - targ_defvec=bfd_elf32_m32c_vec - ;; - -@@ -728,6 +728,9 @@ - targ_defvec=bfd_elf32_m32rle_vec - targ_selvecs="bfd_elf32_m32r_vec bfd_elf32_m32rle_vec" - ;; -+ m32r-*-rtems*) -+ targ_defvec=bfd_elf32_m32r_vec -+ ;; - m32r-*-*) - targ_defvec=bfd_elf32_m32r_vec - ;; -diff -Naur gdb-6.8.orig/gdb/breakpoint.c gdb-6.8-rtems4.10-20090312/gdb/breakpoint.c ---- gdb-6.8.orig/gdb/breakpoint.c 2008-02-26 09:14:11.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/gdb/breakpoint.c 2009-03-12 04:56:03.000000000 +0100 -@@ -55,6 +55,7 @@ - #include "memattr.h" - #include "ada-lang.h" - #include "top.h" -+#include "wrapper.h" - - #include "gdb-events.h" - #include "mi/mi-common.h" -@@ -826,7 +827,65 @@ - || bpt->type == bp_access_watchpoint); - } - --/* Assuming that B is a hardware breakpoint: -+/* Find the current value of a watchpoint on EXP. Return the value in -+ *VALP and *RESULTP and the chain of intermediate and final values -+ in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does -+ not need them. -+ -+ If an error occurs while evaluating the expression, *RESULTP will -+ be set to NULL. *RESULTP may be a lazy value, if the result could -+ not be read from memory. It is used to determine whether a value -+ is user-specified (we should watch the whole value) or intermediate -+ (we should watch only the bit used to locate the final value). -+ -+ If the final value, or any intermediate value, could not be read -+ from memory, *VALP will be set to NULL. *VAL_CHAIN will still be -+ set to any referenced values. *VALP will never be a lazy value. -+ This is the value which we store in struct breakpoint. -+ -+ If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the -+ value chain. The caller must free the values individually. If -+ VAL_CHAIN is NULL, all generated values will be left on the value -+ chain. */ -+ -+static void -+fetch_watchpoint_value (struct expression *exp, struct value **valp, -+ struct value **resultp, struct value **val_chain) -+{ -+ struct value *mark, *new_mark, *result; -+ -+ *valp = NULL; -+ if (resultp) -+ *resultp = NULL; -+ if (val_chain) -+ *val_chain = NULL; -+ -+ /* Evaluate the expression. */ -+ mark = value_mark (); -+ result = NULL; -+ gdb_evaluate_expression (exp, &result); -+ new_mark = value_mark (); -+ if (mark == new_mark) -+ return; -+ if (resultp) -+ *resultp = result; -+ -+ /* Make sure it's not lazy, so that after the target stops again we -+ have a non-lazy previous value to compare with. */ -+ if (result != NULL -+ && (!value_lazy (result) || gdb_value_fetch_lazy (result))) -+ *valp = result; -+ -+ if (val_chain) -+ { -+ /* Return the chain of intermediate values. We use this to -+ decide which addresses to watch. */ -+ *val_chain = new_mark; -+ value_release_to_mark (mark); -+ } -+} -+ -+/* Assuming that B is a hardware watchpoint: - - Reparse watchpoint expression, is REPARSE is non-zero - - Evaluate expression and store the result in B->val - - Update the list of values that must be watched in B->loc. -@@ -837,7 +896,6 @@ - update_watchpoint (struct breakpoint *b, int reparse) - { - int within_current_scope; -- struct value *mark = value_mark (); - struct frame_id saved_frame_id; - struct bp_location *loc; - bpstat bs; -@@ -889,9 +947,9 @@ - to the user when the old value and the new value may actually - be completely different objects. */ - value_free (b->val); -- b->val = NULL; -+ b->val = NULL; -+ b->val_valid = 0; - } -- - - /* If we failed to parse the expression, for example because - it refers to a global variable in a not-yet-loaded shared library, -@@ -900,43 +958,37 @@ - is different from out-of-scope watchpoint. */ - if (within_current_scope && b->exp) - { -- struct value *v, *next; -+ struct value *val_chain, *v, *result, *next; -+ -+ fetch_watchpoint_value (b->exp, &v, &result, &val_chain); - -- /* Evaluate the expression and make sure it's not lazy, so that -- after target stops again, we have a non-lazy previous value -- to compare with. Also, making the value non-lazy will fetch -- intermediate values as needed, which we use to decide which -- addresses to watch. -- -- The value returned by evaluate_expression is stored in b->val. -- In addition, we look at all values which were created -- during evaluation, and set watchoints at addresses as needed. -- Those values are explicitly deleted here. */ -- v = evaluate_expression (b->exp); - /* Avoid setting b->val if it's already set. The meaning of - b->val is 'the last value' user saw, and we should update - it only if we reported that last value to user. As it - happens, the code that reports it updates b->val directly. */ -- if (b->val == NULL) -- b->val = v; -- value_contents (v); -- value_release_to_mark (mark); -+ if (!b->val_valid) -+ { -+ b->val = v; -+ b->val_valid = 1; -+ } - - /* Look at each value on the value chain. */ -- for (; v; v = next) -+ for (v = val_chain; v; v = next) - { - /* If it's a memory location, and GDB actually needed - its contents to evaluate the expression, then we -- must watch it. */ -+ must watch it. If the first value returned is -+ still lazy, that means an error occurred reading it; -+ watch it anyway in case it becomes readable. */ - if (VALUE_LVAL (v) == lval_memory -- && ! value_lazy (v)) -+ && (v == val_chain || ! value_lazy (v))) - { - struct type *vtype = check_typedef (value_type (v)); - - /* We only watch structs and arrays if user asked - for it explicitly, never if they just happen to - appear in the middle of some value chain. */ -- if (v == b->val -+ if (v == result - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT - && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) - { -@@ -1681,6 +1733,7 @@ - if (b->val) - value_free (b->val); - b->val = NULL; -+ b->val_valid = 0; - } - break; - default: -@@ -2103,6 +2156,17 @@ - do_cleanups (old_chain); - } - -+/* Print out the (old or new) value associated with a watchpoint. */ -+ -+static void -+watchpoint_value_print (struct value *val, struct ui_file *stream) -+{ -+ if (val == NULL) -+ fprintf_unfiltered (stream, _("<unreadable>")); -+ else -+ value_print (val, stream, 0, Val_pretty_default); -+} -+ - /* This is the normal print function for a bpstat. In the future, - much of this logic could (should?) be moved to bpstat_stop_status, - by having it set different print_it values. -@@ -2221,26 +2285,21 @@ - - case bp_watchpoint: - case bp_hardware_watchpoint: -- if (bs->old_val != NULL) -- { -- annotate_watchpoint (b->number); -- if (ui_out_is_mi_like_p (uiout)) -- ui_out_field_string -- (uiout, "reason", -- async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -- mention (b); -- ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -- ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "old", stb); -- ui_out_text (uiout, "\nNew value = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "new", stb); -- do_cleanups (ui_out_chain); -- ui_out_text (uiout, "\n"); -- value_free (bs->old_val); -- bs->old_val = NULL; -- } -+ annotate_watchpoint (b->number); -+ if (ui_out_is_mi_like_p (uiout)) -+ ui_out_field_string -+ (uiout, "reason", -+ async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -+ mention (b); -+ ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -+ ui_out_text (uiout, "\nOld value = "); -+ watchpoint_value_print (bs->old_val, stb->stream); -+ ui_out_field_stream (uiout, "old", stb); -+ ui_out_text (uiout, "\nNew value = "); -+ watchpoint_value_print (b->val, stb->stream); -+ ui_out_field_stream (uiout, "new", stb); -+ do_cleanups (ui_out_chain); -+ ui_out_text (uiout, "\n"); - /* More than one watchpoint may have been triggered. */ - return PRINT_UNKNOWN; - break; -@@ -2253,7 +2312,7 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "value", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2261,7 +2320,7 @@ - break; - - case bp_access_watchpoint: -- if (bs->old_val != NULL) -+ if (bs->old_val != NULL) - { - annotate_watchpoint (b->number); - if (ui_out_is_mi_like_p (uiout)) -@@ -2271,10 +2330,8 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (bs->old_val, stb->stream); - ui_out_field_stream (uiout, "old", stb); -- value_free (bs->old_val); -- bs->old_val = NULL; - ui_out_text (uiout, "\nNew value = "); - } - else -@@ -2287,7 +2344,7 @@ - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); - } -- value_print (b->val, stb->stream, 0,Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "new", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2574,13 +2631,20 @@ - we might be in the middle of evaluating a function call. */ - - struct value *mark = value_mark (); -- struct value *new_val = evaluate_expression (b->exp); -- if (!value_equal (b->val, new_val)) -+ struct value *new_val; -+ -+ fetch_watchpoint_value (b->exp, &new_val, NULL, NULL); -+ if ((b->val != NULL) != (new_val != NULL) -+ || (b->val != NULL && !value_equal (b->val, new_val))) - { -- release_value (new_val); -- value_free_to_mark (mark); -+ if (new_val != NULL) -+ { -+ release_value (new_val); -+ value_free_to_mark (mark); -+ } - bs->old_val = b->val; - b->val = new_val; -+ b->val_valid = 1; - /* We will stop here */ - return WP_VALUE_CHANGED; - } -@@ -5722,10 +5786,9 @@ - exp_end = arg; - exp_valid_block = innermost_block; - mark = value_mark (); -- val = evaluate_expression (exp); -- release_value (val); -- if (value_lazy (val)) -- value_fetch_lazy (val); -+ fetch_watchpoint_value (exp, &val, NULL, NULL); -+ if (val != NULL) -+ release_value (val); - - tok = arg; - while (*tok == ' ' || *tok == '\t') -@@ -5814,6 +5877,7 @@ - b->exp_valid_block = exp_valid_block; - b->exp_string = savestring (exp_start, exp_end - exp_start); - b->val = val; -+ b->val_valid = 1; - b->loc->cond = cond; - if (cond_start) - b->cond_string = savestring (cond_start, cond_end - cond_start); -@@ -7697,11 +7761,11 @@ - if (bpt->val) - value_free (bpt->val); - mark = value_mark (); -- bpt->val = evaluate_expression (bpt->exp); -- release_value (bpt->val); -- if (value_lazy (bpt->val)) -- value_fetch_lazy (bpt->val); -- -+ fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); -+ if (bpt->val) -+ release_value (bpt->val); -+ bpt->val_valid = 1; -+ - if (bpt->type == bp_hardware_watchpoint || - bpt->type == bp_read_watchpoint || - bpt->type == bp_access_watchpoint) -diff -Naur gdb-6.8.orig/gdb/breakpoint.h gdb-6.8-rtems4.10-20090312/gdb/breakpoint.h ---- gdb-6.8.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/gdb/breakpoint.h 2009-03-12 04:56:03.000000000 +0100 -@@ -391,8 +391,13 @@ - /* The largest block within which it is valid, or NULL if it is - valid anywhere (e.g. consists just of global symbols). */ - struct block *exp_valid_block; -- /* Value of the watchpoint the last time we checked it. */ -+ /* Value of the watchpoint the last time we checked it, or NULL -+ when we do not know the value yet or the value was not -+ readable. VAL is never lazy. */ - struct value *val; -+ /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, -+ then an error occurred reading the value. */ -+ int val_valid; - - /* Holds the address of the related watchpoint_scope breakpoint - when using watchpoints on local variables (might the concept -diff -Naur gdb-6.8.orig/gdb/NEWS gdb-6.8-rtems4.10-20090312/gdb/NEWS ---- gdb-6.8.orig/gdb/NEWS 2008-03-27 19:14:10.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/gdb/NEWS 2009-03-12 04:56:03.000000000 +0100 -@@ -1,6 +1,9 @@ - What has changed in GDB? - (Organized release by release) - -+* Watchpoints can now be set on unreadable memory locations, e.g. addresses -+which will be allocated using malloc later in program execution. -+ - *** Changes in GDB 6.8 - - * New native configurations -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.8-rtems4.10-20090312/gdb/testsuite/gdb.base/watchpoint.c ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/gdb/testsuite/gdb.base/watchpoint.c 2009-03-12 04:56:03.000000000 +0100 -@@ -39,6 +39,8 @@ - - int doread = 0; - -+char *global_ptr; -+ - void marker1 () - { - } -@@ -110,6 +112,14 @@ - return 73; - } - -+void -+func4 () -+{ -+ buf[0] = 3; -+ global_ptr = buf; -+ buf[0] = 7; -+} -+ - int main () - { - #ifdef usestubs -@@ -185,5 +195,7 @@ - - func3 (); - -+ func4 (); -+ - return 0; - } -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.8-rtems4.10-20090312/gdb/testsuite/gdb.base/watchpoint.exp ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/gdb/testsuite/gdb.base/watchpoint.exp 2009-03-12 04:56:03.000000000 +0100 -@@ -645,6 +645,30 @@ - } - } - -+proc test_inaccessible_watchpoint {} { -+ global gdb_prompt -+ -+ # This is a test for watchpoints on currently inaccessible (but later -+ # valid) memory. -+ -+ if [runto func4] then { -+ gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" -+ gdb_test "next" ".*global_ptr = buf.*" -+ gdb_test_multiple "next" "next over ptr init" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { -+ # We can not test for <unknown> here because NULL may be readable. -+ # This test does rely on *NULL != 3. -+ pass "next over ptr init" -+ } -+ } -+ gdb_test_multiple "next" "next over buffer set" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { -+ pass "next over buffer set" -+ } -+ } -+ } -+} -+ - # Start with a fresh gdb. - - gdb_exit -@@ -797,6 +821,8 @@ - } - } - -+ test_inaccessible_watchpoint -+ - # See above. - if [istarget "mips-idt-*"] then { - gdb_exit -diff -Naur gdb-6.8.orig/sim/common/aclocal.m4 gdb-6.8-rtems4.10-20090312/sim/common/aclocal.m4 ---- gdb-6.8.orig/sim/common/aclocal.m4 2006-06-13 10:06:48.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/common/aclocal.m4 2009-03-12 04:56:03.000000000 +0100 -@@ -18,7 +18,7 @@ - # - # SIM_AC_OUTPUT - --AC_DEFUN(SIM_AC_COMMON, -+AC_DEFUN([SIM_AC_COMMON], - [ - # autoconf.info says this should be called right after AC_INIT. - AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) -@@ -245,7 +245,7 @@ - dnl supported. - dnl ??? Until there is demonstrable value in doing something more complicated, - dnl let's not. --AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT, -+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], - [ - AC_ARG_ENABLE(sim-environment, - [ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], -@@ -269,7 +269,7 @@ - dnl Without this option all possible alignment restrictions are accommodated. - dnl arg[1] is hardwired target alignment - dnl arg[2] is default target alignment --AC_DEFUN(SIM_AC_OPTION_ALIGNMENT, -+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT], - wire_alignment="[$1]" - default_alignment="[$2]" - [ -@@ -318,7 +318,7 @@ - - - dnl Conditionally compile in assertion statements. --AC_DEFUN(SIM_AC_OPTION_ASSERT, -+AC_DEFUN([SIM_AC_OPTION_ASSERT], - [ - AC_ARG_ENABLE(sim-assert, - [ --enable-sim-assert Specify whether to perform random assertions.], -@@ -342,7 +342,7 @@ - dnl arg[3] is the number of bits in an address - dnl arg[4] is the number of bits in an OpenFirmware cell. - dnl FIXME: this information should be obtained from bfd/archure --AC_DEFUN(SIM_AC_OPTION_BITSIZE, -+AC_DEFUN([SIM_AC_OPTION_BITSIZE], - wire_word_bitsize="[$1]" - wire_word_msb="[$2]" - wire_address_bitsize="[$3]" -@@ -408,7 +408,7 @@ - dnl that support both big and little endian targets. - dnl arg[1] is hardwired target endianness. - dnl arg[2] is default target endianness. --AC_DEFUN(SIM_AC_OPTION_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_ENDIAN], - [ - wire_endian="[$1]" - default_endian="[$2]" -@@ -458,7 +458,7 @@ - dnl --enable-sim-hostendian is for users of the simulator when - dnl they find that AC_C_BIGENDIAN does not function correctly - dnl (for instance in a canadian cross) --AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN, -+AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], - [ - AC_ARG_ENABLE(sim-hostendian, - [ --enable-sim-hostendian=end Specify host byte endian orientation.], -@@ -490,7 +490,7 @@ - dnl And optionally the bitsize of the floating point register. - dnl arg[1] specifies the presence (or absence) of floating point hardware - dnl arg[2] specifies the number of bits in a floating point register --AC_DEFUN(SIM_AC_OPTION_FLOAT, -+AC_DEFUN([SIM_AC_OPTION_FLOAT], - [ - default_sim_float="[$1]" - default_sim_float_bitsize="[$2]" -@@ -519,7 +519,7 @@ - - - dnl The argument is the default cache size if none is specified. --AC_DEFUN(SIM_AC_OPTION_SCACHE, -+AC_DEFUN([SIM_AC_OPTION_SCACHE], - [ - default_sim_scache="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-scache, -@@ -539,7 +539,7 @@ - - - dnl The argument is the default model if none is specified. --AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL, -+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], - [ - default_sim_default_model="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-default-model, -@@ -559,7 +559,7 @@ - dnl arg[1] Enable sim-hw by default? ("yes" or "no") - dnl arg[2] is a space separated list of devices that override the defaults - dnl arg[3] is a space separated list of extra target specific devices. --AC_DEFUN(SIM_AC_OPTION_HARDWARE, -+AC_DEFUN([SIM_AC_OPTION_HARDWARE], - [ - if test x"[$1]" = x"yes"; then - sim_hw_p=yes -@@ -621,7 +621,7 @@ - dnl performance by inlining functions. - dnl Guarantee that unconfigured simulators do not do any inlining - sim_inline="-DDEFAULT_INLINE=0" --AC_DEFUN(SIM_AC_OPTION_INLINE, -+AC_DEFUN([SIM_AC_OPTION_INLINE], - [ - default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" - AC_ARG_ENABLE(sim-inline, -@@ -666,7 +666,7 @@ - AC_SUBST(sim_inline) - - --AC_DEFUN(SIM_AC_OPTION_PACKAGES, -+AC_DEFUN([SIM_AC_OPTION_PACKAGES], - [ - AC_ARG_ENABLE(sim-packages, - [ --enable-sim-packages=list Specify the packages to be included in the build.], -@@ -692,7 +692,7 @@ - AC_SUBST(sim_packages) - - --AC_DEFUN(SIM_AC_OPTION_REGPARM, -+AC_DEFUN([SIM_AC_OPTION_REGPARM], - [ - AC_ARG_ENABLE(sim-regparm, - [ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], -@@ -709,7 +709,7 @@ - AC_SUBST(sim_regparm) - - --AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS, -+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], - [ - default_sim_reserved_bits="ifelse([$1],,1,[$1])" - AC_ARG_ENABLE(sim-reserved-bits, -@@ -726,7 +726,7 @@ - AC_SUBST(sim_reserved_bits) - - --AC_DEFUN(SIM_AC_OPTION_SMP, -+AC_DEFUN([SIM_AC_OPTION_SMP], - [ - default_sim_smp="ifelse([$1],,5,[$1])" - AC_ARG_ENABLE(sim-smp, -@@ -746,7 +746,7 @@ - AC_SUBST(sim_smp) - - --AC_DEFUN(SIM_AC_OPTION_STDCALL, -+AC_DEFUN([SIM_AC_OPTION_STDCALL], - [ - AC_ARG_ENABLE(sim-stdcall, - [ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], -@@ -763,7 +763,7 @@ - AC_SUBST(sim_stdcall) - - --AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], - [ - default_sim_xor_endian="ifelse([$1],,8,[$1])" - AC_ARG_ENABLE(sim-xor-endian, -@@ -782,7 +782,7 @@ - - dnl --enable-build-warnings is for developers of the simulator. - dnl it enables extra GCC specific warnings. --AC_DEFUN(SIM_AC_OPTION_WARNINGS, -+AC_DEFUN([SIM_AC_OPTION_WARNINGS], - [ - # NOTE: Don't add -Wall or -Wunused, they both include - # -Wunused-parameter which reports bogus warnings. -@@ -866,7 +866,7 @@ - dnl one afterwards. The two pieces of the common fragment are inserted into - dnl the target's fragment at the appropriate points. - --AC_DEFUN(SIM_AC_OUTPUT, -+AC_DEFUN([SIM_AC_OUTPUT], - [ - AC_LINK_FILES($sim_link_files, $sim_link_links) - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. -@@ -895,7 +895,7 @@ - sinclude(../../config/gettext-sister.m4) - - dnl --enable-cgen-maint support --AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, -+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT], - [ - cgen_maint=no - dnl Default is to use one in build tree. -diff -Naur gdb-6.8.orig/sim/common/gentmap.c gdb-6.8-rtems4.10-20090312/sim/common/gentmap.c ---- gdb-6.8.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/common/gentmap.c 2009-03-12 04:56:03.000000000 +0100 -@@ -2,6 +2,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - struct tdefs { - char *symbol; -diff -Naur gdb-6.8.orig/sim/common/sim-signal.c gdb-6.8-rtems4.10-20090312/sim/common/sim-signal.c ---- gdb-6.8.orig/sim/common/sim-signal.c 2008-01-01 23:53:23.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/common/sim-signal.c 2009-03-12 04:56:03.000000000 +0100 -@@ -26,7 +26,7 @@ - to not think the process has died (so it can be debugged at the point of - failure). */ - --#ifdef _MSC_VER -+#ifdef _WIN32 - #ifndef SIGTRAP - #define SIGTRAP 5 - #endif -diff -Naur gdb-6.8.orig/sim/erc32/configure gdb-6.8-rtems4.10-20090312/sim/erc32/configure ---- gdb-6.8.orig/sim/erc32/configure 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/erc32/configure 2009-03-12 04:56:03.000000000 +0100 -@@ -309,7 +309,7 @@ - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS' -+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile READLINE READLINE_DEPS READLINE_CFLAGS cgen_breaks LIBOBJS LTLIBOBJS' - ac_subst_files='' - - # Initialize some variables set by options. -@@ -858,6 +858,11 @@ - --enable-sim-trace=opts Enable tracing flags - --enable-sim-profile=opts Enable profiling flags - -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-system-readline use installed readline library -+ - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags -@@ -4493,57 +4498,36 @@ - done - - --# In the Cygwin environment, we need some additional flags. --echo "$as_me:$LINENO: checking for cygwin" >&5 --echo $ECHO_N "checking for cygwin... $ECHO_C" >&6 --if test "${sim_cv_os_cygwin+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --#ifdef __CYGWIN__ --lose --#endif --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then -- sim_cv_os_cygwin=yes --else -- sim_cv_os_cygwin=no --fi --rm -f conftest* -+# Check whether --with-system-readline or --without-system-readline was given. -+if test "${with_system_readline+set}" = set; then -+ withval="$with_system_readline" - --fi --echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5 --echo "${ECHO_T}$sim_cv_os_cygwin" >&6 -+fi; - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' --else -- echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 --echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 --if test "${ac_cv_lib_termcap_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+if test "$with_system_readline" = yes; then -+ echo "$as_me:$LINENO: checking for readline" >&5 -+echo $ECHO_N "checking for readline... $ECHO_C" >&6 -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - -- -+/* Override any gcc2 internal prototype to avoid an error. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char add_history (); - int - main () - { --main (); -+add_history (); - ; - return 0; - } -@@ -4570,41 +4554,13 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_termcap_main=yes -+ READLINE=-lreadline - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_termcap_main=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 --echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 --if test $ac_cv_lib_termcap_main = yes; then -- TERMCAP=-ltermcap --else -- TERMCAP="" --fi -- --fi -- -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF -+ LIBS="-lreadline -lncurses $save_LIBS" -+ cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF - cat confdefs.h >>conftest.$ac_ext -@@ -4617,11 +4573,11 @@ - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char readline (); -+char add_history (); - int - main () - { --readline (); -+add_history (); - ; - return 0; - } -@@ -4648,28 +4604,34 @@ - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+ READLINE="-lreadline -lncurses" - else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --ac_cv_lib_readline_readline=no -+{ { echo "$as_me:$LINENO: error: unable to detect readline" >&5 -+echo "$as_me: error: unable to detect readline" >&2;} -+ { (exit 1); exit 1; }; } - fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- READLINE=-lreadline --else -- { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5 --echo "$as_me: error: the required \"readline\" library is missing" >&2;} -- { (exit 1); exit 1; }; } -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ echo "$as_me:$LINENO: result: $READLINE" >&5 -+echo "${ECHO_T}$READLINE" >&6 -+ READLINE_DEPS= -+ READLINE_CFLAGS= -+else -+ READLINE='$(READLINE_DIR)/libreadline.a' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - --fi -+ -+ - - - ac_sources="$sim_link_files" -@@ -5389,8 +5351,9 @@ - s,@sim_stdio@,$sim_stdio,;t t - s,@sim_trace@,$sim_trace,;t t - s,@sim_profile@,$sim_profile,;t t --s,@TERMCAP@,$TERMCAP,;t t - s,@READLINE@,$READLINE,;t t -+s,@READLINE_DEPS@,$READLINE_DEPS,;t t -+s,@READLINE_CFLAGS@,$READLINE_CFLAGS,;t t - s,@cgen_breaks@,$cgen_breaks,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t -diff -Naur gdb-6.8.orig/sim/erc32/configure.ac gdb-6.8-rtems4.10-20090312/sim/erc32/configure.ac ---- gdb-6.8.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/erc32/configure.ac 2009-03-12 04:56:03.000000000 +0100 -@@ -11,27 +11,32 @@ - - AC_CHECK_HEADERS(stdlib.h) - --# In the Cygwin environment, we need some additional flags. --AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ --#ifdef __CYGWIN__ --lose --#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) -+AC_ARG_WITH([system-readline], -+ [AS_HELP_STRING([--with-system-readline], -+ [use installed readline library])]) - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -+if test "$with_system_readline" = yes; then -+ AC_MSG_CHECKING([for readline]) -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE=-lreadline], -+ [ LIBS="-lreadline -lncurses $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE="-lreadline -lncurses"], -+ [AC_MSG_ERROR([unable to detect readline])]) -+ ]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT($READLINE) -+ READLINE_DEPS= -+ READLINE_CFLAGS= - else -- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="") --fi --AC_SUBST(TERMCAP) -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- AC_CHECK_LIB(readline, readline, READLINE=-lreadline, -- AC_ERROR([the required "readline" library is missing]), $TERMCAP) -+ READLINE='$(READLINE_DIR)/libreadline.a' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - AC_SUBST(READLINE) -+AC_SUBST(READLINE_DEPS) -+AC_SUBST(READLINE_CFLAGS) -+ - SIM_AC_OUTPUT -diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8-rtems4.10-20090312/sim/erc32/erc32.c ---- gdb-6.8.orig/sim/erc32/erc32.c 1999-04-16 03:35:00.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/erc32/erc32.c 2009-03-12 04:56:03.000000000 +0100 -@@ -24,6 +24,7 @@ - - #include <sys/types.h> - #include <stdio.h> -+#include <string.h> - #include <termios.h> - #include <sys/fcntl.h> - #include <sys/file.h> -@@ -413,7 +414,7 @@ - if (rom8) mec_memcfg &= ~0x20000; - else mec_memcfg |= 0x20000; - -- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7); -+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7); - mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7); - - if (sparclite_board) { -@@ -1659,7 +1660,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz); -@@ -1736,7 +1737,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - if (mem_accprot) { -diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8-rtems4.10-20090312/sim/erc32/exec.c ---- gdb-6.8.orig/sim/erc32/exec.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/erc32/exec.c 2009-03-12 04:56:03.000000000 +0100 -@@ -1713,7 +1713,7 @@ - sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1]; - sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1]; - default: -- ; -+ break; - } - #endif - -@@ -1886,7 +1886,7 @@ - sregs->fs[rd & ~1] = sregs->fdp[rd | 1]; - sregs->fs[rd | 1] = sregs->fdp[rd & ~1]; - default: -- ; -+ break; - } - #endif - if (sregs->fpstate == FP_EXC_PE) { -diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8-rtems4.10-20090312/sim/erc32/Makefile.in ---- gdb-6.8.orig/sim/erc32/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/erc32/Makefile.in 2009-03-12 04:56:03.000000000 +0100 -@@ -18,12 +18,12 @@ - - ## COMMON_PRE_CONFIG_FRAG - --TERMCAP_LIB = @TERMCAP@ -+# TERMCAP_LIB = -lncurses - READLINE_LIB = @READLINE@ - - SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o - SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm --SIM_EXTRA_ALL = sis -+SIM_EXTRA_ALL = sis$(EXEEXT) - SIM_EXTRA_INSTALL = install-sis - SIM_EXTRA_CLEAN = clean-sis - -@@ -37,8 +37,8 @@ - # `sis' doesn't need interf.o. - SIS_OFILES = exec.o erc32.o func.o help.o float.o - --sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -- $(CC) $(ALL_CFLAGS) -o sis \ -+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) - - # FIXME: This computes the build host's endianness, doesn't it? -@@ -51,11 +51,11 @@ - - # Copy the files into directories where they will be run. - install-sis: installdirs -- n=`echo sis | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) -+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \ -+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n - - clean-sis: -- rm -f sis end end.h -+ rm -f sis$(EXEEXT) end end.h - - configure: - @echo "Rebuilding configure..." -diff -Naur gdb-6.8.orig/sim/h8300/compile.c gdb-6.8-rtems4.10-20090312/sim/h8300/compile.c ---- gdb-6.8.orig/sim/h8300/compile.c 2007-07-03 19:19:38.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/h8300/compile.c 2009-03-12 04:56:03.000000000 +0100 -@@ -38,6 +38,12 @@ - # define SIGTRAP 5 - #endif - -+#ifdef _WIN32 -+#ifndef SIGBUS -+#define SIGBUS 10 -+#endif -+#endif -+ - int debug; - - host_callback *sim_callback; -@@ -599,7 +605,7 @@ - /* Find the exact opcode/arg combo. */ - for (q = h8_opcodes; q->name; q++) - { -- op_type *nib = q->data.nib; -+ const op_type *nib = q->data.nib; - unsigned int len = 0; - - if ((q->available == AV_H8SX && !h8300sxmode) || -@@ -924,7 +930,7 @@ - #endif - /* Fill in the args. */ - { -- op_type *args = q->args.nib; -+ const op_type *args = q->args.nib; - int hadone = 0; - int nargs; - -diff -Naur gdb-6.8.orig/sim/m32c/gdb-if.c gdb-6.8-rtems4.10-20090312/sim/m32c/gdb-if.c ---- gdb-6.8.orig/sim/m32c/gdb-if.c 2008-01-01 23:53:25.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/m32c/gdb-if.c 2009-03-12 04:56:03.000000000 +0100 -@@ -534,8 +534,12 @@ - #endif - - case 5: -+#ifdef SIGTRAP - return SIGTRAP; -- -+#else -+ return SIGSEGV; -+#endif -+ - case 10: - #ifdef SIGBUS - return SIGBUS; -diff -Naur gdb-6.8.orig/sim/m32c/Makefile.in gdb-6.8-rtems4.10-20090312/sim/m32c/Makefile.in ---- gdb-6.8.orig/sim/m32c/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/m32c/Makefile.in 2009-03-12 04:56:03.000000000 +0100 -@@ -55,7 +55,7 @@ - ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c - - opc2c : opc2c.o safe-fgets.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - - sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld - ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o -@@ -83,8 +83,10 @@ - mem.o : mem.h cpu.h syscalls.h - misc.o : cpu.h misc.h - opc2c.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c - reg.o : cpu.h - safe-fgets.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c - srcdest.c : cpu.h mem.h - syscalls.c : cpu.h mem.h syscalls.h - -diff -Naur gdb-6.8.orig/sim/ppc/configure gdb-6.8-rtems4.10-20090312/sim/ppc/configure ---- gdb-6.8.orig/sim/ppc/configure 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/configure 2009-03-12 04:56:37.000000000 +0100 -@@ -2709,10 +2709,263 @@ - - fi; - -+echo "$as_me:$LINENO: checking if union semun defined" >&5 -+echo $ECHO_N "checking if union semun defined... $ECHO_C" >&6 -+if test "${ac_cv_HAS_UNION_SEMUN+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h> -+int -+main () -+{ -+union semun arg ; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_has_union_semun="yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_has_union_semun="no" -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_cv_has_union_semun" >&5 -+echo "${ECHO_T}$ac_cv_has_union_semun" >&6 -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_HAS_UNION_SEMUN" >&5 -+echo "${ECHO_T}$ac_cv_HAS_UNION_SEMUN" >&6 -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+else # semun is not defined -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+fi -+ -+echo "$as_me:$LINENO: checking whether System V shared memory is supported" >&5 -+echo $ECHO_N "checking whether System V shared memory is supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_shm+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_shm="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_shm="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_shm" >&5 -+echo "${ECHO_T}$ac_cv_sysv_shm" >&6 -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ -+ - # Check whether --enable-sim-hardware or --disable-sim-hardware was given. - if test "${enable_sim_hardware+set}" = set; then - enableval="$enable_sim_hardware" -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) { { echo "$as_me:$LINENO: error: \"List of hardware must be specified for --enable-sim-hardware\"" >&5 -@@ -2728,14 +2981,13 @@ - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - else -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - fi; -- - # Check whether --enable-sim-hostbitsize or --disable-sim-hostbitsize was given. - if test "${enable_sim_hostbitsize+set}" = set; then - enableval="$enable_sim_hostbitsize" -@@ -2752,7 +3004,6 @@ - sim_hostbitsize="" - fi; - -- - # Check whether --enable-sim-hostendian or --disable-sim-hostendian was given. - if test "${enable_sim_hostendian+set}" = set; then - enableval="$enable_sim_hostendian" -diff -Naur gdb-6.8.orig/sim/ppc/configure.ac gdb-6.8-rtems4.10-20090312/sim/ppc/configure.ac ---- gdb-6.8.orig/sim/ppc/configure.ac 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/configure.ac 2009-03-12 04:56:03.000000000 +0100 -@@ -209,10 +209,105 @@ - esac - ])dnl - -+AC_CACHE_CHECK([if union semun defined], -+ ac_cv_HAS_UNION_SEMUN, -+ [AC_TRY_COMPILE([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h>], -+[union semun arg ;], -+[ac_cv_has_union_semun="yes"], -+[ac_cv_has_union_semun="no"]) -+AC_MSG_RESULT($ac_cv_has_union_semun) -+]) -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+else # semun is not defined -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+fi -+ -+AC_CACHE_CHECK(whether System V shared memory is supported, -+ac_cv_sysv_shm, -+[ -+AC_TRY_RUN([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+], -+ac_cv_sysv_shm="yes", ac_cv_sysv_shm="no", :) -+]) -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ - - AC_ARG_ENABLE(sim-hardware, - [ --enable-sim-hardware=list Specify the hardware to be included in the build.], --[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";; -@@ -224,14 +319,13 @@ - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" --fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi])dnl - -- - AC_ARG_ENABLE(sim-hostbitsize, - [ --enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).], - [case "${enableval}" in -diff -Naur gdb-6.8.orig/sim/ppc/debug.c gdb-6.8-rtems4.10-20090312/sim/ppc/debug.c ---- gdb-6.8.orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/debug.c 2009-03-12 04:56:03.000000000 +0100 -@@ -70,6 +70,8 @@ - { trace_pass_device, "pass-device" }, - { trace_phb_device, "phb-device" }, - { trace_register_device, "register-device", "Device initializing registers" }, -+ { trace_sem_device, "sem-device" }, -+ { trace_shm_device, "shm-device" }, - { trace_stack_device, "stack-device" }, - { trace_vm_device, "vm-device" }, - /* packages */ -diff -Naur gdb-6.8.orig/sim/ppc/debug.h gdb-6.8-rtems4.10-20090312/sim/ppc/debug.h ---- gdb-6.8.orig/sim/ppc/debug.h 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/debug.h 2009-03-12 04:56:03.000000000 +0100 -@@ -51,6 +51,8 @@ - trace_pal_device, - trace_pass_device, - trace_phb_device, -+ trace_sem_device, -+ trace_shm_device, - trace_stack_device, - trace_register_device, - trace_vm_device, -diff -Naur gdb-6.8.orig/sim/ppc/hw_sem.c gdb-6.8-rtems4.10-20090312/sim/ppc/hw_sem.c ---- gdb-6.8.orig/sim/ppc/hw_sem.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/hw_sem.c 2009-03-12 04:56:03.000000000 +0100 -@@ -0,0 +1,301 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SEM_C_ -+#define _HW_SEM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/sem.h> -+ -+#include <errno.h> -+ -+/* DEVICE -+ -+ -+ sem - provide access to a unix semaphore -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an interface to a unix semaphore. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix semaphore. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the sem: -+ -+ | bash$ psim -t sem-device \ -+ -+ -+ Configure a UNIX semaphore using key 0x12345678 mapped into psim -+ address space at 0xfff00000: -+ -+ | -o '/sem@0xfff00000/reg 0xfff00000 0x80000' \ -+ | -o '/sem@0xfff00000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/sem@0xc0000000/reg 0xc0000000 0x80000' \ -+ -o '/sem@0xc0000000/key 0x12345678' ../psim-hello/hello -+ -+ REGISTERS -+ -+ offset 0 - lock count -+ offset 4 - lock operation -+ offset 8 - unlock operation -+ -+ All reads return the current or resulting count. -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_sem_device { -+ unsigned_word physical_address; -+ key_t key; -+ int id; -+ int initial; -+ int count; -+} hw_sem_device; -+ -+static void -+hw_sem_init_data(device *me) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ const device_unit *d; -+ int status; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* initialize the properties of the sem */ -+ -+ if (device_find_property(me, "key") == NULL) -+ error("sem_init_data() required key property is missing\n"); -+ -+ if (device_find_property(me, "value") == NULL) -+ error("sem_init_data() required value property is missing\n"); -+ -+ sem->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(sem, ("semaphore key (%d)\n", sem->key) ); -+ -+ sem->initial = (int) device_find_integer_property(me, "value"); -+ DTRACE(sem, ("semaphore initial value (%d)\n", sem->initial) ); -+ -+ d = device_unit_address(me); -+ sem->physical_address = d->cells[ d->nr_cells-1 ]; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", sem->physical_address)); -+ -+ /* Now to initialize the semaphore */ -+ -+ if ( sem->initial != -1 ) { -+ -+ sem->id = semget(sem->key, 1, IPC_CREAT | 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ -+ help.val = sem->initial; -+ status = semctl( sem->id, 0, SETVAL, help ); -+ if (status == -1) -+ error("hw_sem_init_data() semctl -- set value failed\n"); -+ -+ } else { -+ sem->id = semget(sem->key, 1, 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ } -+ -+ sem->count = semctl( sem->id, 0, GETVAL, help ); -+ if (sem->count == -1) -+ error("hw_sem_init_data() semctl -- get value failed\n"); -+ DTRACE(sem, ("semaphore OS value (%d)\n", sem->count) ); -+ -+ if (sizeof(int) != 4) -+ error("hw_sem_init_data() typing problem\n"); -+} -+ -+static void -+hw_sem_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ -+ if (space != 0) -+ error("sem_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 12) -+ error("sem_attach_address_callback() invalid size\n"); -+ -+ sem->physical_address = addr; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", addr)); -+} -+ -+static unsigned -+hw_sem_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ struct sembuf sb; -+ int status; -+ unsigned32 u32; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(sem, ("semaphore read addr=0x%x length=%d\n", addr, nr_bytes)); -+ -+ if (!(addr >= sem->physical_address && addr <= sem->physical_address + 11)) -+ error("hw_sem_io_read_buffer() invalid address - out of range\n"); -+ -+ if ((addr % 4) != 0) -+ error("hw_sem_io_read_buffer() invalid address - alignment\n"); -+ -+ if (nr_bytes != 4) -+ error("hw_sem_io_read_buffer() invalid length\n"); -+ -+ switch ( (addr - sem->physical_address) / 4 ) { -+ -+ case 0: /* OBTAIN CURRENT VALUE */ -+ break; -+ -+ case 1: /* LOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = -1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: lock" ); -+ error("hw_sem_io_read_buffer() sem lock\n"); -+ } -+ -+ DTRACE(sem, ("semaphore lock %d\n", sem->count)); -+ break; -+ -+ case 2: /* UNLOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = 1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: unlock" ); -+ error("hw_sem_io_read_buffer() sem unlock\n"); -+ } -+ DTRACE(sem, ("semaphore unlock %d\n", sem->count)); -+ break; -+ -+ default: -+ error("hw_sem_io_read_buffer() invalid address - unknown error\n"); -+ break; -+ } -+ -+ /* assume target is big endian */ -+ u32 = H2T_4(semctl( sem->id, 0, GETVAL, help )); -+ -+ DTRACE(sem, ("semaphore OS value (%d)\n", u32) ); -+ if (u32 == 0xffffffff) { -+ perror( "hw_sem.c: getval" ); -+ error("hw_sem_io_read_buffer() semctl -- get value failed\n"); -+ } -+ -+ memcpy(dest, &u32, nr_bytes); -+ return nr_bytes; -+ -+} -+ -+static device_callbacks const hw_sem_callbacks = { -+ { generic_device_init_address, hw_sem_init_data }, -+ { hw_sem_attach_address_callback, }, /* address */ -+ { hw_sem_io_read_buffer, NULL }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_sem_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_sem_device *sem = ZALLOC(hw_sem_device); -+ return sem; -+} -+ -+const device_descriptor hw_sem_device_descriptor[] = { -+ { "sem", hw_sem_create, &hw_sem_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SEM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/hw_shm.c gdb-6.8-rtems4.10-20090312/sim/ppc/hw_shm.c ---- gdb-6.8.orig/sim/ppc/hw_shm.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/hw_shm.c 2009-03-12 04:56:03.000000000 +0100 -@@ -0,0 +1,236 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SHM_C_ -+#define _HW_SHM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/shm.h> -+ -+ -+/* DEVICE -+ -+ -+ shm - map unix shared memory into psim address space -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an area of memory which is mapped into UNIX -+ shared memory. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ The SHM area is assumed to be of the same length. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix shared memory area. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the shm: -+ -+ | bash$ psim -t shm-device \ -+ -+ -+ Configure a 512 kilobytes of UNIX shared memory with the key 0x12345678 -+ mapped into psim address space at 0x0c000000. -+ -+ | -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ | -o '/shm@0x0c000000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ -o '/shm@0x0c000000/key 0x12345678' ../psim-hello/hello -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_shm_device { -+ unsigned_word physical_address; -+ char *shm_address; -+ unsigned sizeof_memory; -+ key_t key; -+ int id; -+} hw_shm_device; -+ -+static void -+hw_shm_init_data(device *me) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ const device_unit *d; -+ reg_property_spec reg; -+ int i; -+ -+ /* Obtain the Key Value */ -+ if (device_find_property(me, "key") == NULL) -+ error("shm_init_data() required key property is missing\n"); -+ -+ shm->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(shm, ("shm key (0x%08x)\n", shm->key) ); -+ -+ /* Figure out where this memory is in address space and how long it is */ -+ if ( !device_find_reg_array_property(me, "reg", 0, ®) ) -+ error("hw_shm_init_data() no address registered\n"); -+ -+ /* Determine the address and length being as paranoid as possible */ -+ shm->physical_address = 0xffffffff; -+ shm->sizeof_memory = 0xffffffff; -+ -+ for ( i=0 ; i<reg.address.nr_cells; i++ ) { -+ if (reg.address.cells[0] == 0 && reg.size.cells[0] == 0) -+ continue; -+ -+ if ( shm->physical_address != 0xffffffff ) -+ device_error(me, "Only single celled address ranges supported\n"); -+ -+ shm->physical_address = reg.address.cells[i]; -+ DTRACE(shm, ("shm physical_address=0x%x\n", shm->physical_address)); -+ -+ shm->sizeof_memory = reg.size.cells[i]; -+ DTRACE(shm, ("shm length=0x%x\n", shm->sizeof_memory)); -+ } -+ -+ if ( shm->physical_address == 0xffffffff ) -+ device_error(me, "Address not specified\n" ); -+ -+ if ( shm->sizeof_memory == 0xffffffff ) -+ device_error(me, "Length not specified\n" ); -+ -+ /* Now actually attach to or create the shared memory area */ -+ shm->id = shmget(shm->key, shm->sizeof_memory, IPC_CREAT | 0660); -+ if (shm->id == -1) -+ error("hw_shm_init_data() shmget failed\n"); -+ -+ shm->shm_address = shmat(shm->id, (char *)0, SHM_RND); -+ if (shm->shm_address == (void *)-1) -+ error("hw_shm_init_data() shmat failed\n"); -+} -+ -+static void -+hw_shm_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ if (space != 0) -+ error("shm_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 0) -+ error("shm_attach_address_callback() invalid size\n"); -+} -+ -+ -+static unsigned -+hw_shm_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("read %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(dest, &shm->shm_address[addr - shm->physical_address], nr_bytes); -+ return nr_bytes; -+} -+ -+ -+static unsigned -+hw_shm_io_write_buffer(device *me, -+ const void *source, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("write %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(&shm->shm_address[addr - shm->physical_address], source, nr_bytes); -+ return nr_bytes; -+} -+ -+static device_callbacks const hw_shm_callbacks = { -+ { generic_device_init_address, hw_shm_init_data }, -+ { hw_shm_attach_address_callback, }, /* address */ -+ { hw_shm_io_read_buffer, -+ hw_shm_io_write_buffer }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_shm_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_shm_device *shm = ZALLOC(hw_shm_device); -+ return shm; -+} -+ -+ -+ -+const device_descriptor hw_shm_device_descriptor[] = { -+ { "shm", hw_shm_create, &hw_shm_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SHM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/Makefile.in gdb-6.8-rtems4.10-20090312/sim/ppc/Makefile.in ---- gdb-6.8.orig/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/Makefile.in 2009-03-12 04:56:03.000000000 +0100 -@@ -834,6 +834,8 @@ - hw_pal.o: hw_pal.c $(DEVICE_TABLE_H) $(CPU_H) - hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) $(HW_PHB_H) $(COREFILE_H) - hw_register.o: hw_register.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_sem.o: hw_sem.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_shm.o: hw_shm.c $(DEVICE_TABLE_H) $(PSIM_H) - hw_trace.o: hw_trace.c $(DEVICE_TABLE_H) - hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) - # ignore this line, it stops make from getting confused -diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8-rtems4.10-20090312/sim/ppc/ppc-instructions ---- gdb-6.8.orig/sim/ppc/ppc-instructions 2006-11-29 16:20:55.000000000 +0100 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/ppc-instructions 2009-03-12 04:56:03.000000000 +0100 -@@ -3402,6 +3402,14 @@ - case spr_dec: - *rT = cpu_get_decrementer(processor); - break; -+ case spr_tbrl: -+ if (is_64bit_implementation) *rT = TB; -+ else *rT = EXTRACTED64(TB, 32, 63); -+ break; -+ case spr_tbru: -+ if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31); -+ else *rT = EXTRACTED64(TB, 0, 31); -+ break; - case spr_tbu: - case spr_tbl: - /* NOTE - these SPR's are not readable. Use mftb[ul] */ -diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8-rtems4.10-20090312/sim/ppc/ppc-spr-table ---- gdb-6.8.orig/sim/ppc/ppc-spr-table 2003-06-22 18:48:12.000000000 +0200 -+++ gdb-6.8-rtems4.10-20090312/sim/ppc/ppc-spr-table 2009-03-12 04:56:03.000000000 +0100 -@@ -32,6 +32,8 @@ - SRR0:26:0:0 - SRR1:27:0:0 - VRSAVE:256:0:0 -+TBRL:268:0:0 -+TBRU:269:0:0 - SPRG0:272:0:0 - SPRG1:273:0:0 - SPRG2:274:0:0 diff --git a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090923.diff b/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090923.diff deleted file mode 100644 index 3655a8836e..0000000000 --- a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20090923.diff +++ /dev/null @@ -1,10739 +0,0 @@ -diff -Naur gdb-6.8.orig/bfd/config.bfd gdb-6.8/bfd/config.bfd ---- gdb-6.8.orig/bfd/config.bfd 2008-02-14 16:20:24.000000000 +0100 -+++ gdb-6.8/bfd/config.bfd 2009-09-23 18:00:02.000000000 +0200 -@@ -712,7 +712,7 @@ - targ_defvec=bfd_elf32_iq2000_vec - ;; - -- m32c-*-elf) -+ m32c-*-elf | m32c-*-rtems*) - targ_defvec=bfd_elf32_m32c_vec - ;; - -@@ -728,6 +728,9 @@ - targ_defvec=bfd_elf32_m32rle_vec - targ_selvecs="bfd_elf32_m32r_vec bfd_elf32_m32rle_vec" - ;; -+ m32r-*-rtems*) -+ targ_defvec=bfd_elf32_m32r_vec -+ ;; - m32r-*-*) - targ_defvec=bfd_elf32_m32r_vec - ;; -diff -Naur gdb-6.8.orig/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c ---- gdb-6.8.orig/gdb/breakpoint.c 2008-02-26 09:14:11.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.c 2009-09-23 18:00:02.000000000 +0200 -@@ -55,6 +55,7 @@ - #include "memattr.h" - #include "ada-lang.h" - #include "top.h" -+#include "wrapper.h" - - #include "gdb-events.h" - #include "mi/mi-common.h" -@@ -826,7 +827,65 @@ - || bpt->type == bp_access_watchpoint); - } - --/* Assuming that B is a hardware breakpoint: -+/* Find the current value of a watchpoint on EXP. Return the value in -+ *VALP and *RESULTP and the chain of intermediate and final values -+ in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does -+ not need them. -+ -+ If an error occurs while evaluating the expression, *RESULTP will -+ be set to NULL. *RESULTP may be a lazy value, if the result could -+ not be read from memory. It is used to determine whether a value -+ is user-specified (we should watch the whole value) or intermediate -+ (we should watch only the bit used to locate the final value). -+ -+ If the final value, or any intermediate value, could not be read -+ from memory, *VALP will be set to NULL. *VAL_CHAIN will still be -+ set to any referenced values. *VALP will never be a lazy value. -+ This is the value which we store in struct breakpoint. -+ -+ If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the -+ value chain. The caller must free the values individually. If -+ VAL_CHAIN is NULL, all generated values will be left on the value -+ chain. */ -+ -+static void -+fetch_watchpoint_value (struct expression *exp, struct value **valp, -+ struct value **resultp, struct value **val_chain) -+{ -+ struct value *mark, *new_mark, *result; -+ -+ *valp = NULL; -+ if (resultp) -+ *resultp = NULL; -+ if (val_chain) -+ *val_chain = NULL; -+ -+ /* Evaluate the expression. */ -+ mark = value_mark (); -+ result = NULL; -+ gdb_evaluate_expression (exp, &result); -+ new_mark = value_mark (); -+ if (mark == new_mark) -+ return; -+ if (resultp) -+ *resultp = result; -+ -+ /* Make sure it's not lazy, so that after the target stops again we -+ have a non-lazy previous value to compare with. */ -+ if (result != NULL -+ && (!value_lazy (result) || gdb_value_fetch_lazy (result))) -+ *valp = result; -+ -+ if (val_chain) -+ { -+ /* Return the chain of intermediate values. We use this to -+ decide which addresses to watch. */ -+ *val_chain = new_mark; -+ value_release_to_mark (mark); -+ } -+} -+ -+/* Assuming that B is a hardware watchpoint: - - Reparse watchpoint expression, is REPARSE is non-zero - - Evaluate expression and store the result in B->val - - Update the list of values that must be watched in B->loc. -@@ -837,7 +896,6 @@ - update_watchpoint (struct breakpoint *b, int reparse) - { - int within_current_scope; -- struct value *mark = value_mark (); - struct frame_id saved_frame_id; - struct bp_location *loc; - bpstat bs; -@@ -889,9 +947,9 @@ - to the user when the old value and the new value may actually - be completely different objects. */ - value_free (b->val); -- b->val = NULL; -+ b->val = NULL; -+ b->val_valid = 0; - } -- - - /* If we failed to parse the expression, for example because - it refers to a global variable in a not-yet-loaded shared library, -@@ -900,43 +958,37 @@ - is different from out-of-scope watchpoint. */ - if (within_current_scope && b->exp) - { -- struct value *v, *next; -+ struct value *val_chain, *v, *result, *next; -+ -+ fetch_watchpoint_value (b->exp, &v, &result, &val_chain); - -- /* Evaluate the expression and make sure it's not lazy, so that -- after target stops again, we have a non-lazy previous value -- to compare with. Also, making the value non-lazy will fetch -- intermediate values as needed, which we use to decide which -- addresses to watch. -- -- The value returned by evaluate_expression is stored in b->val. -- In addition, we look at all values which were created -- during evaluation, and set watchoints at addresses as needed. -- Those values are explicitly deleted here. */ -- v = evaluate_expression (b->exp); - /* Avoid setting b->val if it's already set. The meaning of - b->val is 'the last value' user saw, and we should update - it only if we reported that last value to user. As it - happens, the code that reports it updates b->val directly. */ -- if (b->val == NULL) -- b->val = v; -- value_contents (v); -- value_release_to_mark (mark); -+ if (!b->val_valid) -+ { -+ b->val = v; -+ b->val_valid = 1; -+ } - - /* Look at each value on the value chain. */ -- for (; v; v = next) -+ for (v = val_chain; v; v = next) - { - /* If it's a memory location, and GDB actually needed - its contents to evaluate the expression, then we -- must watch it. */ -+ must watch it. If the first value returned is -+ still lazy, that means an error occurred reading it; -+ watch it anyway in case it becomes readable. */ - if (VALUE_LVAL (v) == lval_memory -- && ! value_lazy (v)) -+ && (v == val_chain || ! value_lazy (v))) - { - struct type *vtype = check_typedef (value_type (v)); - - /* We only watch structs and arrays if user asked - for it explicitly, never if they just happen to - appear in the middle of some value chain. */ -- if (v == b->val -+ if (v == result - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT - && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) - { -@@ -1681,6 +1733,7 @@ - if (b->val) - value_free (b->val); - b->val = NULL; -+ b->val_valid = 0; - } - break; - default: -@@ -2103,6 +2156,17 @@ - do_cleanups (old_chain); - } - -+/* Print out the (old or new) value associated with a watchpoint. */ -+ -+static void -+watchpoint_value_print (struct value *val, struct ui_file *stream) -+{ -+ if (val == NULL) -+ fprintf_unfiltered (stream, _("<unreadable>")); -+ else -+ value_print (val, stream, 0, Val_pretty_default); -+} -+ - /* This is the normal print function for a bpstat. In the future, - much of this logic could (should?) be moved to bpstat_stop_status, - by having it set different print_it values. -@@ -2221,26 +2285,21 @@ - - case bp_watchpoint: - case bp_hardware_watchpoint: -- if (bs->old_val != NULL) -- { -- annotate_watchpoint (b->number); -- if (ui_out_is_mi_like_p (uiout)) -- ui_out_field_string -- (uiout, "reason", -- async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -- mention (b); -- ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -- ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "old", stb); -- ui_out_text (uiout, "\nNew value = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "new", stb); -- do_cleanups (ui_out_chain); -- ui_out_text (uiout, "\n"); -- value_free (bs->old_val); -- bs->old_val = NULL; -- } -+ annotate_watchpoint (b->number); -+ if (ui_out_is_mi_like_p (uiout)) -+ ui_out_field_string -+ (uiout, "reason", -+ async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -+ mention (b); -+ ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -+ ui_out_text (uiout, "\nOld value = "); -+ watchpoint_value_print (bs->old_val, stb->stream); -+ ui_out_field_stream (uiout, "old", stb); -+ ui_out_text (uiout, "\nNew value = "); -+ watchpoint_value_print (b->val, stb->stream); -+ ui_out_field_stream (uiout, "new", stb); -+ do_cleanups (ui_out_chain); -+ ui_out_text (uiout, "\n"); - /* More than one watchpoint may have been triggered. */ - return PRINT_UNKNOWN; - break; -@@ -2253,7 +2312,7 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "value", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2261,7 +2320,7 @@ - break; - - case bp_access_watchpoint: -- if (bs->old_val != NULL) -+ if (bs->old_val != NULL) - { - annotate_watchpoint (b->number); - if (ui_out_is_mi_like_p (uiout)) -@@ -2271,10 +2330,8 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (bs->old_val, stb->stream); - ui_out_field_stream (uiout, "old", stb); -- value_free (bs->old_val); -- bs->old_val = NULL; - ui_out_text (uiout, "\nNew value = "); - } - else -@@ -2287,7 +2344,7 @@ - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); - } -- value_print (b->val, stb->stream, 0,Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "new", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2574,13 +2631,20 @@ - we might be in the middle of evaluating a function call. */ - - struct value *mark = value_mark (); -- struct value *new_val = evaluate_expression (b->exp); -- if (!value_equal (b->val, new_val)) -+ struct value *new_val; -+ -+ fetch_watchpoint_value (b->exp, &new_val, NULL, NULL); -+ if ((b->val != NULL) != (new_val != NULL) -+ || (b->val != NULL && !value_equal (b->val, new_val))) - { -- release_value (new_val); -- value_free_to_mark (mark); -+ if (new_val != NULL) -+ { -+ release_value (new_val); -+ value_free_to_mark (mark); -+ } - bs->old_val = b->val; - b->val = new_val; -+ b->val_valid = 1; - /* We will stop here */ - return WP_VALUE_CHANGED; - } -@@ -5722,10 +5786,9 @@ - exp_end = arg; - exp_valid_block = innermost_block; - mark = value_mark (); -- val = evaluate_expression (exp); -- release_value (val); -- if (value_lazy (val)) -- value_fetch_lazy (val); -+ fetch_watchpoint_value (exp, &val, NULL, NULL); -+ if (val != NULL) -+ release_value (val); - - tok = arg; - while (*tok == ' ' || *tok == '\t') -@@ -5814,6 +5877,7 @@ - b->exp_valid_block = exp_valid_block; - b->exp_string = savestring (exp_start, exp_end - exp_start); - b->val = val; -+ b->val_valid = 1; - b->loc->cond = cond; - if (cond_start) - b->cond_string = savestring (cond_start, cond_end - cond_start); -@@ -7697,11 +7761,11 @@ - if (bpt->val) - value_free (bpt->val); - mark = value_mark (); -- bpt->val = evaluate_expression (bpt->exp); -- release_value (bpt->val); -- if (value_lazy (bpt->val)) -- value_fetch_lazy (bpt->val); -- -+ fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); -+ if (bpt->val) -+ release_value (bpt->val); -+ bpt->val_valid = 1; -+ - if (bpt->type == bp_hardware_watchpoint || - bpt->type == bp_read_watchpoint || - bpt->type == bp_access_watchpoint) -diff -Naur gdb-6.8.orig/gdb/breakpoint.h gdb-6.8/gdb/breakpoint.h ---- gdb-6.8.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.h 2009-09-23 18:00:02.000000000 +0200 -@@ -391,8 +391,13 @@ - /* The largest block within which it is valid, or NULL if it is - valid anywhere (e.g. consists just of global symbols). */ - struct block *exp_valid_block; -- /* Value of the watchpoint the last time we checked it. */ -+ /* Value of the watchpoint the last time we checked it, or NULL -+ when we do not know the value yet or the value was not -+ readable. VAL is never lazy. */ - struct value *val; -+ /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, -+ then an error occurred reading the value. */ -+ int val_valid; - - /* Holds the address of the related watchpoint_scope breakpoint - when using watchpoints on local variables (might the concept -diff -Naur gdb-6.8.orig/gdb/NEWS gdb-6.8/gdb/NEWS ---- gdb-6.8.orig/gdb/NEWS 2008-03-27 19:14:10.000000000 +0100 -+++ gdb-6.8/gdb/NEWS 2009-09-23 18:00:02.000000000 +0200 -@@ -1,6 +1,9 @@ - What has changed in GDB? - (Organized release by release) - -+* Watchpoints can now be set on unreadable memory locations, e.g. addresses -+which will be allocated using malloc later in program execution. -+ - *** Changes in GDB 6.8 - - * New native configurations -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c 2009-09-23 18:00:02.000000000 +0200 -@@ -39,6 +39,8 @@ - - int doread = 0; - -+char *global_ptr; -+ - void marker1 () - { - } -@@ -110,6 +112,14 @@ - return 73; - } - -+void -+func4 () -+{ -+ buf[0] = 3; -+ global_ptr = buf; -+ buf[0] = 7; -+} -+ - int main () - { - #ifdef usestubs -@@ -185,5 +195,7 @@ - - func3 (); - -+ func4 (); -+ - return 0; - } -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2009-09-23 18:00:02.000000000 +0200 -@@ -645,6 +645,30 @@ - } - } - -+proc test_inaccessible_watchpoint {} { -+ global gdb_prompt -+ -+ # This is a test for watchpoints on currently inaccessible (but later -+ # valid) memory. -+ -+ if [runto func4] then { -+ gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" -+ gdb_test "next" ".*global_ptr = buf.*" -+ gdb_test_multiple "next" "next over ptr init" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { -+ # We can not test for <unknown> here because NULL may be readable. -+ # This test does rely on *NULL != 3. -+ pass "next over ptr init" -+ } -+ } -+ gdb_test_multiple "next" "next over buffer set" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { -+ pass "next over buffer set" -+ } -+ } -+ } -+} -+ - # Start with a fresh gdb. - - gdb_exit -@@ -797,6 +821,8 @@ - } - } - -+ test_inaccessible_watchpoint -+ - # See above. - if [istarget "mips-idt-*"] then { - gdb_exit -diff -Naur gdb-6.8.orig/sim/common/aclocal.m4 gdb-6.8/sim/common/aclocal.m4 ---- gdb-6.8.orig/sim/common/aclocal.m4 2006-06-13 10:06:48.000000000 +0200 -+++ gdb-6.8/sim/common/aclocal.m4 2009-09-23 18:00:02.000000000 +0200 -@@ -18,7 +18,7 @@ - # - # SIM_AC_OUTPUT - --AC_DEFUN(SIM_AC_COMMON, -+AC_DEFUN([SIM_AC_COMMON], - [ - # autoconf.info says this should be called right after AC_INIT. - AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) -@@ -245,7 +245,7 @@ - dnl supported. - dnl ??? Until there is demonstrable value in doing something more complicated, - dnl let's not. --AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT, -+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], - [ - AC_ARG_ENABLE(sim-environment, - [ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], -@@ -269,7 +269,7 @@ - dnl Without this option all possible alignment restrictions are accommodated. - dnl arg[1] is hardwired target alignment - dnl arg[2] is default target alignment --AC_DEFUN(SIM_AC_OPTION_ALIGNMENT, -+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT], - wire_alignment="[$1]" - default_alignment="[$2]" - [ -@@ -318,7 +318,7 @@ - - - dnl Conditionally compile in assertion statements. --AC_DEFUN(SIM_AC_OPTION_ASSERT, -+AC_DEFUN([SIM_AC_OPTION_ASSERT], - [ - AC_ARG_ENABLE(sim-assert, - [ --enable-sim-assert Specify whether to perform random assertions.], -@@ -342,7 +342,7 @@ - dnl arg[3] is the number of bits in an address - dnl arg[4] is the number of bits in an OpenFirmware cell. - dnl FIXME: this information should be obtained from bfd/archure --AC_DEFUN(SIM_AC_OPTION_BITSIZE, -+AC_DEFUN([SIM_AC_OPTION_BITSIZE], - wire_word_bitsize="[$1]" - wire_word_msb="[$2]" - wire_address_bitsize="[$3]" -@@ -408,7 +408,7 @@ - dnl that support both big and little endian targets. - dnl arg[1] is hardwired target endianness. - dnl arg[2] is default target endianness. --AC_DEFUN(SIM_AC_OPTION_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_ENDIAN], - [ - wire_endian="[$1]" - default_endian="[$2]" -@@ -458,7 +458,7 @@ - dnl --enable-sim-hostendian is for users of the simulator when - dnl they find that AC_C_BIGENDIAN does not function correctly - dnl (for instance in a canadian cross) --AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN, -+AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], - [ - AC_ARG_ENABLE(sim-hostendian, - [ --enable-sim-hostendian=end Specify host byte endian orientation.], -@@ -490,7 +490,7 @@ - dnl And optionally the bitsize of the floating point register. - dnl arg[1] specifies the presence (or absence) of floating point hardware - dnl arg[2] specifies the number of bits in a floating point register --AC_DEFUN(SIM_AC_OPTION_FLOAT, -+AC_DEFUN([SIM_AC_OPTION_FLOAT], - [ - default_sim_float="[$1]" - default_sim_float_bitsize="[$2]" -@@ -519,7 +519,7 @@ - - - dnl The argument is the default cache size if none is specified. --AC_DEFUN(SIM_AC_OPTION_SCACHE, -+AC_DEFUN([SIM_AC_OPTION_SCACHE], - [ - default_sim_scache="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-scache, -@@ -539,7 +539,7 @@ - - - dnl The argument is the default model if none is specified. --AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL, -+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], - [ - default_sim_default_model="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-default-model, -@@ -559,7 +559,7 @@ - dnl arg[1] Enable sim-hw by default? ("yes" or "no") - dnl arg[2] is a space separated list of devices that override the defaults - dnl arg[3] is a space separated list of extra target specific devices. --AC_DEFUN(SIM_AC_OPTION_HARDWARE, -+AC_DEFUN([SIM_AC_OPTION_HARDWARE], - [ - if test x"[$1]" = x"yes"; then - sim_hw_p=yes -@@ -621,7 +621,7 @@ - dnl performance by inlining functions. - dnl Guarantee that unconfigured simulators do not do any inlining - sim_inline="-DDEFAULT_INLINE=0" --AC_DEFUN(SIM_AC_OPTION_INLINE, -+AC_DEFUN([SIM_AC_OPTION_INLINE], - [ - default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" - AC_ARG_ENABLE(sim-inline, -@@ -666,7 +666,7 @@ - AC_SUBST(sim_inline) - - --AC_DEFUN(SIM_AC_OPTION_PACKAGES, -+AC_DEFUN([SIM_AC_OPTION_PACKAGES], - [ - AC_ARG_ENABLE(sim-packages, - [ --enable-sim-packages=list Specify the packages to be included in the build.], -@@ -692,7 +692,7 @@ - AC_SUBST(sim_packages) - - --AC_DEFUN(SIM_AC_OPTION_REGPARM, -+AC_DEFUN([SIM_AC_OPTION_REGPARM], - [ - AC_ARG_ENABLE(sim-regparm, - [ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], -@@ -709,7 +709,7 @@ - AC_SUBST(sim_regparm) - - --AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS, -+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], - [ - default_sim_reserved_bits="ifelse([$1],,1,[$1])" - AC_ARG_ENABLE(sim-reserved-bits, -@@ -726,7 +726,7 @@ - AC_SUBST(sim_reserved_bits) - - --AC_DEFUN(SIM_AC_OPTION_SMP, -+AC_DEFUN([SIM_AC_OPTION_SMP], - [ - default_sim_smp="ifelse([$1],,5,[$1])" - AC_ARG_ENABLE(sim-smp, -@@ -746,7 +746,7 @@ - AC_SUBST(sim_smp) - - --AC_DEFUN(SIM_AC_OPTION_STDCALL, -+AC_DEFUN([SIM_AC_OPTION_STDCALL], - [ - AC_ARG_ENABLE(sim-stdcall, - [ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], -@@ -763,7 +763,7 @@ - AC_SUBST(sim_stdcall) - - --AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], - [ - default_sim_xor_endian="ifelse([$1],,8,[$1])" - AC_ARG_ENABLE(sim-xor-endian, -@@ -782,7 +782,7 @@ - - dnl --enable-build-warnings is for developers of the simulator. - dnl it enables extra GCC specific warnings. --AC_DEFUN(SIM_AC_OPTION_WARNINGS, -+AC_DEFUN([SIM_AC_OPTION_WARNINGS], - [ - # NOTE: Don't add -Wall or -Wunused, they both include - # -Wunused-parameter which reports bogus warnings. -@@ -866,7 +866,7 @@ - dnl one afterwards. The two pieces of the common fragment are inserted into - dnl the target's fragment at the appropriate points. - --AC_DEFUN(SIM_AC_OUTPUT, -+AC_DEFUN([SIM_AC_OUTPUT], - [ - AC_LINK_FILES($sim_link_files, $sim_link_links) - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. -@@ -895,7 +895,7 @@ - sinclude(../../config/gettext-sister.m4) - - dnl --enable-cgen-maint support --AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, -+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT], - [ - cgen_maint=no - dnl Default is to use one in build tree. -diff -Naur gdb-6.8.orig/sim/common/gentmap.c gdb-6.8/sim/common/gentmap.c ---- gdb-6.8.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100 -+++ gdb-6.8/sim/common/gentmap.c 2009-09-23 18:00:02.000000000 +0200 -@@ -2,6 +2,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - struct tdefs { - char *symbol; -diff -Naur gdb-6.8.orig/sim/common/sim-signal.c gdb-6.8/sim/common/sim-signal.c ---- gdb-6.8.orig/sim/common/sim-signal.c 2008-01-01 23:53:23.000000000 +0100 -+++ gdb-6.8/sim/common/sim-signal.c 2009-09-23 18:00:02.000000000 +0200 -@@ -26,7 +26,7 @@ - to not think the process has died (so it can be debugged at the point of - failure). */ - --#ifdef _MSC_VER -+#ifdef _WIN32 - #ifndef SIGTRAP - #define SIGTRAP 5 - #endif -diff -Naur gdb-6.8.orig/sim/erc32/configure gdb-6.8/sim/erc32/configure ---- gdb-6.8.orig/sim/erc32/configure 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure 2009-09-23 18:04:46.000000000 +0200 -@@ -1,81 +1,413 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.64. -+# -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -+# Foundation, Inc. - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ # We cannot yet assume a decent shell, so we have to provide a -+ # neutralization value for shells without unset; and this also -+ # works around shells that cannot unset nonexistent variables. -+ BASH_ENV=/dev/null -+ ENV=/dev/null -+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+# as_fn_error ERROR [LINENO LOG_FD] -+# --------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with status $?, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$?; test $as_status -eq 0 && as_status=1 -+ if test "$3"; then -+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ fi -+ $as_echo "$as_me: error: $1" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -- --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +415,107 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +524,24 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+exec 7<&0 </dev/null 6>&1 - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,51 +549,186 @@ - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - ac_unique_file="Makefile.in" - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include <sys/types.h> - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include <sys/stat.h> - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include <stdlib.h> - # include <stddef.h> - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include <stdlib.h> - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include <memory.h> - # endif - # include <string.h> - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include <strings.h> - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include <inttypes.h> --#else --# if HAVE_STDINT_H --# include <stdint.h> --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include <stdint.h> -+#endif -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+cgen_breaks -+READLINE_CFLAGS -+READLINE_DEPS -+READLINE -+sim_profile -+sim_trace -+sim_stdio -+sim_debug -+sim_cflags -+sim_bswap -+MAINT -+EGREP -+GREP -+CPP -+CATOBJEXT -+GENCAT -+INSTOBJEXT -+DATADIRNAME -+CATALOGS -+POSUB -+GMSGFMT -+XGETTEXT -+INCINTL -+LIBINTL_DEP -+LIBINTL -+USE_NLS -+RANLIB -+AR -+HDEFINES -+CC_FOR_BUILD -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+target_os -+target_vendor -+target_cpu -+target -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+WERROR_CFLAGS -+WARN_CFLAGS -+sim_xor_endian -+sim_stdcall -+sim_smp -+sim_reserved_bits -+sim_regparm -+sim_packages -+sim_inline -+sim_hw -+sim_hw_objs -+sim_hw_cflags -+sim_default_model -+sim_scache -+sim_float -+sim_hostendian -+sim_endian -+sim_bitsize -+sim_assert -+sim_alignment -+sim_environment -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_maintainer_mode -+enable_sim_bswap -+enable_sim_cflags -+enable_sim_debug -+enable_sim_stdio -+enable_sim_trace -+enable_sim_profile -+with_system_readline -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -337,34 +751,48 @@ - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -386,33 +814,59 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -439,6 +893,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -463,13 +923,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -534,6 +997,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -584,26 +1057,36 @@ - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -623,26 +1106,25 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information." - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -651,31 +1133,36 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; - esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -689,7 +1176,7 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -702,74 +1189,72 @@ - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi --fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -798,14 +1283,11 @@ - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -815,18 +1297,25 @@ - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -848,6 +1337,7 @@ - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode Enable developer functionality. -@@ -858,185 +1348,513 @@ - --enable-sim-trace=opts Enable tracing flags - --enable-sim-profile=opts Enable profiling flags - -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-system-readline use installed readline library -+ - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -+ LIBS libraries to pass to the linker, e.g. -l<library> -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if -+ you have headers in a nonstandard directory <include dir> - CPP C preprocessor - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.64 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2009 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -- -- $ $0 $@ - --_ACEOF -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () - { --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -- --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -- --_ASUNAME -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval - --} >&5 -+} # ac_fn_c_try_compile - --cat >&5 <<_ACEOF -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval - --## ----------- ## --## Core tests. ## --## ----------- ## -+} # ac_fn_c_try_cpp - -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -- --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case <limits.h> declares $2. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_func -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by $as_me, which was -+generated by GNU Autoconf 2.64. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. - # Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1047,13 +1865,13 @@ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1069,21 +1887,19 @@ - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { -@@ -1096,20 +1912,35 @@ - _ASBOX - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - - cat <<\_ASBOX -@@ -1120,22 +1951,28 @@ - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1147,26 +1984,26 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1174,40 +2011,46 @@ - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ ac_site_file1=$CONFIG_SITE -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -@@ -1217,69 +2060,79 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1288,24 +2141,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ac_config_headers="$ac_config_headers config.h:config.in" -+ac_config_headers="$ac_config_headers config.h:config.in" - - - # This file contains common code used by all simulators. -@@ -1451,104 +2287,130 @@ - # ... target specific stuff ... - - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install-sh -c" -- break -- elif test -f $ac_dir/install.sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install.sh -c" -- break -- elif test -f $ac_dir/shtool; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break -- fi -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ for ac_t in install-sh install.sh shtool; do -+ if test -f "$ac_dir/$ac_t"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/$ac_t -c" -+ break 2 -+ fi -+ done - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } --fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -- --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if test "${ac_cv_build+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- -- --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if test "${ac_cv_host+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- -- --echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6 --if test "${ac_cv_target+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_target_alias=$target_alias --test "x$ac_cv_target_alias" = "x" && -- ac_cv_target_alias=$ac_cv_host_alias --ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -+$as_echo_n "checking target system type... " >&6; } -+if test "${ac_cv_target+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$target_alias" = x; then -+ ac_cv_target=$ac_cv_host -+else -+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -+$as_echo "$ac_cv_target" >&6; } -+case $ac_cv_target in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; -+esac - target=$ac_cv_target --target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_target -+shift -+target_cpu=$1 -+target_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+target_os=$* -+IFS=$ac_save_IFS -+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - - # The aliases save the names the user supplied, while $host etc. -@@ -1557,18 +2419,16 @@ - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- -+ - test "$program_prefix" != NONE && -- program_transform_name="s,^,$program_prefix,;$program_transform_name" -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && -- program_transform_name="s,\$,$program_suffix,;$program_transform_name" --# Double any \ or $. echo might interpret backslashes. -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" -+# Double any \ or $. - # By default was `s,x,x', remove it if useless. --cat <<\_ACEOF >conftest.sed --s/[\\$]/&&/g;s/;s,x,x,$// --_ACEOF --program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm conftest.sed -+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1578,10 +2438,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1591,35 +2451,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1629,39 +2491,50 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1671,77 +2544,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1752,18 +2585,19 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1781,24 +2615,25 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1808,39 +2643,41 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1850,183 +2687,192 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "no acceptable C compiler found in \$PATH -+See \`config.log' for more details." "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int - main () - { -- -+return 0; - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files - do -- test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -- ;; -- [ab].out ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' -+do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) -+ ;; -+ [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+test "$ac_cv_exeext" = no && ac_cv_exeext= - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+else -+ ac_file='' - fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "C compiler cannot create executables -+See \`config.log' for more details." "$LINENO" 5; }; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -2034,38 +2880,90 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." "$LINENO" 5; } - fi -- - rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if test "${ac_cv_objext+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2077,45 +2975,46 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2129,55 +3028,34 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2188,39 +3066,49 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ - --ac_cv_prog_cc_g=no -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2236,18 +3124,14 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> -@@ -2275,12 +3159,17 @@ - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2295,205 +3184,37 @@ - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include <stdlib.h> --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if test "x$ac_cv_prog_cc_c89" != xno; then : - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2513,22 +3234,23 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if test "${ac_cv_path_install+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in #(( -+ ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2536,7 +3258,7 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2546,30 +3268,43 @@ - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac --done - -+ done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2595,10 +3330,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_RANLIB+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2608,35 +3343,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2646,28 +3383,38 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -2687,22 +3434,20 @@ - if test -f ../../intl/config.intl; then - . ../../intl/config.intl - fi --echo "$as_me:$LINENO: checking whether NLS is requested" >&5 --echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -+$as_echo_n "checking whether NLS is requested... " >&6; } - if test x"$USE_NLS" != xyes; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define ENABLE_NLS 1 --_ACEOF -+$as_echo "#define ENABLE_NLS 1" >>confdefs.h - - -- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -+$as_echo_n "checking for catalogs to be installed... " >&6; } - # Look for .po and .gmo files in the source directory. - CATALOGS= - XLINGUAS= -@@ -2733,8 +3478,8 @@ - fi - done - LINGUAS="$XLINGUAS" -- echo "$as_me:$LINENO: result: $LINGUAS" >&5 --echo "${ECHO_T}$LINGUAS" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -+$as_echo "$LINGUAS" >&6; } - - - DATADIRNAME=share -@@ -2756,15 +3501,15 @@ - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if test "${ac_cv_prog_CPP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2778,11 +3523,7 @@ - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include <limits.h> -@@ -2791,68 +3532,24 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break -@@ -2862,7 +3559,7 @@ - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+if $ac_preproc_ok; then : - break - fi - -@@ -2874,8 +3571,8 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -2885,11 +3582,7 @@ - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include <limits.h> -@@ -2898,68 +3591,24 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break -@@ -2969,14 +3618,13 @@ - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." "$LINENO" 5; } - fi - - ac_ext=c -@@ -2986,31 +3634,142 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdlib.h> - #include <stdarg.h> -@@ -3025,51 +3784,23 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <string.h> - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3079,18 +3810,14 @@ - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdlib.h> - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3100,16 +3827,13 @@ - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <ctype.h> -+#include <stdlib.h> - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3129,109 +3853,40 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3239,714 +3894,70 @@ - done - - -- -- -- -- -- - for ac_header in stdlib.h string.h strings.h unistd.h time.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- - for ac_header in sys/time.h sys/resource.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- - for ac_header in fcntl.h fpu_control.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- -- - for ac_header in dlfcn.h errno.h sys/stat.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- -- -- - for ac_func in getrusage time sigaction __setfpucw --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != $ac_func; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_var=no" --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3954,72 +3965,43 @@ - - - # Check for socket libraries -- --echo "$as_me:$LINENO: checking for bind in -lsocket" >&5 --echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6 --if test "${ac_cv_lib_socket_bind+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5 -+$as_echo_n "checking for bind in -lsocket... " >&6; } -+if test "${ac_cv_lib_socket_bind+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char bind (); - int - main () - { --bind (); -+return bind (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_bind=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_socket_bind=no -+ ac_cv_lib_socket_bind=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6 --if test $ac_cv_lib_socket_bind = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5 -+$as_echo "$ac_cv_lib_socket_bind" >&6; } -+if test "x$ac_cv_lib_socket_bind" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBSOCKET 1 - _ACEOF -@@ -4028,72 +4010,43 @@ - - fi - -- --echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 --if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char gethostbyname (); - int - main () - { --gethostbyname (); -+return gethostbyname (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_nsl_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_nsl_gethostbyname=no -+ ac_cv_lib_nsl_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 --if test $ac_cv_lib_nsl_gethostbyname = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBNSL 1 - _ACEOF -@@ -4108,50 +4061,43 @@ - - - USE_MAINTAINER_MODE=no --# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then -- enableval="$enable_maintainer_mode" -- case "${enableval}" in -+# Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then : -+ enableval=$enable_maintainer_mode; case "${enableval}" in - yes) MAINT="" USE_MAINTAINER_MODE=yes ;; - no) MAINT="#" ;; -- *) { { echo "$as_me:$LINENO: error: \"--enable-maintainer-mode does not take a value\"" >&5 --echo "$as_me: error: \"--enable-maintainer-mode does not take a value\"" >&2;} -- { (exit 1); exit 1; }; }; MAINT="#" ;; -+ *) as_fn_error "\"--enable-maintainer-mode does not take a value\"" "$LINENO" 5; MAINT="#" ;; - esac - if test x"$silent" != x"yes" && test x"$MAINT" = x""; then - echo "Setting maintainer mode" 6>&1 - fi - else - MAINT="#" --fi; -+fi -+ - - --# Check whether --enable-sim-bswap or --disable-sim-bswap was given. --if test "${enable_sim_bswap+set}" = set; then -- enableval="$enable_sim_bswap" -- case "${enableval}" in -+# Check whether --enable-sim-bswap was given. -+if test "${enable_sim_bswap+set}" = set; then : -+ enableval=$enable_sim_bswap; case "${enableval}" in - yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";; - no) sim_bswap="-DWITH_BSWAP=0";; -- *) { { echo "$as_me:$LINENO: error: \"--enable-sim-bswap does not take a value\"" >&5 --echo "$as_me: error: \"--enable-sim-bswap does not take a value\"" >&2;} -- { (exit 1); exit 1; }; }; sim_bswap="";; -+ *) as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";; - esac - if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then - echo "Setting bswap flags = $sim_bswap" 6>&1 - fi - else - sim_bswap="" --fi; -+fi - - --# Check whether --enable-sim-cflags or --disable-sim-cflags was given. --if test "${enable_sim_cflags+set}" = set; then -- enableval="$enable_sim_cflags" -- case "${enableval}" in -+ -+# Check whether --enable-sim-cflags was given. -+if test "${enable_sim_cflags+set}" = set; then : -+ enableval=$enable_sim_cflags; case "${enableval}" in - yes) sim_cflags="-O2 -fomit-frame-pointer";; -- trace) { { echo "$as_me:$LINENO: error: \"Please use --enable-sim-debug instead.\"" >&5 --echo "$as_me: error: \"Please use --enable-sim-debug instead.\"" >&2;} -- { (exit 1); exit 1; }; }; sim_cflags="";; -+ trace) as_fn_error "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";; - no) sim_cflags="";; - *) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac -@@ -4160,13 +4106,13 @@ - fi - else - sim_cflags="" --fi; -+fi - - --# Check whether --enable-sim-debug or --disable-sim-debug was given. --if test "${enable_sim_debug+set}" = set; then -- enableval="$enable_sim_debug" -- case "${enableval}" in -+ -+# Check whether --enable-sim-debug was given. -+if test "${enable_sim_debug+set}" = set; then : -+ enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; -@@ -4176,31 +4122,29 @@ - fi - else - sim_debug="" --fi; -+fi -+ - - --# Check whether --enable-sim-stdio or --disable-sim-stdio was given. --if test "${enable_sim_stdio+set}" = set; then -- enableval="$enable_sim_stdio" -- case "${enableval}" in -+# Check whether --enable-sim-stdio was given. -+if test "${enable_sim_stdio+set}" = set; then : -+ enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; -- *) { { echo "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&5 --echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&2;} -- { (exit 1); exit 1; }; }; sim_stdio="";; -+ *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; - esac - if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 - fi - else - sim_stdio="" --fi; -+fi -+ - - --# Check whether --enable-sim-trace or --disable-sim-trace was given. --if test "${enable_sim_trace+set}" = set; then -- enableval="$enable_sim_trace" -- case "${enableval}" in -+# Check whether --enable-sim-trace was given. -+if test "${enable_sim_trace+set}" = set; then : -+ enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";; - no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";; - [-0-9]*) -@@ -4221,13 +4165,13 @@ - fi - else - sim_trace="" --fi; -+fi -+ - - --# Check whether --enable-sim-profile or --disable-sim-profile was given. --if test "${enable_sim_profile+set}" = set; then -- enableval="$enable_sim_profile" -- case "${enableval}" in -+# Check whether --enable-sim-profile was given. -+if test "${enable_sim_profile+set}" = set; then : -+ enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; - [-0-9]*) -@@ -4248,72 +4192,37 @@ - fi - else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" --fi; -+fi - - --echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 --if test "${ac_cv_type_signal+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if test "${ac_cv_type_signal+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <sys/types.h> - #include <signal.h> --#ifdef signal --# undef signal --#endif --#ifdef __cplusplus --extern "C" void (*signal (int, void (*)(int)))(int); --#else --void (*signal ()) (); --#endif - - int - main () - { --int i; -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_signal=void -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_type_signal=int - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_signal=int -+ ac_cv_type_signal=void - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --echo "${ECHO_T}$ac_cv_type_signal" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal -@@ -4342,150 +4251,12 @@ - sim_link_links="${sim_link_links} targ-vals.def" - - -- - for ac_header in stdlib.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_STDLIB_H 1 - _ACEOF - - fi -@@ -4493,183 +4264,82 @@ - done - - --# In the Cygwin environment, we need some additional flags. --echo "$as_me:$LINENO: checking for cygwin" >&5 --echo $ECHO_N "checking for cygwin... $ECHO_C" >&6 --if test "${sim_cv_os_cygwin+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --#ifdef __CYGWIN__ --lose --#endif --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then -- sim_cv_os_cygwin=yes --else -- sim_cv_os_cygwin=no -+# Check whether --with-system-readline was given. -+if test "${with_system_readline+set}" = set; then : -+ withval=$with_system_readline; - fi --rm -f conftest* - --fi --echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5 --echo "${ECHO_T}$sim_cv_os_cygwin" >&6 - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' --else -- echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 --echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 --if test "${ac_cv_lib_termcap_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if test "$with_system_readline" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5 -+$as_echo_n "checking for readline... " >&6; } -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -- -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char add_history (); - int - main () - { --main (); -+return add_history (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_termcap_main=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_termcap_main=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 --echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 --if test $ac_cv_lib_termcap_main = yes; then -- TERMCAP=-ltermcap --else -- TERMCAP="" --fi -- --fi -- -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if ac_fn_c_try_link "$LINENO"; then : -+ READLINE=-lreadline - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ LIBS="-lreadline -lncurses $save_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char readline (); -+char add_history (); - int - main () - { --readline (); -+return add_history (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ READLINE="-lreadline -lncurses" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_readline_readline=no -+ as_fn_error "unable to detect readline" "$LINENO" 5 - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- READLINE=-lreadline --else -- { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5 --echo "$as_me: error: the required \"readline\" library is missing" >&2;} -- { (exit 1); exit 1; }; } -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5 -+$as_echo "$READLINE" >&6; } -+ READLINE_DEPS= -+ READLINE_CFLAGS= -+else -+ READLINE='../../readline/libreadline.a -lncurses' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - --fi -+ -+ - - - ac_sources="$sim_link_files" -@@ -4679,22 +4349,22 @@ - set $ac_sources; ac_source=$1; shift; ac_sources=$* - ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source" - done -- ac_config_links="$ac_config_links $ac_config_links_1" -+ac_config_links="$ac_config_links $ac_config_links_1" - - cgen_breaks="" - if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then - cgen_breaks="break cgen_rtx_error"; - fi - -- ac_config_files="$ac_config_files Makefile.sim:Makefile.in" -+ac_config_files="$ac_config_files Makefile.sim:Makefile.in" - -- ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in" -+ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in" - -- ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in" -+ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in" - -- ac_config_commands="$ac_config_commands Makefile" -+ac_config_commands="$ac_config_commands Makefile" - -- ac_config_commands="$ac_config_commands stamp-h" -+ac_config_commands="$ac_config_commands stamp-h" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -4714,39 +4384,59 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -4755,32 +4445,18 @@ - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -4789,11 +4465,13 @@ - - - : ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -4803,81 +4481,252 @@ - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+# as_fn_error ERROR [LINENO LOG_FD] -+# --------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with status $?, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$?; test $as_status -eq 0 && as_status=1 -+ if test "$3"; then -+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ fi -+ $as_echo "$as_me: error: $1" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -- --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -4885,148 +4734,123 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" - -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -5035,31 +4859,20 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.64. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -5067,45 +4880,47 @@ - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -+case $ac_config_headers in *" -+"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+esac - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_links="$ac_config_links" -+config_commands="$ac_config_commands" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -5119,84 +4934,81 @@ - Configuration commands: - $config_commands - --Report bugs to <bug-autoconf@gnu.org>." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.64, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2009 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ as_fn_error "ambiguous option: \`$1' -+Try \`$0 --help' for more information.";; -+ --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -5210,36 +5022,50 @@ - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile.sim" ) CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;; -- "Make-common.sim" ) CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;; -- ".gdbinit" ) CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;; -- "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;; -- "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; -- "stamp-h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;; -- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; -+ "$ac_config_links_1") CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;; -+ "Makefile.sim") CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;; -+ "Make-common.sim") CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;; -+ ".gdbinit") CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;; -+ "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; -+ "stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;; -+ -+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -5252,862 +5078,565 @@ - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -- --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- --# --# CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@sim_environment@,$sim_environment,;t t --s,@sim_alignment@,$sim_alignment,;t t --s,@sim_assert@,$sim_assert,;t t --s,@sim_bitsize@,$sim_bitsize,;t t --s,@sim_endian@,$sim_endian,;t t --s,@sim_hostendian@,$sim_hostendian,;t t --s,@sim_float@,$sim_float,;t t --s,@sim_scache@,$sim_scache,;t t --s,@sim_default_model@,$sim_default_model,;t t --s,@sim_hw_cflags@,$sim_hw_cflags,;t t --s,@sim_hw_objs@,$sim_hw_objs,;t t --s,@sim_hw@,$sim_hw,;t t --s,@sim_inline@,$sim_inline,;t t --s,@sim_packages@,$sim_packages,;t t --s,@sim_regparm@,$sim_regparm,;t t --s,@sim_reserved_bits@,$sim_reserved_bits,;t t --s,@sim_smp@,$sim_smp,;t t --s,@sim_stdcall@,$sim_stdcall,;t t --s,@sim_xor_endian@,$sim_xor_endian,;t t --s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t --s,@WERROR_CFLAGS@,$WERROR_CFLAGS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@target@,$target,;t t --s,@target_cpu@,$target_cpu,;t t --s,@target_vendor@,$target_vendor,;t t --s,@target_os@,$target_os,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t --s,@HDEFINES@,$HDEFINES,;t t --s,@AR@,$AR,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@USE_NLS@,$USE_NLS,;t t --s,@LIBINTL@,$LIBINTL,;t t --s,@LIBINTL_DEP@,$LIBINTL_DEP,;t t --s,@INCINTL@,$INCINTL,;t t --s,@XGETTEXT@,$XGETTEXT,;t t --s,@GMSGFMT@,$GMSGFMT,;t t --s,@POSUB@,$POSUB,;t t --s,@CATALOGS@,$CATALOGS,;t t --s,@DATADIRNAME@,$DATADIRNAME,;t t --s,@INSTOBJEXT@,$INSTOBJEXT,;t t --s,@GENCAT@,$GENCAT,;t t --s,@CATOBJEXT@,$CATOBJEXT,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@MAINT@,$MAINT,;t t --s,@sim_bswap@,$sim_bswap,;t t --s,@sim_cflags@,$sim_cflags,;t t --s,@sim_debug@,$sim_debug,;t t --s,@sim_stdio@,$sim_stdio,;t t --s,@sim_trace@,$sim_trace,;t t --s,@sim_profile@,$sim_profile,;t t --s,@TERMCAP@,$TERMCAP,;t t --s,@READLINE@,$READLINE,;t t --s,@cgen_breaks@,$cgen_breaks,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -- esac -- -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then - -- ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\r' - else -- ac_dir_suffix= ac_top_builddir= -+ ac_cs_awk_cr=$ac_cr - fi - --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF - - -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -- esac -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - else -- configure_input="$ac_file. " -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+done -+rm -f conf$$subs.sh - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' <conf$$subs.awk | sed ' -+/^[^""]/{ -+ N -+ s/\n// -+} -+' >>$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } - --# --# CONFIG_HEADER section. --# -+ print line -+} - --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || as_fn_error "could not setup config files machinery" "$LINENO" 5 -+_ACEOF - --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -- esac -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi - -- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- # Do quote $f, to prevent DOS paths from being IFS'd. -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script `defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_t=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_t"; then -+ break -+ elif $ac_last_try; then -+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done - -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' <confdefs.h | sed ' -+s/'"$ac_delim"'/"\\\ -+"/g' >>$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", prefix defundef, macro, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ as_fn_error "could not setup config headers machinery" "$LINENO" 5 -+fi # test -n "$CONFIG_HEADERS" - --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\_ACEOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --_ACEOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -- --# This sed command replaces #undef with comments. This is necessary, for --# example, in the case of _POSIX_SOURCE, which is predefined and required --# on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, --_ACEOF -- --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null --do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -- rm -f conftest.defines -- mv conftest.tail conftest.defines --done --rm -f conftest.defines --echo ' fi # grep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null -+ -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" -+shift -+for ac_tag - do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -- --cat >>$CONFIG_STATUS <<\_ACEOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in -- if test x"$ac_file" != x-; then -- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --echo "$as_me: $ac_file is unchanged" >&6;} -- else -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } - -- rm -f $ac_file -- mv $tmp/config.h $ac_file -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -- else -- cat $tmp/config.h -- rm -f $tmp/config.h -- fi --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_LINKS section. --# -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - --for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- -- { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5 --echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;} -- -- if test ! -r $srcdir/$ac_source; then -- { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5 --echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;} -- { (exit 1); exit 1; }; } -- fi -- rm -f $ac_dest -- -- # Make relative symlinks. -- ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dest_dir" -- else -- as_dir="$ac_dest_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; -+ esac - -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dest_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dest_dir";; --*) -- case "$ac_dest_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dest_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -- case $srcdir in -- [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;; -- *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;; -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- # Try a symlink, then a hard link, then a copy. -- ln -s $ac_rel_source $ac_dest 2>/dev/null || -- ln $srcdir/$ac_source $ac_dest 2>/dev/null || -- cp -p $srcdir/$ac_source $ac_dest || -- { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5 --echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;} -- { (exit 1); exit 1; }; } --done -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - --# --# CONFIG_COMMANDS section. --# --for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} -+ -+ rm -f "$tmp/stdin" -+ case $ac_file in -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+ if test x"$ac_file" != x-; then -+ { -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -+ } >"$tmp/config.h" \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -+$as_echo "$as_me: $ac_file is unchanged" >&6;} -+ else -+ rm -f "$ac_file" -+ mv "$tmp/config.h" "$ac_file" \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ fi - else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -+ || as_fn_error "could not create -" "$LINENO" 5 -+ fi -+ ;; -+ :L) -+ # -+ # CONFIG_LINK -+ # - -- ac_builddir=. -+ if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then -+ : -+ else -+ # Prefer the file from the source tree if names are identical. -+ if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then -+ ac_source=$srcdir/$ac_source -+ fi - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 -+$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} - --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -+ if test ! -r "$ac_source"; then -+ as_fn_error "$ac_source: file not found" "$LINENO" 5 -+ fi -+ rm -f "$ac_file" - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+ # Try a relative symlink, then a hard link, then a copy. -+ case $srcdir in -+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; -+ *) ac_rel_source=$ac_top_build_prefix$ac_source ;; -+ esac -+ ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || -+ ln "$ac_source" "$ac_file" 2>/dev/null || -+ cp -p "$ac_source" "$ac_file" || -+ as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 -+ fi -+ ;; -+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -+$as_echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - - -- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 --echo "$as_me: executing $ac_dest commands" >&6;} -- case $ac_dest in -- Makefile ) echo "Merging Makefile.sim+Make-common.sim into Makefile ..." -+ case $ac_file$ac_mode in -+ "Makefile":C) echo "Merging Makefile.sim+Make-common.sim into Makefile ..." - rm -f Makesim1.tmp Makesim2.tmp Makefile - sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp -@@ -6116,18 +5645,19 @@ - <Makefile.sim >Makefile - rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp - ;; -- stamp-h ) echo > stamp-h ;; -+ "stamp-h":C) echo > stamp-h ;; -+ - esac --done --_ACEOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - --{ (exit 0); exit 0; } -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -6147,7 +5677,11 @@ - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit $? -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - -diff -Naur gdb-6.8.orig/sim/erc32/configure.ac gdb-6.8/sim/erc32/configure.ac ---- gdb-6.8.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure.ac 2009-09-23 18:02:13.000000000 +0200 -@@ -11,27 +11,32 @@ - - AC_CHECK_HEADERS(stdlib.h) - --# In the Cygwin environment, we need some additional flags. --AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ --#ifdef __CYGWIN__ --lose --#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) -+AC_ARG_WITH([system-readline], -+ [AS_HELP_STRING([--with-system-readline], -+ [use installed readline library])]) - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -+if test "$with_system_readline" = yes; then -+ AC_MSG_CHECKING([for readline]) -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE=-lreadline], -+ [ LIBS="-lreadline -lncurses $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE="-lreadline -lncurses"], -+ [AC_MSG_ERROR([unable to detect readline])]) -+ ]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT($READLINE) -+ READLINE_DEPS= -+ READLINE_CFLAGS= - else -- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="") --fi --AC_SUBST(TERMCAP) -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- AC_CHECK_LIB(readline, readline, READLINE=-lreadline, -- AC_ERROR([the required "readline" library is missing]), $TERMCAP) -+ READLINE='../../readline/libreadline.a -lncurses' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - AC_SUBST(READLINE) -+AC_SUBST(READLINE_DEPS) -+AC_SUBST(READLINE_CFLAGS) -+ - SIM_AC_OUTPUT -diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8/sim/erc32/erc32.c ---- gdb-6.8.orig/sim/erc32/erc32.c 1999-04-16 03:35:00.000000000 +0200 -+++ gdb-6.8/sim/erc32/erc32.c 2009-09-23 18:00:02.000000000 +0200 -@@ -24,6 +24,7 @@ - - #include <sys/types.h> - #include <stdio.h> -+#include <string.h> - #include <termios.h> - #include <sys/fcntl.h> - #include <sys/file.h> -@@ -413,7 +414,7 @@ - if (rom8) mec_memcfg &= ~0x20000; - else mec_memcfg |= 0x20000; - -- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7); -+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7); - mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7); - - if (sparclite_board) { -@@ -1659,7 +1660,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz); -@@ -1736,7 +1737,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - if (mem_accprot) { -diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8/sim/erc32/exec.c ---- gdb-6.8.orig/sim/erc32/exec.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8/sim/erc32/exec.c 2009-09-23 18:00:02.000000000 +0200 -@@ -1713,7 +1713,7 @@ - sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1]; - sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1]; - default: -- ; -+ break; - } - #endif - -@@ -1886,7 +1886,7 @@ - sregs->fs[rd & ~1] = sregs->fdp[rd | 1]; - sregs->fs[rd | 1] = sregs->fdp[rd & ~1]; - default: -- ; -+ break; - } - #endif - if (sregs->fpstate == FP_EXC_PE) { -diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8/sim/erc32/Makefile.in ---- gdb-6.8.orig/sim/erc32/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8/sim/erc32/Makefile.in 2009-09-23 18:00:02.000000000 +0200 -@@ -18,12 +18,12 @@ - - ## COMMON_PRE_CONFIG_FRAG - --TERMCAP_LIB = @TERMCAP@ -+# TERMCAP_LIB = -lncurses - READLINE_LIB = @READLINE@ - - SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o - SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm --SIM_EXTRA_ALL = sis -+SIM_EXTRA_ALL = sis$(EXEEXT) - SIM_EXTRA_INSTALL = install-sis - SIM_EXTRA_CLEAN = clean-sis - -@@ -37,8 +37,8 @@ - # `sis' doesn't need interf.o. - SIS_OFILES = exec.o erc32.o func.o help.o float.o - --sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -- $(CC) $(ALL_CFLAGS) -o sis \ -+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) - - # FIXME: This computes the build host's endianness, doesn't it? -@@ -51,11 +51,11 @@ - - # Copy the files into directories where they will be run. - install-sis: installdirs -- n=`echo sis | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) -+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \ -+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n - - clean-sis: -- rm -f sis end end.h -+ rm -f sis$(EXEEXT) end end.h - - configure: - @echo "Rebuilding configure..." -diff -Naur gdb-6.8.orig/sim/erc32/sis.c gdb-6.8/sim/erc32/sis.c ---- gdb-6.8.orig/sim/erc32/sis.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8/sim/erc32/sis.c 2009-09-23 18:03:21.000000000 +0200 -@@ -177,7 +177,7 @@ - cfile = 0; - for (i = 0; i < 64; i++) - cmdq[i] = 0; -- printf("\n SIS - SPARC intruction simulator %s, copyright Jiri Gaisler 1995\n", sis_version); -+ printf("\n SIS - SPARC instruction simulator %s, copyright Jiri Gaisler 1995\n", sis_version); - printf(" Bug-reports to jgais@wd.estec.esa.nl\n\n"); - while (stat < argc) { - if (argv[stat][0] == '-') { -diff -Naur gdb-6.8.orig/sim/h8300/compile.c gdb-6.8/sim/h8300/compile.c ---- gdb-6.8.orig/sim/h8300/compile.c 2007-07-03 19:19:38.000000000 +0200 -+++ gdb-6.8/sim/h8300/compile.c 2009-09-23 18:00:02.000000000 +0200 -@@ -38,6 +38,12 @@ - # define SIGTRAP 5 - #endif - -+#ifdef _WIN32 -+#ifndef SIGBUS -+#define SIGBUS 10 -+#endif -+#endif -+ - int debug; - - host_callback *sim_callback; -@@ -599,7 +605,7 @@ - /* Find the exact opcode/arg combo. */ - for (q = h8_opcodes; q->name; q++) - { -- op_type *nib = q->data.nib; -+ const op_type *nib = q->data.nib; - unsigned int len = 0; - - if ((q->available == AV_H8SX && !h8300sxmode) || -@@ -924,7 +930,7 @@ - #endif - /* Fill in the args. */ - { -- op_type *args = q->args.nib; -+ const op_type *args = q->args.nib; - int hadone = 0; - int nargs; - -diff -Naur gdb-6.8.orig/sim/m32c/gdb-if.c gdb-6.8/sim/m32c/gdb-if.c ---- gdb-6.8.orig/sim/m32c/gdb-if.c 2008-01-01 23:53:25.000000000 +0100 -+++ gdb-6.8/sim/m32c/gdb-if.c 2009-09-23 18:00:02.000000000 +0200 -@@ -534,8 +534,12 @@ - #endif - - case 5: -+#ifdef SIGTRAP - return SIGTRAP; -- -+#else -+ return SIGSEGV; -+#endif -+ - case 10: - #ifdef SIGBUS - return SIGBUS; -diff -Naur gdb-6.8.orig/sim/m32c/Makefile.in gdb-6.8/sim/m32c/Makefile.in ---- gdb-6.8.orig/sim/m32c/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8/sim/m32c/Makefile.in 2009-09-23 18:00:02.000000000 +0200 -@@ -55,7 +55,7 @@ - ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c - - opc2c : opc2c.o safe-fgets.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - - sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld - ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o -@@ -83,8 +83,10 @@ - mem.o : mem.h cpu.h syscalls.h - misc.o : cpu.h misc.h - opc2c.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c - reg.o : cpu.h - safe-fgets.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c - srcdest.c : cpu.h mem.h - syscalls.c : cpu.h mem.h syscalls.h - -diff -Naur gdb-6.8.orig/sim/ppc/configure gdb-6.8/sim/ppc/configure ---- gdb-6.8.orig/sim/ppc/configure 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure 2009-09-23 18:00:02.000000000 +0200 -@@ -2709,10 +2709,263 @@ - - fi; - -+echo "$as_me:$LINENO: checking if union semun defined" >&5 -+echo $ECHO_N "checking if union semun defined... $ECHO_C" >&6 -+if test "${ac_cv_HAS_UNION_SEMUN+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h> -+int -+main () -+{ -+union semun arg ; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_has_union_semun="yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_has_union_semun="no" -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_cv_has_union_semun" >&5 -+echo "${ECHO_T}$ac_cv_has_union_semun" >&6 -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_HAS_UNION_SEMUN" >&5 -+echo "${ECHO_T}$ac_cv_HAS_UNION_SEMUN" >&6 -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+else # semun is not defined -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+fi -+ -+echo "$as_me:$LINENO: checking whether System V shared memory is supported" >&5 -+echo $ECHO_N "checking whether System V shared memory is supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_shm+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_shm="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_shm="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_shm" >&5 -+echo "${ECHO_T}$ac_cv_sysv_shm" >&6 -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ -+ - # Check whether --enable-sim-hardware or --disable-sim-hardware was given. - if test "${enable_sim_hardware+set}" = set; then - enableval="$enable_sim_hardware" -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) { { echo "$as_me:$LINENO: error: \"List of hardware must be specified for --enable-sim-hardware\"" >&5 -@@ -2728,14 +2981,13 @@ - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - else -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - fi; -- - # Check whether --enable-sim-hostbitsize or --disable-sim-hostbitsize was given. - if test "${enable_sim_hostbitsize+set}" = set; then - enableval="$enable_sim_hostbitsize" -@@ -2752,7 +3004,6 @@ - sim_hostbitsize="" - fi; - -- - # Check whether --enable-sim-hostendian or --disable-sim-hostendian was given. - if test "${enable_sim_hostendian+set}" = set; then - enableval="$enable_sim_hostendian" -diff -Naur gdb-6.8.orig/sim/ppc/configure.ac gdb-6.8/sim/ppc/configure.ac ---- gdb-6.8.orig/sim/ppc/configure.ac 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure.ac 2009-09-23 18:00:02.000000000 +0200 -@@ -209,10 +209,105 @@ - esac - ])dnl - -+AC_CACHE_CHECK([if union semun defined], -+ ac_cv_HAS_UNION_SEMUN, -+ [AC_TRY_COMPILE([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h>], -+[union semun arg ;], -+[ac_cv_has_union_semun="yes"], -+[ac_cv_has_union_semun="no"]) -+AC_MSG_RESULT($ac_cv_has_union_semun) -+]) -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+else # semun is not defined -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+fi -+ -+AC_CACHE_CHECK(whether System V shared memory is supported, -+ac_cv_sysv_shm, -+[ -+AC_TRY_RUN([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+], -+ac_cv_sysv_shm="yes", ac_cv_sysv_shm="no", :) -+]) -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ - - AC_ARG_ENABLE(sim-hardware, - [ --enable-sim-hardware=list Specify the hardware to be included in the build.], --[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";; -@@ -224,14 +319,13 @@ - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" --fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi])dnl - -- - AC_ARG_ENABLE(sim-hostbitsize, - [ --enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).], - [case "${enableval}" in -diff -Naur gdb-6.8.orig/sim/ppc/debug.c gdb-6.8/sim/ppc/debug.c ---- gdb-6.8.orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.c 2009-09-23 18:00:02.000000000 +0200 -@@ -70,6 +70,8 @@ - { trace_pass_device, "pass-device" }, - { trace_phb_device, "phb-device" }, - { trace_register_device, "register-device", "Device initializing registers" }, -+ { trace_sem_device, "sem-device" }, -+ { trace_shm_device, "shm-device" }, - { trace_stack_device, "stack-device" }, - { trace_vm_device, "vm-device" }, - /* packages */ -diff -Naur gdb-6.8.orig/sim/ppc/debug.h gdb-6.8/sim/ppc/debug.h ---- gdb-6.8.orig/sim/ppc/debug.h 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.h 2009-09-23 18:00:02.000000000 +0200 -@@ -51,6 +51,8 @@ - trace_pal_device, - trace_pass_device, - trace_phb_device, -+ trace_sem_device, -+ trace_shm_device, - trace_stack_device, - trace_register_device, - trace_vm_device, -diff -Naur gdb-6.8.orig/sim/ppc/hw_sem.c gdb-6.8/sim/ppc/hw_sem.c ---- gdb-6.8.orig/sim/ppc/hw_sem.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_sem.c 2009-09-23 18:00:02.000000000 +0200 -@@ -0,0 +1,301 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SEM_C_ -+#define _HW_SEM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/sem.h> -+ -+#include <errno.h> -+ -+/* DEVICE -+ -+ -+ sem - provide access to a unix semaphore -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an interface to a unix semaphore. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix semaphore. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the sem: -+ -+ | bash$ psim -t sem-device \ -+ -+ -+ Configure a UNIX semaphore using key 0x12345678 mapped into psim -+ address space at 0xfff00000: -+ -+ | -o '/sem@0xfff00000/reg 0xfff00000 0x80000' \ -+ | -o '/sem@0xfff00000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/sem@0xc0000000/reg 0xc0000000 0x80000' \ -+ -o '/sem@0xc0000000/key 0x12345678' ../psim-hello/hello -+ -+ REGISTERS -+ -+ offset 0 - lock count -+ offset 4 - lock operation -+ offset 8 - unlock operation -+ -+ All reads return the current or resulting count. -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_sem_device { -+ unsigned_word physical_address; -+ key_t key; -+ int id; -+ int initial; -+ int count; -+} hw_sem_device; -+ -+static void -+hw_sem_init_data(device *me) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ const device_unit *d; -+ int status; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* initialize the properties of the sem */ -+ -+ if (device_find_property(me, "key") == NULL) -+ error("sem_init_data() required key property is missing\n"); -+ -+ if (device_find_property(me, "value") == NULL) -+ error("sem_init_data() required value property is missing\n"); -+ -+ sem->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(sem, ("semaphore key (%d)\n", sem->key) ); -+ -+ sem->initial = (int) device_find_integer_property(me, "value"); -+ DTRACE(sem, ("semaphore initial value (%d)\n", sem->initial) ); -+ -+ d = device_unit_address(me); -+ sem->physical_address = d->cells[ d->nr_cells-1 ]; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", sem->physical_address)); -+ -+ /* Now to initialize the semaphore */ -+ -+ if ( sem->initial != -1 ) { -+ -+ sem->id = semget(sem->key, 1, IPC_CREAT | 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ -+ help.val = sem->initial; -+ status = semctl( sem->id, 0, SETVAL, help ); -+ if (status == -1) -+ error("hw_sem_init_data() semctl -- set value failed\n"); -+ -+ } else { -+ sem->id = semget(sem->key, 1, 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ } -+ -+ sem->count = semctl( sem->id, 0, GETVAL, help ); -+ if (sem->count == -1) -+ error("hw_sem_init_data() semctl -- get value failed\n"); -+ DTRACE(sem, ("semaphore OS value (%d)\n", sem->count) ); -+ -+ if (sizeof(int) != 4) -+ error("hw_sem_init_data() typing problem\n"); -+} -+ -+static void -+hw_sem_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ -+ if (space != 0) -+ error("sem_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 12) -+ error("sem_attach_address_callback() invalid size\n"); -+ -+ sem->physical_address = addr; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", addr)); -+} -+ -+static unsigned -+hw_sem_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ struct sembuf sb; -+ int status; -+ unsigned32 u32; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(sem, ("semaphore read addr=0x%x length=%d\n", addr, nr_bytes)); -+ -+ if (!(addr >= sem->physical_address && addr <= sem->physical_address + 11)) -+ error("hw_sem_io_read_buffer() invalid address - out of range\n"); -+ -+ if ((addr % 4) != 0) -+ error("hw_sem_io_read_buffer() invalid address - alignment\n"); -+ -+ if (nr_bytes != 4) -+ error("hw_sem_io_read_buffer() invalid length\n"); -+ -+ switch ( (addr - sem->physical_address) / 4 ) { -+ -+ case 0: /* OBTAIN CURRENT VALUE */ -+ break; -+ -+ case 1: /* LOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = -1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: lock" ); -+ error("hw_sem_io_read_buffer() sem lock\n"); -+ } -+ -+ DTRACE(sem, ("semaphore lock %d\n", sem->count)); -+ break; -+ -+ case 2: /* UNLOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = 1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: unlock" ); -+ error("hw_sem_io_read_buffer() sem unlock\n"); -+ } -+ DTRACE(sem, ("semaphore unlock %d\n", sem->count)); -+ break; -+ -+ default: -+ error("hw_sem_io_read_buffer() invalid address - unknown error\n"); -+ break; -+ } -+ -+ /* assume target is big endian */ -+ u32 = H2T_4(semctl( sem->id, 0, GETVAL, help )); -+ -+ DTRACE(sem, ("semaphore OS value (%d)\n", u32) ); -+ if (u32 == 0xffffffff) { -+ perror( "hw_sem.c: getval" ); -+ error("hw_sem_io_read_buffer() semctl -- get value failed\n"); -+ } -+ -+ memcpy(dest, &u32, nr_bytes); -+ return nr_bytes; -+ -+} -+ -+static device_callbacks const hw_sem_callbacks = { -+ { generic_device_init_address, hw_sem_init_data }, -+ { hw_sem_attach_address_callback, }, /* address */ -+ { hw_sem_io_read_buffer, NULL }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_sem_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_sem_device *sem = ZALLOC(hw_sem_device); -+ return sem; -+} -+ -+const device_descriptor hw_sem_device_descriptor[] = { -+ { "sem", hw_sem_create, &hw_sem_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SEM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/hw_shm.c gdb-6.8/sim/ppc/hw_shm.c ---- gdb-6.8.orig/sim/ppc/hw_shm.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_shm.c 2009-09-23 18:00:02.000000000 +0200 -@@ -0,0 +1,236 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SHM_C_ -+#define _HW_SHM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/shm.h> -+ -+ -+/* DEVICE -+ -+ -+ shm - map unix shared memory into psim address space -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an area of memory which is mapped into UNIX -+ shared memory. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ The SHM area is assumed to be of the same length. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix shared memory area. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the shm: -+ -+ | bash$ psim -t shm-device \ -+ -+ -+ Configure a 512 kilobytes of UNIX shared memory with the key 0x12345678 -+ mapped into psim address space at 0x0c000000. -+ -+ | -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ | -o '/shm@0x0c000000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ -o '/shm@0x0c000000/key 0x12345678' ../psim-hello/hello -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_shm_device { -+ unsigned_word physical_address; -+ char *shm_address; -+ unsigned sizeof_memory; -+ key_t key; -+ int id; -+} hw_shm_device; -+ -+static void -+hw_shm_init_data(device *me) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ const device_unit *d; -+ reg_property_spec reg; -+ int i; -+ -+ /* Obtain the Key Value */ -+ if (device_find_property(me, "key") == NULL) -+ error("shm_init_data() required key property is missing\n"); -+ -+ shm->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(shm, ("shm key (0x%08x)\n", shm->key) ); -+ -+ /* Figure out where this memory is in address space and how long it is */ -+ if ( !device_find_reg_array_property(me, "reg", 0, ®) ) -+ error("hw_shm_init_data() no address registered\n"); -+ -+ /* Determine the address and length being as paranoid as possible */ -+ shm->physical_address = 0xffffffff; -+ shm->sizeof_memory = 0xffffffff; -+ -+ for ( i=0 ; i<reg.address.nr_cells; i++ ) { -+ if (reg.address.cells[0] == 0 && reg.size.cells[0] == 0) -+ continue; -+ -+ if ( shm->physical_address != 0xffffffff ) -+ device_error(me, "Only single celled address ranges supported\n"); -+ -+ shm->physical_address = reg.address.cells[i]; -+ DTRACE(shm, ("shm physical_address=0x%x\n", shm->physical_address)); -+ -+ shm->sizeof_memory = reg.size.cells[i]; -+ DTRACE(shm, ("shm length=0x%x\n", shm->sizeof_memory)); -+ } -+ -+ if ( shm->physical_address == 0xffffffff ) -+ device_error(me, "Address not specified\n" ); -+ -+ if ( shm->sizeof_memory == 0xffffffff ) -+ device_error(me, "Length not specified\n" ); -+ -+ /* Now actually attach to or create the shared memory area */ -+ shm->id = shmget(shm->key, shm->sizeof_memory, IPC_CREAT | 0660); -+ if (shm->id == -1) -+ error("hw_shm_init_data() shmget failed\n"); -+ -+ shm->shm_address = shmat(shm->id, (char *)0, SHM_RND); -+ if (shm->shm_address == (void *)-1) -+ error("hw_shm_init_data() shmat failed\n"); -+} -+ -+static void -+hw_shm_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ if (space != 0) -+ error("shm_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 0) -+ error("shm_attach_address_callback() invalid size\n"); -+} -+ -+ -+static unsigned -+hw_shm_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("read %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(dest, &shm->shm_address[addr - shm->physical_address], nr_bytes); -+ return nr_bytes; -+} -+ -+ -+static unsigned -+hw_shm_io_write_buffer(device *me, -+ const void *source, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("write %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(&shm->shm_address[addr - shm->physical_address], source, nr_bytes); -+ return nr_bytes; -+} -+ -+static device_callbacks const hw_shm_callbacks = { -+ { generic_device_init_address, hw_shm_init_data }, -+ { hw_shm_attach_address_callback, }, /* address */ -+ { hw_shm_io_read_buffer, -+ hw_shm_io_write_buffer }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_shm_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_shm_device *shm = ZALLOC(hw_shm_device); -+ return shm; -+} -+ -+ -+ -+const device_descriptor hw_shm_device_descriptor[] = { -+ { "shm", hw_shm_create, &hw_shm_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SHM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/Makefile.in gdb-6.8/sim/ppc/Makefile.in ---- gdb-6.8.orig/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 -+++ gdb-6.8/sim/ppc/Makefile.in 2009-09-23 18:00:02.000000000 +0200 -@@ -834,6 +834,8 @@ - hw_pal.o: hw_pal.c $(DEVICE_TABLE_H) $(CPU_H) - hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) $(HW_PHB_H) $(COREFILE_H) - hw_register.o: hw_register.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_sem.o: hw_sem.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_shm.o: hw_shm.c $(DEVICE_TABLE_H) $(PSIM_H) - hw_trace.o: hw_trace.c $(DEVICE_TABLE_H) - hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) - # ignore this line, it stops make from getting confused -diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8/sim/ppc/ppc-instructions ---- gdb-6.8.orig/sim/ppc/ppc-instructions 2006-11-29 16:20:55.000000000 +0100 -+++ gdb-6.8/sim/ppc/ppc-instructions 2009-09-23 18:00:02.000000000 +0200 -@@ -3402,6 +3402,14 @@ - case spr_dec: - *rT = cpu_get_decrementer(processor); - break; -+ case spr_tbrl: -+ if (is_64bit_implementation) *rT = TB; -+ else *rT = EXTRACTED64(TB, 32, 63); -+ break; -+ case spr_tbru: -+ if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31); -+ else *rT = EXTRACTED64(TB, 0, 31); -+ break; - case spr_tbu: - case spr_tbl: - /* NOTE - these SPR's are not readable. Use mftb[ul] */ -diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8/sim/ppc/ppc-spr-table ---- gdb-6.8.orig/sim/ppc/ppc-spr-table 2003-06-22 18:48:12.000000000 +0200 -+++ gdb-6.8/sim/ppc/ppc-spr-table 2009-09-23 18:00:02.000000000 +0200 -@@ -32,6 +32,8 @@ - SRR0:26:0:0 - SRR1:27:0:0 - VRSAVE:256:0:0 -+TBRL:268:0:0 -+TBRU:269:0:0 - SPRG0:272:0:0 - SPRG1:273:0:0 - SPRG2:274:0:0 diff --git a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20091111.diff b/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20091111.diff deleted file mode 100644 index 63035e6e1b..0000000000 --- a/contrib/crossrpms/patches/gdb-6.8-rtems4.9-20091111.diff +++ /dev/null @@ -1,10849 +0,0 @@ -diff -Naur gdb-6.8.orig/bfd/config.bfd gdb-6.8/bfd/config.bfd ---- gdb-6.8.orig/bfd/config.bfd 2008-02-14 16:20:24.000000000 +0100 -+++ gdb-6.8/bfd/config.bfd 2009-11-11 14:46:43.000000000 +0100 -@@ -712,7 +712,7 @@ - targ_defvec=bfd_elf32_iq2000_vec - ;; - -- m32c-*-elf) -+ m32c-*-elf | m32c-*-rtems*) - targ_defvec=bfd_elf32_m32c_vec - ;; - -@@ -728,6 +728,9 @@ - targ_defvec=bfd_elf32_m32rle_vec - targ_selvecs="bfd_elf32_m32r_vec bfd_elf32_m32rle_vec" - ;; -+ m32r-*-rtems*) -+ targ_defvec=bfd_elf32_m32r_vec -+ ;; - m32r-*-*) - targ_defvec=bfd_elf32_m32r_vec - ;; -diff -Naur gdb-6.8.orig/gdb/breakpoint.c gdb-6.8/gdb/breakpoint.c ---- gdb-6.8.orig/gdb/breakpoint.c 2008-02-26 09:14:11.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.c 2009-11-11 14:46:43.000000000 +0100 -@@ -55,6 +55,7 @@ - #include "memattr.h" - #include "ada-lang.h" - #include "top.h" -+#include "wrapper.h" - - #include "gdb-events.h" - #include "mi/mi-common.h" -@@ -826,7 +827,65 @@ - || bpt->type == bp_access_watchpoint); - } - --/* Assuming that B is a hardware breakpoint: -+/* Find the current value of a watchpoint on EXP. Return the value in -+ *VALP and *RESULTP and the chain of intermediate and final values -+ in *VAL_CHAIN. RESULTP and VAL_CHAIN may be NULL if the caller does -+ not need them. -+ -+ If an error occurs while evaluating the expression, *RESULTP will -+ be set to NULL. *RESULTP may be a lazy value, if the result could -+ not be read from memory. It is used to determine whether a value -+ is user-specified (we should watch the whole value) or intermediate -+ (we should watch only the bit used to locate the final value). -+ -+ If the final value, or any intermediate value, could not be read -+ from memory, *VALP will be set to NULL. *VAL_CHAIN will still be -+ set to any referenced values. *VALP will never be a lazy value. -+ This is the value which we store in struct breakpoint. -+ -+ If VAL_CHAIN is non-NULL, *VAL_CHAIN will be released from the -+ value chain. The caller must free the values individually. If -+ VAL_CHAIN is NULL, all generated values will be left on the value -+ chain. */ -+ -+static void -+fetch_watchpoint_value (struct expression *exp, struct value **valp, -+ struct value **resultp, struct value **val_chain) -+{ -+ struct value *mark, *new_mark, *result; -+ -+ *valp = NULL; -+ if (resultp) -+ *resultp = NULL; -+ if (val_chain) -+ *val_chain = NULL; -+ -+ /* Evaluate the expression. */ -+ mark = value_mark (); -+ result = NULL; -+ gdb_evaluate_expression (exp, &result); -+ new_mark = value_mark (); -+ if (mark == new_mark) -+ return; -+ if (resultp) -+ *resultp = result; -+ -+ /* Make sure it's not lazy, so that after the target stops again we -+ have a non-lazy previous value to compare with. */ -+ if (result != NULL -+ && (!value_lazy (result) || gdb_value_fetch_lazy (result))) -+ *valp = result; -+ -+ if (val_chain) -+ { -+ /* Return the chain of intermediate values. We use this to -+ decide which addresses to watch. */ -+ *val_chain = new_mark; -+ value_release_to_mark (mark); -+ } -+} -+ -+/* Assuming that B is a hardware watchpoint: - - Reparse watchpoint expression, is REPARSE is non-zero - - Evaluate expression and store the result in B->val - - Update the list of values that must be watched in B->loc. -@@ -837,7 +896,6 @@ - update_watchpoint (struct breakpoint *b, int reparse) - { - int within_current_scope; -- struct value *mark = value_mark (); - struct frame_id saved_frame_id; - struct bp_location *loc; - bpstat bs; -@@ -889,9 +947,9 @@ - to the user when the old value and the new value may actually - be completely different objects. */ - value_free (b->val); -- b->val = NULL; -+ b->val = NULL; -+ b->val_valid = 0; - } -- - - /* If we failed to parse the expression, for example because - it refers to a global variable in a not-yet-loaded shared library, -@@ -900,43 +958,37 @@ - is different from out-of-scope watchpoint. */ - if (within_current_scope && b->exp) - { -- struct value *v, *next; -+ struct value *val_chain, *v, *result, *next; -+ -+ fetch_watchpoint_value (b->exp, &v, &result, &val_chain); - -- /* Evaluate the expression and make sure it's not lazy, so that -- after target stops again, we have a non-lazy previous value -- to compare with. Also, making the value non-lazy will fetch -- intermediate values as needed, which we use to decide which -- addresses to watch. -- -- The value returned by evaluate_expression is stored in b->val. -- In addition, we look at all values which were created -- during evaluation, and set watchoints at addresses as needed. -- Those values are explicitly deleted here. */ -- v = evaluate_expression (b->exp); - /* Avoid setting b->val if it's already set. The meaning of - b->val is 'the last value' user saw, and we should update - it only if we reported that last value to user. As it - happens, the code that reports it updates b->val directly. */ -- if (b->val == NULL) -- b->val = v; -- value_contents (v); -- value_release_to_mark (mark); -+ if (!b->val_valid) -+ { -+ b->val = v; -+ b->val_valid = 1; -+ } - - /* Look at each value on the value chain. */ -- for (; v; v = next) -+ for (v = val_chain; v; v = next) - { - /* If it's a memory location, and GDB actually needed - its contents to evaluate the expression, then we -- must watch it. */ -+ must watch it. If the first value returned is -+ still lazy, that means an error occurred reading it; -+ watch it anyway in case it becomes readable. */ - if (VALUE_LVAL (v) == lval_memory -- && ! value_lazy (v)) -+ && (v == val_chain || ! value_lazy (v))) - { - struct type *vtype = check_typedef (value_type (v)); - - /* We only watch structs and arrays if user asked - for it explicitly, never if they just happen to - appear in the middle of some value chain. */ -- if (v == b->val -+ if (v == result - || (TYPE_CODE (vtype) != TYPE_CODE_STRUCT - && TYPE_CODE (vtype) != TYPE_CODE_ARRAY)) - { -@@ -1681,6 +1733,7 @@ - if (b->val) - value_free (b->val); - b->val = NULL; -+ b->val_valid = 0; - } - break; - default: -@@ -2103,6 +2156,17 @@ - do_cleanups (old_chain); - } - -+/* Print out the (old or new) value associated with a watchpoint. */ -+ -+static void -+watchpoint_value_print (struct value *val, struct ui_file *stream) -+{ -+ if (val == NULL) -+ fprintf_unfiltered (stream, _("<unreadable>")); -+ else -+ value_print (val, stream, 0, Val_pretty_default); -+} -+ - /* This is the normal print function for a bpstat. In the future, - much of this logic could (should?) be moved to bpstat_stop_status, - by having it set different print_it values. -@@ -2221,26 +2285,21 @@ - - case bp_watchpoint: - case bp_hardware_watchpoint: -- if (bs->old_val != NULL) -- { -- annotate_watchpoint (b->number); -- if (ui_out_is_mi_like_p (uiout)) -- ui_out_field_string -- (uiout, "reason", -- async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -- mention (b); -- ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -- ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "old", stb); -- ui_out_text (uiout, "\nNew value = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -- ui_out_field_stream (uiout, "new", stb); -- do_cleanups (ui_out_chain); -- ui_out_text (uiout, "\n"); -- value_free (bs->old_val); -- bs->old_val = NULL; -- } -+ annotate_watchpoint (b->number); -+ if (ui_out_is_mi_like_p (uiout)) -+ ui_out_field_string -+ (uiout, "reason", -+ async_reason_lookup (EXEC_ASYNC_WATCHPOINT_TRIGGER)); -+ mention (b); -+ ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); -+ ui_out_text (uiout, "\nOld value = "); -+ watchpoint_value_print (bs->old_val, stb->stream); -+ ui_out_field_stream (uiout, "old", stb); -+ ui_out_text (uiout, "\nNew value = "); -+ watchpoint_value_print (b->val, stb->stream); -+ ui_out_field_stream (uiout, "new", stb); -+ do_cleanups (ui_out_chain); -+ ui_out_text (uiout, "\n"); - /* More than one watchpoint may have been triggered. */ - return PRINT_UNKNOWN; - break; -@@ -2253,7 +2312,7 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); -- value_print (b->val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "value", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2261,7 +2320,7 @@ - break; - - case bp_access_watchpoint: -- if (bs->old_val != NULL) -+ if (bs->old_val != NULL) - { - annotate_watchpoint (b->number); - if (ui_out_is_mi_like_p (uiout)) -@@ -2271,10 +2330,8 @@ - mention (b); - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nOld value = "); -- value_print (bs->old_val, stb->stream, 0, Val_pretty_default); -+ watchpoint_value_print (bs->old_val, stb->stream); - ui_out_field_stream (uiout, "old", stb); -- value_free (bs->old_val); -- bs->old_val = NULL; - ui_out_text (uiout, "\nNew value = "); - } - else -@@ -2287,7 +2344,7 @@ - ui_out_chain = make_cleanup_ui_out_tuple_begin_end (uiout, "value"); - ui_out_text (uiout, "\nValue = "); - } -- value_print (b->val, stb->stream, 0,Val_pretty_default); -+ watchpoint_value_print (b->val, stb->stream); - ui_out_field_stream (uiout, "new", stb); - do_cleanups (ui_out_chain); - ui_out_text (uiout, "\n"); -@@ -2574,13 +2631,20 @@ - we might be in the middle of evaluating a function call. */ - - struct value *mark = value_mark (); -- struct value *new_val = evaluate_expression (b->exp); -- if (!value_equal (b->val, new_val)) -+ struct value *new_val; -+ -+ fetch_watchpoint_value (b->exp, &new_val, NULL, NULL); -+ if ((b->val != NULL) != (new_val != NULL) -+ || (b->val != NULL && !value_equal (b->val, new_val))) - { -- release_value (new_val); -- value_free_to_mark (mark); -+ if (new_val != NULL) -+ { -+ release_value (new_val); -+ value_free_to_mark (mark); -+ } - bs->old_val = b->val; - b->val = new_val; -+ b->val_valid = 1; - /* We will stop here */ - return WP_VALUE_CHANGED; - } -@@ -5722,10 +5786,9 @@ - exp_end = arg; - exp_valid_block = innermost_block; - mark = value_mark (); -- val = evaluate_expression (exp); -- release_value (val); -- if (value_lazy (val)) -- value_fetch_lazy (val); -+ fetch_watchpoint_value (exp, &val, NULL, NULL); -+ if (val != NULL) -+ release_value (val); - - tok = arg; - while (*tok == ' ' || *tok == '\t') -@@ -5814,6 +5877,7 @@ - b->exp_valid_block = exp_valid_block; - b->exp_string = savestring (exp_start, exp_end - exp_start); - b->val = val; -+ b->val_valid = 1; - b->loc->cond = cond; - if (cond_start) - b->cond_string = savestring (cond_start, cond_end - cond_start); -@@ -7697,11 +7761,11 @@ - if (bpt->val) - value_free (bpt->val); - mark = value_mark (); -- bpt->val = evaluate_expression (bpt->exp); -- release_value (bpt->val); -- if (value_lazy (bpt->val)) -- value_fetch_lazy (bpt->val); -- -+ fetch_watchpoint_value (bpt->exp, &bpt->val, NULL, NULL); -+ if (bpt->val) -+ release_value (bpt->val); -+ bpt->val_valid = 1; -+ - if (bpt->type == bp_hardware_watchpoint || - bpt->type == bp_read_watchpoint || - bpt->type == bp_access_watchpoint) -diff -Naur gdb-6.8.orig/gdb/breakpoint.h gdb-6.8/gdb/breakpoint.h ---- gdb-6.8.orig/gdb/breakpoint.h 2008-02-01 17:24:46.000000000 +0100 -+++ gdb-6.8/gdb/breakpoint.h 2009-11-11 14:46:43.000000000 +0100 -@@ -391,8 +391,13 @@ - /* The largest block within which it is valid, or NULL if it is - valid anywhere (e.g. consists just of global symbols). */ - struct block *exp_valid_block; -- /* Value of the watchpoint the last time we checked it. */ -+ /* Value of the watchpoint the last time we checked it, or NULL -+ when we do not know the value yet or the value was not -+ readable. VAL is never lazy. */ - struct value *val; -+ /* Nonzero if VAL is valid. If VAL_VALID is set but VAL is NULL, -+ then an error occurred reading the value. */ -+ int val_valid; - - /* Holds the address of the related watchpoint_scope breakpoint - when using watchpoints on local variables (might the concept -diff -Naur gdb-6.8.orig/gdb/config.in gdb-6.8/gdb/config.in ---- gdb-6.8.orig/gdb/config.in 2008-01-08 20:38:33.000000000 +0100 -+++ gdb-6.8/gdb/config.in 2009-11-11 14:44:56.000000000 +0100 -@@ -622,5 +622,8 @@ - /* Define to `int' if <sys/types.h> does not define. */ - #undef pid_t - -+/* readline-6.0 started to use different name. */ -+#undef readline_echoing_p -+ - /* Define as `fork' if `vfork' does not work. */ - #undef vfork -diff -Naur gdb-6.8.orig/gdb/configure gdb-6.8/gdb/configure ---- gdb-6.8.orig/gdb/configure 2008-01-13 13:23:04.000000000 +0100 -+++ gdb-6.8/gdb/configure 2009-11-11 14:46:06.000000000 +0100 -@@ -6431,6 +6431,69 @@ - READLINE=-lreadline - READLINE_DEPS= - READLINE_CFLAGS= -+ -+ # readline-6.0 started to use the name `_rl_echoing_p'. -+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure. -+ -+ echo "$as_me:$LINENO: checking for readline_echoing_p" >&5 -+echo $ECHO_N "checking for readline_echoing_p... $ECHO_C" >&6 -+ save_LIBS=$LIBS -+ LIBS="$LIBS $READLINE" -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+extern int readline_echoing_p; -+ return readline_echoing_p; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ READLINE_ECHOING_P=yes -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+READLINE_ECHOING_P=no -+ -+cat >>confdefs.h <<\_ACEOF -+#define readline_echoing_p _rl_echoing_p -+_ACEOF -+ -+fi -+rm -f conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ echo "$as_me:$LINENO: result: $READLINE_ECHOING_P" >&5 -+echo "${ECHO_T}$READLINE_ECHOING_P" >&6 - else - READLINE='$(READLINE_DIR)/libreadline.a' - READLINE_DEPS='$(READLINE)' -diff -Naur gdb-6.8.orig/gdb/configure.ac gdb-6.8/gdb/configure.ac ---- gdb-6.8.orig/gdb/configure.ac 2008-01-13 13:23:05.000000000 +0100 -+++ gdb-6.8/gdb/configure.ac 2009-11-11 14:45:21.000000000 +0100 -@@ -442,6 +442,21 @@ - READLINE=-lreadline - READLINE_DEPS= - READLINE_CFLAGS= -+ -+ # readline-6.0 started to use the name `_rl_echoing_p'. -+ # `$(READLINE_DIR)/' of bundled readline would not resolve in configure. -+ -+ AC_MSG_CHECKING([for readline_echoing_p]) -+ save_LIBS=$LIBS -+ LIBS="$LIBS $READLINE" -+ AC_LINK_IFELSE(AC_LANG_PROGRAM(,[[extern int readline_echoing_p; -+ return readline_echoing_p;]]), -+ [READLINE_ECHOING_P=yes], -+ [READLINE_ECHOING_P=no -+ AC_DEFINE([readline_echoing_p], [_rl_echoing_p], -+ [readline-6.0 started to use different name.])]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT([$READLINE_ECHOING_P]) - else - READLINE='$(READLINE_DIR)/libreadline.a' - READLINE_DEPS='$(READLINE)' -diff -Naur gdb-6.8.orig/gdb/NEWS gdb-6.8/gdb/NEWS ---- gdb-6.8.orig/gdb/NEWS 2008-03-27 19:14:10.000000000 +0100 -+++ gdb-6.8/gdb/NEWS 2009-11-11 14:46:43.000000000 +0100 -@@ -1,6 +1,9 @@ - What has changed in GDB? - (Organized release by release) - -+* Watchpoints can now be set on unreadable memory locations, e.g. addresses -+which will be allocated using malloc later in program execution. -+ - *** Changes in GDB 6.8 - - * New native configurations -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.c 2003-03-17 20:51:58.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.c 2009-11-11 14:46:43.000000000 +0100 -@@ -39,6 +39,8 @@ - - int doread = 0; - -+char *global_ptr; -+ - void marker1 () - { - } -@@ -110,6 +112,14 @@ - return 73; - } - -+void -+func4 () -+{ -+ buf[0] = 3; -+ global_ptr = buf; -+ buf[0] = 7; -+} -+ - int main () - { - #ifdef usestubs -@@ -185,5 +195,7 @@ - - func3 (); - -+ func4 (); -+ - return 0; - } -diff -Naur gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp ---- gdb-6.8.orig/gdb/testsuite/gdb.base/watchpoint.exp 2008-01-01 23:53:19.000000000 +0100 -+++ gdb-6.8/gdb/testsuite/gdb.base/watchpoint.exp 2009-11-11 14:46:43.000000000 +0100 -@@ -645,6 +645,30 @@ - } - } - -+proc test_inaccessible_watchpoint {} { -+ global gdb_prompt -+ -+ # This is a test for watchpoints on currently inaccessible (but later -+ # valid) memory. -+ -+ if [runto func4] then { -+ gdb_test "watch *global_ptr" ".*atchpoint \[0-9\]+: \\*global_ptr" -+ gdb_test "next" ".*global_ptr = buf.*" -+ gdb_test_multiple "next" "next over ptr init" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = .*\r\nNew value = 3 .*\r\n.*$gdb_prompt $" { -+ # We can not test for <unknown> here because NULL may be readable. -+ # This test does rely on *NULL != 3. -+ pass "next over ptr init" -+ } -+ } -+ gdb_test_multiple "next" "next over buffer set" { -+ -re ".*atchpoint \[0-9\]+: \\*global_ptr\r\n\r\nOld value = 3 .*\r\nNew value = 7 .*\r\n.*$gdb_prompt $" { -+ pass "next over buffer set" -+ } -+ } -+ } -+} -+ - # Start with a fresh gdb. - - gdb_exit -@@ -797,6 +821,8 @@ - } - } - -+ test_inaccessible_watchpoint -+ - # See above. - if [istarget "mips-idt-*"] then { - gdb_exit -diff -Naur gdb-6.8.orig/sim/common/aclocal.m4 gdb-6.8/sim/common/aclocal.m4 ---- gdb-6.8.orig/sim/common/aclocal.m4 2006-06-13 10:06:48.000000000 +0200 -+++ gdb-6.8/sim/common/aclocal.m4 2009-11-11 14:46:43.000000000 +0100 -@@ -18,7 +18,7 @@ - # - # SIM_AC_OUTPUT - --AC_DEFUN(SIM_AC_COMMON, -+AC_DEFUN([SIM_AC_COMMON], - [ - # autoconf.info says this should be called right after AC_INIT. - AC_CONFIG_HEADER(ifelse([$1],,config.h,[$1]):config.in) -@@ -245,7 +245,7 @@ - dnl supported. - dnl ??? Until there is demonstrable value in doing something more complicated, - dnl let's not. --AC_DEFUN(SIM_AC_OPTION_ENVIRONMENT, -+AC_DEFUN([SIM_AC_OPTION_ENVIRONMENT], - [ - AC_ARG_ENABLE(sim-environment, - [ --enable-sim-environment=environment Specify mixed, user, virtual or operating environment.], -@@ -269,7 +269,7 @@ - dnl Without this option all possible alignment restrictions are accommodated. - dnl arg[1] is hardwired target alignment - dnl arg[2] is default target alignment --AC_DEFUN(SIM_AC_OPTION_ALIGNMENT, -+AC_DEFUN([SIM_AC_OPTION_ALIGNMENT], - wire_alignment="[$1]" - default_alignment="[$2]" - [ -@@ -318,7 +318,7 @@ - - - dnl Conditionally compile in assertion statements. --AC_DEFUN(SIM_AC_OPTION_ASSERT, -+AC_DEFUN([SIM_AC_OPTION_ASSERT], - [ - AC_ARG_ENABLE(sim-assert, - [ --enable-sim-assert Specify whether to perform random assertions.], -@@ -342,7 +342,7 @@ - dnl arg[3] is the number of bits in an address - dnl arg[4] is the number of bits in an OpenFirmware cell. - dnl FIXME: this information should be obtained from bfd/archure --AC_DEFUN(SIM_AC_OPTION_BITSIZE, -+AC_DEFUN([SIM_AC_OPTION_BITSIZE], - wire_word_bitsize="[$1]" - wire_word_msb="[$2]" - wire_address_bitsize="[$3]" -@@ -408,7 +408,7 @@ - dnl that support both big and little endian targets. - dnl arg[1] is hardwired target endianness. - dnl arg[2] is default target endianness. --AC_DEFUN(SIM_AC_OPTION_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_ENDIAN], - [ - wire_endian="[$1]" - default_endian="[$2]" -@@ -458,7 +458,7 @@ - dnl --enable-sim-hostendian is for users of the simulator when - dnl they find that AC_C_BIGENDIAN does not function correctly - dnl (for instance in a canadian cross) --AC_DEFUN(SIM_AC_OPTION_HOSTENDIAN, -+AC_DEFUN([SIM_AC_OPTION_HOSTENDIAN], - [ - AC_ARG_ENABLE(sim-hostendian, - [ --enable-sim-hostendian=end Specify host byte endian orientation.], -@@ -490,7 +490,7 @@ - dnl And optionally the bitsize of the floating point register. - dnl arg[1] specifies the presence (or absence) of floating point hardware - dnl arg[2] specifies the number of bits in a floating point register --AC_DEFUN(SIM_AC_OPTION_FLOAT, -+AC_DEFUN([SIM_AC_OPTION_FLOAT], - [ - default_sim_float="[$1]" - default_sim_float_bitsize="[$2]" -@@ -519,7 +519,7 @@ - - - dnl The argument is the default cache size if none is specified. --AC_DEFUN(SIM_AC_OPTION_SCACHE, -+AC_DEFUN([SIM_AC_OPTION_SCACHE], - [ - default_sim_scache="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-scache, -@@ -539,7 +539,7 @@ - - - dnl The argument is the default model if none is specified. --AC_DEFUN(SIM_AC_OPTION_DEFAULT_MODEL, -+AC_DEFUN([SIM_AC_OPTION_DEFAULT_MODEL], - [ - default_sim_default_model="ifelse([$1],,0,[$1])" - AC_ARG_ENABLE(sim-default-model, -@@ -559,7 +559,7 @@ - dnl arg[1] Enable sim-hw by default? ("yes" or "no") - dnl arg[2] is a space separated list of devices that override the defaults - dnl arg[3] is a space separated list of extra target specific devices. --AC_DEFUN(SIM_AC_OPTION_HARDWARE, -+AC_DEFUN([SIM_AC_OPTION_HARDWARE], - [ - if test x"[$1]" = x"yes"; then - sim_hw_p=yes -@@ -621,7 +621,7 @@ - dnl performance by inlining functions. - dnl Guarantee that unconfigured simulators do not do any inlining - sim_inline="-DDEFAULT_INLINE=0" --AC_DEFUN(SIM_AC_OPTION_INLINE, -+AC_DEFUN([SIM_AC_OPTION_INLINE], - [ - default_sim_inline="ifelse([$1],,,-DDEFAULT_INLINE=[$1])" - AC_ARG_ENABLE(sim-inline, -@@ -666,7 +666,7 @@ - AC_SUBST(sim_inline) - - --AC_DEFUN(SIM_AC_OPTION_PACKAGES, -+AC_DEFUN([SIM_AC_OPTION_PACKAGES], - [ - AC_ARG_ENABLE(sim-packages, - [ --enable-sim-packages=list Specify the packages to be included in the build.], -@@ -692,7 +692,7 @@ - AC_SUBST(sim_packages) - - --AC_DEFUN(SIM_AC_OPTION_REGPARM, -+AC_DEFUN([SIM_AC_OPTION_REGPARM], - [ - AC_ARG_ENABLE(sim-regparm, - [ --enable-sim-regparm=nr-parm Pass parameters in registers instead of on the stack - x86/GCC specific.], -@@ -709,7 +709,7 @@ - AC_SUBST(sim_regparm) - - --AC_DEFUN(SIM_AC_OPTION_RESERVED_BITS, -+AC_DEFUN([SIM_AC_OPTION_RESERVED_BITS], - [ - default_sim_reserved_bits="ifelse([$1],,1,[$1])" - AC_ARG_ENABLE(sim-reserved-bits, -@@ -726,7 +726,7 @@ - AC_SUBST(sim_reserved_bits) - - --AC_DEFUN(SIM_AC_OPTION_SMP, -+AC_DEFUN([SIM_AC_OPTION_SMP], - [ - default_sim_smp="ifelse([$1],,5,[$1])" - AC_ARG_ENABLE(sim-smp, -@@ -746,7 +746,7 @@ - AC_SUBST(sim_smp) - - --AC_DEFUN(SIM_AC_OPTION_STDCALL, -+AC_DEFUN([SIM_AC_OPTION_STDCALL], - [ - AC_ARG_ENABLE(sim-stdcall, - [ --enable-sim-stdcall=type Use an alternative function call/return mechanism - x86/GCC specific.], -@@ -763,7 +763,7 @@ - AC_SUBST(sim_stdcall) - - --AC_DEFUN(SIM_AC_OPTION_XOR_ENDIAN, -+AC_DEFUN([SIM_AC_OPTION_XOR_ENDIAN], - [ - default_sim_xor_endian="ifelse([$1],,8,[$1])" - AC_ARG_ENABLE(sim-xor-endian, -@@ -782,7 +782,7 @@ - - dnl --enable-build-warnings is for developers of the simulator. - dnl it enables extra GCC specific warnings. --AC_DEFUN(SIM_AC_OPTION_WARNINGS, -+AC_DEFUN([SIM_AC_OPTION_WARNINGS], - [ - # NOTE: Don't add -Wall or -Wunused, they both include - # -Wunused-parameter which reports bogus warnings. -@@ -866,7 +866,7 @@ - dnl one afterwards. The two pieces of the common fragment are inserted into - dnl the target's fragment at the appropriate points. - --AC_DEFUN(SIM_AC_OUTPUT, -+AC_DEFUN([SIM_AC_OUTPUT], - [ - AC_LINK_FILES($sim_link_files, $sim_link_links) - dnl Make @cgen_breaks@ non-null only if the sim uses CGEN. -@@ -895,7 +895,7 @@ - sinclude(../../config/gettext-sister.m4) - - dnl --enable-cgen-maint support --AC_DEFUN(SIM_AC_OPTION_CGEN_MAINT, -+AC_DEFUN([SIM_AC_OPTION_CGEN_MAINT], - [ - cgen_maint=no - dnl Default is to use one in build tree. -diff -Naur gdb-6.8.orig/sim/common/gentmap.c gdb-6.8/sim/common/gentmap.c ---- gdb-6.8.orig/sim/common/gentmap.c 2006-11-07 20:29:59.000000000 +0100 -+++ gdb-6.8/sim/common/gentmap.c 2009-11-11 14:46:43.000000000 +0100 -@@ -2,6 +2,7 @@ - - #include <stdio.h> - #include <stdlib.h> -+#include <string.h> - - struct tdefs { - char *symbol; -diff -Naur gdb-6.8.orig/sim/common/sim-signal.c gdb-6.8/sim/common/sim-signal.c ---- gdb-6.8.orig/sim/common/sim-signal.c 2008-01-01 23:53:23.000000000 +0100 -+++ gdb-6.8/sim/common/sim-signal.c 2009-11-11 14:46:43.000000000 +0100 -@@ -26,7 +26,7 @@ - to not think the process has died (so it can be debugged at the point of - failure). */ - --#ifdef _MSC_VER -+#ifdef _WIN32 - #ifndef SIGTRAP - #define SIGTRAP 5 - #endif -diff -Naur gdb-6.8.orig/sim/erc32/configure gdb-6.8/sim/erc32/configure ---- gdb-6.8.orig/sim/erc32/configure 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure 2009-11-11 14:46:43.000000000 +0100 -@@ -1,81 +1,413 @@ - #! /bin/sh - # Guess values for system-dependent variables and create Makefiles. --# Generated by GNU Autoconf 2.59. -+# Generated by GNU Autoconf 2.64. -+# -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software -+# Foundation, Inc. - # --# Copyright (C) 2003 Free Software Foundation, Inc. - # This configure script is free software; the Free Software Foundation - # gives unlimited permission to copy, distribute and modify it. --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+if test "x$CONFIG_SHELL" = x; then -+ as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : -+ emulate sh -+ NULLCMD=: -+ # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which -+ # is contrary to our usage. Disable this feature. -+ alias -g '\${1+\"\$@\"}'='\"\$@\"' -+ setopt NO_GLOB_SUBST -+else -+ case \`(set -o) 2>/dev/null\` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac -+fi -+" -+ as_required="as_fn_return () { (exit \$1); } -+as_fn_success () { as_fn_return 0; } -+as_fn_failure () { as_fn_return 1; } -+as_fn_ret_success () { return 0; } -+as_fn_ret_failure () { return 1; } -+ -+exitcode=0 -+as_fn_success || { exitcode=1; echo as_fn_success failed.; } -+as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -+as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -+as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -+if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : -+ -+else -+ exitcode=1; echo positional parameters were not saved. -+fi -+test x\$exitcode = x0 || exit 1" -+ as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO -+ as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO -+ eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && -+ test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -+test \$(( 1 + 1 )) = 2 || exit 1" -+ if (eval "$as_required") 2>/dev/null; then : -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : -+ -+else -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+as_found=false -+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH - do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ as_found=: -+ case $as_dir in #( -+ /*) -+ for as_base in sh bash ksh sh5; do -+ # Try only shells that exist, to save several forks. -+ as_shell=$as_dir/$as_base -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ CONFIG_SHELL=$as_shell as_have_required=yes -+ if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : -+ break 2 -+fi -+fi -+ done;; -+ esac -+ as_found=false -+done -+$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && -+ { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : -+ CONFIG_SHELL=$SHELL as_have_required=yes -+fi; } -+IFS=$as_save_IFS -+ -+ -+ if test "x$CONFIG_SHELL" != x; then : -+ # We cannot yet assume a decent shell, so we have to provide a -+ # neutralization value for shells without unset; and this also -+ # works around shells that cannot unset nonexistent variables. -+ BASH_ENV=/dev/null -+ ENV=/dev/null -+ (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ if test x$as_have_required = xno; then : -+ $as_echo "$0: This script requires a shell more modern than all" -+ $as_echo "$0: the shells that I found on your system." -+ if test x${ZSH_VERSION+set} = xset ; then -+ $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" -+ $as_echo "$0: be upgraded to zsh 4.3.4 or later." - else -- $as_unset $as_var -+ $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -+$0: including any error possibly output before this -+$0: message. Then install a modern shell, or manually run -+$0: the script under such a shell if you do have one." - fi --done -+ exit 1 -+fi -+fi -+fi -+SHELL=${CONFIG_SHELL-/bin/sh} -+export SHELL -+# Unset more variables known to interfere with behavior of common tools. -+CLICOLOR_FORCE= GREP_OPTIONS= -+unset CLICOLOR_FORCE GREP_OPTIONS -+ -+## --------------------- ## -+## M4sh Shell Functions. ## -+## --------------------- ## -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" -+ -+ -+} # as_fn_mkdir_p -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+# as_fn_error ERROR [LINENO LOG_FD] -+# --------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with status $?, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$?; test $as_status -eq 0 && as_status=1 -+ if test "$3"; then -+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ fi -+ $as_echo "$as_me: error: $1" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -- --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -83,146 +415,107 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac - -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -+ as_lineno_1=$LINENO as_lineno_1a=$LINENO -+ as_lineno_2=$LINENO as_lineno_2a=$LINENO -+ eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && -+ test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { -+ # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | - sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno - N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ - t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -+ s/-\n.*// - ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 -- { (exit 1); exit 1; }; } -+ chmod +x "$as_me.lineno" || -+ { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } - - # Don't try to exec as it changes $[0], causing all sort of problems - # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -+ # original and so on. Autoconf is especially sensitive to this). -+ . "./$as_me.lineno" - # Exit status is that of the last command. - exit - } - -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null - - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -231,38 +524,24 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- -+exec 7<&0 </dev/null 6>&1 - - # Name of the host. - # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, - # so uname gets run too. - ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` - --exec 6>&1 -- - # - # Initializations. - # - ac_default_prefix=/usr/local -+ac_clean_files= - ac_config_libobj_dir=. -+LIBOBJS= - cross_compiling=no - subdirs= - MFLAGS= - MAKEFLAGS= --SHELL=${CONFIG_SHELL-/bin/sh} -- --# Maximum number of lines to put in a shell here document. --# This variable seems obsolete. It should probably be removed, and --# only ac_max_sed_lines should be used. --: ${ac_max_here_lines=38} - - # Identity of this package. - PACKAGE_NAME= -@@ -270,51 +549,186 @@ - PACKAGE_VERSION= - PACKAGE_STRING= - PACKAGE_BUGREPORT= -+PACKAGE_URL= - - ac_unique_file="Makefile.in" - # Factoring default headers for most tests. - ac_includes_default="\ - #include <stdio.h> --#if HAVE_SYS_TYPES_H -+#ifdef HAVE_SYS_TYPES_H - # include <sys/types.h> - #endif --#if HAVE_SYS_STAT_H -+#ifdef HAVE_SYS_STAT_H - # include <sys/stat.h> - #endif --#if STDC_HEADERS -+#ifdef STDC_HEADERS - # include <stdlib.h> - # include <stddef.h> - #else --# if HAVE_STDLIB_H -+# ifdef HAVE_STDLIB_H - # include <stdlib.h> - # endif - #endif --#if HAVE_STRING_H --# if !STDC_HEADERS && HAVE_MEMORY_H -+#ifdef HAVE_STRING_H -+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H - # include <memory.h> - # endif - # include <string.h> - #endif --#if HAVE_STRINGS_H -+#ifdef HAVE_STRINGS_H - # include <strings.h> - #endif --#if HAVE_INTTYPES_H -+#ifdef HAVE_INTTYPES_H - # include <inttypes.h> --#else --# if HAVE_STDINT_H --# include <stdint.h> --# endif - #endif --#if HAVE_UNISTD_H -+#ifdef HAVE_STDINT_H -+# include <stdint.h> -+#endif -+#ifdef HAVE_UNISTD_H - # include <unistd.h> - #endif" - --ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS sim_environment sim_alignment sim_assert sim_bitsize sim_endian sim_hostendian sim_float sim_scache sim_default_model sim_hw_cflags sim_hw_objs sim_hw sim_inline sim_packages sim_regparm sim_reserved_bits sim_smp sim_stdcall sim_xor_endian WARN_CFLAGS WERROR_CFLAGS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CC_FOR_BUILD HDEFINES AR RANLIB ac_ct_RANLIB USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT CPP EGREP MAINT sim_bswap sim_cflags sim_debug sim_stdio sim_trace sim_profile TERMCAP READLINE cgen_breaks LIBOBJS LTLIBOBJS' -+ac_subst_vars='LTLIBOBJS -+LIBOBJS -+cgen_breaks -+READLINE_CFLAGS -+READLINE_DEPS -+READLINE -+sim_profile -+sim_trace -+sim_stdio -+sim_debug -+sim_cflags -+sim_bswap -+MAINT -+EGREP -+GREP -+CPP -+CATOBJEXT -+GENCAT -+INSTOBJEXT -+DATADIRNAME -+CATALOGS -+POSUB -+GMSGFMT -+XGETTEXT -+INCINTL -+LIBINTL_DEP -+LIBINTL -+USE_NLS -+RANLIB -+AR -+HDEFINES -+CC_FOR_BUILD -+INSTALL_DATA -+INSTALL_SCRIPT -+INSTALL_PROGRAM -+OBJEXT -+EXEEXT -+ac_ct_CC -+CPPFLAGS -+LDFLAGS -+CFLAGS -+CC -+target_os -+target_vendor -+target_cpu -+target -+host_os -+host_vendor -+host_cpu -+host -+build_os -+build_vendor -+build_cpu -+build -+WERROR_CFLAGS -+WARN_CFLAGS -+sim_xor_endian -+sim_stdcall -+sim_smp -+sim_reserved_bits -+sim_regparm -+sim_packages -+sim_inline -+sim_hw -+sim_hw_objs -+sim_hw_cflags -+sim_default_model -+sim_scache -+sim_float -+sim_hostendian -+sim_endian -+sim_bitsize -+sim_assert -+sim_alignment -+sim_environment -+target_alias -+host_alias -+build_alias -+LIBS -+ECHO_T -+ECHO_N -+ECHO_C -+DEFS -+mandir -+localedir -+libdir -+psdir -+pdfdir -+dvidir -+htmldir -+infodir -+docdir -+oldincludedir -+includedir -+localstatedir -+sharedstatedir -+sysconfdir -+datadir -+datarootdir -+libexecdir -+sbindir -+bindir -+program_transform_name -+prefix -+exec_prefix -+PACKAGE_URL -+PACKAGE_BUGREPORT -+PACKAGE_STRING -+PACKAGE_VERSION -+PACKAGE_TARNAME -+PACKAGE_NAME -+PATH_SEPARATOR -+SHELL' - ac_subst_files='' -+ac_user_opts=' -+enable_option_checking -+enable_maintainer_mode -+enable_sim_bswap -+enable_sim_cflags -+enable_sim_debug -+enable_sim_stdio -+enable_sim_trace -+enable_sim_profile -+with_system_readline -+' -+ ac_precious_vars='build_alias -+host_alias -+target_alias -+CC -+CFLAGS -+LDFLAGS -+LIBS -+CPPFLAGS -+CPP' -+ - - # Initialize some variables set by options. - ac_init_help= - ac_init_version=false -+ac_unrecognized_opts= -+ac_unrecognized_sep= - # The variables have the same names as the options, with - # dashes changed to underlines. - cache_file=/dev/null -@@ -337,34 +751,48 @@ - # and all the variables that are supposed to be based on exec_prefix - # by default will actually change. - # Use braces instead of parens because sh, perl, etc. also accept them. -+# (The list follows the same order as the GNU Coding Standards.) - bindir='${exec_prefix}/bin' - sbindir='${exec_prefix}/sbin' - libexecdir='${exec_prefix}/libexec' --datadir='${prefix}/share' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' - sysconfdir='${prefix}/etc' - sharedstatedir='${prefix}/com' - localstatedir='${prefix}/var' --libdir='${exec_prefix}/lib' - includedir='${prefix}/include' - oldincludedir='/usr/include' --infodir='${prefix}/info' --mandir='${prefix}/man' -+docdir='${datarootdir}/doc/${PACKAGE}' -+infodir='${datarootdir}/info' -+htmldir='${docdir}' -+dvidir='${docdir}' -+pdfdir='${docdir}' -+psdir='${docdir}' -+libdir='${exec_prefix}/lib' -+localedir='${datarootdir}/locale' -+mandir='${datarootdir}/man' - - ac_prev= -+ac_dashdash= - for ac_option - do - # If the previous option needs an argument, assign it. - if test -n "$ac_prev"; then -- eval "$ac_prev=\$ac_option" -+ eval $ac_prev=\$ac_option - ac_prev= - continue - fi - -- ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` -+ case $ac_option in -+ *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; -+ *) ac_optarg=yes ;; -+ esac - - # Accept the important Cygnus configure options, so we can diagnose typos. - -- case $ac_option in -+ case $ac_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; - - -bindir | --bindir | --bindi | --bind | --bin | --bi) - ac_prev=bindir ;; -@@ -386,33 +814,59 @@ - --config-cache | -C) - cache_file=config.cache ;; - -- -datadir | --datadir | --datadi | --datad | --data | --dat | --da) -+ -datadir | --datadir | --datadi | --datad) - ac_prev=datadir ;; -- -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ -- | --da=*) -+ -datadir=* | --datadir=* | --datadi=* | --datad=*) - datadir=$ac_optarg ;; - -+ -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ -+ | --dataroo | --dataro | --datar) -+ ac_prev=datarootdir ;; -+ -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ -+ | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) -+ datarootdir=$ac_optarg ;; -+ - -disable-* | --disable-*) -- ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- eval "enable_$ac_feature=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval enable_$ac_useropt=no ;; -+ -+ -docdir | --docdir | --docdi | --doc | --do) -+ ac_prev=docdir ;; -+ -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) -+ docdir=$ac_optarg ;; -+ -+ -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) -+ ac_prev=dvidir ;; -+ -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) -+ dvidir=$ac_optarg ;; - - -enable-* | --enable-*) -- ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid feature name: $ac_feature" >&2 -- { (exit 1); exit 1; }; } -- ac_feature=`echo $ac_feature | sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid feature name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"enable_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "enable_$ac_feature='$ac_optarg'" ;; -+ eval enable_$ac_useropt=\$ac_optarg ;; - - -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ - | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ -@@ -439,6 +893,12 @@ - -host=* | --host=* | --hos=* | --ho=*) - host_alias=$ac_optarg ;; - -+ -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) -+ ac_prev=htmldir ;; -+ -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ -+ | --ht=*) -+ htmldir=$ac_optarg ;; -+ - -includedir | --includedir | --includedi | --included | --include \ - | --includ | --inclu | --incl | --inc) - ac_prev=includedir ;; -@@ -463,13 +923,16 @@ - | --libexe=* | --libex=* | --libe=*) - libexecdir=$ac_optarg ;; - -+ -localedir | --localedir | --localedi | --localed | --locale) -+ ac_prev=localedir ;; -+ -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) -+ localedir=$ac_optarg ;; -+ - -localstatedir | --localstatedir | --localstatedi | --localstated \ -- | --localstate | --localstat | --localsta | --localst \ -- | --locals | --local | --loca | --loc | --lo) -+ | --localstate | --localstat | --localsta | --localst | --locals) - ac_prev=localstatedir ;; - -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -- | --localstate=* | --localstat=* | --localsta=* | --localst=* \ -- | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) - localstatedir=$ac_optarg ;; - - -mandir | --mandir | --mandi | --mand | --man | --ma | --m) -@@ -534,6 +997,16 @@ - | --progr-tra=* | --program-tr=* | --program-t=*) - program_transform_name=$ac_optarg ;; - -+ -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) -+ ac_prev=pdfdir ;; -+ -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) -+ pdfdir=$ac_optarg ;; -+ -+ -psdir | --psdir | --psdi | --psd | --ps) -+ ac_prev=psdir ;; -+ -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) -+ psdir=$ac_optarg ;; -+ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - silent=yes ;; -@@ -584,26 +1057,36 @@ - ac_init_version=: ;; - - -with-* | --with-*) -- ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package| sed 's/-/_/g'` -- case $ac_option in -- *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; -- *) ac_optarg=yes ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; - esac -- eval "with_$ac_package='$ac_optarg'" ;; -+ eval with_$ac_useropt=\$ac_optarg ;; - - -without-* | --without-*) -- ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` -+ ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` - # Reject names that are not valid shell variable names. -- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid package name: $ac_package" >&2 -- { (exit 1); exit 1; }; } -- ac_package=`echo $ac_package | sed 's/-/_/g'` -- eval "with_$ac_package=no" ;; -+ expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && -+ as_fn_error "invalid package name: $ac_useropt" -+ ac_useropt_orig=$ac_useropt -+ ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` -+ case $ac_user_opts in -+ *" -+"with_$ac_useropt" -+"*) ;; -+ *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" -+ ac_unrecognized_sep=', ';; -+ esac -+ eval with_$ac_useropt=no ;; - - --x) - # Obsolete; use --with-x. -@@ -623,26 +1106,25 @@ - | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) - x_libraries=$ac_optarg ;; - -- -*) { echo "$as_me: error: unrecognized option: $ac_option --Try \`$0 --help' for more information." >&2 -- { (exit 1); exit 1; }; } -+ -*) as_fn_error "unrecognized option: \`$ac_option' -+Try \`$0 --help' for more information." - ;; - - *=*) - ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` - # Reject names that are not valid shell variable names. -- expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && -- { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 -- { (exit 1); exit 1; }; } -- ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` -- eval "$ac_envvar='$ac_optarg'" -+ case $ac_envvar in #( -+ '' | [0-9]* | *[!_$as_cr_alnum]* ) -+ as_fn_error "invalid variable name: \`$ac_envvar'" ;; -+ esac -+ eval $ac_envvar=\$ac_optarg - export $ac_envvar ;; - - *) - # FIXME: should be removed in autoconf 3.0. -- echo "$as_me: WARNING: you should use --build, --host, --target" >&2 -+ $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 - expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && -- echo "$as_me: WARNING: invalid host type: $ac_option" >&2 -+ $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 - : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} - ;; - -@@ -651,31 +1133,36 @@ - - if test -n "$ac_prev"; then - ac_option=--`echo $ac_prev | sed 's/_/-/g'` -- { echo "$as_me: error: missing argument to $ac_option" >&2 -- { (exit 1); exit 1; }; } -+ as_fn_error "missing argument to $ac_option" - fi - --# Be sure to have absolute paths. --for ac_var in exec_prefix prefix --do -- eval ac_val=$`echo $ac_var` -- case $ac_val in -- [\\/$]* | ?:[\\/]* | NONE | '' ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+if test -n "$ac_unrecognized_opts"; then -+ case $enable_option_checking in -+ no) ;; -+ fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; -+ *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac --done -+fi - --# Be sure to have absolute paths. --for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ -- localstatedir libdir includedir oldincludedir infodir mandir -+# Check all directory arguments for consistency. -+for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ -+ datadir sysconfdir sharedstatedir localstatedir includedir \ -+ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ -+ libdir localedir mandir - do -- eval ac_val=$`echo $ac_var` -+ eval ac_val=\$$ac_var -+ # Remove trailing slashes. - case $ac_val in -- [\\/$]* | ?:[\\/]* ) ;; -- *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -- { (exit 1); exit 1; }; };; -+ */ ) -+ ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` -+ eval $ac_var=\$ac_val;; - esac -+ # Be sure to have absolute directory names. -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" - done - - # There might be people who depend on the old broken behavior: `$host' -@@ -689,7 +1176,7 @@ - if test "x$host_alias" != x; then - if test "x$build_alias" = x; then - cross_compiling=maybe -- echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. -+ $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used." >&2 - elif test "x$build_alias" != "x$host_alias"; then - cross_compiling=yes -@@ -702,74 +1189,72 @@ - test "$silent" = yes && exec 6>/dev/null - - -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ as_fn_error "working directory cannot be determined" -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ as_fn_error "pwd does not report name of working directory" -+ -+ - # Find the source files, if location was not specified. - if test -z "$srcdir"; then - ac_srcdir_defaulted=yes -- # Try the directory containing this script, then its parent. -- ac_confdir=`(dirname "$0") 2>/dev/null || --$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$0" : 'X\(//\)[^/]' \| \ -- X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$0" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ # Try the directory containing this script, then the parent directory. -+ ac_confdir=`$as_dirname -- "$as_myself" || -+$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_myself" : 'X\(//\)[^/]' \| \ -+ X"$as_myself" : 'X\(//\)$' \| \ -+ X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_myself" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - srcdir=$ac_confdir -- if test ! -r $srcdir/$ac_unique_file; then -+ if test ! -r "$srcdir/$ac_unique_file"; then - srcdir=.. - fi - else - ac_srcdir_defaulted=no - fi --if test ! -r $srcdir/$ac_unique_file; then -- if test "$ac_srcdir_defaulted" = yes; then -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 -- { (exit 1); exit 1; }; } -- else -- { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -- { (exit 1); exit 1; }; } -- fi --fi --(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || -- { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 -- { (exit 1); exit 1; }; } --srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` --ac_env_build_alias_set=${build_alias+set} --ac_env_build_alias_value=$build_alias --ac_cv_env_build_alias_set=${build_alias+set} --ac_cv_env_build_alias_value=$build_alias --ac_env_host_alias_set=${host_alias+set} --ac_env_host_alias_value=$host_alias --ac_cv_env_host_alias_set=${host_alias+set} --ac_cv_env_host_alias_value=$host_alias --ac_env_target_alias_set=${target_alias+set} --ac_env_target_alias_value=$target_alias --ac_cv_env_target_alias_set=${target_alias+set} --ac_cv_env_target_alias_value=$target_alias --ac_env_CC_set=${CC+set} --ac_env_CC_value=$CC --ac_cv_env_CC_set=${CC+set} --ac_cv_env_CC_value=$CC --ac_env_CFLAGS_set=${CFLAGS+set} --ac_env_CFLAGS_value=$CFLAGS --ac_cv_env_CFLAGS_set=${CFLAGS+set} --ac_cv_env_CFLAGS_value=$CFLAGS --ac_env_LDFLAGS_set=${LDFLAGS+set} --ac_env_LDFLAGS_value=$LDFLAGS --ac_cv_env_LDFLAGS_set=${LDFLAGS+set} --ac_cv_env_LDFLAGS_value=$LDFLAGS --ac_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_env_CPPFLAGS_value=$CPPFLAGS --ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} --ac_cv_env_CPPFLAGS_value=$CPPFLAGS --ac_env_CPP_set=${CPP+set} --ac_env_CPP_value=$CPP --ac_cv_env_CPP_set=${CPP+set} --ac_cv_env_CPP_value=$CPP -+if test ! -r "$srcdir/$ac_unique_file"; then -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" -+ pwd)` -+# When building in place, set srcdir=. -+if test "$ac_abs_confdir" = "$ac_pwd"; then -+ srcdir=. -+fi -+# Remove unnecessary trailing slashes from srcdir. -+# Double slashes in file names in object file debugging info -+# mess up M-x gdb in Emacs. -+case $srcdir in -+*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -+esac -+for ac_var in $ac_precious_vars; do -+ eval ac_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_env_${ac_var}_value=\$${ac_var} -+ eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} -+ eval ac_cv_env_${ac_var}_value=\$${ac_var} -+done - - # - # Report the --help message. -@@ -798,14 +1283,11 @@ - -n, --no-create do not create output files - --srcdir=DIR find the sources in DIR [configure dir or \`..'] - --_ACEOF -- -- cat <<_ACEOF - Installation directories: - --prefix=PREFIX install architecture-independent files in PREFIX -- [$ac_default_prefix] -+ [$ac_default_prefix] - --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX -- [PREFIX] -+ [PREFIX] - - By default, \`make install' will install all the files in - \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify -@@ -815,18 +1297,25 @@ - For better control, use the options below. - - Fine tuning of the installation directories: -- --bindir=DIR user executables [EPREFIX/bin] -- --sbindir=DIR system admin executables [EPREFIX/sbin] -- --libexecdir=DIR program executables [EPREFIX/libexec] -- --datadir=DIR read-only architecture-independent data [PREFIX/share] -- --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -- --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -- --localstatedir=DIR modifiable single-machine data [PREFIX/var] -- --libdir=DIR object code libraries [EPREFIX/lib] -- --includedir=DIR C header files [PREFIX/include] -- --oldincludedir=DIR C header files for non-gcc [/usr/include] -- --infodir=DIR info documentation [PREFIX/info] -- --mandir=DIR man documentation [PREFIX/man] -+ --bindir=DIR user executables [EPREFIX/bin] -+ --sbindir=DIR system admin executables [EPREFIX/sbin] -+ --libexecdir=DIR program executables [EPREFIX/libexec] -+ --sysconfdir=DIR read-only single-machine data [PREFIX/etc] -+ --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] -+ --localstatedir=DIR modifiable single-machine data [PREFIX/var] -+ --libdir=DIR object code libraries [EPREFIX/lib] -+ --includedir=DIR C header files [PREFIX/include] -+ --oldincludedir=DIR C header files for non-gcc [/usr/include] -+ --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] -+ --datadir=DIR read-only architecture-independent data [DATAROOTDIR] -+ --infodir=DIR info documentation [DATAROOTDIR/info] -+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale] -+ --mandir=DIR man documentation [DATAROOTDIR/man] -+ --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] -+ --htmldir=DIR html documentation [DOCDIR] -+ --dvidir=DIR dvi documentation [DOCDIR] -+ --pdfdir=DIR pdf documentation [DOCDIR] -+ --psdir=DIR ps documentation [DOCDIR] - _ACEOF - - cat <<\_ACEOF -@@ -848,6 +1337,7 @@ - cat <<\_ACEOF - - Optional Features: -+ --disable-option-checking ignore unrecognized --enable/--with options - --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) - --enable-FEATURE[=ARG] include FEATURE [ARG=yes] - --enable-maintainer-mode Enable developer functionality. -@@ -858,185 +1348,513 @@ - --enable-sim-trace=opts Enable tracing flags - --enable-sim-profile=opts Enable profiling flags - -+Optional Packages: -+ --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] -+ --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) -+ --with-system-readline use installed readline library -+ - Some influential environment variables: - CC C compiler command - CFLAGS C compiler flags - LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a - nonstandard directory <lib dir> -- CPPFLAGS C/C++ preprocessor flags, e.g. -I<include dir> if you have -- headers in a nonstandard directory <include dir> -+ LIBS libraries to pass to the linker, e.g. -l<library> -+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if -+ you have headers in a nonstandard directory <include dir> - CPP C preprocessor - - Use these variables to override the choices made by `configure' or to help - it to find libraries and programs with nonstandard names/locations. - -+Report bugs to the package provider. - _ACEOF -+ac_status=$? - fi - - if test "$ac_init_help" = "recursive"; then - # If there are subdirs, report their specific --help. -- ac_popdir=`pwd` - for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -- test -d $ac_dir || continue -+ test -d "$ac_dir" || -+ { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || -+ continue - ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - -- cd $ac_dir -- # Check for guested configure; otherwise get Cygnus style configure. -- if test -f $ac_srcdir/configure.gnu; then -- echo -- $SHELL $ac_srcdir/configure.gnu --help=recursive -- elif test -f $ac_srcdir/configure; then -- echo -- $SHELL $ac_srcdir/configure --help=recursive -- elif test -f $ac_srcdir/configure.ac || -- test -f $ac_srcdir/configure.in; then -- echo -- $ac_configure --help -+ cd "$ac_dir" || { ac_status=$?; continue; } -+ # Check for guested configure. -+ if test -f "$ac_srcdir/configure.gnu"; then -+ echo && -+ $SHELL "$ac_srcdir/configure.gnu" --help=recursive -+ elif test -f "$ac_srcdir/configure"; then -+ echo && -+ $SHELL "$ac_srcdir/configure" --help=recursive - else -- echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -- fi -- cd $ac_popdir -+ $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 -+ fi || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } - done - fi - --test -n "$ac_init_help" && exit 0 -+test -n "$ac_init_help" && exit $ac_status - if $ac_init_version; then - cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.64 - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2009 Free Software Foundation, Inc. - This configure script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it. - _ACEOF -- exit 0 -+ exit - fi --exec 5>config.log --cat >&5 <<_ACEOF --This file contains any messages produced by compilers while --running configure, to aid debugging if configure makes a mistake. -- --It was created by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -- -- $ $0 $@ - --_ACEOF -+## ------------------------ ## -+## Autoconf initialization. ## -+## ------------------------ ## -+ -+# ac_fn_c_try_compile LINENO -+# -------------------------- -+# Try to compile conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_compile () - { --cat <<_ASUNAME --## --------- ## --## Platform. ## --## --------- ## -- --hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` --uname -m = `(uname -m) 2>/dev/null || echo unknown` --uname -r = `(uname -r) 2>/dev/null || echo unknown` --uname -s = `(uname -s) 2>/dev/null || echo unknown` --uname -v = `(uname -v) 2>/dev/null || echo unknown` -- --/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` --/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -- --/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` --/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` --/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` --hostinfo = `(hostinfo) 2>/dev/null || echo unknown` --/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` --/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` --/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -- --_ASUNAME -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext -+ if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest.$ac_objext; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- echo "PATH: $as_dir" --done -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval - --} >&5 -+} # ac_fn_c_try_compile - --cat >&5 <<_ACEOF -+# ac_fn_c_try_cpp LINENO -+# ---------------------- -+# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_cpp () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_cpp conftest.$ac_ext" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } >/dev/null && { -+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || -+ test ! -s conftest.err -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+ ac_retval=1 -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval - --## ----------- ## --## Core tests. ## --## ----------- ## -+} # ac_fn_c_try_cpp - -+# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists, giving a warning if it cannot be compiled using -+# the include files in INCLUDES and setting the cache variable VAR -+# accordingly. -+ac_fn_c_check_header_mongrel () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+else -+ # Is the header compilable? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -+$as_echo_n "checking $2 usability... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> - _ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_header_compiler=yes -+else -+ ac_header_compiler=no -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -+$as_echo "$ac_header_compiler" >&6; } - -- --# Keep a trace of the command line. --# Strip out --no-create and --no-recursion so they do not pile up. --# Strip out --silent because we don't want to record it for future runs. -+# Is the header present? -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -+$as_echo_n "checking $2 presence... " >&6; } -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <$2> -+_ACEOF -+if ac_fn_c_try_cpp "$LINENO"; then : -+ ac_header_preproc=yes -+else -+ ac_header_preproc=no -+fi -+rm -f conftest.err conftest.$ac_ext -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -+$as_echo "$ac_header_preproc" >&6; } -+ -+# So? What about this header? -+case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( -+ yes:no: ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -+$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+ no:yes:* ) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -+$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -+$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -+$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -+$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -+$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -+ ;; -+esac -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ eval "$3=\$ac_header_compiler" -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+fi -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_header_mongrel -+ -+# ac_fn_c_try_run LINENO -+# ---------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -+# that executables *can* be run. -+ac_fn_c_try_run () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: program exited with status $ac_status" >&5 -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=$ac_status -+fi -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval -+ -+} # ac_fn_c_try_run -+ -+# ac_fn_c_check_header_compile LINENO HEADER VAR INCLUDES -+# ------------------------------------------------------- -+# Tests whether HEADER exists and can be compiled using the include files in -+# INCLUDES, setting the cache variable VAR accordingly. -+ac_fn_c_check_header_compile () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+$4 -+#include <$2> -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_header_compile -+ -+# ac_fn_c_try_link LINENO -+# ----------------------- -+# Try to link conftest.$ac_ext, and return whether this succeeded. -+ac_fn_c_try_link () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ rm -f conftest.$ac_objext conftest$ac_exeext -+ if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>conftest.err -+ ac_status=$? -+ if test -s conftest.err; then -+ grep -v '^ *+' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ mv -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } && { -+ test -z "$ac_c_werror_flag" || -+ test ! -s conftest.err -+ } && test -s conftest$ac_exeext && { -+ test "$cross_compiling" = yes || -+ $as_test_x conftest$ac_exeext -+ }; then : -+ ac_retval=0 -+else -+ $as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ ac_retval=1 -+fi -+ # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information -+ # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would -+ # interfere with the next link command; also delete a directory that is -+ # left behind by Apple's compiler. We do this before executing the actions. -+ rm -rf conftest.dSYM conftest_ipa8_conftest.oo -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ return $ac_retval -+ -+} # ac_fn_c_try_link -+ -+# ac_fn_c_check_func LINENO FUNC VAR -+# ---------------------------------- -+# Tests whether FUNC exists, setting the cache variable VAR accordingly -+ac_fn_c_check_func () -+{ -+ as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -+$as_echo_n "checking for $2... " >&6; } -+if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+/* Define $2 to an innocuous variant, in case <limits.h> declares $2. -+ For example, HP-UX 11i <limits.h> declares gettimeofday. */ -+#define $2 innocuous_$2 -+ -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char $2 (); below. -+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -+ <limits.h> exists even on freestanding compilers. */ -+ -+#ifdef __STDC__ -+# include <limits.h> -+#else -+# include <assert.h> -+#endif -+ -+#undef $2 -+ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char $2 (); -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined __stub_$2 || defined __stub___$2 -+choke me -+#endif -+ -+int -+main () -+{ -+return $2 (); -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_link "$LINENO"; then : -+ eval "$3=yes" -+else -+ eval "$3=no" -+fi -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+fi -+eval ac_res=\$$3 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -+$as_echo "$ac_res" >&6; } -+ eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} -+ -+} # ac_fn_c_check_func -+cat >config.log <<_ACEOF -+This file contains any messages produced by compilers while -+running configure, to aid debugging if configure makes a mistake. -+ -+It was created by $as_me, which was -+generated by GNU Autoconf 2.64. Invocation command line was -+ -+ $ $0 $@ -+ -+_ACEOF -+exec 5>>config.log -+{ -+cat <<_ASUNAME -+## --------- ## -+## Platform. ## -+## --------- ## -+ -+hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -+uname -m = `(uname -m) 2>/dev/null || echo unknown` -+uname -r = `(uname -r) 2>/dev/null || echo unknown` -+uname -s = `(uname -s) 2>/dev/null || echo unknown` -+uname -v = `(uname -v) 2>/dev/null || echo unknown` -+ -+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -+/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -+ -+/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -+/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -+/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -+/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` -+ -+_ASUNAME -+ -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ $as_echo "PATH: $as_dir" -+ done -+IFS=$as_save_IFS -+ -+} >&5 -+ -+cat >&5 <<_ACEOF -+ -+ -+## ----------- ## -+## Core tests. ## -+## ----------- ## -+ -+_ACEOF -+ -+ -+# Keep a trace of the command line. -+# Strip out --no-create and --no-recursion so they do not pile up. -+# Strip out --silent because we don't want to record it for future runs. - # Also quote any args containing shell meta-characters. - # Make two passes to allow for proper duplicate-argument suppression. - ac_configure_args= - ac_configure_args0= - ac_configure_args1= --ac_sep= - ac_must_keep_next=false - for ac_pass in 1 2 - do -@@ -1047,13 +1865,13 @@ - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil) - continue ;; -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) -+ ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - case $ac_pass in -- 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; -+ 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; - 2) -- ac_configure_args1="$ac_configure_args1 '$ac_arg'" -+ as_fn_append ac_configure_args1 " '$ac_arg'" - if test $ac_must_keep_next = true; then - ac_must_keep_next=false # Got value, back to normal. - else -@@ -1069,21 +1887,19 @@ - -* ) ac_must_keep_next=true ;; - esac - fi -- ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" -- # Get rid of the leading space. -- ac_sep=" " -+ as_fn_append ac_configure_args " '$ac_arg'" - ;; - esac - done - done --$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } --$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } -+{ ac_configure_args0=; unset ac_configure_args0;} -+{ ac_configure_args1=; unset ac_configure_args1;} - - # When interrupted or exit'd, cleanup temporary files, and complete - # config.log. We remove comments because anyway the quotes in there - # would cause problems or look ugly. --# WARNING: Be sure not to use single quotes in there, as some shells, --# such as our DU 5.0 friend, will then `close' the trap. -+# WARNING: Use '\'' to represent an apostrophe within the trap. -+# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. - trap 'exit_status=$? - # Save into config.log some information that might help in debugging. - { -@@ -1096,20 +1912,35 @@ - _ASBOX - echo - # The following way of writing the cache mishandles newlines in values, --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done - (set) 2>&1 | -- case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -+ case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) - sed -n \ -- "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; -- s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" -- ;; -+ "s/'\''/'\''\\\\'\'''\''/g; -+ s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" -+ ;; #( - *) -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} -+ esac | -+ sort -+) - echo - - cat <<\_ASBOX -@@ -1120,22 +1951,28 @@ - echo - for ac_var in $ac_subst_vars - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - - if test -n "$ac_subst_files"; then - cat <<\_ASBOX --## ------------- ## --## Output files. ## --## ------------- ## -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## - _ASBOX - echo - for ac_var in $ac_subst_files - do -- eval ac_val=$`echo $ac_var` -- echo "$ac_var='"'"'$ac_val'"'"'" -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ $as_echo "$ac_var='\''$ac_val'\''" - done | sort - echo - fi -@@ -1147,26 +1984,26 @@ - ## ----------- ## - _ASBOX - echo -- sed "/^$/d" confdefs.h | sort -+ cat confdefs.h - echo - fi - test "$ac_signal" != 0 && -- echo "$as_me: caught signal $ac_signal" -- echo "$as_me: exit $exit_status" -+ $as_echo "$as_me: caught signal $ac_signal" -+ $as_echo "$as_me: exit $exit_status" - } >&5 -- rm -f core *.core && -- rm -rf conftest* confdefs* conf$$* $ac_clean_files && -+ rm -f core *.core core.conftest.* && -+ rm -f -r conftest* confdefs* conf$$* $ac_clean_files && - exit $exit_status -- ' 0 -+' 0 - for ac_signal in 1 2 13 15; do -- trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal -+ trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal - done - ac_signal=0 - - # confdefs.h avoids OS command line length limits that DEFS can exceed. --rm -rf conftest* confdefs.h --# AIX cpp loses on an empty file, so make sure it contains at least a newline. --echo >confdefs.h -+rm -f -r conftest* confdefs.h -+ -+$as_echo "/* confdefs.h */" > confdefs.h - - # Predefined preprocessor variables. - -@@ -1174,40 +2011,46 @@ - #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF - -- - cat >>confdefs.h <<_ACEOF - #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF - -+cat >>confdefs.h <<_ACEOF -+#define PACKAGE_URL "$PACKAGE_URL" -+_ACEOF -+ - - # Let the site file select an alternate cache file if it wants to. --# Prefer explicitly selected file to automatically selected ones. --if test -z "$CONFIG_SITE"; then -- if test "x$prefix" != xNONE; then -- CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" -- else -- CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" -- fi -+# Prefer an explicitly selected file to automatically selected ones. -+ac_site_file1=NONE -+ac_site_file2=NONE -+if test -n "$CONFIG_SITE"; then -+ ac_site_file1=$CONFIG_SITE -+elif test "x$prefix" != xNONE; then -+ ac_site_file1=$prefix/share/config.site -+ ac_site_file2=$prefix/etc/config.site -+else -+ ac_site_file1=$ac_default_prefix/share/config.site -+ ac_site_file2=$ac_default_prefix/etc/config.site - fi --for ac_site_file in $CONFIG_SITE; do -+for ac_site_file in "$ac_site_file1" "$ac_site_file2" -+do -+ test "x$ac_site_file" = xNONE && continue - if test -r "$ac_site_file"; then -- { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 --echo "$as_me: loading site script $ac_site_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -+$as_echo "$as_me: loading site script $ac_site_file" >&6;} - sed 's/^/| /' "$ac_site_file" >&5 - . "$ac_site_file" - fi -@@ -1217,69 +2060,79 @@ - # Some versions of bash will fail to source /dev/null (special - # files actually), so we avoid doing that. - if test -f "$cache_file"; then -- { echo "$as_me:$LINENO: loading cache $cache_file" >&5 --echo "$as_me: loading cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -+$as_echo "$as_me: loading cache $cache_file" >&6;} - case $cache_file in -- [\\/]* | ?:[\\/]* ) . $cache_file;; -- *) . ./$cache_file;; -+ [\\/]* | ?:[\\/]* ) . "$cache_file";; -+ *) . "./$cache_file";; - esac - fi - else -- { echo "$as_me:$LINENO: creating cache $cache_file" >&5 --echo "$as_me: creating cache $cache_file" >&6;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -+$as_echo "$as_me: creating cache $cache_file" >&6;} - >$cache_file - fi - - # Check that the precious variables saved in the cache have kept the same - # value. - ac_cache_corrupted=false --for ac_var in `(set) 2>&1 | -- sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do -+for ac_var in $ac_precious_vars; do - eval ac_old_set=\$ac_cv_env_${ac_var}_set - eval ac_new_set=\$ac_env_${ac_var}_set -- eval ac_old_val="\$ac_cv_env_${ac_var}_value" -- eval ac_new_val="\$ac_env_${ac_var}_value" -+ eval ac_old_val=\$ac_cv_env_${ac_var}_value -+ eval ac_new_val=\$ac_env_${ac_var}_value - case $ac_old_set,$ac_new_set in - set,) -- { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,set) -- { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 --echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -+$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} - ac_cache_corrupted=: ;; - ,);; - *) - if test "x$ac_old_val" != "x$ac_new_val"; then -- { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 --echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -- { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 --echo "$as_me: former value: $ac_old_val" >&2;} -- { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 --echo "$as_me: current value: $ac_new_val" >&2;} -- ac_cache_corrupted=: -+ # differences in whitespace do not lead to failure. -+ ac_old_val_w=`echo x $ac_old_val` -+ ac_new_val_w=`echo x $ac_new_val` -+ if test "$ac_old_val_w" != "$ac_new_val_w"; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -+$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} -+ ac_cache_corrupted=: -+ else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -+$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} -+ eval $ac_var=\$ac_old_val -+ fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -+$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -+$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} - fi;; - esac - # Pass precious variables to config.status. - if test "$ac_new_set" = set; then - case $ac_new_val in -- *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) -- ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; -+ *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; - *) ac_arg=$ac_var=$ac_new_val ;; - esac - case " $ac_configure_args " in - *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. -- *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; -+ *) as_fn_append ac_configure_args " '$ac_arg'" ;; - esac - fi - done - if $ac_cache_corrupted; then -- { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 --echo "$as_me: error: changes in the environment can compromise the build" >&2;} -- { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 --echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} -- { (exit 1); exit 1; }; } --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+ { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -+$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} -+ as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 -+fi -+## -------------------- ## -+## Main body of script. ## -+## -------------------- ## - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1288,24 +2141,7 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- ac_config_headers="$ac_config_headers config.h:config.in" -+ac_config_headers="$ac_config_headers config.h:config.in" - - - # This file contains common code used by all simulators. -@@ -1451,104 +2287,130 @@ - # ... target specific stuff ... - - ac_aux_dir= --for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do -- if test -f $ac_dir/install-sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install-sh -c" -- break -- elif test -f $ac_dir/install.sh; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/install.sh -c" -- break -- elif test -f $ac_dir/shtool; then -- ac_aux_dir=$ac_dir -- ac_install_sh="$ac_aux_dir/shtool install -c" -- break -- fi -+for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do -+ for ac_t in install-sh install.sh shtool; do -+ if test -f "$ac_dir/$ac_t"; then -+ ac_aux_dir=$ac_dir -+ ac_install_sh="$ac_aux_dir/$ac_t -c" -+ break 2 -+ fi -+ done - done - if test -z "$ac_aux_dir"; then -- { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 --echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} -- { (exit 1); exit 1; }; } --fi --ac_config_guess="$SHELL $ac_aux_dir/config.guess" --ac_config_sub="$SHELL $ac_aux_dir/config.sub" --ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. -+ as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 -+fi -+ -+# These three variables are undocumented and unsupported, -+# and are intended to be withdrawn in a future Autoconf release. -+# They can cause serious problems if a builder's source tree is in a directory -+# whose full name contains unusual characters. -+ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -+ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -+ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. -+ - - # Make sure we can run config.sub. --$ac_config_sub sun4 >/dev/null 2>&1 || -- { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 --echo "$as_me: error: cannot run $ac_config_sub" >&2;} -- { (exit 1); exit 1; }; } -- --echo "$as_me:$LINENO: checking build system type" >&5 --echo $ECHO_N "checking build system type... $ECHO_C" >&6 --if test "${ac_cv_build+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_build_alias=$build_alias --test -z "$ac_cv_build_alias" && -- ac_cv_build_alias=`$ac_config_guess` --test -z "$ac_cv_build_alias" && -- { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 --echo "$as_me: error: cannot guess build type; you must specify one" >&2;} -- { (exit 1); exit 1; }; } --ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - --fi --echo "$as_me:$LINENO: result: $ac_cv_build" >&5 --echo "${ECHO_T}$ac_cv_build" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -+$as_echo_n "checking build system type... " >&6; } -+if test "${ac_cv_build+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_build_alias=$build_alias -+test "x$ac_build_alias" = x && -+ ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -+test "x$ac_build_alias" = x && -+ as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -+ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -+$as_echo "$ac_cv_build" >&6; } -+case $ac_cv_build in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; -+esac - build=$ac_cv_build --build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- -- --echo "$as_me:$LINENO: checking host system type" >&5 --echo $ECHO_N "checking host system type... $ECHO_C" >&6 --if test "${ac_cv_host+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_host_alias=$host_alias --test -z "$ac_cv_host_alias" && -- ac_cv_host_alias=$ac_cv_build_alias --ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_build -+shift -+build_cpu=$1 -+build_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+build_os=$* -+IFS=$ac_save_IFS -+case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -+$as_echo_n "checking host system type... " >&6; } -+if test "${ac_cv_host+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$host_alias" = x; then -+ ac_cv_host=$ac_cv_build -+else -+ ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_host" >&5 --echo "${ECHO_T}$ac_cv_host" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -+$as_echo "$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; -+esac - host=$ac_cv_host --host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -- -- --echo "$as_me:$LINENO: checking target system type" >&5 --echo $ECHO_N "checking target system type... $ECHO_C" >&6 --if test "${ac_cv_target+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_cv_target_alias=$target_alias --test "x$ac_cv_target_alias" = "x" && -- ac_cv_target_alias=$ac_cv_host_alias --ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || -- { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 --echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} -- { (exit 1); exit 1; }; } -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_host -+shift -+host_cpu=$1 -+host_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+host_os=$* -+IFS=$ac_save_IFS -+case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -+$as_echo_n "checking target system type... " >&6; } -+if test "${ac_cv_target+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test "x$target_alias" = x; then -+ ac_cv_target=$ac_cv_host -+else -+ ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || -+ as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -+fi - - fi --echo "$as_me:$LINENO: result: $ac_cv_target" >&5 --echo "${ECHO_T}$ac_cv_target" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -+$as_echo "$ac_cv_target" >&6; } -+case $ac_cv_target in -+*-*-*) ;; -+*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; -+esac - target=$ac_cv_target --target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` --target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` --target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -+ac_save_IFS=$IFS; IFS='-' -+set x $ac_cv_target -+shift -+target_cpu=$1 -+target_vendor=$2 -+shift; shift -+# Remember, the first character of IFS is used to create $*, -+# except with old shells: -+target_os=$* -+IFS=$ac_save_IFS -+case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac - - - # The aliases save the names the user supplied, while $host etc. -@@ -1557,18 +2419,16 @@ - test "$program_prefix$program_suffix$program_transform_name" = \ - NONENONEs,x,x, && - program_prefix=${target_alias}- -+ - test "$program_prefix" != NONE && -- program_transform_name="s,^,$program_prefix,;$program_transform_name" -+ program_transform_name="s&^&$program_prefix&;$program_transform_name" - # Use a double $ so make ignores it. - test "$program_suffix" != NONE && -- program_transform_name="s,\$,$program_suffix,;$program_transform_name" --# Double any \ or $. echo might interpret backslashes. -+ program_transform_name="s&\$&$program_suffix&;$program_transform_name" -+# Double any \ or $. - # By default was `s,x,x', remove it if useless. --cat <<\_ACEOF >conftest.sed --s/[\\$]/&&/g;s/;s,x,x,$// --_ACEOF --program_transform_name=`echo $program_transform_name | sed -f conftest.sed` --rm conftest.sed -+ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' -+program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` - - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' -@@ -1578,10 +2438,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. - set dummy ${ac_tool_prefix}gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1591,35 +2451,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_CC"; then - ac_ct_CC=$CC - # Extract the first word of "gcc", so it can be a program name with args. - set dummy gcc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1629,39 +2491,50 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="gcc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - else - CC="$ac_cv_prog_CC" - fi - - if test -z "$CC"; then -- if test -n "$ac_tool_prefix"; then -- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. -+ if test -n "$ac_tool_prefix"; then -+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. - set dummy ${ac_tool_prefix}cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1671,77 +2544,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="${ac_tool_prefix}cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 --else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 --fi -- --fi --if test -z "$ac_cv_prog_CC"; then -- ac_ct_CC=$CC -- # Extract the first word of "cc", so it can be a program name with args. --set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if test -n "$ac_ct_CC"; then -- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. --else --as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -- ac_cv_prog_ac_ct_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -- break 2 -- fi --done --done -- --fi --fi --ac_ct_CC=$ac_cv_prog_ac_ct_CC --if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- CC=$ac_ct_CC --else -- CC="$ac_cv_prog_CC" --fi - -+ fi - fi - if test -z "$CC"; then - # Extract the first word of "cc", so it can be a program name with args. - set dummy cc; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1752,18 +2585,19 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then - ac_prog_rejected=yes - continue - fi - ac_cv_prog_CC="cc" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - if test $ac_prog_rejected = yes; then - # We found a bogon in the path, so make sure we never use it. -@@ -1781,24 +2615,25 @@ - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. - set dummy $ac_tool_prefix$ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$CC"; then - ac_cv_prog_CC="$CC" # Let the user override the test. -@@ -1808,39 +2643,41 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_CC="$ac_tool_prefix$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - CC=$ac_cv_prog_CC - if test -n "$CC"; then -- echo "$as_me:$LINENO: result: $CC" >&5 --echo "${ECHO_T}$CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -+$as_echo "$CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$CC" && break - done - fi - if test -z "$CC"; then - ac_ct_CC=$CC -- for ac_prog in cl -+ for ac_prog in cl.exe - do - # Extract the first word of "$ac_prog", so it can be a program name with args. - set dummy $ac_prog; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_CC+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_CC"; then - ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. -@@ -1850,183 +2687,192 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_CC="$ac_prog" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - ac_ct_CC=$ac_cv_prog_ac_ct_CC - if test -n "$ac_ct_CC"; then -- echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 --echo "${ECHO_T}$ac_ct_CC" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -+$as_echo "$ac_ct_CC" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - test -n "$ac_ct_CC" && break - done - -- CC=$ac_ct_CC -+ if test "x$ac_ct_CC" = x; then -+ CC="" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ CC=$ac_ct_CC -+ fi - fi - - fi - - --test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&5 --echo "$as_me: error: no acceptable C compiler found in \$PATH --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "no acceptable C compiler found in \$PATH -+See \`config.log' for more details." "$LINENO" 5; } - - # Provide some information about the compiler. --echo "$as_me:$LINENO:" \ -- "checking for C compiler version" >&5 --ac_compiler=`set X $ac_compile; echo $2` --{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5 -- (eval $ac_compiler --version </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5 -- (eval $ac_compiler -v </dev/null >&5) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } --{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5 -- (eval $ac_compiler -V </dev/null >&5) 2>&5 -+$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -+set X $ac_compile -+ac_compiler=$2 -+for ac_option in --version -v -V -qversion; do -+ { { ac_try="$ac_compiler $ac_option >&5" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compiler $ac_option >&5") 2>conftest.err - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } -+ if test -s conftest.err; then -+ sed '10a\ -+... rest of stderr output deleted ... -+ 10q' conftest.err >conftest.er1 -+ cat conftest.er1 >&5 -+ rm -f conftest.er1 conftest.err -+ fi -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+done - --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int - main () - { -- -+return 0; - ; - return 0; - } - _ACEOF - ac_clean_files_save=$ac_clean_files --ac_clean_files="$ac_clean_files a.out a.exe b.out" -+ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" - # Try to create an executable without -o first, disregard a.out. - # It will help us diagnose broken compilers, and finding out an intuition - # of exeext. --echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 --echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 --ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` --if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 -- (eval $ac_link_default) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- # Find the output, starting from the most likely. This scheme is --# not robust to junk in `.', hence go to wildcards (a.*) only as a last --# resort. -- --# Be careful to initialize this variable, since it used to be cached. --# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. --ac_cv_exeext= --# b.out is created by i960 compilers. --for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -+$as_echo_n "checking whether the C compiler works... " >&6; } -+ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` -+ -+# The possible output files: -+ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" -+ -+ac_rmfiles= -+for ac_file in $ac_files - do -- test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) -- ;; -- conftest.$ac_ext ) -- # This is the source file. -- ;; -- [ab].out ) -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; -+ * ) ac_rmfiles="$ac_rmfiles $ac_file";; -+ esac -+done -+rm -f $ac_rmfiles -+ -+if { { ac_try="$ac_link_default" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link_default") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -+# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -+# in a Makefile. We should not override ac_cv_exeext if it was cached, -+# so that the user can short-circuit this test for compilers unknown to -+# Autoconf. -+for ac_file in $ac_files '' -+do -+ test -f "$ac_file" || continue -+ case $ac_file in -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) -+ ;; -+ [ab].out ) - # We found the default executable, but exeext='' is most - # certainly right. - break;; - *.* ) -- ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- # FIXME: I believe we export ac_cv_exeext for Libtool, -- # but it would be cool to find out if it's true. Does anybody -- # maintain Libtool? --akim. -- export ac_cv_exeext -+ if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; -+ then :; else -+ ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -+ fi -+ # We set ac_cv_exeext here because the later test for it is not -+ # safe: cross compilers may not add the suffix if given an `-o' -+ # argument, so we may need to know it at that point already. -+ # Even if this section looks crufty: it has the advantage of -+ # actually working. - break;; - * ) - break;; - esac - done --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+test "$ac_cv_exeext" = no && ac_cv_exeext= - --{ { echo "$as_me:$LINENO: error: C compiler cannot create executables --See \`config.log' for more details." >&5 --echo "$as_me: error: C compiler cannot create executables --See \`config.log' for more details." >&2;} -- { (exit 77); exit 77; }; } -+else -+ ac_file='' - fi -+if test -z "$ac_file"; then : -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } -+$as_echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 - -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+{ as_fn_set_status 77 -+as_fn_error "C compiler cannot create executables -+See \`config.log' for more details." "$LINENO" 5; }; } -+else -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -+$as_echo_n "checking for C compiler default output file name... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -+$as_echo "$ac_file" >&6; } - ac_exeext=$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_file" >&5 --echo "${ECHO_T}$ac_file" >&6 -- --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether the C compiler works" >&5 --echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 --# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 --# If not cross compiling, check that we can run a simple program. --if test "$cross_compiling" != yes; then -- if { ac_try='./$ac_file' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- cross_compiling=no -- else -- if test "$cross_compiling" = maybe; then -- cross_compiling=yes -- else -- { { echo "$as_me:$LINENO: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot run C compiled programs. --If you meant to cross compile, use \`--host'. --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -- fi -- fi --fi --echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 - --rm -f a.out a.exe conftest$ac_cv_exeext b.out -+rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out - ac_clean_files=$ac_clean_files_save --# Check the compiler produces executables we can run. If not, either --# the compiler is broken, or we cross compile. --echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 --echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 --echo "$as_me:$LINENO: result: $cross_compiling" >&5 --echo "${ECHO_T}$cross_compiling" >&6 -- --echo "$as_me:$LINENO: checking for suffix of executables" >&5 --echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -+$as_echo_n "checking for suffix of executables... " >&6; } -+if { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 - ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : - # If both `conftest.exe' and `conftest' are `present' (well, observable) - # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will - # work properly (i.e., refer to `conftest.exe'), while it won't with -@@ -2034,38 +2880,90 @@ - for ac_file in conftest.exe conftest conftest.*; do - test -f "$ac_file" || continue - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` -- export ac_cv_exeext - break;; - * ) break;; - esac - done - else -- { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of executables: cannot compile and link --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot compute suffix of executables: cannot compile and link -+See \`config.log' for more details." "$LINENO" 5; } - fi -- - rm -f conftest$ac_cv_exeext --echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 --echo "${ECHO_T}$ac_cv_exeext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -+$as_echo "$ac_cv_exeext" >&6; } - - rm -f conftest.$ac_ext - EXEEXT=$ac_cv_exeext - ac_exeext=$EXEEXT --echo "$as_me:$LINENO: checking for suffix of object files" >&5 --echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 --if test "${ac_cv_objext+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+#include <stdio.h> -+int -+main () -+{ -+FILE *f = fopen ("conftest.out", "w"); -+ return ferror (f) || fclose (f) != 0; -+ -+ ; -+ return 0; -+} - _ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ac_clean_files="$ac_clean_files conftest.out" -+# Check that the compiler produces executables we can run. If not, either -+# the compiler is broken, or we cross compile. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -+$as_echo_n "checking whether we are cross compiling... " >&6; } -+if test "$cross_compiling" != yes; then -+ { { ac_try="$ac_link" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_link") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; } -+ if { ac_try='./conftest$ac_cv_exeext' -+ { { case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_try") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; }; then -+ cross_compiling=no -+ else -+ if test "$cross_compiling" = maybe; then -+ cross_compiling=yes -+ else -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot run C compiled programs. -+If you meant to cross compile, use \`--host'. -+See \`config.log' for more details." "$LINENO" 5; } -+ fi -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -+$as_echo "$cross_compiling" >&6; } -+ -+rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -+ac_clean_files=$ac_clean_files_save -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -+$as_echo_n "checking for suffix of object files... " >&6; } -+if test "${ac_cv_objext+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2077,45 +2975,46 @@ - } - _ACEOF - rm -f conftest.o conftest.obj --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; then -- for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do -+if { { ac_try="$ac_compile" -+case "(($ac_try" in -+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -+ *) ac_try_echo=$ac_try;; -+esac -+eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -+$as_echo "$ac_try_echo"; } >&5 -+ (eval "$ac_compile") 2>&5 -+ ac_status=$? -+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 -+ test $ac_status = 0; }; then : -+ for ac_file in conftest.o conftest.obj conftest.*; do -+ test -f "$ac_file" || continue; - case $ac_file in -- *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; -+ *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; - *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` - break;; - esac - done - else -- echo "$as_me: failed program was:" >&5 -+ $as_echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 - --{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&5 --echo "$as_me: error: cannot compute suffix of object files: cannot compile --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "cannot compute suffix of object files: cannot compile -+See \`config.log' for more details." "$LINENO" 5; } - fi -- - rm -f conftest.$ac_cv_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 --echo "${ECHO_T}$ac_cv_objext" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -+$as_echo "$ac_cv_objext" >&6; } - OBJEXT=$ac_cv_objext - ac_objext=$OBJEXT --echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 --echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 --if test "${ac_cv_c_compiler_gnu+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -+$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -+if test "${ac_cv_c_compiler_gnu+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2129,55 +3028,34 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_compiler_gnu=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_compiler_gnu=no -+ ac_compiler_gnu=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_c_compiler_gnu=$ac_compiler_gnu - - fi --echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 --echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 --GCC=`test $ac_compiler_gnu = yes && echo yes` -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -+$as_echo "$ac_cv_c_compiler_gnu" >&6; } -+if test $ac_compiler_gnu = yes; then -+ GCC=yes -+else -+ GCC= -+fi - ac_test_CFLAGS=${CFLAGS+set} - ac_save_CFLAGS=$CFLAGS --CFLAGS="-g" --echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 --echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_g+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -+$as_echo_n "checking whether $CC accepts -g... " >&6; } -+if test "${ac_cv_prog_cc_g+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ ac_save_c_werror_flag=$ac_c_werror_flag -+ ac_c_werror_flag=yes -+ ac_cv_prog_cc_g=no -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - - int -@@ -2188,39 +3066,49 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+ CFLAGS="" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ - --ac_cv_prog_cc_g=no -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ -+else -+ ac_c_werror_flag=$ac_save_c_werror_flag -+ CFLAGS="-g" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext -+/* end confdefs.h. */ -+ -+int -+main () -+{ -+ -+ ; -+ return 0; -+} -+_ACEOF -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_g=yes -+fi -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -+ ac_c_werror_flag=$ac_save_c_werror_flag -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -+$as_echo "$ac_cv_prog_cc_g" >&6; } - if test "$ac_test_CFLAGS" = set; then - CFLAGS=$ac_save_CFLAGS - elif test $ac_cv_prog_cc_g = yes; then -@@ -2236,18 +3124,14 @@ - CFLAGS= - fi - fi --echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 --echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 --if test "${ac_cv_prog_cc_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -+$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -+if test "${ac_cv_prog_cc_c89+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- ac_cv_prog_cc_stdc=no -+ ac_cv_prog_cc_c89=no - ac_save_CC=$CC --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdarg.h> - #include <stdio.h> -@@ -2275,12 +3159,17 @@ - /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has - function prototypes and stuff, but not '\xHH' hex character constants. - These don't provoke an error unfortunately, instead are silently treated -- as 'x'. The following induces an error, until -std1 is added to get -+ as 'x'. The following induces an error, until -std is added to get - proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an - array size at least. It's necessary to write '\x00'==0 to get something -- that's true only with -std1. */ -+ that's true only with -std. */ - int osf4_cc_array ['\x00' == 0 ? 1 : -1]; - -+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters -+ inside strings and character constants. */ -+#define FOO(x) 'x' -+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; -+ - int test (int i, double x); - struct s1 {int (*f) (int a);}; - struct s2 {int (*f) (double a);}; -@@ -2295,205 +3184,37 @@ - return 0; - } - _ACEOF --# Don't try gcc -ansi; that turns off useful extensions and --# breaks some systems' header files. --# AIX -qlanglvl=ansi --# Ultrix and OSF/1 -std1 --# HP-UX 10.20 and later -Ae --# HP-UX older versions -Aa -D_HPUX_SOURCE --# SVR4 -Xc -D__EXTENSIONS__ --for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ -+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" - do - CC="$ac_save_CC $ac_arg" -- rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_prog_cc_stdc=$ac_arg --break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -+ if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_prog_cc_c89=$ac_arg - fi --rm -f conftest.err conftest.$ac_objext -+rm -f core conftest.err conftest.$ac_objext -+ test "x$ac_cv_prog_cc_c89" != "xno" && break - done --rm -f conftest.$ac_ext conftest.$ac_objext -+rm -f conftest.$ac_ext - CC=$ac_save_CC - - fi -- --case "x$ac_cv_prog_cc_stdc" in -- x|xno) -- echo "$as_me:$LINENO: result: none needed" >&5 --echo "${ECHO_T}none needed" >&6 ;; -+# AC_CACHE_VAL -+case "x$ac_cv_prog_cc_c89" in -+ x) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -+$as_echo "none needed" >&6; } ;; -+ xno) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -+$as_echo "unsupported" >&6; } ;; - *) -- echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 --echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 -- CC="$CC $ac_cv_prog_cc_stdc" ;; -+ CC="$CC $ac_cv_prog_cc_c89" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -+$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; - esac -- --# Some people use a C++ compiler to compile C. Since we use `exit', --# in C++ we need to declare it. In case someone uses the same compiler --# for both compiling C and C++ we need to have the C++ compiler decide --# the declaration of exit, since it's the most demanding environment. --cat >conftest.$ac_ext <<_ACEOF --#ifndef __cplusplus -- choke me --#endif --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- for ac_declaration in \ -- '' \ -- 'extern "C" void std::exit (int) throw (); using std::exit;' \ -- 'extern "C" void std::exit (int); using std::exit;' \ -- 'extern "C" void exit (int) throw ();' \ -- 'extern "C" void exit (int);' \ -- 'void exit (int);' --do -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --#include <stdlib.h> --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --continue --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_declaration --int --main () --{ --exit (42); -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- break --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if test "x$ac_cv_prog_cc_c89" != xno; then : - - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --done --rm -f conftest* --if test -n "$ac_declaration"; then -- echo '#ifdef __cplusplus' >>confdefs.h -- echo $ac_declaration >>confdefs.h -- echo '#endif' >>confdefs.h --fi -- --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 - --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=c - ac_cpp='$CPP $CPPFLAGS' - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -@@ -2513,22 +3234,23 @@ - # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" - # OS/2's system install, which has a completely different semantic - # ./install, which can be erroneously created by make from ./install.sh. --echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 --echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6 -+# Reject install programs that cannot install multiple files. -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5 -+$as_echo_n "checking for a BSD-compatible install... " >&6; } - if test -z "$INSTALL"; then --if test "${ac_cv_path_install+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if test "${ac_cv_path_install+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR - for as_dir in $PATH - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- # Account for people who put trailing slashes in PATH elements. --case $as_dir/ in -- ./ | .// | /cC/* | \ -+ # Account for people who put trailing slashes in PATH elements. -+case $as_dir/ in #(( -+ ./ | .// | /[cC]/* | \ - /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ -- ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ -+ ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \ - /usr/ucb/* ) ;; - *) - # OSF1 and SCO ODT 3.0 have their own names for install. -@@ -2536,7 +3258,7 @@ - # by default. - for ac_prog in ginstall scoinst install; do - for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then -+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then - if test $ac_prog = install && - grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then - # AIX install. It has an incompatible calling convention. -@@ -2546,30 +3268,43 @@ - # program-specific install script used by HP pwplus--don't use. - : - else -- ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -- break 3 -+ rm -rf conftest.one conftest.two conftest.dir -+ echo one > conftest.one -+ echo two > conftest.two -+ mkdir conftest.dir -+ if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" && -+ test -s conftest.one && test -s conftest.two && -+ test -s conftest.dir/conftest.one && -+ test -s conftest.dir/conftest.two -+ then -+ ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" -+ break 3 -+ fi - fi - fi - done - done - ;; - esac --done - -+ done -+IFS=$as_save_IFS -+ -+rm -rf conftest.one conftest.two conftest.dir - - fi - if test "${ac_cv_path_install+set}" = set; then - INSTALL=$ac_cv_path_install - else -- # As a last resort, use the slow shell script. We don't cache a -- # path for INSTALL within a source directory, because that will -+ # As a last resort, use the slow shell script. Don't cache a -+ # value for INSTALL within a source directory, because that will - # break other packages using the cache if that directory is -- # removed, or if the path is relative. -+ # removed, or if the value is a relative name. - INSTALL=$ac_install_sh - fi - fi --echo "$as_me:$LINENO: result: $INSTALL" >&5 --echo "${ECHO_T}$INSTALL" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5 -+$as_echo "$INSTALL" >&6; } - - # Use test -z because SunOS4 sh mishandles braces in ${var-val}. - # It thinks the first close brace ends the variable substitution. -@@ -2595,10 +3330,10 @@ - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_RANLIB+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$RANLIB"; then - ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -@@ -2608,35 +3343,37 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - - fi - fi - RANLIB=$ac_cv_prog_RANLIB - if test -n "$RANLIB"; then -- echo "$as_me:$LINENO: result: $RANLIB" >&5 --echo "${ECHO_T}$RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 -+$as_echo "$RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -+ - fi - if test -z "$ac_cv_prog_RANLIB"; then - ac_ct_RANLIB=$RANLIB - # Extract the first word of "ranlib", so it can be a program name with args. - set dummy ranlib; ac_word=$2 --echo "$as_me:$LINENO: checking for $ac_word" >&5 --echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 --if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -+$as_echo_n "checking for $ac_word... " >&6; } -+if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - if test -n "$ac_ct_RANLIB"; then - ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. -@@ -2646,28 +3383,38 @@ - do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. -- for ac_exec_ext in '' $ac_executable_extensions; do -- if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_ac_ct_RANLIB="ranlib" -- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 - break 2 - fi - done --done -+ done -+IFS=$as_save_IFS - -- test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":" - fi - fi - ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB - if test -n "$ac_ct_RANLIB"; then -- echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5 --echo "${ECHO_T}$ac_ct_RANLIB" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 -+$as_echo "$ac_ct_RANLIB" >&6; } - else -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - fi - -- RANLIB=$ac_ct_RANLIB -+ if test "x$ac_ct_RANLIB" = x; then -+ RANLIB=":" -+ else -+ case $cross_compiling:$ac_tool_warned in -+yes:) -+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -+ac_tool_warned=yes ;; -+esac -+ RANLIB=$ac_ct_RANLIB -+ fi - else - RANLIB="$ac_cv_prog_RANLIB" - fi -@@ -2687,22 +3434,20 @@ - if test -f ../../intl/config.intl; then - . ../../intl/config.intl - fi --echo "$as_me:$LINENO: checking whether NLS is requested" >&5 --echo $ECHO_N "checking whether NLS is requested... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 -+$as_echo_n "checking whether NLS is requested... " >&6; } - if test x"$USE_NLS" != xyes; then -- echo "$as_me:$LINENO: result: no" >&5 --echo "${ECHO_T}no" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -+$as_echo "no" >&6; } - else -- echo "$as_me:$LINENO: result: yes" >&5 --echo "${ECHO_T}yes" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -+$as_echo "yes" >&6; } - --cat >>confdefs.h <<\_ACEOF --#define ENABLE_NLS 1 --_ACEOF -+$as_echo "#define ENABLE_NLS 1" >>confdefs.h - - -- echo "$as_me:$LINENO: checking for catalogs to be installed" >&5 --echo $ECHO_N "checking for catalogs to be installed... $ECHO_C" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for catalogs to be installed" >&5 -+$as_echo_n "checking for catalogs to be installed... " >&6; } - # Look for .po and .gmo files in the source directory. - CATALOGS= - XLINGUAS= -@@ -2733,8 +3478,8 @@ - fi - done - LINGUAS="$XLINGUAS" -- echo "$as_me:$LINENO: result: $LINGUAS" >&5 --echo "${ECHO_T}$LINGUAS" >&6 -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LINGUAS" >&5 -+$as_echo "$LINGUAS" >&6; } - - - DATADIRNAME=share -@@ -2756,15 +3501,15 @@ - ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' - ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' - ac_compiler_gnu=$ac_cv_c_compiler_gnu --echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 --echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -+$as_echo_n "checking how to run the C preprocessor... " >&6; } - # On Suns, sometimes $CPP names a directory. - if test -n "$CPP" && test -d "$CPP"; then - CPP= - fi - if test -z "$CPP"; then -- if test "${ac_cv_prog_CPP+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ if test "${ac_cv_prog_CPP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - # Double quotes because CPP needs to be expanded - for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" -@@ -2778,11 +3523,7 @@ - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include <limits.h> -@@ -2791,68 +3532,24 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break -@@ -2862,7 +3559,7 @@ - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -+if $ac_preproc_ok; then : - break - fi - -@@ -2874,8 +3571,8 @@ - else - ac_cv_prog_CPP=$CPP - fi --echo "$as_me:$LINENO: result: $CPP" >&5 --echo "${ECHO_T}$CPP" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -+$as_echo "$CPP" >&6; } - ac_preproc_ok=false - for ac_c_preproc_warn_flag in '' yes - do -@@ -2885,11 +3582,7 @@ - # <limits.h> exists even on freestanding compilers. - # On the NeXT, cc -E runs the code through the compiler's parser, - # not just through cpp. "Syntax error" is here to catch this case. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #ifdef __STDC__ - # include <limits.h> -@@ -2898,68 +3591,24 @@ - #endif - Syntax error - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- : --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_cpp "$LINENO"; then : - -+else - # Broken: fails on valid input. - continue - fi - rm -f conftest.err conftest.$ac_ext - -- # OK, works on sane cases. Now check whether non-existent headers -+ # OK, works on sane cases. Now check whether nonexistent headers - # can be detected and how. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <ac_nonexistent.h> - _ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -+if ac_fn_c_try_cpp "$LINENO"; then : - # Broken: success on invalid input. - continue - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- - # Passes both tests. - ac_preproc_ok=: - break -@@ -2969,14 +3618,13 @@ - done - # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. - rm -f conftest.err conftest.$ac_ext --if $ac_preproc_ok; then -- : -+if $ac_preproc_ok; then : -+ - else -- { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&5 --echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check --See \`config.log' for more details." >&2;} -- { (exit 1); exit 1; }; } -+ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -+as_fn_error "C preprocessor \"$CPP\" fails sanity check -+See \`config.log' for more details." "$LINENO" 5; } - fi - - ac_ext=c -@@ -2986,31 +3634,142 @@ - ac_compiler_gnu=$ac_cv_c_compiler_gnu - - --echo "$as_me:$LINENO: checking for egrep" >&5 --echo $ECHO_N "checking for egrep... $ECHO_C" >&6 --if test "${ac_cv_prog_egrep+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -- then ac_cv_prog_egrep='grep -E' -- else ac_cv_prog_egrep='egrep' -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -+$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -+if test "${ac_cv_path_GREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if test -z "$GREP"; then -+ ac_path_GREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in grep ggrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -+# Check for GNU ac_path_GREP and select it if it is found. -+ # Check for GNU $ac_path_GREP -+case `"$ac_path_GREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'GREP' >> "conftest.nl" -+ "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_GREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_GREP="$ac_path_GREP" -+ ac_path_GREP_max=$ac_count -+ fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_GREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_GREP"; then -+ as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_GREP=$GREP -+fi -+ -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -+$as_echo "$ac_cv_path_GREP" >&6; } -+ GREP="$ac_cv_path_GREP" -+ -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -+$as_echo_n "checking for egrep... " >&6; } -+if test "${ac_cv_path_EGREP+set}" = set; then : -+ $as_echo_n "(cached) " >&6 -+else -+ if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 -+ then ac_cv_path_EGREP="$GREP -E" -+ else -+ if test -z "$EGREP"; then -+ ac_path_EGREP_found=false -+ # Loop through the user's path and test for each of PROGNAME-LIST -+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for ac_prog in egrep; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" -+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -+# Check for GNU ac_path_EGREP and select it if it is found. -+ # Check for GNU $ac_path_EGREP -+case `"$ac_path_EGREP" --version 2>&1` in -+*GNU*) -+ ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -+*) -+ ac_count=0 -+ $as_echo_n 0123456789 >"conftest.in" -+ while : -+ do -+ cat "conftest.in" "conftest.in" >"conftest.tmp" -+ mv "conftest.tmp" "conftest.in" -+ cp "conftest.in" "conftest.nl" -+ $as_echo 'EGREP' >> "conftest.nl" -+ "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break -+ diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break -+ as_fn_arith $ac_count + 1 && ac_count=$as_val -+ if test $ac_count -gt ${ac_path_EGREP_max-0}; then -+ # Best one so far, save it but keep looking for a better one -+ ac_cv_path_EGREP="$ac_path_EGREP" -+ ac_path_EGREP_max=$ac_count - fi -+ # 10*(2^10) chars as input seems more than enough -+ test $ac_count -gt 10 && break -+ done -+ rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -+esac -+ -+ $ac_path_EGREP_found && break 3 -+ done -+ done -+ done -+IFS=$as_save_IFS -+ if test -z "$ac_cv_path_EGREP"; then -+ as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 -+ fi -+else -+ ac_cv_path_EGREP=$EGREP - fi --echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 --echo "${ECHO_T}$ac_cv_prog_egrep" >&6 -- EGREP=$ac_cv_prog_egrep -+ -+ fi -+fi -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -+$as_echo "$ac_cv_path_EGREP" >&6; } -+ EGREP="$ac_cv_path_EGREP" - - --echo "$as_me:$LINENO: checking for ANSI C header files" >&5 --echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 --if test "${ac_cv_header_stdc+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -+$as_echo_n "checking for ANSI C header files... " >&6; } -+if test "${ac_cv_header_stdc+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdlib.h> - #include <stdarg.h> -@@ -3025,51 +3784,23 @@ - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_header_stdc=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_header_stdc=no -+ ac_cv_header_stdc=no - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - - if test $ac_cv_header_stdc = yes; then - # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <string.h> - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "memchr" >/dev/null 2>&1; then -- : -+ $EGREP "memchr" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3079,18 +3810,14 @@ - - if test $ac_cv_header_stdc = yes; then - # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <stdlib.h> - - _ACEOF - if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "free" >/dev/null 2>&1; then -- : -+ $EGREP "free" >/dev/null 2>&1; then : -+ - else - ac_cv_header_stdc=no - fi -@@ -3100,16 +3827,13 @@ - - if test $ac_cv_header_stdc = yes; then - # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -- if test "$cross_compiling" = yes; then -+ if test "$cross_compiling" = yes; then : - : - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <ctype.h> -+#include <stdlib.h> - #if ((' ' & 0x0FF) == 0x020) - # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') - # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -@@ -3129,109 +3853,40 @@ - for (i = 0; i < 256; i++) - if (XOR (islower (i), ISLOWER (i)) - || toupper (i) != TOUPPER (i)) -- exit(2); -- exit (0); -+ return 2; -+ return 0; - } - _ACEOF --rm -f conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- : --else -- echo "$as_me: program exited with status $ac_status" >&5 --echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -+if ac_fn_c_try_run "$LINENO"; then : - --( exit $ac_status ) --ac_cv_header_stdc=no -+else -+ ac_cv_header_stdc=no - fi --rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ -+ conftest.$ac_objext conftest.beam conftest.$ac_ext - fi -+ - fi - fi --echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 --echo "${ECHO_T}$ac_cv_header_stdc" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -+$as_echo "$ac_cv_header_stdc" >&6; } - if test $ac_cv_header_stdc = yes; then - --cat >>confdefs.h <<\_ACEOF --#define STDC_HEADERS 1 --_ACEOF -+$as_echo "#define STDC_HEADERS 1" >>confdefs.h - - fi - - # On IRIX 5.3, sys/types and inttypes.h are conflicting. -- -- -- -- -- -- -- -- -- - for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ - inttypes.h stdint.h unistd.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default -- --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_Header=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_Header=no" --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -+" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3239,714 +3894,70 @@ - done - - -- -- -- -- -- - for ac_header in stdlib.h string.h strings.h unistd.h time.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- - for ac_header in sys/time.h sys/resource.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- - for ac_header in fcntl.h fpu_control.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- -- - for ac_header in dlfcn.h errno.h sys/stat.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -+eval as_val=\$$as_ac_Header -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF - - fi - - done - -- -- -- -- - for ac_func in getrusage time sigaction __setfpucw --do --as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` --echo "$as_me:$LINENO: checking for $ac_func" >&5 --echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 --if eval "test \"\${$as_ac_var+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. -- For example, HP-UX 11i <limits.h> declares gettimeofday. */ --#define $ac_func innocuous_$ac_func -- --/* System header to define __stub macros and hopefully few prototypes, -- which can conflict with char $ac_func (); below. -- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since -- <limits.h> exists even on freestanding compilers. */ -- --#ifdef __STDC__ --# include <limits.h> --#else --# include <assert.h> --#endif -- --#undef $ac_func -- --/* Override any gcc2 internal prototype to avoid an error. */ --#ifdef __cplusplus --extern "C" --{ --#endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func (); --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --char (*f) () = $ac_func; --#endif --#ifdef __cplusplus --} --#endif -- --int --main () --{ --return f != $ac_func; -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- eval "$as_ac_var=yes" --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --eval "$as_ac_var=no" --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 --if test `eval echo '${'$as_ac_var'}'` = yes; then -+do : -+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -+eval as_val=\$$as_ac_var -+ if test "x$as_val" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF - - fi -@@ -3954,72 +3965,43 @@ - - - # Check for socket libraries -- --echo "$as_me:$LINENO: checking for bind in -lsocket" >&5 --echo $ECHO_N "checking for bind in -lsocket... $ECHO_C" >&6 --if test "${ac_cv_lib_socket_bind+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for bind in -lsocket" >&5 -+$as_echo_n "checking for bind in -lsocket... " >&6; } -+if test "${ac_cv_lib_socket_bind+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lsocket $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char bind (); - int - main () - { --bind (); -+return bind (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_socket_bind=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_socket_bind=no -+ ac_cv_lib_socket_bind=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_socket_bind" >&5 --echo "${ECHO_T}$ac_cv_lib_socket_bind" >&6 --if test $ac_cv_lib_socket_bind = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_bind" >&5 -+$as_echo "$ac_cv_lib_socket_bind" >&6; } -+if test "x$ac_cv_lib_socket_bind" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBSOCKET 1 - _ACEOF -@@ -4028,72 +4010,43 @@ - - fi - -- --echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 --echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 --if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -+$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -+if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS - LIBS="-lnsl $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ - char gethostbyname (); - int - main () - { --gethostbyname (); -+return gethostbyname (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -+if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_nsl_gethostbyname=yes - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_nsl_gethostbyname=no -+ ac_cv_lib_nsl_gethostbyname=no - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_lib_save_LIBS - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 --echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 --if test $ac_cv_lib_nsl_gethostbyname = yes; then -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -+$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -+if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : - cat >>confdefs.h <<_ACEOF - #define HAVE_LIBNSL 1 - _ACEOF -@@ -4108,50 +4061,43 @@ - - - USE_MAINTAINER_MODE=no --# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. --if test "${enable_maintainer_mode+set}" = set; then -- enableval="$enable_maintainer_mode" -- case "${enableval}" in -+# Check whether --enable-maintainer-mode was given. -+if test "${enable_maintainer_mode+set}" = set; then : -+ enableval=$enable_maintainer_mode; case "${enableval}" in - yes) MAINT="" USE_MAINTAINER_MODE=yes ;; - no) MAINT="#" ;; -- *) { { echo "$as_me:$LINENO: error: \"--enable-maintainer-mode does not take a value\"" >&5 --echo "$as_me: error: \"--enable-maintainer-mode does not take a value\"" >&2;} -- { (exit 1); exit 1; }; }; MAINT="#" ;; -+ *) as_fn_error "\"--enable-maintainer-mode does not take a value\"" "$LINENO" 5; MAINT="#" ;; - esac - if test x"$silent" != x"yes" && test x"$MAINT" = x""; then - echo "Setting maintainer mode" 6>&1 - fi - else - MAINT="#" --fi; -+fi -+ - - --# Check whether --enable-sim-bswap or --disable-sim-bswap was given. --if test "${enable_sim_bswap+set}" = set; then -- enableval="$enable_sim_bswap" -- case "${enableval}" in -+# Check whether --enable-sim-bswap was given. -+if test "${enable_sim_bswap+set}" = set; then : -+ enableval=$enable_sim_bswap; case "${enableval}" in - yes) sim_bswap="-DWITH_BSWAP=1 -DUSE_BSWAP=1";; - no) sim_bswap="-DWITH_BSWAP=0";; -- *) { { echo "$as_me:$LINENO: error: \"--enable-sim-bswap does not take a value\"" >&5 --echo "$as_me: error: \"--enable-sim-bswap does not take a value\"" >&2;} -- { (exit 1); exit 1; }; }; sim_bswap="";; -+ *) as_fn_error "\"--enable-sim-bswap does not take a value\"" "$LINENO" 5; sim_bswap="";; - esac - if test x"$silent" != x"yes" && test x"$sim_bswap" != x""; then - echo "Setting bswap flags = $sim_bswap" 6>&1 - fi - else - sim_bswap="" --fi; -+fi - - --# Check whether --enable-sim-cflags or --disable-sim-cflags was given. --if test "${enable_sim_cflags+set}" = set; then -- enableval="$enable_sim_cflags" -- case "${enableval}" in -+ -+# Check whether --enable-sim-cflags was given. -+if test "${enable_sim_cflags+set}" = set; then : -+ enableval=$enable_sim_cflags; case "${enableval}" in - yes) sim_cflags="-O2 -fomit-frame-pointer";; -- trace) { { echo "$as_me:$LINENO: error: \"Please use --enable-sim-debug instead.\"" >&5 --echo "$as_me: error: \"Please use --enable-sim-debug instead.\"" >&2;} -- { (exit 1); exit 1; }; }; sim_cflags="";; -+ trace) as_fn_error "\"Please use --enable-sim-debug instead.\"" "$LINENO" 5; sim_cflags="";; - no) sim_cflags="";; - *) sim_cflags=`echo "${enableval}" | sed -e "s/,/ /g"`;; - esac -@@ -4160,13 +4106,13 @@ - fi - else - sim_cflags="" --fi; -+fi - - --# Check whether --enable-sim-debug or --disable-sim-debug was given. --if test "${enable_sim_debug+set}" = set; then -- enableval="$enable_sim_debug" -- case "${enableval}" in -+ -+# Check whether --enable-sim-debug was given. -+if test "${enable_sim_debug+set}" = set; then : -+ enableval=$enable_sim_debug; case "${enableval}" in - yes) sim_debug="-DDEBUG=7 -DWITH_DEBUG=7";; - no) sim_debug="-DDEBUG=0 -DWITH_DEBUG=0";; - *) sim_debug="-DDEBUG='(${enableval})' -DWITH_DEBUG='(${enableval})'";; -@@ -4176,31 +4122,29 @@ - fi - else - sim_debug="" --fi; -+fi -+ - - --# Check whether --enable-sim-stdio or --disable-sim-stdio was given. --if test "${enable_sim_stdio+set}" = set; then -- enableval="$enable_sim_stdio" -- case "${enableval}" in -+# Check whether --enable-sim-stdio was given. -+if test "${enable_sim_stdio+set}" = set; then : -+ enableval=$enable_sim_stdio; case "${enableval}" in - yes) sim_stdio="-DWITH_STDIO=DO_USE_STDIO";; - no) sim_stdio="-DWITH_STDIO=DONT_USE_STDIO";; -- *) { { echo "$as_me:$LINENO: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&5 --echo "$as_me: error: \"Unknown value $enableval passed to --enable-sim-stdio\"" >&2;} -- { (exit 1); exit 1; }; }; sim_stdio="";; -+ *) as_fn_error "\"Unknown value $enableval passed to --enable-sim-stdio\"" "$LINENO" 5; sim_stdio="";; - esac - if test x"$silent" != x"yes" && test x"$sim_stdio" != x""; then - echo "Setting stdio flags = $sim_stdio" 6>&1 - fi - else - sim_stdio="" --fi; -+fi -+ - - --# Check whether --enable-sim-trace or --disable-sim-trace was given. --if test "${enable_sim_trace+set}" = set; then -- enableval="$enable_sim_trace" -- case "${enableval}" in -+# Check whether --enable-sim-trace was given. -+if test "${enable_sim_trace+set}" = set; then : -+ enableval=$enable_sim_trace; case "${enableval}" in - yes) sim_trace="-DTRACE=1 -DWITH_TRACE=-1";; - no) sim_trace="-DTRACE=0 -DWITH_TRACE=0";; - [-0-9]*) -@@ -4221,13 +4165,13 @@ - fi - else - sim_trace="" --fi; -+fi -+ - - --# Check whether --enable-sim-profile or --disable-sim-profile was given. --if test "${enable_sim_profile+set}" = set; then -- enableval="$enable_sim_profile" -- case "${enableval}" in -+# Check whether --enable-sim-profile was given. -+if test "${enable_sim_profile+set}" = set; then : -+ enableval=$enable_sim_profile; case "${enableval}" in - yes) sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1";; - no) sim_profile="-DPROFILE=0 -DWITH_PROFILE=0";; - [-0-9]*) -@@ -4248,72 +4192,37 @@ - fi - else - sim_profile="-DPROFILE=1 -DWITH_PROFILE=-1" --fi; -+fi - - --echo "$as_me:$LINENO: checking return type of signal handlers" >&5 --echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6 --if test "${ac_cv_type_signal+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+ -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5 -+$as_echo_n "checking return type of signal handlers... " >&6; } -+if test "${ac_cv_type_signal+set}" = set; then : -+ $as_echo_n "(cached) " >&6 - else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - #include <sys/types.h> - #include <signal.h> --#ifdef signal --# undef signal --#endif --#ifdef __cplusplus --extern "C" void (*signal (int, void (*)(int)))(int); --#else --void (*signal ()) (); --#endif - - int - main () - { --int i; -+return *(signal (0, 0)) (0) == 1; - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_type_signal=void -+if ac_fn_c_try_compile "$LINENO"; then : -+ ac_cv_type_signal=int - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_type_signal=int -+ ac_cv_type_signal=void - fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi --echo "$as_me:$LINENO: result: $ac_cv_type_signal" >&5 --echo "${ECHO_T}$ac_cv_type_signal" >&6 -+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5 -+$as_echo "$ac_cv_type_signal" >&6; } - - cat >>confdefs.h <<_ACEOF - #define RETSIGTYPE $ac_cv_type_signal -@@ -4342,150 +4251,12 @@ - sim_link_links="${sim_link_links} targ-vals.def" - - -- - for ac_header in stdlib.h --do --as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 --else -- # Is the header compilable? --echo "$as_me:$LINENO: checking $ac_header usability" >&5 --echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --$ac_includes_default --#include <$ac_header> --_ACEOF --rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_header_compiler=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_header_compiler=no --fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 --echo "${ECHO_T}$ac_header_compiler" >&6 -- --# Is the header present? --echo "$as_me:$LINENO: checking $ac_header presence" >&5 --echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ --#include <$ac_header> --_ACEOF --if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 -- (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } >/dev/null; then -- if test -s conftest.err; then -- ac_cpp_err=$ac_c_preproc_warn_flag -- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag -- else -- ac_cpp_err= -- fi --else -- ac_cpp_err=yes --fi --if test -z "$ac_cpp_err"; then -- ac_header_preproc=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- ac_header_preproc=no --fi --rm -f conftest.err conftest.$ac_ext --echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 --echo "${ECHO_T}$ac_header_preproc" >&6 -- --# So? What about this header? --case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in -- yes:no: ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 --echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} -- ac_header_preproc=yes -- ;; -- no:yes:* ) -- { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 --echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 --echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 --echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 --echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 --echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} -- { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 --echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} -- ( -- cat <<\_ASBOX --## ------------------------------------------ ## --## Report this to the AC_PACKAGE_NAME lists. ## --## ------------------------------------------ ## --_ASBOX -- ) | -- sed "s/^/$as_me: WARNING: /" >&2 -- ;; --esac --echo "$as_me:$LINENO: checking for $ac_header" >&5 --echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 --if eval "test \"\${$as_ac_Header+set}\" = set"; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- eval "$as_ac_Header=\$ac_header_preproc" --fi --echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 --echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 -- --fi --if test `eval echo '${'$as_ac_Header'}'` = yes; then -+do : -+ ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" -+if test "x$ac_cv_header_stdlib_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF --#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 -+#define HAVE_STDLIB_H 1 - _ACEOF - - fi -@@ -4493,183 +4264,82 @@ - done - - --# In the Cygwin environment, we need some additional flags. --echo "$as_me:$LINENO: checking for cygwin" >&5 --echo $ECHO_N "checking for cygwin... $ECHO_C" >&6 --if test "${sim_cv_os_cygwin+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ - --#ifdef __CYGWIN__ --lose --#endif --_ACEOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- $EGREP "lose" >/dev/null 2>&1; then -- sim_cv_os_cygwin=yes --else -- sim_cv_os_cygwin=no -+# Check whether --with-system-readline was given. -+if test "${with_system_readline+set}" = set; then : -+ withval=$with_system_readline; - fi --rm -f conftest* - --fi --echo "$as_me:$LINENO: result: $sim_cv_os_cygwin" >&5 --echo "${ECHO_T}$sim_cv_os_cygwin" >&6 - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' --else -- echo "$as_me:$LINENO: checking for main in -ltermcap" >&5 --echo $ECHO_N "checking for main in -ltermcap... $ECHO_C" >&6 --if test "${ac_cv_lib_termcap_main+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 --else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-ltermcap $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+if test "$with_system_readline" = yes; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for readline" >&5 -+$as_echo_n "checking for readline... " >&6; } -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -- -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ -+#ifdef __cplusplus -+extern "C" -+#endif -+char add_history (); - int - main () - { --main (); -+return add_history (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_termcap_main=yes --else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_termcap_main=no --fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS --fi --echo "$as_me:$LINENO: result: $ac_cv_lib_termcap_main" >&5 --echo "${ECHO_T}$ac_cv_lib_termcap_main" >&6 --if test $ac_cv_lib_termcap_main = yes; then -- TERMCAP=-ltermcap --else -- TERMCAP="" --fi -- --fi -- -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- echo "$as_me:$LINENO: checking for readline in -lreadline" >&5 --echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6 --if test "${ac_cv_lib_readline_readline+set}" = set; then -- echo $ECHO_N "(cached) $ECHO_C" >&6 -+if ac_fn_c_try_link "$LINENO"; then : -+ READLINE=-lreadline - else -- ac_check_lib_save_LIBS=$LIBS --LIBS="-lreadline $TERMCAP $LIBS" --cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF -+ LIBS="-lreadline -lncurses $save_LIBS" -+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - --/* Override any gcc2 internal prototype to avoid an error. */ -+/* Override any GCC internal prototype to avoid an error. -+ Use char because int might match the return type of a GCC -+ builtin and then its argument prototype would still apply. */ - #ifdef __cplusplus - extern "C" - #endif --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char readline (); -+char add_history (); - int - main () - { --readline (); -+return add_history (); - ; - return 0; - } - _ACEOF --rm -f conftest.$ac_objext conftest$ac_exeext --if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -- (eval $ac_link) 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; } && -- { ac_try='test -s conftest$ac_exeext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 -- ac_status=$? -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); }; }; then -- ac_cv_lib_readline_readline=yes -+if ac_fn_c_try_link "$LINENO"; then : -+ READLINE="-lreadline -lncurses" - else -- echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- --ac_cv_lib_readline_readline=no -+ as_fn_error "unable to detect readline" "$LINENO" 5 - fi --rm -f conftest.err conftest.$ac_objext \ -- conftest$ac_exeext conftest.$ac_ext --LIBS=$ac_check_lib_save_LIBS -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ - fi --echo "$as_me:$LINENO: result: $ac_cv_lib_readline_readline" >&5 --echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6 --if test $ac_cv_lib_readline_readline = yes; then -- READLINE=-lreadline --else -- { { echo "$as_me:$LINENO: error: the required \"readline\" library is missing" >&5 --echo "$as_me: error: the required \"readline\" library is missing" >&2;} -- { (exit 1); exit 1; }; } -+rm -f core conftest.err conftest.$ac_objext \ -+ conftest$ac_exeext conftest.$ac_ext -+ LIBS="$save_LIBS" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $READLINE" >&5 -+$as_echo "$READLINE" >&6; } -+ READLINE_DEPS= -+ READLINE_CFLAGS= -+else -+ READLINE='../../readline/libreadline.a -lncurses' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - --fi -+ -+ - - - ac_sources="$sim_link_files" -@@ -4679,22 +4349,22 @@ - set $ac_sources; ac_source=$1; shift; ac_sources=$* - ac_config_links_1="$ac_config_links_1 $ac_dest:$ac_source" - done -- ac_config_links="$ac_config_links $ac_config_links_1" -+ac_config_links="$ac_config_links $ac_config_links_1" - - cgen_breaks="" - if grep CGEN_MAINT $srcdir/Makefile.in >/dev/null; then - cgen_breaks="break cgen_rtx_error"; - fi - -- ac_config_files="$ac_config_files Makefile.sim:Makefile.in" -+ac_config_files="$ac_config_files Makefile.sim:Makefile.in" - -- ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in" -+ac_config_files="$ac_config_files Make-common.sim:../common/Make-common.in" - -- ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in" -+ac_config_files="$ac_config_files .gdbinit:../common/gdbinit.in" - -- ac_config_commands="$ac_config_commands Makefile" -+ac_config_commands="$ac_config_commands Makefile" - -- ac_config_commands="$ac_config_commands stamp-h" -+ac_config_commands="$ac_config_commands stamp-h" - - cat >confcache <<\_ACEOF - # This file is a shell script that caches the results of configure -@@ -4714,39 +4384,59 @@ - - # The following way of writing the cache mishandles newlines in values, - # but we know of no workaround that is simple, portable, and efficient. --# So, don't put newlines in cache variables' values. -+# So, we kill variables containing newlines. - # Ultrix sh set writes to stderr and can't be redirected directly, - # and sets the high bit in the cache file unless we assign to the vars. --{ -+( -+ for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do -+ eval ac_val=\$$ac_var -+ case $ac_val in #( -+ *${as_nl}*) -+ case $ac_var in #( -+ *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -+$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( -+ *) { eval $ac_var=; unset $ac_var;} ;; -+ esac ;; -+ esac -+ done -+ - (set) 2>&1 | -- case `(ac_space=' '; set | grep ac_space) 2>&1` in -- *ac_space=\ *) -- # `set' does not quote correctly, so add quotes (double-quote -- # substitution turns \\\\ into \\, and sed turns \\ into \). -+ case $as_nl`(ac_space=' '; set) 2>&1` in #( -+ *${as_nl}ac_space=\ *) -+ # `set' does not quote correctly, so add quotes: double-quote -+ # substitution turns \\\\ into \\, and sed turns \\ into \. - sed -n \ - "s/'/'\\\\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" -- ;; -+ ;; #( - *) - # `set' quotes correctly as required by POSIX, so do not add quotes. -- sed -n \ -- "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" - ;; -- esac; --} | -+ esac | -+ sort -+) | - sed ' -+ /^ac_cv_env_/b end - t clear -- : clear -+ :clear - s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ - t end -- /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -- : end' >>confcache --if diff $cache_file confcache >/dev/null 2>&1; then :; else -- if test -w $cache_file; then -- test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" -+ s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ -+ :end' >>confcache -+if diff "$cache_file" confcache >/dev/null 2>&1; then :; else -+ if test -w "$cache_file"; then -+ test "x$cache_file" != "x/dev/null" && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -+$as_echo "$as_me: updating cache $cache_file" >&6;} - cat confcache >$cache_file - else -- echo "not updating unwritable cache $cache_file" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -+$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} - fi - fi - rm -f confcache -@@ -4755,32 +4445,18 @@ - # Let make expand exec_prefix. - test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' - --# VPATH may cause trouble with some makes, so we remove $(srcdir), --# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and --# trailing colons and then remove the whole line if VPATH becomes empty --# (actually we leave an empty line to preserve line numbers). --if test "x$srcdir" = x.; then -- ac_vpsub='/^[ ]*VPATH[ ]*=/{ --s/:*\$(srcdir):*/:/; --s/:*\${srcdir}:*/:/; --s/:*@srcdir@:*/:/; --s/^\([^=]*=[ ]*\):*/\1/; --s/:*$//; --s/^[^=]*=[ ]*$//; --}' --fi -- - DEFS=-DHAVE_CONFIG_H - - ac_libobjs= - ac_ltlibobjs= - for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue - # 1. Remove the extension, and $U if already installed. -- ac_i=`echo "$ac_i" | -- sed 's/\$U\././;s/\.o$//;s/\.obj$//'` -- # 2. Add them. -- ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" -- ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' -+ ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`$as_echo "$ac_i" | sed "$ac_script"` -+ # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR -+ # will be set to the directory where LIBOBJS objects are built. -+ as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' - done - LIBOBJS=$ac_libobjs - -@@ -4789,11 +4465,13 @@ - - - : ${CONFIG_STATUS=./config.status} -+ac_write_fail=0 - ac_clean_files_save=$ac_clean_files - ac_clean_files="$ac_clean_files $CONFIG_STATUS" --{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 --echo "$as_me: creating $CONFIG_STATUS" >&6;} --cat >$CONFIG_STATUS <<_ACEOF -+{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -+$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -+as_write_fail=0 -+cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 - #! $SHELL - # Generated by $as_me. - # Run this file to recreate the current configuration. -@@ -4803,81 +4481,252 @@ - debug=false - ac_cs_recheck=false - ac_cs_silent=false --SHELL=\${CONFIG_SHELL-$SHELL} --_ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --## --------------------- ## --## M4sh Initialization. ## --## --------------------- ## -+SHELL=\${CONFIG_SHELL-$SHELL} -+export SHELL -+_ASEOF -+cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -+## -------------------- ## -+## M4sh Initialization. ## -+## -------------------- ## - --# Be Bourne compatible --if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then -+# Be more Bourne compatible -+DUALCASE=1; export DUALCASE # for MKS sh -+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: -- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which -+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which - # is contrary to our usage. Disable this feature. - alias -g '${1+"$@"}'='"$@"' --elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then -- set -o posix -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in #( -+ *posix*) : -+ set -o posix ;; #( -+ *) : -+ ;; -+esac - fi --DUALCASE=1; export DUALCASE # for MKS sh - --# Support unset when possible. --if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -- as_unset=unset --else -- as_unset=false -+ -+as_nl=' -+' -+export as_nl -+# Printing a long string crashes Solaris 7 /usr/bin/printf. -+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -+# Prefer a ksh shell builtin over an external printf program on Solaris, -+# but without wasting forks for bash or zsh. -+if test -z "$BASH_VERSION$ZSH_VERSION" \ -+ && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='print -r --' -+ as_echo_n='print -rn --' -+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then -+ as_echo='printf %s\n' -+ as_echo_n='printf %s' -+else -+ if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then -+ as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' -+ as_echo_n='/usr/ucb/echo -n' -+ else -+ as_echo_body='eval expr "X$1" : "X\\(.*\\)"' -+ as_echo_n_body='eval -+ arg=$1; -+ case $arg in #( -+ *"$as_nl"*) -+ expr "X$arg" : "X\\(.*\\)$as_nl"; -+ arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; -+ esac; -+ expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" -+ ' -+ export as_echo_n_body -+ as_echo_n='sh -c $as_echo_n_body as_echo' -+ fi -+ export as_echo_body -+ as_echo='sh -c $as_echo_body as_echo' -+fi -+ -+# The user is always right. -+if test "${PATH_SEPARATOR+set}" != set; then -+ PATH_SEPARATOR=: -+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { -+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || -+ PATH_SEPARATOR=';' -+ } - fi - - --# Work around bugs in pre-3.0 UWIN ksh. --$as_unset ENV MAIL MAILPATH -+# IFS -+# We need space, tab and new line, in precisely that order. Quoting is -+# there to prevent editors from complaining about space-tab. -+# (If _AS_PATH_WALK were called with IFS unset, it would disable word -+# splitting by setting IFS to empty value.) -+IFS=" "" $as_nl" -+ -+# Find who we are. Look in the path if we contain no directory separator. -+case $0 in #(( -+ *[\\/]* ) as_myself=$0 ;; -+ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break -+ done -+IFS=$as_save_IFS -+ -+ ;; -+esac -+# We did not find ourselves, most probably we were run as `sh COMMAND' -+# in which case we are not to be found in the path. -+if test "x$as_myself" = x; then -+ as_myself=$0 -+fi -+if test ! -f "$as_myself"; then -+ $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ exit 1 -+fi -+ -+# Unset variables that we do not need and which cause bugs (e.g. in -+# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -+# suppresses any "Segmentation fault" message there. '((' could -+# trigger a bug in pdksh 5.2.14. -+for as_var in BASH_ENV ENV MAIL MAILPATH -+do eval test x\${$as_var+set} = xset \ -+ && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -+done - PS1='$ ' - PS2='> ' - PS4='+ ' - - # NLS nuisances. --for as_var in \ -- LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ -- LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ -- LC_TELEPHONE LC_TIME --do -- if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then -- eval $as_var=C; export $as_var -- else -- $as_unset $as_var -- fi --done -+LC_ALL=C -+export LC_ALL -+LANGUAGE=C -+export LANGUAGE -+ -+# CDPATH. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ - --# Required to use basename. --if expr a : '\(a\)' >/dev/null 2>&1; then -+# as_fn_error ERROR [LINENO LOG_FD] -+# --------------------------------- -+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -+# script with status $?, using 1 if that was 0. -+as_fn_error () -+{ -+ as_status=$?; test $as_status -eq 0 && as_status=1 -+ if test "$3"; then -+ as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack -+ $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 -+ fi -+ $as_echo "$as_me: error: $1" >&2 -+ as_fn_exit $as_status -+} # as_fn_error -+ -+ -+# as_fn_set_status STATUS -+# ----------------------- -+# Set $? to STATUS, without forking. -+as_fn_set_status () -+{ -+ return $1 -+} # as_fn_set_status -+ -+# as_fn_exit STATUS -+# ----------------- -+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -+as_fn_exit () -+{ -+ set +e -+ as_fn_set_status $1 -+ exit $1 -+} # as_fn_exit -+ -+# as_fn_unset VAR -+# --------------- -+# Portably unset VAR. -+as_fn_unset () -+{ -+ { eval $1=; unset $1;} -+} -+as_unset=as_fn_unset -+# as_fn_append VAR VALUE -+# ---------------------- -+# Append the text in VALUE to the end of the definition contained in VAR. Take -+# advantage of any shell optimizations that allow amortized linear growth over -+# repeated appends, instead of the typical quadratic growth present in naive -+# implementations. -+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : -+ eval 'as_fn_append () -+ { -+ eval $1+=\$2 -+ }' -+else -+ as_fn_append () -+ { -+ eval $1=\$$1\$2 -+ } -+fi # as_fn_append -+ -+# as_fn_arith ARG... -+# ------------------ -+# Perform arithmetic evaluation on the ARGs, and store the result in the -+# global $as_val. Take advantage of shells that can avoid forks. The arguments -+# must be portable across $(()) and expr. -+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : -+ eval 'as_fn_arith () -+ { -+ as_val=$(( $* )) -+ }' -+else -+ as_fn_arith () -+ { -+ as_val=`expr "$@" || test $? -eq 1` -+ } -+fi # as_fn_arith -+ -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then - as_expr=expr - else - as_expr=false - fi - --if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then -+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then - as_basename=basename - else - as_basename=false - fi - -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi - --# Name of the executable. --as_me=`$as_basename "$0" || -+as_me=`$as_basename -- "$0" || - $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ - X"$0" : 'X\(//\)$' \| \ -- X"$0" : 'X\(/\)$' \| \ -- . : '\(.\)' 2>/dev/null || --echo X/"$0" | -- sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } -- /^X\/\(\/\/\)$/{ s//\1/; q; } -- /^X\/\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ X"$0" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X/"$0" | -+ sed '/^.*\/\([^/][^/]*\)\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\/\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` - -- --# PATH needs CR, and LINENO needs CR and PATH. - # Avoid depending upon Character Ranges. - as_cr_letters='abcdefghijklmnopqrstuvwxyz' - as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' -@@ -4885,148 +4734,123 @@ - as_cr_digits='0123456789' - as_cr_alnum=$as_cr_Letters$as_cr_digits - --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi -- -- -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" || { -- # Find who we are. Look in the path if we contain no path at all -- # relative or not. -- case $0 in -- *[\\/]* ) as_myself=$0 ;; -- *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in $PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break --done -- -- ;; -- esac -- # We did not find ourselves, most probably we were run as `sh COMMAND' -- # in which case we are not to be found in the path. -- if test "x$as_myself" = x; then -- as_myself=$0 -- fi -- if test ! -f "$as_myself"; then -- { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 --echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} -- { (exit 1); exit 1; }; } -- fi -- case $CONFIG_SHELL in -- '') -- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR --for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH --do -- IFS=$as_save_IFS -- test -z "$as_dir" && as_dir=. -- for as_base in sh bash ksh sh5; do -- case $as_dir in -- /*) -- if ("$as_dir/$as_base" -c ' -- as_lineno_1=$LINENO -- as_lineno_2=$LINENO -- as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` -- test "x$as_lineno_1" != "x$as_lineno_2" && -- test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then -- $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } -- $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } -- CONFIG_SHELL=$as_dir/$as_base -- export CONFIG_SHELL -- exec "$CONFIG_SHELL" "$0" ${1+"$@"} -- fi;; -- esac -- done --done --;; -- esac -- -- # Create $as_me.lineno as a copy of $as_myself, but with $LINENO -- # uniformly replaced by the line number. The first 'sed' inserts a -- # line-number line before each line; the second 'sed' does the real -- # work. The second script uses 'N' to pair each line-number line -- # with the numbered line, and appends trailing '-' during -- # substitution so that $LINENO is not a special case at line end. -- # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the -- # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) -- sed '=' <$as_myself | -- sed ' -- N -- s,$,-, -- : loop -- s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, -- t loop -- s,-$,, -- s,^['$as_cr_digits']*\n,, -- ' >$as_me.lineno && -- chmod +x $as_me.lineno || -- { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 --echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} -- { (exit 1); exit 1; }; } -- -- # Don't try to exec as it changes $[0], causing all sort of problems -- # (the dirname of $[0] is not the place where we might find the -- # original and so on. Autoconf is especially sensible to this). -- . ./$as_me.lineno -- # Exit status is that of the last command. -- exit --} -- -- --case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in -- *c*,-n*) ECHO_N= ECHO_C=' --' ECHO_T=' ' ;; -- *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; -- *) ECHO_N= ECHO_C='\c' ECHO_T= ;; -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in #((((( -+-n*) -+ case `echo 'xy\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ xy) ECHO_C='\c';; -+ *) echo `echo ksh88 bug on AIX 6.1` > /dev/null -+ ECHO_T=' ';; -+ esac;; -+*) -+ ECHO_N='-n';; - esac - --if expr a : '\(a\)' >/dev/null 2>&1; then -- as_expr=expr -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file - else -- as_expr=false -+ rm -f conf$$.dir -+ mkdir conf$$.dir 2>/dev/null - fi -- --rm -f conf$$ conf$$.exe conf$$.file --echo >conf$$.file --if ln -s conf$$.file conf$$ 2>/dev/null; then -- # We could just check for DJGPP; but this test a) works b) is more generic -- # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). -- if test -f conf$$.exe; then -- # Don't use ln at all; we don't have any links -- as_ln_s='cp -p' -- else -+if (echo >conf$$.file) 2>/dev/null; then -+ if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' -+ # ... but there are two gotchas: -+ # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. -+ # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. -+ # In both cases, we have to default to `cp -p'. -+ ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || -+ as_ln_s='cp -p' -+ elif ln conf$$.file conf$$ 2>/dev/null; then -+ as_ln_s=ln -+ else -+ as_ln_s='cp -p' - fi --elif ln conf$$.file conf$$ 2>/dev/null; then -- as_ln_s=ln - else - as_ln_s='cp -p' - fi --rm -f conf$$ conf$$.exe conf$$.file -+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -+rmdir conf$$.dir 2>/dev/null -+ -+ -+# as_fn_mkdir_p -+# ------------- -+# Create "$as_dir" as a directory, including parents if necessary. -+as_fn_mkdir_p () -+{ -+ -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || eval $as_mkdir_p || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( -+ *) as_qdir=$as_dir;; -+ esac -+ as_dirs="'$as_qdir' $as_dirs" -+ as_dir=`$as_dirname -- "$as_dir" || -+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$as_dir" : 'X\(//\)[^/]' \| \ -+ X"$as_dir" : 'X\(//\)$' \| \ -+ X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$as_dir" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ test -d "$as_dir" && break -+ done -+ test -z "$as_dirs" || eval "mkdir $as_dirs" -+ } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" - -+ -+} # as_fn_mkdir_p - if mkdir -p . 2>/dev/null; then -- as_mkdir_p=: -+ as_mkdir_p='mkdir -p "$as_dir"' - else - test -d ./-p && rmdir ./-p - as_mkdir_p=false - fi - --as_executable_p="test -f" -+if test -x / >/dev/null 2>&1; then -+ as_test_x='test -x' -+else -+ if ls -dL / >/dev/null 2>&1; then -+ as_ls_L_option=L -+ else -+ as_ls_L_option= -+ fi -+ as_test_x=' -+ eval sh -c '\'' -+ if test -d "$1"; then -+ test -d "$1/."; -+ else -+ case $1 in #( -+ -*)set "./$1";; -+ esac; -+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( -+ ???[sx]*):;;*)false;;esac;fi -+ '\'' sh -+ ' -+fi -+as_executable_p=$as_test_x - - # Sed expression to map a string onto a valid CPP name. - as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" -@@ -5035,31 +4859,20 @@ - as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" - - --# IFS --# We need space, tab and new line, in precisely that order. --as_nl=' --' --IFS=" $as_nl" -- --# CDPATH. --$as_unset CDPATH -- - exec 6>&1 -+## ----------------------------------- ## -+## Main body of $CONFIG_STATUS script. ## -+## ----------------------------------- ## -+_ASEOF -+test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - --# Open the log real soon, to keep \$[0] and so on meaningful, and to -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# Save the log message, to keep $0 and so on meaningful, and to - # report actual input values of CONFIG_FILES etc. instead of their --# values after options handling. Logging --version etc. is OK. --exec 5>>config.log --{ -- echo -- sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX --## Running $as_me. ## --_ASBOX --} >&5 --cat >&5 <<_CSEOF -- -+# values after options handling. -+ac_log=" - This file was extended by $as_me, which was --generated by GNU Autoconf 2.59. Invocation command line was -+generated by GNU Autoconf 2.64. Invocation command line was - - CONFIG_FILES = $CONFIG_FILES - CONFIG_HEADERS = $CONFIG_HEADERS -@@ -5067,45 +4880,47 @@ - CONFIG_COMMANDS = $CONFIG_COMMANDS - $ $0 $@ - --_CSEOF --echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 --echo >&5 -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ - _ACEOF - --# Files that config.status was made for. --if test -n "$ac_config_files"; then -- echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS --fi -+case $ac_config_files in *" -+"*) set x $ac_config_files; shift; ac_config_files=$*;; -+esac - --if test -n "$ac_config_headers"; then -- echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS --fi -+case $ac_config_headers in *" -+"*) set x $ac_config_headers; shift; ac_config_headers=$*;; -+esac - --if test -n "$ac_config_links"; then -- echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS --fi - --if test -n "$ac_config_commands"; then -- echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS --fi -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+# Files that config.status was made for. -+config_files="$ac_config_files" -+config_headers="$ac_config_headers" -+config_links="$ac_config_links" -+config_commands="$ac_config_commands" - --cat >>$CONFIG_STATUS <<\_ACEOF -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - ac_cs_usage="\ --\`$as_me' instantiates files from templates according to the --current configuration. -+\`$as_me' instantiates files and other configuration actions -+from templates according to the current configuration. Unless the files -+and actions are specified as TAGs, all are instantiated by default. - --Usage: $0 [OPTIONS] [FILE]... -+Usage: $0 [OPTION]... [TAG]... - - -h, --help print this help, then exit -- -V, --version print version number, then exit -- -q, --quiet do not print progress messages -+ -V, --version print version number and configuration settings, then exit -+ -q, --quiet, --silent -+ do not print progress messages - -d, --debug don't remove temporary files - --recheck update $as_me by reconfiguring in the same conditions -- --file=FILE[:TEMPLATE] -- instantiate the configuration file FILE -- --header=FILE[:TEMPLATE] -- instantiate the configuration header FILE -+ --file=FILE[:TEMPLATE] -+ instantiate the configuration file FILE -+ --header=FILE[:TEMPLATE] -+ instantiate the configuration header FILE - - Configuration files: - $config_files -@@ -5119,84 +4934,81 @@ - Configuration commands: - $config_commands - --Report bugs to <bug-autoconf@gnu.org>." --_ACEOF -+Report bugs to the package provider." - --cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_cs_version="\\ - config.status --configured by $0, generated by GNU Autoconf 2.59, -- with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -+configured by $0, generated by GNU Autoconf 2.64, -+ with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" - --Copyright (C) 2003 Free Software Foundation, Inc. -+Copyright (C) 2009 Free Software Foundation, Inc. - This config.status script is free software; the Free Software Foundation - gives unlimited permission to copy, distribute and modify it." --srcdir=$srcdir --INSTALL="$INSTALL" -+ -+ac_pwd='$ac_pwd' -+srcdir='$srcdir' -+INSTALL='$INSTALL' -+test -n "\$AWK" || AWK=awk - _ACEOF - --cat >>$CONFIG_STATUS <<\_ACEOF --# If no file are specified by the user, then we need to provide default --# value. By we need to know if files were specified by the user. -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# The default lists apply if the user does not specify any file. - ac_need_defaults=: - while test $# != 0 - do - case $1 in - --*=*) -- ac_option=`expr "x$1" : 'x\([^=]*\)='` -- ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` -+ ac_option=`expr "X$1" : 'X\([^=]*\)='` -+ ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` - ac_shift=: - ;; -- -*) -+ *) - ac_option=$1 - ac_optarg=$2 - ac_shift=shift - ;; -- *) # This is not an option, so the user has probably given explicit -- # arguments. -- ac_option=$1 -- ac_need_defaults=false;; - esac - - case $ac_option in - # Handling of the options. --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) - ac_cs_recheck=: ;; -- --version | --vers* | -V ) -- echo "$ac_cs_version"; exit 0 ;; -- --he | --h) -- # Conflict between --help and --header -- { { echo "$as_me:$LINENO: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: ambiguous option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; };; -- --help | --hel | -h ) -- echo "$ac_cs_usage"; exit 0 ;; -- --debug | --d* | -d ) -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ $as_echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) - debug=: ;; - --file | --fil | --fi | --f ) - $ac_shift -- CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_FILES " '$ac_optarg'" - ac_need_defaults=false;; - --header | --heade | --head | --hea ) - $ac_shift -- CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" -+ case $ac_optarg in -+ *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; -+ esac -+ as_fn_append CONFIG_HEADERS " '$ac_optarg'" - ac_need_defaults=false;; -+ --he | --h) -+ # Conflict between --help and --header -+ as_fn_error "ambiguous option: \`$1' -+Try \`$0 --help' for more information.";; -+ --help | --hel | -h ) -+ $as_echo "$ac_cs_usage"; exit ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ - | -silent | --silent | --silen | --sile | --sil | --si | --s) - ac_cs_silent=: ;; - - # This is an error. -- -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&5 --echo "$as_me: error: unrecognized option: $1 --Try \`$0 --help' for more information." >&2;} -- { (exit 1); exit 1; }; } ;; -+ -*) as_fn_error "unrecognized option: \`$1' -+Try \`$0 --help' for more information." ;; - -- *) ac_config_targets="$ac_config_targets $1" ;; -+ *) as_fn_append ac_config_targets " $1" -+ ac_need_defaults=false ;; - - esac - shift -@@ -5210,36 +5022,50 @@ - fi - - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - if \$ac_cs_recheck; then -- echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -- exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+ shift -+ \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 -+ CONFIG_SHELL='$SHELL' -+ export CONFIG_SHELL -+ exec "\$@" - fi - - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ $as_echo "$ac_log" -+} >&5 - -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACEOF - -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 - -- -- --cat >>$CONFIG_STATUS <<\_ACEOF -+# Handling of arguments. - for ac_config_target in $ac_config_targets - do -- case "$ac_config_target" in -- # Handling of arguments. -- "Makefile.sim" ) CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;; -- "Make-common.sim" ) CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;; -- ".gdbinit" ) CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;; -- "$ac_config_links_1" ) CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;; -- "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; -- "stamp-h" ) CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;; -- "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; -- *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 --echo "$as_me: error: invalid argument: $ac_config_target" >&2;} -- { (exit 1); exit 1; }; };; -+ case $ac_config_target in -+ "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;; -+ "$ac_config_links_1") CONFIG_LINKS="$CONFIG_LINKS $ac_config_links_1" ;; -+ "Makefile.sim") CONFIG_FILES="$CONFIG_FILES Makefile.sim:Makefile.in" ;; -+ "Make-common.sim") CONFIG_FILES="$CONFIG_FILES Make-common.sim:../common/Make-common.in" ;; -+ ".gdbinit") CONFIG_FILES="$CONFIG_FILES .gdbinit:../common/gdbinit.in" ;; -+ "Makefile") CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;; -+ "stamp-h") CONFIG_COMMANDS="$CONFIG_COMMANDS stamp-h" ;; -+ -+ *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; - esac - done - -+ - # If the user did not use the arguments to specify the items to instantiate, - # then the envvar interface is used. Set only those that are not. - # We use the long form for the default assignment because of an extremely -@@ -5252,862 +5078,565 @@ - fi - - # Have a temporary directory for convenience. Make it in the build tree --# simply because there is no reason to put it here, and in addition, -+# simply because there is no reason against having it here, and in addition, - # creating and moving files from /tmp can sometimes cause problems. --# Create a temporary directory, and hook for its removal unless debugging. -+# Hook for its removal unless debugging. -+# Note that there is a small window in which the directory will not be cleaned: -+# after its creation but before its name has been assigned to `$tmp'. - $debug || - { -- trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 -- trap '{ (exit 1); exit 1; }' 1 2 13 15 -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -+' 0 -+ trap 'as_fn_exit 1' 1 2 13 15 - } -- - # Create a (secure) tmp directory for tmp files. - - { -- tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && -+ tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && - test -n "$tmp" && test -d "$tmp" - } || - { -- tmp=./confstat$$-$RANDOM -- (umask 077 && mkdir $tmp) --} || --{ -- echo "$me: cannot create a temporary directory in ." >&2 -- { (exit 1); exit 1; } --} -- --_ACEOF -- --cat >>$CONFIG_STATUS <<_ACEOF -- --# --# CONFIG_FILES section. --# -- --# No need to generate the scripts if there are no CONFIG_FILES. --# This happens for instance when ./config.status config.h --if test -n "\$CONFIG_FILES"; then -- # Protect against being on the right side of a sed subst in config.status. -- sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; -- s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF --s,@SHELL@,$SHELL,;t t --s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t --s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t --s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t --s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t --s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t --s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t --s,@exec_prefix@,$exec_prefix,;t t --s,@prefix@,$prefix,;t t --s,@program_transform_name@,$program_transform_name,;t t --s,@bindir@,$bindir,;t t --s,@sbindir@,$sbindir,;t t --s,@libexecdir@,$libexecdir,;t t --s,@datadir@,$datadir,;t t --s,@sysconfdir@,$sysconfdir,;t t --s,@sharedstatedir@,$sharedstatedir,;t t --s,@localstatedir@,$localstatedir,;t t --s,@libdir@,$libdir,;t t --s,@includedir@,$includedir,;t t --s,@oldincludedir@,$oldincludedir,;t t --s,@infodir@,$infodir,;t t --s,@mandir@,$mandir,;t t --s,@build_alias@,$build_alias,;t t --s,@host_alias@,$host_alias,;t t --s,@target_alias@,$target_alias,;t t --s,@DEFS@,$DEFS,;t t --s,@ECHO_C@,$ECHO_C,;t t --s,@ECHO_N@,$ECHO_N,;t t --s,@ECHO_T@,$ECHO_T,;t t --s,@LIBS@,$LIBS,;t t --s,@sim_environment@,$sim_environment,;t t --s,@sim_alignment@,$sim_alignment,;t t --s,@sim_assert@,$sim_assert,;t t --s,@sim_bitsize@,$sim_bitsize,;t t --s,@sim_endian@,$sim_endian,;t t --s,@sim_hostendian@,$sim_hostendian,;t t --s,@sim_float@,$sim_float,;t t --s,@sim_scache@,$sim_scache,;t t --s,@sim_default_model@,$sim_default_model,;t t --s,@sim_hw_cflags@,$sim_hw_cflags,;t t --s,@sim_hw_objs@,$sim_hw_objs,;t t --s,@sim_hw@,$sim_hw,;t t --s,@sim_inline@,$sim_inline,;t t --s,@sim_packages@,$sim_packages,;t t --s,@sim_regparm@,$sim_regparm,;t t --s,@sim_reserved_bits@,$sim_reserved_bits,;t t --s,@sim_smp@,$sim_smp,;t t --s,@sim_stdcall@,$sim_stdcall,;t t --s,@sim_xor_endian@,$sim_xor_endian,;t t --s,@WARN_CFLAGS@,$WARN_CFLAGS,;t t --s,@WERROR_CFLAGS@,$WERROR_CFLAGS,;t t --s,@build@,$build,;t t --s,@build_cpu@,$build_cpu,;t t --s,@build_vendor@,$build_vendor,;t t --s,@build_os@,$build_os,;t t --s,@host@,$host,;t t --s,@host_cpu@,$host_cpu,;t t --s,@host_vendor@,$host_vendor,;t t --s,@host_os@,$host_os,;t t --s,@target@,$target,;t t --s,@target_cpu@,$target_cpu,;t t --s,@target_vendor@,$target_vendor,;t t --s,@target_os@,$target_os,;t t --s,@CC@,$CC,;t t --s,@CFLAGS@,$CFLAGS,;t t --s,@LDFLAGS@,$LDFLAGS,;t t --s,@CPPFLAGS@,$CPPFLAGS,;t t --s,@ac_ct_CC@,$ac_ct_CC,;t t --s,@EXEEXT@,$EXEEXT,;t t --s,@OBJEXT@,$OBJEXT,;t t --s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t --s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t --s,@INSTALL_DATA@,$INSTALL_DATA,;t t --s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t --s,@HDEFINES@,$HDEFINES,;t t --s,@AR@,$AR,;t t --s,@RANLIB@,$RANLIB,;t t --s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t --s,@USE_NLS@,$USE_NLS,;t t --s,@LIBINTL@,$LIBINTL,;t t --s,@LIBINTL_DEP@,$LIBINTL_DEP,;t t --s,@INCINTL@,$INCINTL,;t t --s,@XGETTEXT@,$XGETTEXT,;t t --s,@GMSGFMT@,$GMSGFMT,;t t --s,@POSUB@,$POSUB,;t t --s,@CATALOGS@,$CATALOGS,;t t --s,@DATADIRNAME@,$DATADIRNAME,;t t --s,@INSTOBJEXT@,$INSTOBJEXT,;t t --s,@GENCAT@,$GENCAT,;t t --s,@CATOBJEXT@,$CATOBJEXT,;t t --s,@CPP@,$CPP,;t t --s,@EGREP@,$EGREP,;t t --s,@MAINT@,$MAINT,;t t --s,@sim_bswap@,$sim_bswap,;t t --s,@sim_cflags@,$sim_cflags,;t t --s,@sim_debug@,$sim_debug,;t t --s,@sim_stdio@,$sim_stdio,;t t --s,@sim_trace@,$sim_trace,;t t --s,@sim_profile@,$sim_profile,;t t --s,@TERMCAP@,$TERMCAP,;t t --s,@READLINE@,$READLINE,;t t --s,@cgen_breaks@,$cgen_breaks,;t t --s,@LIBOBJS@,$LIBOBJS,;t t --s,@LTLIBOBJS@,$LTLIBOBJS,;t t --CEOF -- --_ACEOF -- -- cat >>$CONFIG_STATUS <<\_ACEOF -- # Split the substitutions into bite-sized pieces for seds with -- # small command number limits, like on Digital OSF/1 and HP-UX. -- ac_max_sed_lines=48 -- ac_sed_frag=1 # Number of current file. -- ac_beg=1 # First line for current file. -- ac_end=$ac_max_sed_lines # Line after last line for current file. -- ac_more_lines=: -- ac_sed_cmds= -- while $ac_more_lines; do -- if test $ac_beg -gt 1; then -- sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- else -- sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag -- fi -- if test ! -s $tmp/subs.frag; then -- ac_more_lines=false -- else -- # The purpose of the label and of the branching condition is to -- # speed up the sed processing (if there are no `@' at all, there -- # is no need to browse any of the substitutions). -- # These are the two extra sed commands mentioned above. -- (echo ':t -- /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" -- else -- ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" -- fi -- ac_sed_frag=`expr $ac_sed_frag + 1` -- ac_beg=$ac_end -- ac_end=`expr $ac_end + $ac_max_sed_lines` -- fi -- done -- if test -z "$ac_sed_cmds"; then -- ac_sed_cmds=cat -- fi --fi # test -n "$CONFIG_FILES" -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 - --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -- esac -- -- # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+# Set up the scripts for CONFIG_FILES section. -+# No need to generate them if there are no CONFIG_FILES. -+# This happens for instance with `./config.status config.h'. -+if test -n "$CONFIG_FILES"; then - -- ac_builddir=. - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` -+ac_cr=`echo X | tr X '\015'` -+# On cygwin, bash can eat \r inside `` if the user requested igncr. -+# But we know of no other shell where ac_cr would be empty at this -+# point, so we can use a bashism as a fallback. -+if test "x$ac_cr" = x; then -+ eval ac_cr=\$\'\\r\' -+fi -+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null` -+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then -+ ac_cs_awk_cr='\r' - else -- ac_dir_suffix= ac_top_builddir= -+ ac_cs_awk_cr=$ac_cr - fi - --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -- --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+echo 'BEGIN {' >"$tmp/subs1.awk" && -+_ACEOF - - -- case $INSTALL in -- [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -- *) ac_INSTALL=$ac_top_builddir$INSTALL ;; -- esac -+{ -+ echo "cat >conf$$subs.awk <<_ACEOF" && -+ echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && -+ echo "_ACEOF" -+} >conf$$subs.sh || -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -+ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ . ./conf$$subs.sh || -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - -- if test x"$ac_file" != x-; then -- { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -- rm -f "$ac_file" -- fi -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- configure_input= -+ ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` -+ if test $ac_delim_n = $ac_delim_num; then -+ break -+ elif $ac_last_try; then -+ as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - else -- configure_input="$ac_file. " -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -- configure_input=$configure_input"Generated from `echo $ac_file_in | -- sed 's,.*/,,'` by configure." -+done -+rm -f conf$$subs.sh - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+cat >>"\$tmp/subs1.awk" <<\\_ACAWK && - _ACEOF --cat >>$CONFIG_STATUS <<_ACEOF -- sed "$ac_vpsub --$extrasub --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF --:t --/@[a-zA-Z_][a-zA-Z_0-9]*@/!b --s,@configure_input@,$configure_input,;t t --s,@srcdir@,$ac_srcdir,;t t --s,@abs_srcdir@,$ac_abs_srcdir,;t t --s,@top_srcdir@,$ac_top_srcdir,;t t --s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t --s,@builddir@,$ac_builddir,;t t --s,@abs_builddir@,$ac_abs_builddir,;t t --s,@top_builddir@,$ac_top_builddir,;t t --s,@abs_top_builddir@,$ac_abs_top_builddir,;t t --s,@INSTALL@,$ac_INSTALL,;t t --" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out -- rm -f $tmp/stdin -- if test x"$ac_file" != x-; then -- mv $tmp/out $ac_file -- else -- cat $tmp/out -- rm -f $tmp/out -- fi -+sed -n ' -+h -+s/^/S["/; s/!.*/"]=/ -+p -+g -+s/^[^!]*!// -+:repl -+t repl -+s/'"$ac_delim"'$// -+t delim -+:nl -+h -+s/\(.\{148\}\).*/\1/ -+t more1 -+s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -+p -+n -+b repl -+:more1 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t nl -+:delim -+h -+s/\(.\{148\}\).*/\1/ -+t more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"/ -+p -+b -+:more2 -+s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -+p -+g -+s/.\{148\}// -+t delim -+' <conf$$subs.awk | sed ' -+/^[^""]/{ -+ N -+ s/\n// -+} -+' >>$CONFIG_STATUS || ac_write_fail=1 -+rm -f conf$$subs.awk -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+_ACAWK -+cat >>"\$tmp/subs1.awk" <<_ACAWK && -+ for (key in S) S_is_set[key] = 1 -+ FS = "" - --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -+} -+{ -+ line = $ 0 -+ nfields = split(line, field, "@") -+ substed = 0 -+ len = length(field[1]) -+ for (i = 2; i < nfields; i++) { -+ key = field[i] -+ keylen = length(key) -+ if (S_is_set[key]) { -+ value = S[key] -+ line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) -+ len += length(value) + length(field[++i]) -+ substed = 1 -+ } else -+ len += 1 + keylen -+ } - --# --# CONFIG_HEADER section. --# -+ print line -+} - --# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where --# NAME is the cpp macro being defined and VALUE is the value it is being given. --# --# ac_d sets the value in "#define NAME VALUE" lines. --ac_dA='s,^\([ ]*\)#\([ ]*define[ ][ ]*\)' --ac_dB='[ ].*$,\1#\2' --ac_dC=' ' --ac_dD=',;t' --# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE". --ac_uA='s,^\([ ]*\)#\([ ]*\)undef\([ ][ ]*\)' --ac_uB='$,\1#\2define\3' --ac_uC=' ' --ac_uD=',;t' -+_ACAWK -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then -+ sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -+else -+ cat -+fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ -+ || as_fn_error "could not setup config files machinery" "$LINENO" 5 -+_ACEOF - --for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue -- # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". -- case $ac_file in -- - | *:- | *:-:* ) # input from stdin -- cat >$tmp/stdin -- ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; -- * ) ac_file_in=$ac_file.in ;; -- esac -+# VPATH may cause trouble with some makes, so we remove $(srcdir), -+# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -+# trailing colons and then remove the whole line if VPATH becomes empty -+# (actually we leave an empty line to preserve line numbers). -+if test "x$srcdir" = x.; then -+ ac_vpsub='/^[ ]*VPATH[ ]*=/{ -+s/:*\$(srcdir):*/:/ -+s/:*\${srcdir}:*/:/ -+s/:*@srcdir@:*/:/ -+s/^\([^=]*=[ ]*\):*/\1/ -+s/:*$// -+s/^[^=]*=[ ]*$// -+}' -+fi - -- test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5 --echo "$as_me: creating $ac_file" >&6;} -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+fi # test -n "$CONFIG_FILES" - -- # First look for the input files in the build tree, otherwise in the -- # src tree. -- ac_file_inputs=`IFS=: -- for f in $ac_file_in; do -- case $f in -- -) echo $tmp/stdin ;; -- [\\/$]*) -- # Absolute (can't be DOS-style, as IFS=:) -- test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- # Do quote $f, to prevent DOS paths from being IFS'd. -- echo "$f";; -- *) # Relative -- if test -f "$f"; then -- # Build tree -- echo "$f" -- elif test -f "$srcdir/$f"; then -- # Source tree -- echo "$srcdir/$f" -- else -- # /dev/null tree -- { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 --echo "$as_me: error: cannot find input file: $f" >&2;} -- { (exit 1); exit 1; }; } -- fi;; -- esac -- done` || { (exit 1); exit 1; } -- # Remove the trailing spaces. -- sed 's/[ ]*$//' $ac_file_inputs >$tmp/in -+# Set up the scripts for CONFIG_HEADERS section. -+# No need to generate them if there are no CONFIG_HEADERS. -+# This happens for instance with `./config.status Makefile'. -+if test -n "$CONFIG_HEADERS"; then -+cat >"$tmp/defines.awk" <<\_ACAWK || -+BEGIN { -+_ACEOF -+ -+# Transform confdefs.h into an awk script `defines.awk', embedded as -+# here-document in config.status, that substitutes the proper values into -+# config.h.in to produce config.h. -+ -+# Create a delimiter string that does not exist in confdefs.h, to ease -+# handling of long lines. -+ac_delim='%!_!# ' -+for ac_last_try in false false :; do -+ ac_t=`sed -n "/$ac_delim/p" confdefs.h` -+ if test -z "$ac_t"; then -+ break -+ elif $ac_last_try; then -+ as_fn_error "could not make $CONFIG_HEADERS" "$LINENO" 5 -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done - -+# For the awk script, D is an array of macro values keyed by name, -+# likewise P contains macro parameters if any. Preserve backslash -+# newline sequences. -+ -+ac_word_re=[_$as_cr_Letters][_$as_cr_alnum]* -+sed -n ' -+s/.\{148\}/&'"$ac_delim"'/g -+t rset -+:rset -+s/^[ ]*#[ ]*define[ ][ ]*/ / -+t def -+d -+:def -+s/\\$// -+t bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3"/p -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2"/p -+d -+:bsnl -+s/["\\]/\\&/g -+s/^ \('"$ac_word_re"'\)\(([^()]*)\)[ ]*\(.*\)/P["\1"]="\2"\ -+D["\1"]=" \3\\\\\\n"\\/p -+t cont -+s/^ \('"$ac_word_re"'\)[ ]*\(.*\)/D["\1"]=" \2\\\\\\n"\\/p -+t cont -+d -+:cont -+n -+s/.\{148\}/&'"$ac_delim"'/g -+t clear -+:clear -+s/\\$// -+t bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/"/p -+d -+:bsnlc -+s/["\\]/\\&/g; s/^/"/; s/$/\\\\\\n"\\/p -+b cont -+' <confdefs.h | sed ' -+s/'"$ac_delim"'/"\\\ -+"/g' >>$CONFIG_STATUS || ac_write_fail=1 -+ -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ for (key in D) D_is_set[key] = 1 -+ FS = "" -+} -+/^[\t ]*#[\t ]*(define|undef)[\t ]+$ac_word_re([\t (]|\$)/ { -+ line = \$ 0 -+ split(line, arg, " ") -+ if (arg[1] == "#") { -+ defundef = arg[2] -+ mac1 = arg[3] -+ } else { -+ defundef = substr(arg[1], 2) -+ mac1 = arg[2] -+ } -+ split(mac1, mac2, "(") #) -+ macro = mac2[1] -+ prefix = substr(line, 1, index(line, defundef) - 1) -+ if (D_is_set[macro]) { -+ # Preserve the white space surrounding the "#". -+ print prefix "define", macro P[macro] D[macro] -+ next -+ } else { -+ # Replace #undef with comments. This is necessary, for example, -+ # in the case of _POSIX_SOURCE, which is predefined and required -+ # on some systems where configure will not decide to define it. -+ if (defundef == "undef") { -+ print "/*", prefix defundef, macro, "*/" -+ next -+ } -+ } -+} -+{ print } -+_ACAWK - _ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+ as_fn_error "could not setup config headers machinery" "$LINENO" 5 -+fi # test -n "$CONFIG_HEADERS" - --# Transform confdefs.h into two sed scripts, `conftest.defines' and --# `conftest.undefs', that substitutes the proper values into --# config.h.in to produce config.h. The first handles `#define' --# templates, and the second `#undef' templates. --# And first: Protect against being on the right side of a sed subst in --# config.status. Protect against being in an unquoted here document --# in config.status. --rm -f conftest.defines conftest.undefs --# Using a here document instead of a string reduces the quoting nightmare. --# Putting comments in sed scripts is not portable. --# --# `end' is used to avoid that the second main sed command (meant for --# 0-ary CPP macros) applies to n-ary macro definitions. --# See the Autoconf documentation for `clear'. --cat >confdef2sed.sed <<\_ACEOF --s/[\\&,]/\\&/g --s,[\\$`],\\&,g --t clear --: clear --s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*\)\(([^)]*)\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp --t end --s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp --: end --_ACEOF --# If some macros were called several times there might be several times --# the same #defines, which is useless. Nevertheless, we may not want to --# sort them, since we want the *last* AC-DEFINE to be honored. --uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines --sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs --rm -f confdef2sed.sed -- --# This sed command replaces #undef with comments. This is necessary, for --# example, in the case of _POSIX_SOURCE, which is predefined and required --# on some systems where configure will not decide to define it. --cat >>conftest.undefs <<\_ACEOF --s,^[ ]*#[ ]*undef[ ][ ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */, --_ACEOF -- --# Break up conftest.defines because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS --echo ' if grep "^[ ]*#[ ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS --echo ' # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS --echo ' :' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.defines >/dev/null --do -- # Write a limited-size here document to $tmp/defines.sed. -- echo ' cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS -- # Speed up: don't consider the non `#define' lines. -- echo '/^[ ]*#[ ]*define/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/defines.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail -- rm -f conftest.defines -- mv conftest.tail conftest.defines --done --rm -f conftest.defines --echo ' fi # grep' >>$CONFIG_STATUS --echo >>$CONFIG_STATUS -- --# Break up conftest.undefs because some shells have a limit on the size --# of here documents, and old seds have small limits too (100 cmds). --echo ' # Handle all the #undef templates' >>$CONFIG_STATUS --rm -f conftest.tail --while grep . conftest.undefs >/dev/null -+ -+eval set X " :F $CONFIG_FILES :H $CONFIG_HEADERS :L $CONFIG_LINKS :C $CONFIG_COMMANDS" -+shift -+for ac_tag - do -- # Write a limited-size here document to $tmp/undefs.sed. -- echo ' cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS -- # Speed up: don't consider the non `#undef' -- echo '/^[ ]*#[ ]*undef/!b' >>$CONFIG_STATUS -- # Work around the forget-to-reset-the-flag bug. -- echo 't clr' >>$CONFIG_STATUS -- echo ': clr' >>$CONFIG_STATUS -- sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS -- echo 'CEOF -- sed -f $tmp/undefs.sed $tmp/in >$tmp/out -- rm -f $tmp/in -- mv $tmp/out $tmp/in --' >>$CONFIG_STATUS -- sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail -- rm -f conftest.undefs -- mv conftest.tail conftest.undefs --done --rm -f conftest.undefs -- --cat >>$CONFIG_STATUS <<\_ACEOF -- # Let's still pretend it is `configure' which instantiates (i.e., don't -- # use $as_me), people would be surprised to read: -- # /* config.h. Generated by config.status. */ -- if test x"$ac_file" = x-; then -- echo "/* Generated by configure. */" >$tmp/config.h -- else -- echo "/* $ac_file. Generated by configure. */" >$tmp/config.h -- fi -- cat $tmp/in >>$tmp/config.h -- rm -f $tmp/in -- if test x"$ac_file" != x-; then -- if diff $ac_file $tmp/config.h >/dev/null 2>&1; then -- { echo "$as_me:$LINENO: $ac_file is unchanged" >&5 --echo "$as_me: $ac_file is unchanged" >&6;} -- else -- ac_dir=`(dirname "$ac_file") 2>/dev/null || --$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_file" : 'X\(//\)[^/]' \| \ -- X"$ac_file" : 'X\(//\)$' \| \ -- X"$ac_file" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_file" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -- else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; -+ :[FH]-) ac_tag=-:-;; -+ :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; -+ esac -+ ac_save_IFS=$IFS -+ IFS=: -+ set x $ac_tag -+ IFS=$ac_save_IFS -+ shift -+ ac_file=$1 -+ shift -+ -+ case $ac_mode in -+ :L) ac_source=$1;; -+ :[FH]) -+ ac_file_inputs= -+ for ac_f -+ do -+ case $ac_f in -+ -) ac_f="$tmp/stdin";; -+ *) # Look for the file first in the build tree, then in the source tree -+ # (if the path is not absolute). The absolute path cannot be DOS-style, -+ # because $ac_f cannot contain `:'. -+ test -f "$ac_f" || -+ case $ac_f in -+ [\\/$]*) false;; -+ *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; -+ esac || -+ as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; -+ esac -+ case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac -+ as_fn_append ac_file_inputs " '$ac_f'" - done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } - -- rm -f $ac_file -- mv $tmp/config.h $ac_file -+ # Let's still pretend it is `configure' which instantiates (i.e., don't -+ # use $as_me), people would be surprised to read: -+ # /* config.h. Generated by config.status. */ -+ configure_input='Generated from '` -+ $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' -+ `' by configure.' -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -+$as_echo "$as_me: creating $ac_file" >&6;} - fi -- else -- cat $tmp/config.h -- rm -f $tmp/config.h -- fi --done --_ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF -- --# --# CONFIG_LINKS section. --# -+ # Neutralize special characters interpreted by sed in replacement strings. -+ case $configure_input in #( -+ *\&* | *\|* | *\\* ) -+ ac_sed_conf_input=`$as_echo "$configure_input" | -+ sed 's/[\\\\&|]/\\\\&/g'`;; #( -+ *) ac_sed_conf_input=$configure_input;; -+ esac - --for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- -- { echo "$as_me:$LINENO: linking $srcdir/$ac_source to $ac_dest" >&5 --echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;} -- -- if test ! -r $srcdir/$ac_source; then -- { { echo "$as_me:$LINENO: error: $srcdir/$ac_source: file not found" >&5 --echo "$as_me: error: $srcdir/$ac_source: file not found" >&2;} -- { (exit 1); exit 1; }; } -- fi -- rm -f $ac_dest -- -- # Make relative symlinks. -- ac_dest_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dest_dir" -- else -- as_dir="$ac_dest_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dest_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dest_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin" \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; -+ esac -+ ;; -+ esac - -+ ac_dir=`$as_dirname -- "$ac_file" || -+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -+ X"$ac_file" : 'X\(//\)[^/]' \| \ -+ X"$ac_file" : 'X\(//\)$' \| \ -+ X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -+$as_echo X"$ac_file" | -+ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)[^/].*/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\/\)$/{ -+ s//\1/ -+ q -+ } -+ /^X\(\/\).*/{ -+ s//\1/ -+ q -+ } -+ s/.*/./; q'` -+ as_dir="$ac_dir"; as_fn_mkdir_p - ac_builddir=. - --if test "$ac_dest_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dest_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` -+ case $ac_top_builddir_sub in -+ "") ac_top_builddir_sub=. ac_top_build_prefix= ;; -+ *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; -+ esac ;; -+esac -+ac_abs_top_builddir=$ac_pwd -+ac_abs_builddir=$ac_pwd$ac_dir_suffix -+# for backward compatibility: -+ac_top_builddir=$ac_top_build_prefix - - case $srcdir in -- .) # No --srcdir option. We are building in place. -+ .) # We are building in place. - ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -+ ac_top_srcdir=$ac_top_builddir_sub -+ ac_abs_top_srcdir=$ac_pwd ;; -+ [\\/]* | ?:[\\/]* ) # Absolute name. - ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; -+ ac_top_srcdir=$srcdir -+ ac_abs_top_srcdir=$srcdir ;; -+ *) # Relative name. -+ ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix -+ ac_top_srcdir=$ac_top_build_prefix$srcdir -+ ac_abs_top_srcdir=$ac_pwd/$srcdir ;; - esac -+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dest_dir";; --*) -- case "$ac_dest_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dest_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dest_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac - -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # - -- case $srcdir in -- [\\/$]* | ?:[\\/]* ) ac_rel_source=$srcdir/$ac_source ;; -- *) ac_rel_source=$ac_top_builddir$srcdir/$ac_source ;; -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; - esac -+_ACEOF - -- # Try a symlink, then a hard link, then a copy. -- ln -s $ac_rel_source $ac_dest 2>/dev/null || -- ln $srcdir/$ac_source $ac_dest 2>/dev/null || -- cp -p $srcdir/$ac_source $ac_dest || -- { { echo "$as_me:$LINENO: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&5 --echo "$as_me: error: cannot link or copy $srcdir/$ac_source to $ac_dest" >&2;} -- { (exit 1); exit 1; }; } --done -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+# If the template does not know about datarootdir, expand it. -+# FIXME: This hack should be removed a few years after 2.60. -+ac_datarootdir_hack=; ac_datarootdir_seen= -+ac_sed_dataroot=' -+/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p' -+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ ac_datarootdir_hack=' -+ s&@datadir@&$datadir&g -+ s&@docdir@&$docdir&g -+ s&@infodir@&$infodir&g -+ s&@localedir@&$localedir&g -+ s&@mandir@&$mandir&g -+ s&\\\${datarootdir}&$datarootdir&g' ;; -+esac - _ACEOF --cat >>$CONFIG_STATUS <<\_ACEOF - --# --# CONFIG_COMMANDS section. --# --for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue -- ac_dest=`echo "$ac_file" | sed 's,:.*,,'` -- ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'` -- ac_dir=`(dirname "$ac_dest") 2>/dev/null || --$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$ac_dest" : 'X\(//\)[^/]' \| \ -- X"$ac_dest" : 'X\(//\)$' \| \ -- X"$ac_dest" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$ac_dest" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- { if $as_mkdir_p; then -- mkdir -p "$ac_dir" -+# Neutralize VPATH when `$srcdir' = `.'. -+# Shell code in configure.ac might set extrasub. -+# FIXME: do we really want to maintain this feature? -+cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -+ac_sed_extra="$ac_vpsub -+$extrasub -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -+:t -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b -+s|@configure_input@|$ac_sed_conf_input|;t t -+s&@top_builddir@&$ac_top_builddir_sub&;t t -+s&@top_build_prefix@&$ac_top_build_prefix&;t t -+s&@srcdir@&$ac_srcdir&;t t -+s&@abs_srcdir@&$ac_abs_srcdir&;t t -+s&@top_srcdir@&$ac_top_srcdir&;t t -+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -+s&@builddir@&$ac_builddir&;t t -+s&@abs_builddir@&$ac_abs_builddir&;t t -+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -+s&@INSTALL@&$ac_INSTALL&;t t -+$ac_datarootdir_hack -+" -+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ -+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && -+ { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && -+ { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&2;} -+ -+ rm -f "$tmp/stdin" -+ case $ac_file in -+ -) cat "$tmp/out" && rm -f "$tmp/out";; -+ *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; -+ esac \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ ;; -+ :H) -+ # -+ # CONFIG_HEADER -+ # -+ if test x"$ac_file" != x-; then -+ { -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" -+ } >"$tmp/config.h" \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5 -+$as_echo "$as_me: $ac_file is unchanged" >&6;} -+ else -+ rm -f "$ac_file" -+ mv "$tmp/config.h" "$ac_file" \ -+ || as_fn_error "could not create $ac_file" "$LINENO" 5 -+ fi - else -- as_dir="$ac_dir" -- as_dirs= -- while test ! -d "$as_dir"; do -- as_dirs="$as_dir $as_dirs" -- as_dir=`(dirname "$as_dir") 2>/dev/null || --$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ -- X"$as_dir" : 'X\(//\)[^/]' \| \ -- X"$as_dir" : 'X\(//\)$' \| \ -- X"$as_dir" : 'X\(/\)' \| \ -- . : '\(.\)' 2>/dev/null || --echo X"$as_dir" | -- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } -- /^X\(\/\/\)[^/].*/{ s//\1/; q; } -- /^X\(\/\/\)$/{ s//\1/; q; } -- /^X\(\/\).*/{ s//\1/; q; } -- s/.*/./; q'` -- done -- test ! -n "$as_dirs" || mkdir $as_dirs -- fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 --echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} -- { (exit 1); exit 1; }; }; } -+ $as_echo "/* $configure_input */" \ -+ && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \ -+ || as_fn_error "could not create -" "$LINENO" 5 -+ fi -+ ;; -+ :L) -+ # -+ # CONFIG_LINK -+ # - -- ac_builddir=. -+ if test "$ac_source" = "$ac_file" && test "$srcdir" = '.'; then -+ : -+ else -+ # Prefer the file from the source tree if names are identical. -+ if test "$ac_source" = "$ac_file" || test ! -r "$ac_source"; then -+ ac_source=$srcdir/$ac_source -+ fi - --if test "$ac_dir" != .; then -- ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -- # A "../" for each directory in $ac_dir_suffix. -- ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` --else -- ac_dir_suffix= ac_top_builddir= --fi -+ { $as_echo "$as_me:${as_lineno-$LINENO}: linking $ac_source to $ac_file" >&5 -+$as_echo "$as_me: linking $ac_source to $ac_file" >&6;} - --case $srcdir in -- .) # No --srcdir option. We are building in place. -- ac_srcdir=. -- if test -z "$ac_top_builddir"; then -- ac_top_srcdir=. -- else -- ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` -- fi ;; -- [\\/]* | ?:[\\/]* ) # Absolute path. -- ac_srcdir=$srcdir$ac_dir_suffix; -- ac_top_srcdir=$srcdir ;; -- *) # Relative path. -- ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix -- ac_top_srcdir=$ac_top_builddir$srcdir ;; --esac -+ if test ! -r "$ac_source"; then -+ as_fn_error "$ac_source: file not found" "$LINENO" 5 -+ fi -+ rm -f "$ac_file" - --# Do not use `cd foo && pwd` to compute absolute paths, because --# the directories may not exist. --case `pwd` in --.) ac_abs_builddir="$ac_dir";; --*) -- case "$ac_dir" in -- .) ac_abs_builddir=`pwd`;; -- [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; -- *) ac_abs_builddir=`pwd`/"$ac_dir";; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_builddir=${ac_top_builddir}.;; --*) -- case ${ac_top_builddir}. in -- .) ac_abs_top_builddir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; -- *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_srcdir=$ac_srcdir;; --*) -- case $ac_srcdir in -- .) ac_abs_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; -- *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; -- esac;; --esac --case $ac_abs_builddir in --.) ac_abs_top_srcdir=$ac_top_srcdir;; --*) -- case $ac_top_srcdir in -- .) ac_abs_top_srcdir=$ac_abs_builddir;; -- [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; -- *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; -- esac;; --esac -+ # Try a relative symlink, then a hard link, then a copy. -+ case $srcdir in -+ [\\/$]* | ?:[\\/]* ) ac_rel_source=$ac_source ;; -+ *) ac_rel_source=$ac_top_build_prefix$ac_source ;; -+ esac -+ ln -s "$ac_rel_source" "$ac_file" 2>/dev/null || -+ ln "$ac_source" "$ac_file" 2>/dev/null || -+ cp -p "$ac_source" "$ac_file" || -+ as_fn_error "cannot link or copy $ac_source to $ac_file" "$LINENO" 5 -+ fi -+ ;; -+ :C) { $as_echo "$as_me:${as_lineno-$LINENO}: executing $ac_file commands" >&5 -+$as_echo "$as_me: executing $ac_file commands" >&6;} -+ ;; -+ esac - - -- { echo "$as_me:$LINENO: executing $ac_dest commands" >&5 --echo "$as_me: executing $ac_dest commands" >&6;} -- case $ac_dest in -- Makefile ) echo "Merging Makefile.sim+Make-common.sim into Makefile ..." -+ case $ac_file$ac_mode in -+ "Makefile":C) echo "Merging Makefile.sim+Make-common.sim into Makefile ..." - rm -f Makesim1.tmp Makesim2.tmp Makefile - sed -n -e '/^## COMMON_PRE_/,/^## End COMMON_PRE_/ p' <Make-common.sim >Makesim1.tmp - sed -n -e '/^## COMMON_POST_/,/^## End COMMON_POST_/ p' <Make-common.sim >Makesim2.tmp -@@ -6116,18 +5645,19 @@ - <Makefile.sim >Makefile - rm -f Makefile.sim Make-common.sim Makesim1.tmp Makesim2.tmp - ;; -- stamp-h ) echo > stamp-h ;; -+ "stamp-h":C) echo > stamp-h ;; -+ - esac --done --_ACEOF -+done # for ac_tag - --cat >>$CONFIG_STATUS <<\_ACEOF - --{ (exit 0); exit 0; } -+as_fn_exit 0 - _ACEOF --chmod +x $CONFIG_STATUS - ac_clean_files=$ac_clean_files_save - -+test $ac_write_fail = 0 || -+ as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 -+ - - # configure is writing to config.log, and then calls config.status. - # config.status does its own redirection, appending to config.log. -@@ -6147,7 +5677,11 @@ - exec 5>>config.log - # Use ||, not &&, to avoid exiting from the if with $? = 1, which - # would make configure fail if this is the last instruction. -- $ac_cs_success || { (exit 1); exit 1; } -+ $ac_cs_success || as_fn_exit $? -+fi -+if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then -+ { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -+$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} - fi - - -diff -Naur gdb-6.8.orig/sim/erc32/configure.ac gdb-6.8/sim/erc32/configure.ac ---- gdb-6.8.orig/sim/erc32/configure.ac 2006-12-20 23:35:51.000000000 +0100 -+++ gdb-6.8/sim/erc32/configure.ac 2009-11-11 14:46:43.000000000 +0100 -@@ -11,27 +11,32 @@ - - AC_CHECK_HEADERS(stdlib.h) - --# In the Cygwin environment, we need some additional flags. --AC_CACHE_CHECK([for cygwin], sim_cv_os_cygwin, --[AC_EGREP_CPP(lose, [ --#ifdef __CYGWIN__ --lose --#endif],[sim_cv_os_cygwin=yes],[sim_cv_os_cygwin=no])]) -+AC_ARG_WITH([system-readline], -+ [AS_HELP_STRING([--with-system-readline], -+ [use installed readline library])]) - --if test x$sim_cv_os_cygwin = xyes; then -- TERMCAP='`if test -r ../../libtermcap/libtermcap.a; then echo ../../libtermcap/libtermcap.a; else echo -ltermcap; fi` -luser32' -+if test "$with_system_readline" = yes; then -+ AC_MSG_CHECKING([for readline]) -+ save_LIBS="$LIBS" -+ LIBS="-lreadline $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE=-lreadline], -+ [ LIBS="-lreadline -lncurses $save_LIBS" -+ AC_LINK_IFELSE([AC_LANG_CALL([], -+ [add_history])], [READLINE="-lreadline -lncurses"], -+ [AC_MSG_ERROR([unable to detect readline])]) -+ ]) -+ LIBS="$save_LIBS" -+ AC_MSG_RESULT($READLINE) -+ READLINE_DEPS= -+ READLINE_CFLAGS= - else -- AC_CHECK_LIB(termcap, main, TERMCAP=-ltermcap, TERMCAP="") --fi --AC_SUBST(TERMCAP) -- --# We prefer the in-tree readline. Top-level dependencies make sure --# src/readline (if it's there) is configured before src/sim. --if test -r ../../readline/Makefile; then -- READLINE=../../readline/libreadline.a --else -- AC_CHECK_LIB(readline, readline, READLINE=-lreadline, -- AC_ERROR([the required "readline" library is missing]), $TERMCAP) -+ READLINE='../../readline/libreadline.a -lncurses' -+ READLINE_DEPS='$(READLINE)' -+ READLINE_CFLAGS='-I$(READLINE_SRC)/..' - fi - AC_SUBST(READLINE) -+AC_SUBST(READLINE_DEPS) -+AC_SUBST(READLINE_CFLAGS) -+ - SIM_AC_OUTPUT -diff -Naur gdb-6.8.orig/sim/erc32/erc32.c gdb-6.8/sim/erc32/erc32.c ---- gdb-6.8.orig/sim/erc32/erc32.c 1999-04-16 03:35:00.000000000 +0200 -+++ gdb-6.8/sim/erc32/erc32.c 2009-11-11 14:46:43.000000000 +0100 -@@ -24,6 +24,7 @@ - - #include <sys/types.h> - #include <stdio.h> -+#include <string.h> - #include <termios.h> - #include <sys/fcntl.h> - #include <sys/file.h> -@@ -413,7 +414,7 @@ - if (rom8) mec_memcfg &= ~0x20000; - else mec_memcfg |= 0x20000; - -- mem_ramsz = (256 * 1024) << ((mec_memcfg >> 10) & 7); -+ mem_ramsz = (512 * 1024) << ((mec_memcfg >> 10) & 7); - mem_romsz = (128 * 1024) << ((mec_memcfg >> 18) & 7); - - if (sparclite_board) { -@@ -1659,7 +1660,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - fetch_bytes (asi, &ramb[addr & mem_rammask], data, sz); -@@ -1736,7 +1737,7 @@ - errmec = 0; - return(1); - } --#endif; -+#endif - - if ((addr >= mem_ramstart) && (addr < (mem_ramstart + mem_ramsz))) { - if (mem_accprot) { -diff -Naur gdb-6.8.orig/sim/erc32/exec.c gdb-6.8/sim/erc32/exec.c ---- gdb-6.8.orig/sim/erc32/exec.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8/sim/erc32/exec.c 2009-11-11 14:46:43.000000000 +0100 -@@ -1713,7 +1713,7 @@ - sregs->fdp[rs2 | 1] = sregs->fs[rs2 & ~1]; - sregs->fdp[rs2 & ~1] = sregs->fs[rs2 | 1]; - default: -- ; -+ break; - } - #endif - -@@ -1886,7 +1886,7 @@ - sregs->fs[rd & ~1] = sregs->fdp[rd | 1]; - sregs->fs[rd | 1] = sregs->fdp[rd & ~1]; - default: -- ; -+ break; - } - #endif - if (sregs->fpstate == FP_EXC_PE) { -diff -Naur gdb-6.8.orig/sim/erc32/Makefile.in gdb-6.8/sim/erc32/Makefile.in ---- gdb-6.8.orig/sim/erc32/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8/sim/erc32/Makefile.in 2009-11-11 14:46:43.000000000 +0100 -@@ -18,12 +18,12 @@ - - ## COMMON_PRE_CONFIG_FRAG - --TERMCAP_LIB = @TERMCAP@ -+# TERMCAP_LIB = -lncurses - READLINE_LIB = @READLINE@ - - SIM_OBJS = exec.o erc32.o func.o help.o float.o interf.o - SIM_EXTRA_LIBS = $(READLINE_LIB) $(TERMCAP_LIB) -lm --SIM_EXTRA_ALL = sis -+SIM_EXTRA_ALL = sis$(EXEEXT) - SIM_EXTRA_INSTALL = install-sis - SIM_EXTRA_CLEAN = clean-sis - -@@ -37,8 +37,8 @@ - # `sis' doesn't need interf.o. - SIS_OFILES = exec.o erc32.o func.o help.o float.o - --sis: sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -- $(CC) $(ALL_CFLAGS) -o sis \ -+sis$(EXEEXT): sis.o $(SIS_OFILES) $(COMMON_OBJS) $(LIBDEPS) -+ $(CC) $(ALL_CFLAGS) -o sis$(EXEEXT) \ - sis.o $(SIS_OFILES) $(COMMON_OBJS) $(EXTRA_LIBS) - - # FIXME: This computes the build host's endianness, doesn't it? -@@ -51,11 +51,11 @@ - - # Copy the files into directories where they will be run. - install-sis: installdirs -- n=`echo sis | sed '$(program_transform_name)'`; \ -- $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n$(EXEEXT) -+ n=`echo sis$(EXEEXT) | sed '$(program_transform_name)'`; \ -+ $(INSTALL_PROGRAM) sis$(EXEEXT) $(DESTDIR)$(bindir)/$$n - - clean-sis: -- rm -f sis end end.h -+ rm -f sis$(EXEEXT) end end.h - - configure: - @echo "Rebuilding configure..." -diff -Naur gdb-6.8.orig/sim/erc32/sis.c gdb-6.8/sim/erc32/sis.c ---- gdb-6.8.orig/sim/erc32/sis.c 2005-03-07 12:09:05.000000000 +0100 -+++ gdb-6.8/sim/erc32/sis.c 2009-11-11 14:46:43.000000000 +0100 -@@ -177,7 +177,7 @@ - cfile = 0; - for (i = 0; i < 64; i++) - cmdq[i] = 0; -- printf("\n SIS - SPARC intruction simulator %s, copyright Jiri Gaisler 1995\n", sis_version); -+ printf("\n SIS - SPARC instruction simulator %s, copyright Jiri Gaisler 1995\n", sis_version); - printf(" Bug-reports to jgais@wd.estec.esa.nl\n\n"); - while (stat < argc) { - if (argv[stat][0] == '-') { -diff -Naur gdb-6.8.orig/sim/h8300/compile.c gdb-6.8/sim/h8300/compile.c ---- gdb-6.8.orig/sim/h8300/compile.c 2007-07-03 19:19:38.000000000 +0200 -+++ gdb-6.8/sim/h8300/compile.c 2009-11-11 14:46:43.000000000 +0100 -@@ -38,6 +38,12 @@ - # define SIGTRAP 5 - #endif - -+#ifdef _WIN32 -+#ifndef SIGBUS -+#define SIGBUS 10 -+#endif -+#endif -+ - int debug; - - host_callback *sim_callback; -@@ -599,7 +605,7 @@ - /* Find the exact opcode/arg combo. */ - for (q = h8_opcodes; q->name; q++) - { -- op_type *nib = q->data.nib; -+ const op_type *nib = q->data.nib; - unsigned int len = 0; - - if ((q->available == AV_H8SX && !h8300sxmode) || -@@ -924,7 +930,7 @@ - #endif - /* Fill in the args. */ - { -- op_type *args = q->args.nib; -+ const op_type *args = q->args.nib; - int hadone = 0; - int nargs; - -diff -Naur gdb-6.8.orig/sim/m32c/gdb-if.c gdb-6.8/sim/m32c/gdb-if.c ---- gdb-6.8.orig/sim/m32c/gdb-if.c 2008-01-01 23:53:25.000000000 +0100 -+++ gdb-6.8/sim/m32c/gdb-if.c 2009-11-11 14:46:43.000000000 +0100 -@@ -534,8 +534,12 @@ - #endif - - case 5: -+#ifdef SIGTRAP - return SIGTRAP; -- -+#else -+ return SIGSEGV; -+#endif -+ - case 10: - #ifdef SIGBUS - return SIGBUS; -diff -Naur gdb-6.8.orig/sim/m32c/Makefile.in gdb-6.8/sim/m32c/Makefile.in ---- gdb-6.8.orig/sim/m32c/Makefile.in 2008-01-01 23:53:24.000000000 +0100 -+++ gdb-6.8/sim/m32c/Makefile.in 2009-11-11 14:46:43.000000000 +0100 -@@ -55,7 +55,7 @@ - ./opc2c -l m32c.out $(srcdir)/m32c.opc > m32c.c - - opc2c : opc2c.o safe-fgets.o -- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) $(LDFLAGS_FOR_BUILD) $^ -o $@ - - sample.x : $(srcdir)/sample.S $(srcdir)/sample.ld - ../../gcc/xgcc $(CPUFLAGS) -B../../gcc/ -c $(srcdir)/sample.S -o sample.o -@@ -83,8 +83,10 @@ - mem.o : mem.h cpu.h syscalls.h - misc.o : cpu.h misc.h - opc2c.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/opc2c.c - reg.o : cpu.h - safe-fgets.o : safe-fgets.h -+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o $@ -c $(srcdir)/safe-fgets.c - srcdest.c : cpu.h mem.h - syscalls.c : cpu.h mem.h syscalls.h - -diff -Naur gdb-6.8.orig/sim/ppc/configure gdb-6.8/sim/ppc/configure ---- gdb-6.8.orig/sim/ppc/configure 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure 2009-11-11 14:46:43.000000000 +0100 -@@ -2709,10 +2709,263 @@ - - fi; - -+echo "$as_me:$LINENO: checking if union semun defined" >&5 -+echo $ECHO_N "checking if union semun defined... $ECHO_C" >&6 -+if test "${ac_cv_HAS_UNION_SEMUN+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h> -+int -+main () -+{ -+union semun arg ; -+ ; -+ return 0; -+} -+_ACEOF -+rm -f conftest.$ac_objext -+if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>conftest.er1 -+ ac_status=$? -+ grep -v '^ *+' conftest.er1 >conftest.err -+ rm -f conftest.er1 -+ cat conftest.err >&5 -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && -+ { ac_try='test -z "$ac_c_werror_flag" -+ || test ! -s conftest.err' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; } && -+ { ac_try='test -s conftest.$ac_objext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_has_union_semun="yes" -+else -+ echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+ac_cv_has_union_semun="no" -+fi -+rm -f conftest.err conftest.$ac_objext conftest.$ac_ext -+echo "$as_me:$LINENO: result: $ac_cv_has_union_semun" >&5 -+echo "${ECHO_T}$ac_cv_has_union_semun" >&6 -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_HAS_UNION_SEMUN" >&5 -+echo "${ECHO_T}$ac_cv_HAS_UNION_SEMUN" >&6 -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+else # semun is not defined -+ echo "$as_me:$LINENO: checking whether System V semaphores are supported" >&5 -+echo $ECHO_N "checking whether System V semaphores are supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_sem+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+ if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_sem="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_sem="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_sem" >&5 -+echo "${ECHO_T}$ac_cv_sysv_sem" >&6 -+fi -+ -+echo "$as_me:$LINENO: checking whether System V shared memory is supported" >&5 -+echo $ECHO_N "checking whether System V shared memory is supported... $ECHO_C" >&6 -+if test "${ac_cv_sysv_shm+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ : -+else -+ cat >conftest.$ac_ext <<_ACEOF -+/* confdefs.h. */ -+_ACEOF -+cat confdefs.h >>conftest.$ac_ext -+cat >>conftest.$ac_ext <<_ACEOF -+/* end confdefs.h. */ -+ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+ -+_ACEOF -+rm -f conftest$ac_exeext -+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 -+ (eval $ac_link) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext' -+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -+ (eval $ac_try) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; }; then -+ ac_cv_sysv_shm="yes" -+else -+ echo "$as_me: program exited with status $ac_status" >&5 -+echo "$as_me: failed program was:" >&5 -+sed 's/^/| /' conftest.$ac_ext >&5 -+ -+( exit $ac_status ) -+ac_cv_sysv_shm="no" -+fi -+rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -+fi -+ -+fi -+echo "$as_me:$LINENO: result: $ac_cv_sysv_shm" >&5 -+echo "${ECHO_T}$ac_cv_sysv_shm" >&6 -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ -+ - # Check whether --enable-sim-hardware or --disable-sim-hardware was given. - if test "${enable_sim_hardware+set}" = set; then - enableval="$enable_sim_hardware" -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) { { echo "$as_me:$LINENO: error: \"List of hardware must be specified for --enable-sim-hardware\"" >&5 -@@ -2728,14 +2981,13 @@ - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - else -- hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+ hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi - fi; -- - # Check whether --enable-sim-hostbitsize or --disable-sim-hostbitsize was given. - if test "${enable_sim_hostbitsize+set}" = set; then - enableval="$enable_sim_hostbitsize" -@@ -2752,7 +3004,6 @@ - sim_hostbitsize="" - fi; - -- - # Check whether --enable-sim-hostendian or --disable-sim-hostendian was given. - if test "${enable_sim_hostendian+set}" = set; then - enableval="$enable_sim_hostendian" -diff -Naur gdb-6.8.orig/sim/ppc/configure.ac gdb-6.8/sim/ppc/configure.ac ---- gdb-6.8.orig/sim/ppc/configure.ac 2008-03-14 22:35:27.000000000 +0100 -+++ gdb-6.8/sim/ppc/configure.ac 2009-11-11 14:46:43.000000000 +0100 -@@ -209,10 +209,105 @@ - esac - ])dnl - -+AC_CACHE_CHECK([if union semun defined], -+ ac_cv_HAS_UNION_SEMUN, -+ [AC_TRY_COMPILE([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/sem.h>], -+[union semun arg ;], -+[ac_cv_has_union_semun="yes"], -+[ac_cv_has_union_semun="no"]) -+AC_MSG_RESULT($ac_cv_has_union_semun) -+]) -+ -+ -+if test "$ac_cv_has_union_semun" = "yes"; then -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+else # semun is not defined -+ AC_CACHE_CHECK(whether System V semaphores are supported, -+ ac_cv_sysv_sem, -+ [ -+ AC_TRY_RUN( -+ [ -+ #include <sys/types.h> -+ #include <sys/ipc.h> -+ #include <sys/sem.h> -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ ushort *array; -+ }; -+ int main () { -+ union semun arg ; -+ -+ int id=semget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ arg.val = 0; /* avoid implicit type cast to union */ -+ if (semctl(id, 0, IPC_RMID, arg) == -1) -+ exit(1); -+ exit(0); -+ } -+ ], -+ ac_cv_sysv_sem="yes", ac_cv_sysv_sem="no", :) -+ ]) -+fi -+ -+AC_CACHE_CHECK(whether System V shared memory is supported, -+ac_cv_sysv_shm, -+[ -+AC_TRY_RUN([ -+#include <sys/types.h> -+#include <sys/ipc.h> -+#include <sys/shm.h> -+int main () { -+ int id=shmget(IPC_PRIVATE,1,IPC_CREAT|0400); -+ if (id == -1) -+ exit(1); -+ if (shmctl(id, IPC_RMID, 0) == -1) -+ exit(1); -+ exit(0); -+} -+], -+ac_cv_sysv_shm="yes", ac_cv_sysv_shm="no", :) -+]) -+ -+if test x"$ac_cv_sysv_shm" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_sysv_ipc_hw=",sem,shm"; -+else -+ sim_sysv_ipc_hw=""; -+fi -+ -+if test x"$ac_cv_has_union_semun" = x"yes" -a x"$ac_cv_sysv_sem" = x"yes" ; then -+ sim_hwflags="-DHAS_UNION_SEMUN"; -+fi -+ - - AC_ARG_ENABLE(sim-hardware, - [ --enable-sim-hardware=list Specify the hardware to be included in the build.], --[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - case "${enableval}" in - yes) ;; - no) AC_MSG_ERROR("List of hardware must be specified for --enable-sim-hardware"); hardware="";; -@@ -224,14 +319,13 @@ - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes" && test x"$hardware" != x""; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" --fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide" -+fi],[hardware="cpu,memory,nvram,iobus,htab,disk,trace,register,vm,init,core,pal,com,eeprom,opic,glue,phb,ide${sim_sysv_ipc_hw}" - sim_hw_src=`echo $hardware | sed -e 's/,/.c hw_/g' -e 's/^/hw_/' -e s'/$/.c/'` - sim_hw_obj=`echo $sim_hw_src | sed -e 's/\.c/.o/g'` - if test x"$silent" != x"yes"; then - echo "Setting hardware to $sim_hw_src, $sim_hw_obj" - fi])dnl - -- - AC_ARG_ENABLE(sim-hostbitsize, - [ --enable-sim-hostbitsize=32|64 Specify host bitsize (32 or 64).], - [case "${enableval}" in -diff -Naur gdb-6.8.orig/sim/ppc/debug.c gdb-6.8/sim/ppc/debug.c ---- gdb-6.8.orig/sim/ppc/debug.c 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.c 2009-11-11 14:46:43.000000000 +0100 -@@ -70,6 +70,8 @@ - { trace_pass_device, "pass-device" }, - { trace_phb_device, "phb-device" }, - { trace_register_device, "register-device", "Device initializing registers" }, -+ { trace_sem_device, "sem-device" }, -+ { trace_shm_device, "shm-device" }, - { trace_stack_device, "stack-device" }, - { trace_vm_device, "vm-device" }, - /* packages */ -diff -Naur gdb-6.8.orig/sim/ppc/debug.h gdb-6.8/sim/ppc/debug.h ---- gdb-6.8.orig/sim/ppc/debug.h 1999-04-16 03:35:08.000000000 +0200 -+++ gdb-6.8/sim/ppc/debug.h 2009-11-11 14:46:43.000000000 +0100 -@@ -51,6 +51,8 @@ - trace_pal_device, - trace_pass_device, - trace_phb_device, -+ trace_sem_device, -+ trace_shm_device, - trace_stack_device, - trace_register_device, - trace_vm_device, -diff -Naur gdb-6.8.orig/sim/ppc/hw_sem.c gdb-6.8/sim/ppc/hw_sem.c ---- gdb-6.8.orig/sim/ppc/hw_sem.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_sem.c 2009-11-11 14:46:43.000000000 +0100 -@@ -0,0 +1,301 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SEM_C_ -+#define _HW_SEM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/sem.h> -+ -+#include <errno.h> -+ -+/* DEVICE -+ -+ -+ sem - provide access to a unix semaphore -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an interface to a unix semaphore. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix semaphore. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the sem: -+ -+ | bash$ psim -t sem-device \ -+ -+ -+ Configure a UNIX semaphore using key 0x12345678 mapped into psim -+ address space at 0xfff00000: -+ -+ | -o '/sem@0xfff00000/reg 0xfff00000 0x80000' \ -+ | -o '/sem@0xfff00000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/sem@0xc0000000/reg 0xc0000000 0x80000' \ -+ -o '/sem@0xc0000000/key 0x12345678' ../psim-hello/hello -+ -+ REGISTERS -+ -+ offset 0 - lock count -+ offset 4 - lock operation -+ offset 8 - unlock operation -+ -+ All reads return the current or resulting count. -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_sem_device { -+ unsigned_word physical_address; -+ key_t key; -+ int id; -+ int initial; -+ int count; -+} hw_sem_device; -+ -+static void -+hw_sem_init_data(device *me) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ const device_unit *d; -+ int status; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* initialize the properties of the sem */ -+ -+ if (device_find_property(me, "key") == NULL) -+ error("sem_init_data() required key property is missing\n"); -+ -+ if (device_find_property(me, "value") == NULL) -+ error("sem_init_data() required value property is missing\n"); -+ -+ sem->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(sem, ("semaphore key (%d)\n", sem->key) ); -+ -+ sem->initial = (int) device_find_integer_property(me, "value"); -+ DTRACE(sem, ("semaphore initial value (%d)\n", sem->initial) ); -+ -+ d = device_unit_address(me); -+ sem->physical_address = d->cells[ d->nr_cells-1 ]; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", sem->physical_address)); -+ -+ /* Now to initialize the semaphore */ -+ -+ if ( sem->initial != -1 ) { -+ -+ sem->id = semget(sem->key, 1, IPC_CREAT | 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ -+ help.val = sem->initial; -+ status = semctl( sem->id, 0, SETVAL, help ); -+ if (status == -1) -+ error("hw_sem_init_data() semctl -- set value failed\n"); -+ -+ } else { -+ sem->id = semget(sem->key, 1, 0660); -+ if (sem->id == -1) -+ error("hw_sem_init_data() semget failed\n"); -+ } -+ -+ sem->count = semctl( sem->id, 0, GETVAL, help ); -+ if (sem->count == -1) -+ error("hw_sem_init_data() semctl -- get value failed\n"); -+ DTRACE(sem, ("semaphore OS value (%d)\n", sem->count) ); -+ -+ if (sizeof(int) != 4) -+ error("hw_sem_init_data() typing problem\n"); -+} -+ -+static void -+hw_sem_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ -+ if (space != 0) -+ error("sem_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 12) -+ error("sem_attach_address_callback() invalid size\n"); -+ -+ sem->physical_address = addr; -+ DTRACE(sem, ("semaphore physical_address=0x%x\n", addr)); -+} -+ -+static unsigned -+hw_sem_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_sem_device *sem = (hw_sem_device*)device_data(me); -+ struct sembuf sb; -+ int status; -+ unsigned32 u32; -+#if !HAS_UNION_SEMUN -+ union semun { -+ int val; -+ struct semid_ds *buf; -+ unsigned short int *array; -+#if defined(__linux__) -+ struct seminfo *__buf; -+#endif -+ } ; -+#endif -+ union semun help; -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(sem, ("semaphore read addr=0x%x length=%d\n", addr, nr_bytes)); -+ -+ if (!(addr >= sem->physical_address && addr <= sem->physical_address + 11)) -+ error("hw_sem_io_read_buffer() invalid address - out of range\n"); -+ -+ if ((addr % 4) != 0) -+ error("hw_sem_io_read_buffer() invalid address - alignment\n"); -+ -+ if (nr_bytes != 4) -+ error("hw_sem_io_read_buffer() invalid length\n"); -+ -+ switch ( (addr - sem->physical_address) / 4 ) { -+ -+ case 0: /* OBTAIN CURRENT VALUE */ -+ break; -+ -+ case 1: /* LOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = -1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: lock" ); -+ error("hw_sem_io_read_buffer() sem lock\n"); -+ } -+ -+ DTRACE(sem, ("semaphore lock %d\n", sem->count)); -+ break; -+ -+ case 2: /* UNLOCK */ -+ sb.sem_num = 0; -+ sb.sem_op = 1; -+ sb.sem_flg = 0; -+ -+ status = semop(sem->id, &sb, 1); -+ if (status == -1) { -+ perror( "hw_sem.c: unlock" ); -+ error("hw_sem_io_read_buffer() sem unlock\n"); -+ } -+ DTRACE(sem, ("semaphore unlock %d\n", sem->count)); -+ break; -+ -+ default: -+ error("hw_sem_io_read_buffer() invalid address - unknown error\n"); -+ break; -+ } -+ -+ /* assume target is big endian */ -+ u32 = H2T_4(semctl( sem->id, 0, GETVAL, help )); -+ -+ DTRACE(sem, ("semaphore OS value (%d)\n", u32) ); -+ if (u32 == 0xffffffff) { -+ perror( "hw_sem.c: getval" ); -+ error("hw_sem_io_read_buffer() semctl -- get value failed\n"); -+ } -+ -+ memcpy(dest, &u32, nr_bytes); -+ return nr_bytes; -+ -+} -+ -+static device_callbacks const hw_sem_callbacks = { -+ { generic_device_init_address, hw_sem_init_data }, -+ { hw_sem_attach_address_callback, }, /* address */ -+ { hw_sem_io_read_buffer, NULL }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_sem_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_sem_device *sem = ZALLOC(hw_sem_device); -+ return sem; -+} -+ -+const device_descriptor hw_sem_device_descriptor[] = { -+ { "sem", hw_sem_create, &hw_sem_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SEM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/hw_shm.c gdb-6.8/sim/ppc/hw_shm.c ---- gdb-6.8.orig/sim/ppc/hw_shm.c 1970-01-01 01:00:00.000000000 +0100 -+++ gdb-6.8/sim/ppc/hw_shm.c 2009-11-11 14:46:43.000000000 +0100 -@@ -0,0 +1,236 @@ -+/* This file is part of the program psim. -+ -+ Copyright (C) 1997,2008, Joel Sherrill <joel@OARcorp.com> -+ -+ This program is free software; you can redistribute it and/or modify -+ it under the terms of the GNU General Public License as published by -+ the Free Software Foundation; either version 2 of the License, or -+ (at your option) any later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software -+ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+ -+ */ -+ -+ -+#ifndef _HW_SHM_C_ -+#define _HW_SHM_C_ -+ -+#include "device_table.h" -+ -+#ifdef HAVE_STRING_H -+#include <string.h> -+#else -+#ifdef HAVE_STRINGS_H -+#include <strings.h> -+#endif -+#endif -+ -+#include <sys/ipc.h> -+#include <sys/shm.h> -+ -+ -+/* DEVICE -+ -+ -+ shm - map unix shared memory into psim address space -+ -+ -+ DESCRIPTION -+ -+ -+ This device implements an area of memory which is mapped into UNIX -+ shared memory. -+ -+ -+ PROPERTIES -+ -+ -+ reg = <address> <size> (required) -+ -+ Determine where the memory lives in the parents address space. -+ The SHM area is assumed to be of the same length. -+ -+ key = <integer> (required) -+ -+ This is the key of the unix shared memory area. -+ -+ EXAMPLES -+ -+ -+ Enable tracing of the shm: -+ -+ | bash$ psim -t shm-device \ -+ -+ -+ Configure a 512 kilobytes of UNIX shared memory with the key 0x12345678 -+ mapped into psim address space at 0x0c000000. -+ -+ | -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ | -o '/shm@0x0c000000/key 0x12345678' \ -+ -+ sim/ppc/run -o '/#address-cells 1' \ -+ -o '/shm@0x0c000000/reg 0x0c000000 0x80000' \ -+ -o '/shm@0x0c000000/key 0x12345678' ../psim-hello/hello -+ -+ BUGS -+ -+ None known. -+ -+ */ -+ -+typedef struct _hw_shm_device { -+ unsigned_word physical_address; -+ char *shm_address; -+ unsigned sizeof_memory; -+ key_t key; -+ int id; -+} hw_shm_device; -+ -+static void -+hw_shm_init_data(device *me) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ const device_unit *d; -+ reg_property_spec reg; -+ int i; -+ -+ /* Obtain the Key Value */ -+ if (device_find_property(me, "key") == NULL) -+ error("shm_init_data() required key property is missing\n"); -+ -+ shm->key = (key_t) device_find_integer_property(me, "key"); -+ DTRACE(shm, ("shm key (0x%08x)\n", shm->key) ); -+ -+ /* Figure out where this memory is in address space and how long it is */ -+ if ( !device_find_reg_array_property(me, "reg", 0, ®) ) -+ error("hw_shm_init_data() no address registered\n"); -+ -+ /* Determine the address and length being as paranoid as possible */ -+ shm->physical_address = 0xffffffff; -+ shm->sizeof_memory = 0xffffffff; -+ -+ for ( i=0 ; i<reg.address.nr_cells; i++ ) { -+ if (reg.address.cells[0] == 0 && reg.size.cells[0] == 0) -+ continue; -+ -+ if ( shm->physical_address != 0xffffffff ) -+ device_error(me, "Only single celled address ranges supported\n"); -+ -+ shm->physical_address = reg.address.cells[i]; -+ DTRACE(shm, ("shm physical_address=0x%x\n", shm->physical_address)); -+ -+ shm->sizeof_memory = reg.size.cells[i]; -+ DTRACE(shm, ("shm length=0x%x\n", shm->sizeof_memory)); -+ } -+ -+ if ( shm->physical_address == 0xffffffff ) -+ device_error(me, "Address not specified\n" ); -+ -+ if ( shm->sizeof_memory == 0xffffffff ) -+ device_error(me, "Length not specified\n" ); -+ -+ /* Now actually attach to or create the shared memory area */ -+ shm->id = shmget(shm->key, shm->sizeof_memory, IPC_CREAT | 0660); -+ if (shm->id == -1) -+ error("hw_shm_init_data() shmget failed\n"); -+ -+ shm->shm_address = shmat(shm->id, (char *)0, SHM_RND); -+ if (shm->shm_address == (void *)-1) -+ error("hw_shm_init_data() shmat failed\n"); -+} -+ -+static void -+hw_shm_attach_address_callback(device *me, -+ attach_type attach, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ access_type access, -+ device *client) /*callback/default*/ -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ if (space != 0) -+ error("shm_attach_address_callback() invalid address space\n"); -+ -+ if (nr_bytes == 0) -+ error("shm_attach_address_callback() invalid size\n"); -+} -+ -+ -+static unsigned -+hw_shm_io_read_buffer(device *me, -+ void *dest, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("read %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(dest, &shm->shm_address[addr - shm->physical_address], nr_bytes); -+ return nr_bytes; -+} -+ -+ -+static unsigned -+hw_shm_io_write_buffer(device *me, -+ const void *source, -+ int space, -+ unsigned_word addr, -+ unsigned nr_bytes, -+ cpu *processor, -+ unsigned_word cia) -+{ -+ hw_shm_device *shm = (hw_shm_device*)device_data(me); -+ -+ /* do we need to worry about out of range addresses? */ -+ -+ DTRACE(shm, ("write %p %x %x %x\n", \ -+ shm->shm_address, shm->physical_address, addr, nr_bytes) ); -+ -+ memcpy(&shm->shm_address[addr - shm->physical_address], source, nr_bytes); -+ return nr_bytes; -+} -+ -+static device_callbacks const hw_shm_callbacks = { -+ { generic_device_init_address, hw_shm_init_data }, -+ { hw_shm_attach_address_callback, }, /* address */ -+ { hw_shm_io_read_buffer, -+ hw_shm_io_write_buffer }, /* IO */ -+ { NULL, }, /* DMA */ -+ { NULL, }, /* interrupt */ -+ { NULL, }, /* unit */ -+ NULL, -+}; -+ -+static void * -+hw_shm_create(const char *name, -+ const device_unit *unit_address, -+ const char *args) -+{ -+ hw_shm_device *shm = ZALLOC(hw_shm_device); -+ return shm; -+} -+ -+ -+ -+const device_descriptor hw_shm_device_descriptor[] = { -+ { "shm", hw_shm_create, &hw_shm_callbacks }, -+ { NULL }, -+}; -+ -+#endif /* _HW_SHM_C_ */ -diff -Naur gdb-6.8.orig/sim/ppc/Makefile.in gdb-6.8/sim/ppc/Makefile.in ---- gdb-6.8.orig/sim/ppc/Makefile.in 2006-05-31 17:14:45.000000000 +0200 -+++ gdb-6.8/sim/ppc/Makefile.in 2009-11-11 14:46:43.000000000 +0100 -@@ -834,6 +834,8 @@ - hw_pal.o: hw_pal.c $(DEVICE_TABLE_H) $(CPU_H) - hw_phb.o: hw_phb.c $(DEVICE_TABLE_H) $(HW_PHB_H) $(COREFILE_H) - hw_register.o: hw_register.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_sem.o: hw_sem.c $(DEVICE_TABLE_H) $(PSIM_H) -+hw_shm.o: hw_shm.c $(DEVICE_TABLE_H) $(PSIM_H) - hw_trace.o: hw_trace.c $(DEVICE_TABLE_H) - hw_vm.o: hw_vm.c $(DEVICE_TABLE_H) $(CPU_H) - # ignore this line, it stops make from getting confused -diff -Naur gdb-6.8.orig/sim/ppc/ppc-instructions gdb-6.8/sim/ppc/ppc-instructions ---- gdb-6.8.orig/sim/ppc/ppc-instructions 2006-11-29 16:20:55.000000000 +0100 -+++ gdb-6.8/sim/ppc/ppc-instructions 2009-11-11 14:46:43.000000000 +0100 -@@ -3402,6 +3402,14 @@ - case spr_dec: - *rT = cpu_get_decrementer(processor); - break; -+ case spr_tbrl: -+ if (is_64bit_implementation) *rT = TB; -+ else *rT = EXTRACTED64(TB, 32, 63); -+ break; -+ case spr_tbru: -+ if (is_64bit_implementation) *rT = EXTRACTED64(TB, 0, 31); -+ else *rT = EXTRACTED64(TB, 0, 31); -+ break; - case spr_tbu: - case spr_tbl: - /* NOTE - these SPR's are not readable. Use mftb[ul] */ -diff -Naur gdb-6.8.orig/sim/ppc/ppc-spr-table gdb-6.8/sim/ppc/ppc-spr-table ---- gdb-6.8.orig/sim/ppc/ppc-spr-table 2003-06-22 18:48:12.000000000 +0200 -+++ gdb-6.8/sim/ppc/ppc-spr-table 2009-11-11 14:46:43.000000000 +0100 -@@ -32,6 +32,8 @@ - SRR0:26:0:0 - SRR1:27:0:0 - VRSAVE:256:0:0 -+TBRL:268:0:0 -+TBRU:269:0:0 - SPRG0:272:0:0 - SPRG1:273:0:0 - SPRG2:274:0:0 diff --git a/contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20090324.diff b/contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20090324.diff deleted file mode 100644 index ce08abf00a..0000000000 --- a/contrib/crossrpms/patches/newlib-1.16.0-rtems4.9-20090324.diff +++ /dev/null @@ -1,1199 +0,0 @@ -diff -Naur newlib-1.16.0.orig/newlib/ChangeLog.rtems newlib-1.16.0/newlib/ChangeLog.rtems ---- newlib-1.16.0.orig/newlib/ChangeLog.rtems 1970-01-01 01:00:00.000000000 +0100 -+++ newlib-1.16.0/newlib/ChangeLog.rtems 2009-03-24 04:29:55.000000000 +0100 -@@ -0,0 +1,5 @@ -+2009-03-09 Ralf Corsépius <ralf.corsepius@rtems.org> -+ -+ * libc/machine/powerpc/times.c: Remove. -+ * libc/machine/powerpc/Makefile.am: Remove times.c. -+ * libc/machine/powerpc/Makefile.in: Regenerate. -diff -Naur newlib-1.16.0.orig/newlib/configure.host newlib-1.16.0/newlib/configure.host ---- newlib-1.16.0.orig/newlib/configure.host 2007-11-07 22:42:24.000000000 +0100 -+++ newlib-1.16.0/newlib/configure.host 2009-03-24 04:29:55.000000000 +0100 -@@ -528,6 +528,7 @@ - # NOTE: When newlib malloc uses a semaphore, RTEMS will switch to that. - *-*-rtems*) - default_newlib_io_long_long="yes" -+ default_newlib_io_c99_formats="yes" - newlib_cflags="${newlib_cflags} -DMALLOC_PROVIDED -DEXIT_PROVIDED -DMISSING_SYSCALL_NAMES -DSIGNAL_PROVIDED -DREENTRANT_SYSCALLS_PROVIDED -DHAVE_OPENDIR -DNO_EXEC -DHAVE_FCNTL" - ;; - # VxWorks supplies its own version of malloc, and the newlib one -diff -Naur newlib-1.16.0.orig/newlib/libc/include/getopt.h newlib-1.16.0/newlib/libc/include/getopt.h ---- newlib-1.16.0.orig/newlib/libc/include/getopt.h 2006-01-04 22:21:52.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/getopt.h 2009-03-24 04:29:55.000000000 +0100 -@@ -89,31 +89,40 @@ - - /* include files needed by this include file */ - --/* macros defined by this include file */ --#define NO_ARG 0 --#define REQUIRED_ARG 1 --#define OPTIONAL_ARG 2 -- --/* types defined by this include file */ -- --struct option --{ -- char *name; /* the name of the long option */ -- int has_arg; /* one of the above macros */ -- int *flag; /* determines if getopt_long() returns a -- * value for a long option; if it is -- * non-NULL, 0 is returned as a function -- * value and the value of val is stored in -- * the area pointed to by flag. Otherwise, -- * val is returned. */ -- int val; /* determines the value to return if flag is -- * NULL. */ --}; -+ /* These #defines are to keep the namespace clear... */ -+#define getopt_r __getopt_r -+#define getopt_long_r __getopt_long_r -+#define getopt_long_only_r __getopt_long_only_r - - #ifdef __cplusplus - extern "C" - { --#endif -+ -+#endif /* __cplusplus */ -+ -+/* types defined by this include file */ -+ struct option -+ { -+ char *name; /* the name of the long option */ -+ int has_arg; /* one of the above macros */ -+ int *flag; /* determines if getopt_long() returns a -+ * value for a long option; if it is -+ * non-NULL, 0 is returned as a function -+ * value and the value of val is stored in -+ * the area pointed to by flag. Otherwise, -+ * val is returned. */ -+ int val; /* determines the value to return if flag is -+ * NULL. */ -+ -+ }; -+ -+ /* The getopt_data structure is for reentrancy. Its members are similar to -+ the externally-defined variables. */ -+ typedef struct getopt_data -+ { -+ char *optarg; -+ int optind, opterr, optopt, optwhere; -+ } getopt_data; - - /* externally-defined variables */ - extern char *optarg; -@@ -122,14 +131,35 @@ - extern int optopt; - - /* function prototypes */ -- int _EXFUN (getopt, (int __argc, char *const __argv[], const char *__optstring)); -- int _EXFUN (getopt_long, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind)); -- int _EXFUN (getopt_long_only, (int __argc, char *const __argv[], const char *__shortopts, const struct option *__longopts, int *__longind)); -+ int _EXFUN (getopt, -+ (int __argc, char *const __argv[], const char *__optstring)); -+ -+ int _EXFUN (getopt_long, -+ (int __argc, char *const __argv[], const char *__shortopts, -+ const struct option * __longopts, int *__longind)); -+ -+ int _EXFUN (getopt_long_only, -+ (int __argc, char *const __argv[], const char *__shortopts, -+ const struct option * __longopts, int *__longind)); -+ -+ int _EXFUN (__getopt_r, -+ (int __argc, char *const __argv[], const char *__optstring, -+ struct getopt_data * __data)); -+ -+ int _EXFUN (__getopt_long_r, -+ (int __argc, char *const __argv[], const char *__shortopts, -+ const struct option * __longopts, int *__longind, -+ struct getopt_data * __data)); -+ -+ int _EXFUN (__getopt_long_only_r, -+ (int __argc, char *const __argv[], const char *__shortopts, -+ const struct option * __longopts, int *__longind, -+ struct getopt_data * __data)); - - #ifdef __cplusplus - }; - --#endif -+#endif /* __cplusplus */ - - #endif /* GETOPT_H */ - -diff -Naur newlib-1.16.0.orig/newlib/libc/include/inttypes.h newlib-1.16.0/newlib/libc/include/inttypes.h ---- newlib-1.16.0.orig/newlib/libc/include/inttypes.h 2005-12-16 20:03:12.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/inttypes.h 2009-03-24 04:29:55.000000000 +0100 -@@ -242,9 +242,12 @@ - #define SCNxMAX __SCNMAX(x) - - /* ptr types */ --#if __have_longlong64 --#define __PRIPTR(x) __STRINGIFY(ll##x) --#define __SCNPTR(x) __STRINGIFY(ll##x) -+#if __ptrint_t_long_defined -+#define __PRIPTR(x) __STRINGIFY(l##x) -+#define __SCNPTR(x) __STRINGIFY(l##x) -+#elif __ptrint_t_int_defined -+#define __PRIPTR(x) __STRINGIFY(x) -+#define __SCNPTR(x) __STRINGIFY(x) - #elif __have_long64 - #define __PRIPTR(x) __STRINGIFY(l##x) - #define __SCNPTR(x) __STRINGIFY(l##x) -diff -Naur newlib-1.16.0.orig/newlib/libc/include/machine/ieeefp.h newlib-1.16.0/newlib/libc/include/machine/ieeefp.h ---- newlib-1.16.0.orig/newlib/libc/include/machine/ieeefp.h 2007-11-07 22:42:24.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/machine/ieeefp.h 2009-03-24 04:29:55.000000000 +0100 -@@ -62,8 +62,12 @@ - # define __IEEE_BIG_ENDIAN - # endif - #else --# define __IEEE_BIG_ENDIAN - # ifdef __ARMEL__ -+# define __IEEE_LITTLE_ENDIAN -+# else -+# define __IEEE_BIG_ENDIAN -+# endif -+# ifdef __ARMWEL__ - # define __IEEE_BYTES_LITTLE_ENDIAN - # endif - #endif -diff -Naur newlib-1.16.0.orig/newlib/libc/include/machine/setjmp.h newlib-1.16.0/newlib/libc/include/machine/setjmp.h ---- newlib-1.16.0.orig/newlib/libc/include/machine/setjmp.h 2007-11-07 22:42:24.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/machine/setjmp.h 2009-03-24 04:29:55.000000000 +0100 -@@ -27,7 +27,7 @@ - - /* necv70 was 9 as well. */ - --#ifdef __mc68000__ -+#if defined(__m68k__) || defined(__mc68000__) - /* - * onsstack,sigmask,sp,pc,psl,d2-d7,a2-a6, - * fp2-fp7 for 68881. -@@ -268,6 +268,12 @@ - # define _CYGWIN_WORKING_SIGSETJMP - #endif - -+#ifdef _POSIX_THREADS -+#define __SIGMASK_FUNC pthread_sigmask -+#else -+#define __SIGMASK_FUNC sigprocmask -+#endif -+ - #if defined(__GNUC__) - - #define sigsetjmp(env, savemask) \ -@@ -275,7 +281,7 @@ - ({ \ - sigjmp_buf *_sjbuf = &(env); \ - ((*_sjbuf)[_SAVEMASK] = savemask,\ -- sigprocmask (SIG_SETMASK, 0, (sigset_t *)((*_sjbuf) + _SIGMASK)),\ -+ __SIGMASK_FUNC (SIG_SETMASK, 0, (sigset_t *)((*_sjbuf) + _SIGMASK)),\ - setjmp (*_sjbuf)); \ - }) - -@@ -284,7 +290,7 @@ - ({ \ - sigjmp_buf *_sjbuf = &(env); \ - ((((*_sjbuf)[_SAVEMASK]) ? \ -- sigprocmask (SIG_SETMASK, (sigset_t *)((*_sjbuf) + _SIGMASK), 0)\ -+ __SIGMASK_FUNC (SIG_SETMASK, (sigset_t *)((*_sjbuf) + _SIGMASK), 0)\ - : 0), \ - longjmp (*_sjbuf, val)); \ - }) -@@ -292,15 +298,21 @@ - #else /* !__GNUC__ */ - - #define sigsetjmp(env, savemask) ((env)[_SAVEMASK] = savemask,\ -- sigprocmask (SIG_SETMASK, 0, (sigset_t *) ((env) + _SIGMASK)),\ -+ __SIGMASK_FUNC (SIG_SETMASK, 0, (sigset_t *) ((env) + _SIGMASK)),\ - setjmp (env)) - - #define siglongjmp(env, val) ((((env)[_SAVEMASK])?\ -- sigprocmask (SIG_SETMASK, (sigset_t *) ((env) + _SIGMASK), 0):0),\ -+ __SIGMASK_FUNC (SIG_SETMASK, (sigset_t *) ((env) + _SIGMASK), 0):0),\ - longjmp (env, val)) - - #endif - -+/* POSIX _setjmp/_longjmp macros, maintained for XSI compatibility. These -+ are equivalent to sigsetjmp/siglongjmp when not saving the signal mask. -+ New applications should use sigsetjmp/siglongjmp instead. */ -+#define _setjmp(env) sigsetjmp ((env), 0) -+#define _longjmp(env, val) siglongjmp ((env), (val)) -+ - #ifdef __cplusplus - } - #endif -diff -Naur newlib-1.16.0.orig/newlib/libc/include/pthread.h newlib-1.16.0/newlib/libc/include/pthread.h ---- newlib-1.16.0.orig/newlib/libc/include/pthread.h 2006-09-14 00:09:27.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/include/pthread.h 2009-03-24 04:29:55.000000000 +0100 -@@ -283,14 +283,6 @@ - int _EXFUN(pthread_getcpuclockid, - (pthread_t __pthread_id, clockid_t *__clock_id)); - --/* CPU-time Clock Thread Creation Attribute, P1003.4b/D8, p. 59 */ -- --int _EXFUN(pthread_attr_setcputime, -- (pthread_attr_t *__attr, int __clock_allowed)); -- --int _EXFUN(pthread_attr_getcputime, -- (pthread_attr_t *__attr, int *__clock_allowed)); -- - #endif /* defined(_POSIX_THREAD_CPUTIME) */ - - -diff -Naur newlib-1.16.0.orig/newlib/libc/include/sched.h newlib-1.16.0/newlib/libc/include/sched.h ---- newlib-1.16.0.orig/newlib/libc/include/sched.h 2007-09-21 23:02:15.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/include/sched.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,14 +0,0 @@ --#ifndef _SCHED_H_ --#define _SCHED_H_ -- --#ifdef __cplusplus --extern "C" { --#endif -- --#include <sys/sched.h> -- --#ifdef __cplusplus --} --#endif -- --#endif /* _SCHED_H_ */ -diff -Naur newlib-1.16.0.orig/newlib/libc/include/stdint.h newlib-1.16.0/newlib/libc/include/stdint.h ---- newlib-1.16.0.orig/newlib/libc/include/stdint.h 2006-08-16 23:39:43.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/include/stdint.h 2009-03-24 04:29:55.000000000 +0100 -@@ -348,8 +348,7 @@ - #endif - - /* This must match size_t in stddef.h, currently long unsigned int */ --#define SIZE_MIN (-__STDINT_EXP(LONG_MAX) - 1L) --#define SIZE_MAX __STDINT_EXP(LONG_MAX) -+#define SIZE_MAX (__STDINT_EXP(LONG_MAX) * 2UL + 1) - - /* This must match sig_atomic_t in <signal.h> (currently int) */ - #define SIG_ATOMIC_MIN (-__STDINT_EXP(INT_MAX) - 1) -@@ -393,6 +392,9 @@ - #define UINTMAX_C(x) x##UL - #endif - -+#ifdef __rtems__ -+#include <machine/stdint.h> -+#endif - - #ifdef __cplusplus - } -diff -Naur newlib-1.16.0.orig/newlib/libc/include/sys/features.h newlib-1.16.0/newlib/libc/include/sys/features.h ---- newlib-1.16.0.orig/newlib/libc/include/sys/features.h 2007-12-19 19:51:19.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/sys/features.h 2009-03-24 04:29:55.000000000 +0100 -@@ -38,11 +38,12 @@ - #define _POSIX_MEMLOCK_RANGE 1 - #define _POSIX_MEMORY_PROTECTION 1 - #define _POSIX_MESSAGE_PASSING 1 -+#define _POSIX_MONOTONIC_CLOCK 200112L - #define _POSIX_PRIORITIZED_IO 1 - #define _POSIX_PRIORITY_SCHEDULING 1 - #define _POSIX_REALTIME_SIGNALS 1 - #define _POSIX_SEMAPHORES 1 --#define _POSIX_SHARED_MEMORY_OBJECTS 1 -+/* #define _POSIX_SHARED_MEMORY_OBJECTS 1 */ - #define _POSIX_SYNCHRONIZED_IO 1 - #define _POSIX_TIMERS 1 - #define _POSIX_BARRIERS 200112L -diff -Naur newlib-1.16.0.orig/newlib/libc/include/sys/_types.h newlib-1.16.0/newlib/libc/include/sys/_types.h ---- newlib-1.16.0.orig/newlib/libc/include/sys/_types.h 2007-09-18 22:05:17.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/include/sys/_types.h 2009-03-24 04:29:55.000000000 +0100 -@@ -84,4 +84,7 @@ - typedef void *_iconv_t; - #endif - -+typedef long * __intptr_t; -+typedef unsigned long* __uintptr_t; -+ - #endif /* _SYS__TYPES_H */ -diff -Naur newlib-1.16.0.orig/newlib/libc/include/sys/unistd.h newlib-1.16.0/newlib/libc/include/sys/unistd.h ---- newlib-1.16.0.orig/newlib/libc/include/sys/unistd.h 2007-11-08 17:20:12.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/sys/unistd.h 2009-03-24 04:29:55.000000000 +0100 -@@ -157,7 +157,7 @@ - pid_t _EXFUN(tcgetpgrp, (int __fildes )); - int _EXFUN(tcsetpgrp, (int __fildes, pid_t __pgrp_id )); - char _EXFUN(*ttyname, (int __fildes )); --#if defined(__CYGWIN__) -+#if defined(__CYGWIN__) || defined(__rtems__) - int _EXFUN(ttyname_r, (int, char *, size_t)); - #endif - int _EXFUN(unlink, (const char *__path )); -@@ -219,13 +219,11 @@ - char * _EXFUN(mktemp, (char *)); - #endif - --#if defined(__CYGWIN__) || defined(__SPU__) -+#if defined(__CYGWIN__) || defined(__SPU__) || defined(__rtems__) - void _EXFUN(sync, (void)); --#elif defined(__rtems__) --int _EXFUN(sync, (void)); - #endif - --int _EXFUN(readlink, (const char *__path, char *__buf, int __buflen)); -+ssize_t _EXFUN(readlink, (const char *__path, char *__buf, size_t __buflen)); - int _EXFUN(symlink, (const char *__name1, const char *__name2)); - - #define F_OK 0 -diff -Naur newlib-1.16.0.orig/newlib/libc/include/_syslist.h newlib-1.16.0/newlib/libc/include/_syslist.h ---- newlib-1.16.0.orig/newlib/libc/include/_syslist.h 2005-08-22 23:13:35.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/include/_syslist.h 2009-03-24 04:29:55.000000000 +0100 -@@ -11,6 +11,7 @@ - #define _fstat fstat - #define _getpid getpid - #define _gettimeofday gettimeofday -+#define _isatty isatty - #define _kill kill - #define _link link - #define _lseek lseek -diff -Naur newlib-1.16.0.orig/newlib/libc/include/time.h newlib-1.16.0/newlib/libc/include/time.h ---- newlib-1.16.0.orig/newlib/libc/include/time.h 2005-11-18 16:57:24.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/include/time.h 2009-03-24 04:29:55.000000000 +0100 -@@ -226,6 +226,16 @@ - - #endif - -+#if defined(_POSIX_MONOTONIC_CLOCK) -+ -+/* The identifier for the system-wide monotonic clock, which is defined -+ as a clock whose value cannot be set via clock_settime() and which -+ cannot have backward clock jumps. */ -+ -+#define CLOCK_MONOTONIC (clockid_t)4 -+ -+#endif -+ - #if defined(_POSIX_CPUTIME) - - /* Accessing a Process CPU-time CLock, P1003.4b/D8, p. 55 */ -diff -Naur newlib-1.16.0.orig/newlib/libc/machine/arm/machine/endian.h newlib-1.16.0/newlib/libc/machine/arm/machine/endian.h ---- newlib-1.16.0.orig/newlib/libc/machine/arm/machine/endian.h 2004-05-07 22:29:24.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/machine/arm/machine/endian.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,12 +0,0 @@ --/* ARM configuration file */ -- --#ifndef _MACHINE_ENDIAN_H --# define _MACHINE_ENDIAN_H -- --#ifdef __ARMEB__ --#define BYTE_ORDER BIG_ENDIAN --#else --#define BYTE_ORDER LITTLE_ENDIAN --#endif -- --#endif -diff -Naur newlib-1.16.0.orig/newlib/libc/machine/powerpc/Makefile.am newlib-1.16.0/newlib/libc/machine/powerpc/Makefile.am ---- newlib-1.16.0.orig/newlib/libc/machine/powerpc/Makefile.am 2007-05-24 19:33:35.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/machine/powerpc/Makefile.am 2009-03-24 04:29:55.000000000 +0100 -@@ -10,7 +10,7 @@ - - AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib - --lib_a_SOURCES = setjmp.S times.c -+lib_a_SOURCES = setjmp.S - lib_a_CCASFLAGS=$(AM_CCASFLAGS) - lib_a_CFLAGS=$(AM_CFLAGS) - lib_a_LIBADD = @extra_objs@ -diff -Naur newlib-1.16.0.orig/newlib/libc/machine/powerpc/Makefile.in newlib-1.16.0/newlib/libc/machine/powerpc/Makefile.in ---- newlib-1.16.0.orig/newlib/libc/machine/powerpc/Makefile.in 2007-12-19 23:36:34.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/machine/powerpc/Makefile.in 2009-03-24 04:29:55.000000000 +0100 -@@ -39,8 +39,7 @@ - DIST_COMMON = $(srcdir)/../../../../config.guess \ - $(srcdir)/../../../../config.sub $(srcdir)/Makefile.in \ - $(srcdir)/Makefile.am $(top_srcdir)/configure \ -- $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs \ -- $(srcdir)/../../../../compile -+ $(am__configure_deps) $(srcdir)/../../../../mkinstalldirs - subdir = . - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 - am__aclocal_m4_deps = $(top_srcdir)/../../../acinclude.m4 \ -@@ -54,7 +53,7 @@ - LIBRARIES = $(noinst_LIBRARIES) - ARFLAGS = cru - lib_a_AR = $(AR) $(ARFLAGS) --am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) lib_a-times.$(OBJEXT) -+am_lib_a_OBJECTS = lib_a-setjmp.$(OBJEXT) - lib_a_OBJECTS = $(am_lib_a_OBJECTS) - DEFAULT_INCLUDES = -I. -I$(srcdir) - depcomp = -@@ -184,7 +183,7 @@ - AM_CCASFLAGS = $(INCLUDES) - noinst_LIBRARIES = lib.a - AM_CFLAGS = -I $(srcdir)/../../stdio -I $(srcdir)/../../stdlib --lib_a_SOURCES = setjmp.S times.c -+lib_a_SOURCES = setjmp.S - lib_a_CCASFLAGS = $(AM_CCASFLAGS) - lib_a_CFLAGS = $(AM_CFLAGS) - lib_a_LIBADD = @extra_objs@ -@@ -195,7 +194,7 @@ - all: all-am - - .SUFFIXES: --.SUFFIXES: .S .c .o .obj -+.SUFFIXES: .S .o .obj - am--refresh: - @: - $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) -@@ -254,18 +253,6 @@ - - lib_a-setjmp.obj: setjmp.S - $(CCAS) $(lib_a_CCASFLAGS) $(CCASFLAGS) -c -o lib_a-setjmp.obj `if test -f 'setjmp.S'; then $(CYGPATH_W) 'setjmp.S'; else $(CYGPATH_W) '$(srcdir)/setjmp.S'; fi` -- --.c.o: -- $(COMPILE) -c $< -- --.c.obj: -- $(COMPILE) -c `$(CYGPATH_W) '$<'` -- --lib_a-times.o: times.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.o `test -f 'times.c' || echo '$(srcdir)/'`times.c -- --lib_a-times.obj: times.c -- $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(lib_a_CFLAGS) $(CFLAGS) -c -o lib_a-times.obj `if test -f 'times.c'; then $(CYGPATH_W) 'times.c'; else $(CYGPATH_W) '$(srcdir)/times.c'; fi` - uninstall-info-am: - - ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) -diff -Naur newlib-1.16.0.orig/newlib/libc/machine/powerpc/times.c newlib-1.16.0/newlib/libc/machine/powerpc/times.c ---- newlib-1.16.0.orig/newlib/libc/machine/powerpc/times.c 2002-07-22 22:26:51.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/machine/powerpc/times.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,36 +0,0 @@ --/* Time support routines for PowerPC. -- * -- * Written by Aldy Hernandez. -- */ -- --#include <_ansi.h> --#include <reent.h> --#include <sys/time.h> --#include <sys/times.h> --#include <sys/resource.h> -- --clock_t --times (struct tms *tp) --{ -- struct rusage usage; -- union { -- struct rusage r; -- /* Newlib's rusage has only 2 fields. We need to make room for -- when we call the system's rusage. This should be enough. */ -- int filler[32]; -- } host_ru; -- -- getrusage (RUSAGE_SELF, (void *)&host_ru); -- -- if (tp) -- { -- tp->tms_utime = host_ru.r.ru_utime.tv_sec * 1000 -- + host_ru.r.ru_utime.tv_usec; -- tp->tms_stime = host_ru.r.ru_stime.tv_sec * 1000 -- + host_ru.r.ru_stime.tv_usec; -- tp->tms_cutime = 0; /* user time, children */ -- tp->tms_cstime = 0; /* system time, children */ -- } -- -- return tp->tms_utime; --} -diff -Naur newlib-1.16.0.orig/newlib/libc/stdlib/getopt.c newlib-1.16.0/newlib/libc/stdlib/getopt.c ---- newlib-1.16.0.orig/newlib/libc/stdlib/getopt.c 2007-05-29 23:26:59.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/stdlib/getopt.c 2009-03-24 04:29:55.000000000 +0100 -@@ -90,6 +90,9 @@ - #include <getopt.h> - - /* macros */ -+#define NO_ARG 0 -+#define REQUIRED_ARG 1 -+#define OPTIONAL_ARG 2 - - /* types */ - typedef enum GETOPT_ORDERING_T -@@ -100,16 +103,19 @@ - } GETOPT_ORDERING_T; - - /* globally-defined variables */ --char *optarg = NULL; -+char *optarg = 0; - int optind = 0; - int opterr = 1; - int optopt = '?'; - -+/* static variables */ -+static int optwhere = 0; -+ - /* functions */ - - /* reverse_argv_elements: reverses num elements starting at argv */ - static void --reverse_argv_elements (char ** argv, int num) -+reverse_argv_elements (char **argv, int num) - { - int i; - char *tmp; -@@ -126,281 +132,346 @@ - static void - permute (char *const argv[], int len1, int len2) - { -- reverse_argv_elements ((char **)argv, len1); -- reverse_argv_elements ((char **)argv, len1 + len2); -- reverse_argv_elements ((char **)argv, len2); -+ reverse_argv_elements ((char **) argv, len1); -+ reverse_argv_elements ((char **) argv, len1 + len2); -+ reverse_argv_elements ((char **) argv, len2); - } - - /* is_option: is this argv-element an option or the end of the option list? */ - static int - is_option (char *argv_element, int only) - { -- return ((argv_element == NULL) -- || (argv_element[0] == '-') || (only && argv_element[0] == '+')); -+ return ((argv_element == 0) -+ || (argv_element[0] == '-') || (only && argv_element[0] == '+')); -+} -+ -+/* read_globals: read the values from the globals into a getopt_data -+ structure */ -+static void -+read_globals (struct getopt_data *data) -+{ -+ data->optarg = optarg; -+ data->optind = optind; -+ data->opterr = opterr; -+ data->optopt = optopt; -+ data->optwhere = optwhere; -+} -+ -+/* write_globals: write the values into the globals from a getopt_data -+ structure */ -+static void -+write_globals (struct getopt_data *data) -+{ -+ optarg = data->optarg; -+ optind = data->optind; -+ opterr = data->opterr; -+ optopt = data->optopt; -+ optwhere = data->optwhere; - } - - /* getopt_internal: the function that does all the dirty work */ - static int - getopt_internal (int argc, char *const argv[], const char *shortopts, -- const struct option *longopts, int *longind, int only) -+ const struct option *longopts, int *longind, int only, -+ struct getopt_data *data) - { - GETOPT_ORDERING_T ordering = PERMUTE; -- static size_t optwhere = 0; - size_t permute_from = 0; - int num_nonopts = 0; - int optindex = 0; - size_t match_chars = 0; -- char *possible_arg = NULL; -+ char *possible_arg = 0; - int longopt_match = -1; - int has_arg = -1; -- char *cp = NULL; -+ char *cp = 0; - int arg_next = 0; - - /* first, deal with silly parameters and easy stuff */ -- if (argc == 0 || argv == NULL || (shortopts == NULL && longopts == NULL)) -- return EOF; -- if (optind >= argc || argv[optind] == NULL) -+ if (argc == 0 || argv == 0 || (shortopts == 0 && longopts == 0) -+ || data->optind >= argc || argv[data->optind] == 0) - return EOF; -- if (strcmp (argv[optind], "--") == 0) -+ if (strcmp (argv[data->optind], "--") == 0) - { -- optind++; -+ data->optind++; - return EOF; - } -+ - /* if this is our first time through */ -- if (optind == 0) -- optind = optwhere = 1; -+ if (data->optind == 0) -+ data->optind = data->optwhere = 1; - - /* define ordering */ -- if (shortopts != NULL && (*shortopts == '-' || *shortopts == '+')) -+ if (shortopts != 0 && (*shortopts == '-' || *shortopts == '+')) - { - ordering = (*shortopts == '-') ? RETURN_IN_ORDER : REQUIRE_ORDER; - shortopts++; - } - else -- ordering = (getenv ("POSIXLY_CORRECT") != NULL) ? REQUIRE_ORDER : PERMUTE; -+ ordering = (getenv ("POSIXLY_CORRECT") != 0) ? REQUIRE_ORDER : PERMUTE; - - /* - * based on ordering, find our next option, if we're at the beginning of - * one - */ -- if (optwhere == 1) -+ if (data->optwhere == 1) - { - switch (ordering) -- { -- case PERMUTE: -- permute_from = optind; -- num_nonopts = 0; -- while (!is_option (argv[optind], only)) -- { -- optind++; -- num_nonopts++; -- } -- if (argv[optind] == NULL) -- { -- /* no more options */ -- optind = permute_from; -- return EOF; -- } -- else if (strcmp (argv[optind], "--") == 0) -- { -- /* no more options, but have to get `--' out of the way */ -- permute (argv + permute_from, num_nonopts, 1); -- optind = permute_from + 1; -- return EOF; -- } -- break; -- case RETURN_IN_ORDER: -- if (!is_option (argv[optind], only)) -- { -- optarg = argv[optind++]; -- return (optopt = 1); -- } -- break; -- case REQUIRE_ORDER: -- if (!is_option (argv[optind], only)) -- return EOF; -- break; -- } -+ { -+ default: /* shouldn't happen */ -+ case PERMUTE: -+ permute_from = data->optind; -+ num_nonopts = 0; -+ while (!is_option (argv[data->optind], only)) -+ { -+ data->optind++; -+ num_nonopts++; -+ } -+ if (argv[data->optind] == 0) -+ { -+ /* no more options */ -+ data->optind = permute_from; -+ return EOF; -+ } -+ else if (strcmp (argv[data->optind], "--") == 0) -+ { -+ /* no more options, but have to get `--' out of the way */ -+ permute (argv + permute_from, num_nonopts, 1); -+ data->optind = permute_from + 1; -+ return EOF; -+ } -+ break; -+ case RETURN_IN_ORDER: -+ if (!is_option (argv[data->optind], only)) -+ { -+ data->optarg = argv[data->optind++]; -+ return (data->optopt = 1); -+ } -+ break; -+ case REQUIRE_ORDER: -+ if (!is_option (argv[data->optind], only)) -+ return EOF; -+ break; -+ } - } - /* we've got an option, so parse it */ - - /* first, is it a long option? */ -- if (longopts != NULL -- && (memcmp (argv[optind], "--", 2) == 0 -- || (only && argv[optind][0] == '+')) && optwhere == 1) -+ if (longopts != 0 -+ && (memcmp (argv[data->optind], "--", 2) == 0 -+ || (only && argv[data->optind][0] == '+')) && data->optwhere == 1) - { - /* handle long options */ -- if (memcmp (argv[optind], "--", 2) == 0) -- optwhere = 2; -+ if (memcmp (argv[data->optind], "--", 2) == 0) -+ data->optwhere = 2; - longopt_match = -1; -- possible_arg = strchr (argv[optind] + optwhere, '='); -- if (possible_arg == NULL) -- { -- /* no =, so next argv might be arg */ -- match_chars = strlen (argv[optind]); -- possible_arg = argv[optind] + match_chars; -- match_chars = match_chars - optwhere; -- } -+ possible_arg = strchr (argv[data->optind] + data->optwhere, '='); -+ if (possible_arg == 0) -+ { -+ /* no =, so next argv might be arg */ -+ match_chars = strlen (argv[data->optind]); -+ possible_arg = argv[data->optind] + match_chars; -+ match_chars = match_chars - data->optwhere; -+ } - else -- match_chars = (possible_arg - argv[optind]) - optwhere; -- for (optindex = 0; longopts[optindex].name != NULL; optindex++) -- { -- if (memcmp (argv[optind] + optwhere, -- longopts[optindex].name, match_chars) == 0) -- { -- /* do we have an exact match? */ -- if (match_chars == (int) (strlen (longopts[optindex].name))) -- { -- longopt_match = optindex; -- break; -- } -- /* do any characters match? */ -- else -- { -- if (longopt_match < 0) -- longopt_match = optindex; -- else -- { -- /* we have ambiguous options */ -- if (opterr) -- fprintf (stderr, "%s: option `%s' is ambiguous " -- "(could be `--%s' or `--%s')\n", -- argv[0], -- argv[optind], -- longopts[longopt_match].name, -- longopts[optindex].name); -- return (optopt = '?'); -- } -- } -- } -- } -+ match_chars = (possible_arg - argv[data->optind]) - data->optwhere; -+ for (optindex = 0; longopts[optindex].name != 0; ++optindex) -+ { -+ if (memcmp -+ (argv[data->optind] + data->optwhere, longopts[optindex].name, -+ match_chars) == 0) -+ { -+ /* do we have an exact match? */ -+ if (match_chars == (int) (strlen (longopts[optindex].name))) -+ { -+ longopt_match = optindex; -+ break; -+ } -+ /* do any characters match? */ -+ else -+ { -+ if (longopt_match < 0) -+ longopt_match = optindex; -+ else -+ { -+ /* we have ambiguous options */ -+ if (data->opterr) -+ fprintf (stderr, "%s: option `%s' is ambiguous " -+ "(could be `--%s' or `--%s')\n", -+ argv[0], -+ argv[data->optind], -+ longopts[longopt_match].name, -+ longopts[optindex].name); -+ return (data->optopt = '?'); -+ } -+ } -+ } -+ } - if (longopt_match >= 0) -- has_arg = longopts[longopt_match].has_arg; -+ has_arg = longopts[longopt_match].has_arg; - } -+ - /* if we didn't find a long option, is it a short option? */ -- if (longopt_match < 0 && shortopts != NULL) -+ if (longopt_match < 0 && shortopts != 0) - { -- cp = strchr (shortopts, argv[optind][optwhere]); -- if (cp == NULL) -- { -- /* couldn't find option in shortopts */ -- if (opterr) -- fprintf (stderr, -- "%s: invalid option -- `-%c'\n", -- argv[0], argv[optind][optwhere]); -- optwhere++; -- if (argv[optind][optwhere] == '\0') -- { -- optind++; -- optwhere = 1; -- } -- return (optopt = '?'); -- } -+ cp = strchr (shortopts, argv[data->optind][data->optwhere]); -+ if (cp == 0) -+ { -+ /* couldn't find option in shortopts */ -+ if (data->opterr) -+ fprintf (stderr, -+ "%s: invalid option -- `-%c'\n", -+ argv[0], argv[data->optind][data->optwhere]); -+ data->optwhere++; -+ if (argv[data->optind][data->optwhere] == '\0') -+ { -+ data->optind++; -+ data->optwhere = 1; -+ } -+ return (data->optopt = '?'); -+ } - has_arg = ((cp[1] == ':') -- ? ((cp[2] == ':') ? OPTIONAL_ARG : REQUIRED_ARG) : NO_ARG); -- possible_arg = argv[optind] + optwhere + 1; -- optopt = *cp; -+ ? ((cp[2] == ':') ? OPTIONAL_ARG : REQUIRED_ARG) : NO_ARG); -+ possible_arg = argv[data->optind] + data->optwhere + 1; -+ data->optopt = *cp; - } -- /* get argument and reset optwhere */ -+ -+ /* get argument and reset data->optwhere */ - arg_next = 0; - switch (has_arg) - { - case OPTIONAL_ARG: - if (*possible_arg == '=') -- possible_arg++; -- if (*possible_arg != '\0') -- { -- optarg = possible_arg; -- optwhere = 1; -- } -- else -- optarg = NULL; -+ possible_arg++; -+ data->optarg = (*possible_arg != '\0') ? possible_arg : 0; -+ data->optwhere = 1; - break; - case REQUIRED_ARG: - if (*possible_arg == '=') -- possible_arg++; -+ possible_arg++; - if (*possible_arg != '\0') -- { -- optarg = possible_arg; -- optwhere = 1; -- } -- else if (optind + 1 >= argc) -- { -- if (opterr) -- { -- fprintf (stderr, "%s: argument required for option `", argv[0]); -- if (longopt_match >= 0) -- fprintf (stderr, "--%s'\n", longopts[longopt_match].name); -- else -- fprintf (stderr, "-%c'\n", *cp); -- } -- optind++; -- return (optopt = ':'); -- } -+ { -+ data->optarg = possible_arg; -+ data->optwhere = 1; -+ } -+ else if (data->optind + 1 >= argc) -+ { -+ if (data->opterr) -+ { -+ fprintf (stderr, "%s: argument required for option `", argv[0]); -+ if (longopt_match >= 0) -+ fprintf (stderr, "--%s'\n", longopts[longopt_match].name); -+ else -+ fprintf (stderr, "-%c'\n", *cp); -+ } -+ data->optind++; -+ return (data->optopt = ':'); -+ } - else -- { -- optarg = argv[optind + 1]; -- arg_next = 1; -- optwhere = 1; -- } -+ { -+ data->optarg = argv[data->optind + 1]; -+ arg_next = 1; -+ data->optwhere = 1; -+ } - break; -+ default: /* shouldn't happen */ - case NO_ARG: - if (longopt_match < 0) -- { -- optwhere++; -- if (argv[optind][optwhere] == '\0') -- optwhere = 1; -- } -+ { -+ data->optwhere++; -+ if (argv[data->optind][data->optwhere] == '\0') -+ data->optwhere = 1; -+ } - else -- optwhere = 1; -- optarg = NULL; -+ data->optwhere = 1; -+ data->optarg = 0; - break; - } - -- /* do we have to permute or otherwise modify optind? */ -- if (ordering == PERMUTE && optwhere == 1 && num_nonopts != 0) -+ /* do we have to permute or otherwise modify data->optind? */ -+ if (ordering == PERMUTE && data->optwhere == 1 && num_nonopts != 0) - { - permute (argv + permute_from, num_nonopts, 1 + arg_next); -- optind = permute_from + 1 + arg_next; -+ data->optind = permute_from + 1 + arg_next; - } -- else if (optwhere == 1) -- optind = optind + 1 + arg_next; -+ else if (data->optwhere == 1) -+ data->optind = data->optind + 1 + arg_next; - - /* finally return */ - if (longopt_match >= 0) - { -- if (longind != NULL) -- *longind = longopt_match; -- if (longopts[longopt_match].flag != NULL) -- { -- *(longopts[longopt_match].flag) = longopts[longopt_match].val; -- return 0; -- } -+ if (longind != 0) -+ *longind = longopt_match; -+ if (longopts[longopt_match].flag != 0) -+ { -+ *(longopts[longopt_match].flag) = longopts[longopt_match].val; -+ return 0; -+ } - else -- return longopts[longopt_match].val; -+ return longopts[longopt_match].val; - } - else -- return optopt; -+ return data->optopt; - } - - int - getopt (int argc, char *const argv[], const char *optstring) - { -- return getopt_internal (argc, argv, optstring, NULL, NULL, 0); -+ struct getopt_data data; -+ int r; -+ -+ read_globals (&data); -+ r = getopt_internal (argc, argv, optstring, 0, 0, 0, &data); -+ write_globals (&data); -+ return r; - } - - int - getopt_long (int argc, char *const argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct option *longopts, int *longind) - { -- return getopt_internal (argc, argv, shortopts, longopts, longind, 0); -+ struct getopt_data data; -+ int r; -+ -+ read_globals (&data); -+ r = getopt_internal (argc, argv, shortopts, longopts, longind, 0, &data); -+ write_globals (&data); -+ return r; - } - - int - getopt_long_only (int argc, char *const argv[], const char *shortopts, -- const struct option *longopts, int *longind) -+ const struct option *longopts, int *longind) -+{ -+ struct getopt_data data; -+ int r; -+ -+ read_globals (&data); -+ r = getopt_internal (argc, argv, shortopts, longopts, longind, 1, &data); -+ write_globals (&data); -+ return r; -+} -+ -+int -+__getopt_r (int argc, char *const argv[], const char *optstring, -+ struct getopt_data *data) -+{ -+ return getopt_internal (argc, argv, optstring, 0, 0, 0, data); -+} -+ -+int -+__getopt_long_r (int argc, char *const argv[], const char *shortopts, -+ const struct option *longopts, int *longind, -+ struct getopt_data *data) -+{ -+ return getopt_internal (argc, argv, shortopts, longopts, longind, 0, data); -+} -+ -+int -+__getopt_long_only_r (int argc, char *const argv[], const char *shortopts, -+ const struct option *longopts, int *longind, -+ struct getopt_data *data) - { -- return getopt_internal (argc, argv, shortopts, longopts, longind, 1); -+ return getopt_internal (argc, argv, shortopts, longopts, longind, 1, data); - } - - /* end of file GETOPT.C */ -diff -Naur newlib-1.16.0.orig/newlib/libc/sys/rtems/machine/stdint.h newlib-1.16.0/newlib/libc/sys/rtems/machine/stdint.h ---- newlib-1.16.0.orig/newlib/libc/sys/rtems/machine/stdint.h 1970-01-01 01:00:00.000000000 +0100 -+++ newlib-1.16.0/newlib/libc/sys/rtems/machine/stdint.h 2009-03-24 04:29:55.000000000 +0100 -@@ -0,0 +1,35 @@ -+/* -+ * -+ */ -+#ifndef _MACHINE_STDINT_H -+#define _MACHINE_STDINT_H -+ -+#ifndef _STDINT_H -+#error machine/stdint.h is an internal file and must not be directly included -+#endif -+ -+#ifndef __rtems__ -+#error machine/stdint.h is an RTEMS specific internal file and must not be used otherwise -+#endif -+ -+#if defined(__sparc__) \ -+ || defined(__powerpc__) || defined(__PPC__) \ -+ || defined(__mips__) \ -+ || defined(__sh__) \ -+ || defined(__AVR__) \ -+ || defined(_C4x) || defined(_C3x) \ -+ || defined(__H8300__) -+/* PTRDIFF_TYPE = int */ -+#define __ptrint_t_int_defined 1 -+#endif -+ -+#if defined(__i386__) \ -+ || defined(__m68k__) \ -+ || defined(__bfin__) \ -+ || defined(__arm__) \ -+ || defined(__H8300S__) || defined(__H8300H__) -+/* PTRDIFF_TYPE = long */ -+#define __ptrint_t_long_defined 1 -+#endif -+ -+#endif -diff -Naur newlib-1.16.0.orig/newlib/libc/sys/rtems/sys/param.h newlib-1.16.0/newlib/libc/sys/rtems/sys/param.h ---- newlib-1.16.0.orig/newlib/libc/sys/rtems/sys/param.h 2004-05-07 22:29:24.000000000 +0200 -+++ newlib-1.16.0/newlib/libc/sys/rtems/sys/param.h 2009-03-24 04:29:55.000000000 +0100 -@@ -93,7 +93,6 @@ - #include <sys/resource.h> - #include <sys/ucred.h> - #include <sys/uio.h> --#include <sys/rtprio.h> - - #ifndef FALSE - #define FALSE 0 -diff -Naur newlib-1.16.0.orig/newlib/Makefile.am newlib-1.16.0/newlib/Makefile.am ---- newlib-1.16.0.orig/newlib/Makefile.am 2007-05-24 19:33:29.000000000 +0200 -+++ newlib-1.16.0/newlib/Makefile.am 2009-03-24 04:29:55.000000000 +0100 -@@ -81,7 +81,7 @@ - libc.a - endif - --noinst_DATA = stmp-targ-include -+BUILT_SOURCES = stmp-targ-include - - toollib_DATA = $(CRT0) $(CRT1) - -@@ -186,9 +186,6 @@ - - $(CRT1_DIR)$(CRT1): ; @true - -- --all-recursive: stmp-targ-include -- - # The targ-include directory just holds the includes files for the - # particular system and machine we have been configured for. It is - # used while building. -diff -Naur newlib-1.16.0.orig/newlib/Makefile.in newlib-1.16.0/newlib/Makefile.in ---- newlib-1.16.0.orig/newlib/Makefile.in 2007-12-19 23:36:26.000000000 +0100 -+++ newlib-1.16.0/newlib/Makefile.in 2009-03-24 04:29:55.000000000 +0100 -@@ -105,7 +105,7 @@ - pdf-recursive ps-recursive uninstall-info-recursive \ - uninstall-recursive - toollibDATA_INSTALL = $(INSTALL_DATA) --DATA = $(noinst_DATA) $(toollib_DATA) -+DATA = $(toollib_DATA) - ETAGS = etags - CTAGS = ctags - DEJATOOL = $(PACKAGE) -@@ -339,7 +339,7 @@ - @USE_LIBTOOL_FALSE@toollib_LIBRARIES = libm.a \ - @USE_LIBTOOL_FALSE@ libc.a - --noinst_DATA = stmp-targ-include -+BUILT_SOURCES = stmp-targ-include - toollib_DATA = $(CRT0) $(CRT1) - - # The functions ldexp, frexp and modf are traditionally supplied in -@@ -398,7 +398,7 @@ - - # dejagnu support - RUNTESTFLAGS = --all: newlib.h -+all: $(BUILT_SOURCES) newlib.h - $(MAKE) $(AM_MAKEFLAGS) all-recursive - - .SUFFIXES: -@@ -703,14 +703,16 @@ - done - check-am: - $(MAKE) $(AM_MAKEFLAGS) check-DEJAGNU --check: check-recursive -+check: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) check-recursive - all-am: Makefile $(LIBRARIES) $(LTLIBRARIES) $(DATA) newlib.h - installdirs: installdirs-recursive - installdirs-am: - for dir in "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)" "$(DESTDIR)$(toollibdir)"; do \ - test -z "$$dir" || $(mkdir_p) "$$dir"; \ - done --install: install-recursive -+install: $(BUILT_SOURCES) -+ $(MAKE) $(AM_MAKEFLAGS) install-recursive - install-exec: install-exec-recursive - install-data: install-data-recursive - uninstall: uninstall-recursive -@@ -735,6 +737,7 @@ - maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -+ -test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES) - clean: clean-recursive - - clean-am: clean-generic clean-libtool clean-toollibLIBRARIES \ -@@ -853,8 +856,6 @@ - - $(CRT1_DIR)$(CRT1): ; @true - --all-recursive: stmp-targ-include -- - # The targ-include directory just holds the includes files for the - # particular system and machine we have been configured for. It is - # used while building. diff --git a/contrib/crossrpms/rtems4.9/Makefile.am b/contrib/crossrpms/rtems4.9/Makefile.am deleted file mode 100644 index 20440365e2..0000000000 --- a/contrib/crossrpms/rtems4.9/Makefile.am +++ /dev/null @@ -1,14 +0,0 @@ -# $Id$ - -SUBDIRS = -SUBDIRS += arm -SUBDIRS += avr -SUBDIRS += bfin -SUBDIRS += h8300 -SUBDIRS += i386 -SUBDIRS += m68k -SUBDIRS += mips -SUBDIRS += mipstx39 -SUBDIRS += powerpc -SUBDIRS += sh -SUBDIRS += sparc diff --git a/contrib/crossrpms/rtems4.9/arm/Makefile.am b/contrib/crossrpms/rtems4.9/arm/Makefile.am deleted file mode 100644 index 7af3c77c31..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = arm-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/arm/binutils-sources.add b/contrib/crossrpms/rtems4.9/arm/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/arm/gcc-sources.add b/contrib/crossrpms/rtems4.9/arm/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/arm/gdb-sources.add b/contrib/crossrpms/rtems4.9/arm/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec deleted file mode 100644 index c9bead20a2..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-arm-rtems4.9-binutils -Summary: Binutils for target arm-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target arm-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "arm-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=arm-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/arm-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/arm-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# arm-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-arm-rtems4.9-binutils -# Summary: rtems binutils for arm-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-arm-rtems4.9-binutils -GNU binutils targetting arm-rtems4.9. - -%files -n rtems-4.9-arm-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/arm-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/arm-rtems4.9-* - -%dir %{_exec_prefix}/arm-rtems4.9 -%dir %{_exec_prefix}/arm-rtems4.9/bin -%{_exec_prefix}/arm-rtems4.9/bin/* - -%dir %{_exec_prefix}/arm-rtems4.9/lib -%{_exec_prefix}/arm-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec deleted file mode 100644 index 76c20c7f77..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-arm-rtems4.9-gcc -Summary: arm-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-arm-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-arm-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-arm-rtems4.9-binutils -Requires: rtems-4.9-arm-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for arm-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=arm-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/arm-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/arm-rtems4.9-arm-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/arm-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/arm-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/arm-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/arm-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/arm-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-arm-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-arm-rtems4.9-gcc -# Summary: GNU cc compiler for arm-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-arm-rtems4.9-binutils -# Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-arm-rtems4.9-gcc -GNU cc compiler for arm-rtems4.9. - -# ============================================================== -# rtems-4.9-arm-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-arm-rtems4.9-gcc-libgcc -Summary: libgcc for arm-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-arm-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-arm-rtems4.9-gcc-libgcc -libgcc arm-rtems4.9-gcc. - - -%files -n rtems-4.9-arm-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/arm-rtems4.9-gcc.1* -%{_mandir}/man1/arm-rtems4.9-cpp.1* -%{_mandir}/man1/arm-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/arm-rtems4.9-cpp%{_exeext} -%{_bindir}/arm-rtems4.9-gcc%{_exeext} -%{_bindir}/arm-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/arm-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/arm-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/arm-rtems4.9 -%dir %{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-arm-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/arm-rtems4.9 -%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "arm-rtems4.9" != "bfin-rtems4.9" -%if "arm-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-arm-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-arm-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for arm-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-arm-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-arm-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-arm-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-arm-rtems4.9-gcc-c++ -GCC c++ compiler for arm-rtems4.9. - - -%package -n rtems-4.9-arm-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for arm-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-arm-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-arm-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/arm-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/arm-rtems4.9-c++%{_exeext} -%{_bindir}/arm-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/arm-rtems4.9 -%dir %{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/arm-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-arm-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/arm-rtems4.9 -%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/arm-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-arm-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-arm-rtems4.9-newlib -Summary: C Library (newlib) for arm-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-arm-rtems4.9-newlib -Newlib C Library for arm-rtems4.9. - -%files -n rtems-4.9-arm-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/arm-rtems4.9 -%{_exec_prefix}/arm-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec deleted file mode 100644 index 54e35f13e7..0000000000 --- a/contrib/crossrpms/rtems4.9/arm/rtems-4.9-arm-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-arm-rtems4.9-gdb -Summary: Gdb for target arm-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "arm-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "arm-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "arm-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "arm-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "arm-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "arm-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target arm-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=arm-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libarm-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# arm-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-arm-rtems4.9-gdb -# Summary: rtems gdb for arm-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-arm-rtems4.9-gdb -GNU gdb targetting arm-rtems4.9. - -%files -n rtems-4.9-arm-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/arm-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/arm-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/avr/Makefile.am b/contrib/crossrpms/rtems4.9/avr/Makefile.am deleted file mode 100644 index ffd3090ea9..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = avr-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/avr/binutils-sources.add b/contrib/crossrpms/rtems4.9/avr/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/avr/gcc-sources.add b/contrib/crossrpms/rtems4.9/avr/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/avr/gdb-sources.add b/contrib/crossrpms/rtems4.9/avr/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec deleted file mode 100644 index 4e3d92a92f..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-avr-rtems4.9-binutils -Summary: Binutils for target avr-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target avr-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "avr-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=avr-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/avr-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/avr-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# avr-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-avr-rtems4.9-binutils -# Summary: rtems binutils for avr-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-avr-rtems4.9-binutils -GNU binutils targetting avr-rtems4.9. - -%files -n rtems-4.9-avr-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/avr-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/avr-rtems4.9-* - -%dir %{_exec_prefix}/avr-rtems4.9 -%dir %{_exec_prefix}/avr-rtems4.9/bin -%{_exec_prefix}/avr-rtems4.9/bin/* - -%dir %{_exec_prefix}/avr-rtems4.9/lib -%{_exec_prefix}/avr-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec deleted file mode 100644 index d5d0519e12..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gcc.spec +++ /dev/null @@ -1,772 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-avr-rtems4.9-gcc -Summary: avr-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-avr-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-avr-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-avr-rtems4.9-binutils -Requires: rtems-4.9-avr-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for avr-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=avr-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/avr-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/avr-rtems4.9-avr-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/avr-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/avr-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/avr-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/avr-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/avr-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-avr-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-avr-rtems4.9-gcc -# Summary: GNU cc compiler for avr-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-avr-rtems4.9-binutils -# Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-avr-rtems4.9-gcc -GNU cc compiler for avr-rtems4.9. - -# ============================================================== -# rtems-4.9-avr-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-avr-rtems4.9-gcc-libgcc -Summary: libgcc for avr-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-avr-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-avr-rtems4.9-gcc-libgcc -libgcc avr-rtems4.9-gcc. - - -%files -n rtems-4.9-avr-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/avr-rtems4.9-gcc.1* -%{_mandir}/man1/avr-rtems4.9-cpp.1* -%{_mandir}/man1/avr-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/avr-rtems4.9-cpp%{_exeext} -%{_bindir}/avr-rtems4.9-gcc%{_exeext} -%{_bindir}/avr-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/avr-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/avr-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/avr-rtems4.9 -%dir %{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/avr-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-avr-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/avr-rtems4.9 -%dir %{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "avr-rtems4.9" != "bfin-rtems4.9" -%if "avr-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/avr-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - - - - -# ============================================================== -# rtems-4.9-avr-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-avr-rtems4.9-newlib -Summary: C Library (newlib) for avr-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-avr-rtems4.9-newlib -Newlib C Library for avr-rtems4.9. - -%files -n rtems-4.9-avr-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/avr-rtems4.9 -%{_exec_prefix}/avr-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec deleted file mode 100644 index c086ce411e..0000000000 --- a/contrib/crossrpms/rtems4.9/avr/rtems-4.9-avr-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-avr-rtems4.9-gdb -Summary: Gdb for target avr-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "avr-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "avr-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "avr-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "avr-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "avr-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "avr-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target avr-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=avr-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libavr-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# avr-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-avr-rtems4.9-gdb -# Summary: rtems gdb for avr-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-avr-rtems4.9-gdb -GNU gdb targetting avr-rtems4.9. - -%files -n rtems-4.9-avr-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/avr-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/avr-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/bfin/Makefile.am b/contrib/crossrpms/rtems4.9/bfin/Makefile.am deleted file mode 100644 index e3511de515..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = bfin-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.5 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 9 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/bfin/binutils-sources.add b/contrib/crossrpms/rtems4.9/bfin/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/bfin/gcc-sources.add b/contrib/crossrpms/rtems4.9/bfin/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/bfin/gdb-sources.add b/contrib/crossrpms/rtems4.9/bfin/gdb-sources.add deleted file mode 100644 index 28d6439741..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/gdb-sources.add +++ /dev/null @@ -1,3 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.5-bfinrtems-20090122.diff diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec deleted file mode 100644 index 2bf10968dd..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-bfin-rtems4.9-binutils -Summary: Binutils for target bfin-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target bfin-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "bfin-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=bfin-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/bfin-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/bfin-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# bfin-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-bfin-rtems4.9-binutils -# Summary: rtems binutils for bfin-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-bfin-rtems4.9-binutils -GNU binutils targetting bfin-rtems4.9. - -%files -n rtems-4.9-bfin-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/bfin-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/bfin-rtems4.9-* - -%dir %{_exec_prefix}/bfin-rtems4.9 -%dir %{_exec_prefix}/bfin-rtems4.9/bin -%{_exec_prefix}/bfin-rtems4.9/bin/* - -%dir %{_exec_prefix}/bfin-rtems4.9/lib -%{_exec_prefix}/bfin-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec deleted file mode 100644 index 43aa033beb..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-bfin-rtems4.9-gcc -Summary: bfin-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-bfin-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-bfin-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-bfin-rtems4.9-binutils -Requires: rtems-4.9-bfin-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for bfin-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=bfin-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/bfin-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/bfin-rtems4.9-bfin-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/bfin-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/bfin-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/bfin-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/bfin-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/bfin-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-bfin-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-bfin-rtems4.9-gcc -# Summary: GNU cc compiler for bfin-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-bfin-rtems4.9-binutils -# Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-bfin-rtems4.9-gcc -GNU cc compiler for bfin-rtems4.9. - -# ============================================================== -# rtems-4.9-bfin-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-bfin-rtems4.9-gcc-libgcc -Summary: libgcc for bfin-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-bfin-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-bfin-rtems4.9-gcc-libgcc -libgcc bfin-rtems4.9-gcc. - - -%files -n rtems-4.9-bfin-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/bfin-rtems4.9-gcc.1* -%{_mandir}/man1/bfin-rtems4.9-cpp.1* -%{_mandir}/man1/bfin-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/bfin-rtems4.9-cpp%{_exeext} -%{_bindir}/bfin-rtems4.9-gcc%{_exeext} -%{_bindir}/bfin-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/bfin-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/bfin-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/bfin-rtems4.9 -%dir %{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-bfin-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/bfin-rtems4.9 -%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "bfin-rtems4.9" != "bfin-rtems4.9" -%if "bfin-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-bfin-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-bfin-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for bfin-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-bfin-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-bfin-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-bfin-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-bfin-rtems4.9-gcc-c++ -GCC c++ compiler for bfin-rtems4.9. - - -%package -n rtems-4.9-bfin-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for bfin-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-bfin-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-bfin-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/bfin-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/bfin-rtems4.9-c++%{_exeext} -%{_bindir}/bfin-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/bfin-rtems4.9 -%dir %{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/bfin-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-bfin-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/bfin-rtems4.9 -%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/bfin-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-bfin-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-bfin-rtems4.9-newlib -Summary: C Library (newlib) for bfin-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-bfin-rtems4.9-newlib -Newlib C Library for bfin-rtems4.9. - -%files -n rtems-4.9-bfin-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/bfin-rtems4.9 -%{_exec_prefix}/bfin-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec deleted file mode 100644 index dc27b625be..0000000000 --- a/contrib/crossrpms/rtems4.9/bfin/rtems-4.9-bfin-rtems4.9-gdb.spec +++ /dev/null @@ -1,299 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.5 -%define gdb_rpmvers %{expand:%(echo 6.5 | tr - _)} - -Name: rtems-4.9-bfin-rtems4.9-gdb -Summary: Gdb for target bfin-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 9%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "bfin-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "bfin-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "bfin-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "bfin-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "bfin-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "bfin-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.5-bfinrtems-20090122.diff - -%description -GDB for target bfin-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=bfin-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libbfin-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# bfin-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-bfin-rtems4.9-gdb -# Summary: rtems gdb for bfin-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-bfin-rtems4.9-gdb -GNU gdb targetting bfin-rtems4.9. - -%files -n rtems-4.9-bfin-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/bfin-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/bfin-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/binutils.am b/contrib/crossrpms/rtems4.9/binutils.am deleted file mode 100644 index 93578ea74a..0000000000 --- a/contrib/crossrpms/rtems4.9/binutils.am +++ /dev/null @@ -1,31 +0,0 @@ -EXTRA_DIST += binutils-sources.add - -BINUTILS_OPTS = - -BINUTILS_SUBPACKAGES = $(top_srcdir)/common/common.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/binutils.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/prep.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/build.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/install.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/rpm-install.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/common/clean.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/target-binutils.add -BINUTILS_SUBPACKAGES += $(top_srcdir)/binutils/base-binutils.add - -$(TARGET)-binutils.spec.in: $(BINUTILS_SUBPACKAGES) Makefile.am $(srcdir)/binutils-sources.add - cat $(BINUTILS_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r $(srcdir)/binutils-sources.add" \ - -e "/[@]SOURCES[@]/d" \ - -e "s/[@]BINUTILS_VERS[@]/$(BINUTILS_VERS)/g" \ - -e "s/[@]BINUTILS_PKGVERS[@]/$(BINUTILS_PKGVERS)/g" \ - -e "s/[@]BINUTILS_RPMREL[@]/$(BINUTILS_RPMREL)%{?dist}/g" \ - -e "/--with-sysroot/d" \ - | $(MKSPEC0) > $(TARGET)-binutils.spec.in -CLEANFILES += $(TARGET)-binutils.spec.in - -@rpmprefix@$(TARGET)-binutils.spec: $(TARGET)-binutils.spec.in - $(MKSPEC) $(TARGET)-binutils.spec.in | $(SPECSTRIP) $(BINUTILS_OPTS) > $@ -CLEANFILES += @rpmprefix@$(TARGET)-binutils.spec -noinst_DATA += @rpmprefix@$(TARGET)-binutils.spec - -EXTRA_DIST += $(BINUTILS_SUBPACKAGES) diff --git a/contrib/crossrpms/rtems4.9/gcc-prep.add b/contrib/crossrpms/rtems4.9/gcc-prep.add deleted file mode 100644 index db1aa878d5..0000000000 --- a/contrib/crossrpms/rtems4.9/gcc-prep.add +++ /dev/null @@ -1,2 +0,0 @@ -echo "RTEMS gcc-%{gcc_version}-@GCC_RPMREL@\/newlib-%{newlib_version}-@NEWLIB_RPMREL@" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - diff --git a/contrib/crossrpms/rtems4.9/gcc.am b/contrib/crossrpms/rtems4.9/gcc.am deleted file mode 100644 index f7dd7a764c..0000000000 --- a/contrib/crossrpms/rtems4.9/gcc.am +++ /dev/null @@ -1,47 +0,0 @@ -EXTRA_DIST += $(srcdir)/../gcc-prep.add -EXTRA_DIST += $(srcdir)/gcc-sources.add - -GCC_OPTS = --languages=c --newlib - -GCC_SUBPACKAGES = $(top_srcdir)/common/common.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/gccnewlib.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/prep.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/build.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/install.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/rpm-install.add -GCC_SUBPACKAGES += $(top_srcdir)/common/clean.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gcc.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gcc.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-c++.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-gfortran.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-gfortran.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-objc.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/target-newlib.add -GCC_SUBPACKAGES += $(top_srcdir)/gcc/base-newlib.add - -$(TARGET)-gcc.spec.in: $(GCC_SUBPACKAGES) Makefile.am $(srcdir)/gcc-sources.add $(srcdir)/../gcc-prep.add $(srcdir)/../gcc.am - cat $(GCC_SUBPACKAGES) \ - | sed \ - -e "/[@]SOURCES[@]/r $(srcdir)/gcc-sources.add" \ - -e "/[@]SOURCES[@]/d" \ - -e "/[@]PREP[@]/r $(srcdir)/../gcc-prep.add" \ - -e "/[@]PREP[@]/d" \ - | sed \ - -e "s/[@]GCC_VERS[@]/$(GCC_VERS)/g" \ - -e "s/[@]GCC_PKGVERS[@]/$(GCC_PKGVERS)/g" \ - -e "s/[@]GCC_RPMREL[@]/$(GCC_RPMREL)%{?dist}/g" \ - -e "s/[@]NEWLIB_VERS[@]/$(NEWLIB_VERS)/g" \ - -e "s/[@]NEWLIB_PKGVERS[@]/$(NEWLIB_PKGVERS)/g" \ - -e "s/[@]NEWLIB_RPMREL[@]/$(NEWLIB_RPMREL)%{?dist}/g" \ - -e "/--with-sysroot/d" \ - -e "/[@]tool_target[@]-sys-root/d" \ - -e "/[@]tool_target[@]-w32api-sys-root/d" \ - | $(MKSPEC0) > $(TARGET)-gcc.spec.in -CLEANFILES += $(TARGET)-gcc.spec.in - -@rpmprefix@$(TARGET)-gcc.spec: $(TARGET)-gcc.spec.in - $(MKSPEC) $(TARGET)-gcc.spec.in | $(SPECSTRIP) $(GCC_OPTS) > $@ -CLEANFILES += @rpmprefix@$(TARGET)-gcc.spec -noinst_DATA += @rpmprefix@$(TARGET)-gcc.spec - -EXTRA_DIST += $(GCC_SUBPACKAGES) diff --git a/contrib/crossrpms/rtems4.9/gdb.am b/contrib/crossrpms/rtems4.9/gdb.am deleted file mode 100644 index 4b509c4547..0000000000 --- a/contrib/crossrpms/rtems4.9/gdb.am +++ /dev/null @@ -1,31 +0,0 @@ -EXTRA_DIST += gdb-sources.add - -GDB_OPTS = - -GDB_SUBPACKAGES = $(top_srcdir)/common/common.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/gdb.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/prep.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/build.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/install.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/rpm-install.add -GDB_SUBPACKAGES += $(top_srcdir)/common/clean.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/target-gdb.add -GDB_SUBPACKAGES += $(top_srcdir)/gdb/base-gdb.add - -$(TARGET)-gdb.spec.in: $(GDB_SUBPACKAGES) Makefile.am $(srcdir)/gdb-sources.add - cat $(GDB_SUBPACKAGES) | sed \ - -e "/[@]SOURCES[@]/r $(srcdir)/gdb-sources.add" \ - -e "/[@]SOURCES[@]/d" \ - -e "s/[@]GDB_VERS[@]/$(GDB_VERS)/g" \ - -e "s/[@]GDB_PKGVERS[@]/$(GDB_PKGVERS)/g" \ - -e "s/[@]GDB_RPMREL[@]/$(GDB_RPMREL)%{?dist}/g" \ - -e "/--with-sysroot/d" \ - | $(MKSPEC0) > $(TARGET)-gdb.spec.in -CLEANFILES += $(TARGET)-gdb.spec.in - -@rpmprefix@$(TARGET)-gdb.spec: $(TARGET)-gdb.spec.in - $(MKSPEC) $(TARGET)-gdb.spec.in | $(SPECSTRIP) $(GDB_OPTS) > $@ -CLEANFILES += @rpmprefix@$(TARGET)-gdb.spec -noinst_DATA += @rpmprefix@$(TARGET)-gdb.spec - -EXTRA_DIST += $(GDB_SUBPACKAGES) diff --git a/contrib/crossrpms/rtems4.9/h8300/Makefile.am b/contrib/crossrpms/rtems4.9/h8300/Makefile.am deleted file mode 100644 index 738fd87ee4..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = h8300-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/h8300/binutils-sources.add b/contrib/crossrpms/rtems4.9/h8300/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/h8300/gcc-sources.add b/contrib/crossrpms/rtems4.9/h8300/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/h8300/gdb-sources.add b/contrib/crossrpms/rtems4.9/h8300/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec deleted file mode 100644 index 5517492ac1..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-h8300-rtems4.9-binutils -Summary: Binutils for target h8300-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target h8300-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "h8300-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=h8300-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/h8300-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/h8300-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# h8300-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-h8300-rtems4.9-binutils -# Summary: rtems binutils for h8300-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-h8300-rtems4.9-binutils -GNU binutils targetting h8300-rtems4.9. - -%files -n rtems-4.9-h8300-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/h8300-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/h8300-rtems4.9-* - -%dir %{_exec_prefix}/h8300-rtems4.9 -%dir %{_exec_prefix}/h8300-rtems4.9/bin -%{_exec_prefix}/h8300-rtems4.9/bin/* - -%dir %{_exec_prefix}/h8300-rtems4.9/lib -%{_exec_prefix}/h8300-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec deleted file mode 100644 index 8974327cfd..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-h8300-rtems4.9-gcc -Summary: h8300-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-h8300-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-h8300-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-h8300-rtems4.9-binutils -Requires: rtems-4.9-h8300-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for h8300-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=h8300-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/h8300-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/h8300-rtems4.9-h8300-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/h8300-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/h8300-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/h8300-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/h8300-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/h8300-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-h8300-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-h8300-rtems4.9-gcc -# Summary: GNU cc compiler for h8300-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-h8300-rtems4.9-binutils -# Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-h8300-rtems4.9-gcc -GNU cc compiler for h8300-rtems4.9. - -# ============================================================== -# rtems-4.9-h8300-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-h8300-rtems4.9-gcc-libgcc -Summary: libgcc for h8300-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-h8300-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-h8300-rtems4.9-gcc-libgcc -libgcc h8300-rtems4.9-gcc. - - -%files -n rtems-4.9-h8300-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/h8300-rtems4.9-gcc.1* -%{_mandir}/man1/h8300-rtems4.9-cpp.1* -%{_mandir}/man1/h8300-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/h8300-rtems4.9-cpp%{_exeext} -%{_bindir}/h8300-rtems4.9-gcc%{_exeext} -%{_bindir}/h8300-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/h8300-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/h8300-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/h8300-rtems4.9 -%dir %{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-h8300-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/h8300-rtems4.9 -%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "h8300-rtems4.9" != "bfin-rtems4.9" -%if "h8300-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-h8300-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-h8300-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for h8300-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-h8300-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-h8300-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-h8300-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-h8300-rtems4.9-gcc-c++ -GCC c++ compiler for h8300-rtems4.9. - - -%package -n rtems-4.9-h8300-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for h8300-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-h8300-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-h8300-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/h8300-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/h8300-rtems4.9-c++%{_exeext} -%{_bindir}/h8300-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/h8300-rtems4.9 -%dir %{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/h8300-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-h8300-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/h8300-rtems4.9 -%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/h8300-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-h8300-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-h8300-rtems4.9-newlib -Summary: C Library (newlib) for h8300-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-h8300-rtems4.9-newlib -Newlib C Library for h8300-rtems4.9. - -%files -n rtems-4.9-h8300-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/h8300-rtems4.9 -%{_exec_prefix}/h8300-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec deleted file mode 100644 index 38fb9c7324..0000000000 --- a/contrib/crossrpms/rtems4.9/h8300/rtems-4.9-h8300-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-h8300-rtems4.9-gdb -Summary: Gdb for target h8300-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "h8300-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "h8300-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "h8300-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "h8300-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "h8300-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "h8300-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target h8300-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=h8300-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libh8300-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# h8300-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-h8300-rtems4.9-gdb -# Summary: rtems gdb for h8300-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-h8300-rtems4.9-gdb -GNU gdb targetting h8300-rtems4.9. - -%files -n rtems-4.9-h8300-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/h8300-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/h8300-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/i386/Makefile.am b/contrib/crossrpms/rtems4.9/i386/Makefile.am deleted file mode 100644 index aa8b10a79d..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = i386-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/i386/binutils-sources.add b/contrib/crossrpms/rtems4.9/i386/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/i386/gcc-sources.add b/contrib/crossrpms/rtems4.9/i386/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/i386/gdb-sources.add b/contrib/crossrpms/rtems4.9/i386/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec deleted file mode 100644 index 156b010f4e..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-i386-rtems4.9-binutils -Summary: Binutils for target i386-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target i386-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "i386-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=i386-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/i386-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/i386-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# i386-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-i386-rtems4.9-binutils -# Summary: rtems binutils for i386-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-i386-rtems4.9-binutils -GNU binutils targetting i386-rtems4.9. - -%files -n rtems-4.9-i386-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/i386-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/i386-rtems4.9-* - -%dir %{_exec_prefix}/i386-rtems4.9 -%dir %{_exec_prefix}/i386-rtems4.9/bin -%{_exec_prefix}/i386-rtems4.9/bin/* - -%dir %{_exec_prefix}/i386-rtems4.9/lib -%{_exec_prefix}/i386-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec deleted file mode 100644 index e34d15257b..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-i386-rtems4.9-gcc -Summary: i386-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-i386-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-i386-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-i386-rtems4.9-binutils -Requires: rtems-4.9-i386-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for i386-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=i386-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/i386-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/i386-rtems4.9-i386-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/i386-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/i386-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/i386-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/i386-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/i386-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-i386-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-i386-rtems4.9-gcc -# Summary: GNU cc compiler for i386-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-i386-rtems4.9-binutils -# Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-i386-rtems4.9-gcc -GNU cc compiler for i386-rtems4.9. - -# ============================================================== -# rtems-4.9-i386-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-i386-rtems4.9-gcc-libgcc -Summary: libgcc for i386-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-i386-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-i386-rtems4.9-gcc-libgcc -libgcc i386-rtems4.9-gcc. - - -%files -n rtems-4.9-i386-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/i386-rtems4.9-gcc.1* -%{_mandir}/man1/i386-rtems4.9-cpp.1* -%{_mandir}/man1/i386-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/i386-rtems4.9-cpp%{_exeext} -%{_bindir}/i386-rtems4.9-gcc%{_exeext} -%{_bindir}/i386-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/i386-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/i386-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/i386-rtems4.9 -%dir %{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-i386-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/i386-rtems4.9 -%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "i386-rtems4.9" != "bfin-rtems4.9" -%if "i386-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-i386-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-i386-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for i386-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-i386-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-i386-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-i386-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-i386-rtems4.9-gcc-c++ -GCC c++ compiler for i386-rtems4.9. - - -%package -n rtems-4.9-i386-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for i386-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-i386-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-i386-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/i386-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/i386-rtems4.9-c++%{_exeext} -%{_bindir}/i386-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/i386-rtems4.9 -%dir %{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/i386-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-i386-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/i386-rtems4.9 -%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/i386-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-i386-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-i386-rtems4.9-newlib -Summary: C Library (newlib) for i386-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-i386-rtems4.9-newlib -Newlib C Library for i386-rtems4.9. - -%files -n rtems-4.9-i386-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/i386-rtems4.9 -%{_exec_prefix}/i386-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec deleted file mode 100644 index b900068829..0000000000 --- a/contrib/crossrpms/rtems4.9/i386/rtems-4.9-i386-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-i386-rtems4.9-gdb -Summary: Gdb for target i386-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "i386-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "i386-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "i386-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "i386-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "i386-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "i386-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target i386-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=i386-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libi386-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# i386-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-i386-rtems4.9-gdb -# Summary: rtems gdb for i386-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-i386-rtems4.9-gdb -GNU gdb targetting i386-rtems4.9. - -%files -n rtems-4.9-i386-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/i386-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/i386-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/m68k/Makefile.am b/contrib/crossrpms/rtems4.9/m68k/Makefile.am deleted file mode 100644 index a662f528aa..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = m68k-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/m68k/binutils-sources.add b/contrib/crossrpms/rtems4.9/m68k/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/m68k/gcc-sources.add b/contrib/crossrpms/rtems4.9/m68k/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/m68k/gdb-sources.add b/contrib/crossrpms/rtems4.9/m68k/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec deleted file mode 100644 index be7fe42a3e..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-m68k-rtems4.9-binutils -Summary: Binutils for target m68k-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target m68k-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "m68k-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=m68k-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/m68k-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/m68k-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# m68k-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-m68k-rtems4.9-binutils -# Summary: rtems binutils for m68k-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-m68k-rtems4.9-binutils -GNU binutils targetting m68k-rtems4.9. - -%files -n rtems-4.9-m68k-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/m68k-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/m68k-rtems4.9-* - -%dir %{_exec_prefix}/m68k-rtems4.9 -%dir %{_exec_prefix}/m68k-rtems4.9/bin -%{_exec_prefix}/m68k-rtems4.9/bin/* - -%dir %{_exec_prefix}/m68k-rtems4.9/lib -%{_exec_prefix}/m68k-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec deleted file mode 100644 index f9e43eb8d8..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-m68k-rtems4.9-gcc -Summary: m68k-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-m68k-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-m68k-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-m68k-rtems4.9-binutils -Requires: rtems-4.9-m68k-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for m68k-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=m68k-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/m68k-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/m68k-rtems4.9-m68k-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/m68k-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/m68k-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/m68k-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/m68k-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/m68k-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-m68k-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-m68k-rtems4.9-gcc -# Summary: GNU cc compiler for m68k-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-m68k-rtems4.9-binutils -# Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-m68k-rtems4.9-gcc -GNU cc compiler for m68k-rtems4.9. - -# ============================================================== -# rtems-4.9-m68k-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-m68k-rtems4.9-gcc-libgcc -Summary: libgcc for m68k-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-m68k-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-m68k-rtems4.9-gcc-libgcc -libgcc m68k-rtems4.9-gcc. - - -%files -n rtems-4.9-m68k-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/m68k-rtems4.9-gcc.1* -%{_mandir}/man1/m68k-rtems4.9-cpp.1* -%{_mandir}/man1/m68k-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/m68k-rtems4.9-cpp%{_exeext} -%{_bindir}/m68k-rtems4.9-gcc%{_exeext} -%{_bindir}/m68k-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/m68k-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/m68k-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/m68k-rtems4.9 -%dir %{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-m68k-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/m68k-rtems4.9 -%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "m68k-rtems4.9" != "bfin-rtems4.9" -%if "m68k-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-m68k-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-m68k-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for m68k-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-m68k-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-m68k-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-m68k-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-m68k-rtems4.9-gcc-c++ -GCC c++ compiler for m68k-rtems4.9. - - -%package -n rtems-4.9-m68k-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for m68k-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-m68k-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-m68k-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/m68k-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/m68k-rtems4.9-c++%{_exeext} -%{_bindir}/m68k-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/m68k-rtems4.9 -%dir %{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/m68k-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-m68k-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/m68k-rtems4.9 -%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/m68k-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-m68k-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-m68k-rtems4.9-newlib -Summary: C Library (newlib) for m68k-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-m68k-rtems4.9-newlib -Newlib C Library for m68k-rtems4.9. - -%files -n rtems-4.9-m68k-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/m68k-rtems4.9 -%{_exec_prefix}/m68k-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec deleted file mode 100644 index eac0343ceb..0000000000 --- a/contrib/crossrpms/rtems4.9/m68k/rtems-4.9-m68k-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-m68k-rtems4.9-gdb -Summary: Gdb for target m68k-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "m68k-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "m68k-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "m68k-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "m68k-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "m68k-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "m68k-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target m68k-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=m68k-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libm68k-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# m68k-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-m68k-rtems4.9-gdb -# Summary: rtems gdb for m68k-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-m68k-rtems4.9-gdb -GNU gdb targetting m68k-rtems4.9. - -%files -n rtems-4.9-m68k-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/m68k-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/m68k-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/mips/Makefile.am b/contrib/crossrpms/rtems4.9/mips/Makefile.am deleted file mode 100644 index 0171af749d..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = mips-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/mips/binutils-sources.add b/contrib/crossrpms/rtems4.9/mips/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/mips/gcc-sources.add b/contrib/crossrpms/rtems4.9/mips/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/mips/gdb-sources.add b/contrib/crossrpms/rtems4.9/mips/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec deleted file mode 100644 index a7cd046de3..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-mips-rtems4.9-binutils -Summary: Binutils for target mips-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target mips-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "mips-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=mips-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/mips-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mips-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# mips-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-mips-rtems4.9-binutils -# Summary: rtems binutils for mips-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-mips-rtems4.9-binutils -GNU binutils targetting mips-rtems4.9. - -%files -n rtems-4.9-mips-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/mips-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/mips-rtems4.9-* - -%dir %{_exec_prefix}/mips-rtems4.9 -%dir %{_exec_prefix}/mips-rtems4.9/bin -%{_exec_prefix}/mips-rtems4.9/bin/* - -%dir %{_exec_prefix}/mips-rtems4.9/lib -%{_exec_prefix}/mips-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec deleted file mode 100644 index 642dd82eff..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-mips-rtems4.9-gcc -Summary: mips-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-mips-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-mips-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-mips-rtems4.9-binutils -Requires: rtems-4.9-mips-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for mips-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=mips-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/mips-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/mips-rtems4.9-mips-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/mips-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/mips-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/mips-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/mips-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/mips-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-mips-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-mips-rtems4.9-gcc -# Summary: GNU cc compiler for mips-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-mips-rtems4.9-binutils -# Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-mips-rtems4.9-gcc -GNU cc compiler for mips-rtems4.9. - -# ============================================================== -# rtems-4.9-mips-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-mips-rtems4.9-gcc-libgcc -Summary: libgcc for mips-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-mips-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-mips-rtems4.9-gcc-libgcc -libgcc mips-rtems4.9-gcc. - - -%files -n rtems-4.9-mips-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/mips-rtems4.9-gcc.1* -%{_mandir}/man1/mips-rtems4.9-cpp.1* -%{_mandir}/man1/mips-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/mips-rtems4.9-cpp%{_exeext} -%{_bindir}/mips-rtems4.9-gcc%{_exeext} -%{_bindir}/mips-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/mips-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/mips-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/mips-rtems4.9 -%dir %{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-mips-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/mips-rtems4.9 -%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "mips-rtems4.9" != "bfin-rtems4.9" -%if "mips-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-mips-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-mips-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for mips-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-mips-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-mips-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-mips-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-mips-rtems4.9-gcc-c++ -GCC c++ compiler for mips-rtems4.9. - - -%package -n rtems-4.9-mips-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for mips-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-mips-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-mips-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/mips-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/mips-rtems4.9-c++%{_exeext} -%{_bindir}/mips-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/mips-rtems4.9 -%dir %{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/mips-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-mips-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/mips-rtems4.9 -%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/mips-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-mips-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-mips-rtems4.9-newlib -Summary: C Library (newlib) for mips-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-mips-rtems4.9-newlib -Newlib C Library for mips-rtems4.9. - -%files -n rtems-4.9-mips-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/mips-rtems4.9 -%{_exec_prefix}/mips-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec deleted file mode 100644 index a28105591d..0000000000 --- a/contrib/crossrpms/rtems4.9/mips/rtems-4.9-mips-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-mips-rtems4.9-gdb -Summary: Gdb for target mips-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "mips-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "mips-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "mips-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "mips-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "mips-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "mips-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target mips-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=mips-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmips-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# mips-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-mips-rtems4.9-gdb -# Summary: rtems gdb for mips-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-mips-rtems4.9-gdb -GNU gdb targetting mips-rtems4.9. - -%files -n rtems-4.9-mips-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/mips-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/mips-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am b/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am deleted file mode 100644 index 88e50051df..0000000000 --- a/contrib/crossrpms/rtems4.9/mipstx39/Makefile.am +++ /dev/null @@ -1,12 +0,0 @@ -# $Id$ - -TARGET = mipstx39-rtems4.9 - -include $(top_srcdir)/mkspec.am - -# We only want a gdb with a tx39 simulator in it. We share the other tools -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/mipstx39/gdb-sources.add b/contrib/crossrpms/rtems4.9/mipstx39/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/mipstx39/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec deleted file mode 100644 index 15066a2f1c..0000000000 --- a/contrib/crossrpms/rtems4.9/mipstx39/rtems-4.9-mipstx39-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-mipstx39-rtems4.9-gdb -Summary: Gdb for target mipstx39-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "mipstx39-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "mipstx39-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "mipstx39-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "mipstx39-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "mipstx39-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "mipstx39-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target mipstx39-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=mipstx39-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libmipstx39-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# mipstx39-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-mipstx39-rtems4.9-gdb -# Summary: rtems gdb for mipstx39-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-mipstx39-rtems4.9-gdb -GNU gdb targetting mipstx39-rtems4.9. - -%files -n rtems-4.9-mipstx39-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/mipstx39-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/mipstx39-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am b/contrib/crossrpms/rtems4.9/powerpc/Makefile.am deleted file mode 100644 index 1202efe70e..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = powerpc-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/powerpc/binutils-sources.add b/contrib/crossrpms/rtems4.9/powerpc/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/powerpc/gcc-sources.add b/contrib/crossrpms/rtems4.9/powerpc/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/powerpc/gdb-sources.add b/contrib/crossrpms/rtems4.9/powerpc/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec deleted file mode 100644 index 8222ff41e7..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-powerpc-rtems4.9-binutils -Summary: Binutils for target powerpc-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target powerpc-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "powerpc-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=powerpc-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/powerpc-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/powerpc-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# powerpc-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-powerpc-rtems4.9-binutils -# Summary: rtems binutils for powerpc-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-powerpc-rtems4.9-binutils -GNU binutils targetting powerpc-rtems4.9. - -%files -n rtems-4.9-powerpc-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/powerpc-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/powerpc-rtems4.9-* - -%dir %{_exec_prefix}/powerpc-rtems4.9 -%dir %{_exec_prefix}/powerpc-rtems4.9/bin -%{_exec_prefix}/powerpc-rtems4.9/bin/* - -%dir %{_exec_prefix}/powerpc-rtems4.9/lib -%{_exec_prefix}/powerpc-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec deleted file mode 100644 index 1af1e45422..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-powerpc-rtems4.9-gcc -Summary: powerpc-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-powerpc-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-powerpc-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-powerpc-rtems4.9-binutils -Requires: rtems-4.9-powerpc-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for powerpc-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=powerpc-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/powerpc-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/powerpc-rtems4.9-powerpc-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/powerpc-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/powerpc-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/powerpc-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/powerpc-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/powerpc-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-powerpc-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-powerpc-rtems4.9-gcc -# Summary: GNU cc compiler for powerpc-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-powerpc-rtems4.9-binutils -# Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-powerpc-rtems4.9-gcc -GNU cc compiler for powerpc-rtems4.9. - -# ============================================================== -# rtems-4.9-powerpc-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-powerpc-rtems4.9-gcc-libgcc -Summary: libgcc for powerpc-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-powerpc-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-powerpc-rtems4.9-gcc-libgcc -libgcc powerpc-rtems4.9-gcc. - - -%files -n rtems-4.9-powerpc-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/powerpc-rtems4.9-gcc.1* -%{_mandir}/man1/powerpc-rtems4.9-cpp.1* -%{_mandir}/man1/powerpc-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/powerpc-rtems4.9-cpp%{_exeext} -%{_bindir}/powerpc-rtems4.9-gcc%{_exeext} -%{_bindir}/powerpc-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/powerpc-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/powerpc-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/powerpc-rtems4.9 -%dir %{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-powerpc-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9 -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "powerpc-rtems4.9" != "bfin-rtems4.9" -%if "powerpc-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-powerpc-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-powerpc-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for powerpc-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-powerpc-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-powerpc-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-powerpc-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-powerpc-rtems4.9-gcc-c++ -GCC c++ compiler for powerpc-rtems4.9. - - -%package -n rtems-4.9-powerpc-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for powerpc-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-powerpc-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-powerpc-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/powerpc-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/powerpc-rtems4.9-c++%{_exeext} -%{_bindir}/powerpc-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/powerpc-rtems4.9 -%dir %{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/powerpc-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-powerpc-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9 -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/powerpc-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-powerpc-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-powerpc-rtems4.9-newlib -Summary: C Library (newlib) for powerpc-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-powerpc-rtems4.9-newlib -Newlib C Library for powerpc-rtems4.9. - -%files -n rtems-4.9-powerpc-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/powerpc-rtems4.9 -%{_exec_prefix}/powerpc-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec deleted file mode 100644 index d4c228f341..0000000000 --- a/contrib/crossrpms/rtems4.9/powerpc/rtems-4.9-powerpc-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-powerpc-rtems4.9-gdb -Summary: Gdb for target powerpc-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "powerpc-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "powerpc-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "powerpc-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "powerpc-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "powerpc-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "powerpc-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target powerpc-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=powerpc-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libpowerpc-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# powerpc-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-powerpc-rtems4.9-gdb -# Summary: rtems gdb for powerpc-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-powerpc-rtems4.9-gdb -GNU gdb targetting powerpc-rtems4.9. - -%files -n rtems-4.9-powerpc-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/powerpc-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/powerpc-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/sh/Makefile.am b/contrib/crossrpms/rtems4.9/sh/Makefile.am deleted file mode 100644 index fc9bdb3eba..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = sh-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/sh/binutils-sources.add b/contrib/crossrpms/rtems4.9/sh/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/sh/gcc-sources.add b/contrib/crossrpms/rtems4.9/sh/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/sh/gdb-sources.add b/contrib/crossrpms/rtems4.9/sh/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec deleted file mode 100644 index 83b25c18c6..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-sh-rtems4.9-binutils -Summary: Binutils for target sh-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target sh-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "sh-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=sh-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sh-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sh-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# sh-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-sh-rtems4.9-binutils -# Summary: rtems binutils for sh-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-sh-rtems4.9-binutils -GNU binutils targetting sh-rtems4.9. - -%files -n rtems-4.9-sh-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sh-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/sh-rtems4.9-* - -%dir %{_exec_prefix}/sh-rtems4.9 -%dir %{_exec_prefix}/sh-rtems4.9/bin -%{_exec_prefix}/sh-rtems4.9/bin/* - -%dir %{_exec_prefix}/sh-rtems4.9/lib -%{_exec_prefix}/sh-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec deleted file mode 100644 index 430dd1b190..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-sh-rtems4.9-gcc -Summary: sh-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sh-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-sh-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-sh-rtems4.9-binutils -Requires: rtems-4.9-sh-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for sh-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=sh-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/sh-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/sh-rtems4.9-sh-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/sh-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/sh-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/sh-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sh-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sh-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-sh-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-sh-rtems4.9-gcc -# Summary: GNU cc compiler for sh-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-sh-rtems4.9-binutils -# Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-sh-rtems4.9-gcc -GNU cc compiler for sh-rtems4.9. - -# ============================================================== -# rtems-4.9-sh-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-sh-rtems4.9-gcc-libgcc -Summary: libgcc for sh-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-sh-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-sh-rtems4.9-gcc-libgcc -libgcc sh-rtems4.9-gcc. - - -%files -n rtems-4.9-sh-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sh-rtems4.9-gcc.1* -%{_mandir}/man1/sh-rtems4.9-cpp.1* -%{_mandir}/man1/sh-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/sh-rtems4.9-cpp%{_exeext} -%{_bindir}/sh-rtems4.9-gcc%{_exeext} -%{_bindir}/sh-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/sh-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/sh-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/sh-rtems4.9 -%dir %{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-sh-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/sh-rtems4.9 -%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "sh-rtems4.9" != "bfin-rtems4.9" -%if "sh-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-sh-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-sh-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for sh-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-sh-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sh-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-sh-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-sh-rtems4.9-gcc-c++ -GCC c++ compiler for sh-rtems4.9. - - -%package -n rtems-4.9-sh-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for sh-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-sh-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-sh-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sh-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/sh-rtems4.9-c++%{_exeext} -%{_bindir}/sh-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/sh-rtems4.9 -%dir %{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/sh-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-sh-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/sh-rtems4.9 -%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/sh-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-sh-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-sh-rtems4.9-newlib -Summary: C Library (newlib) for sh-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-sh-rtems4.9-newlib -Newlib C Library for sh-rtems4.9. - -%files -n rtems-4.9-sh-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/sh-rtems4.9 -%{_exec_prefix}/sh-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec deleted file mode 100644 index 9f1ad6b188..0000000000 --- a/contrib/crossrpms/rtems4.9/sh/rtems-4.9-sh-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-sh-rtems4.9-gdb -Summary: Gdb for target sh-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "sh-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "sh-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "sh-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "sh-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "sh-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "sh-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target sh-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=sh-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsh-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# sh-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-sh-rtems4.9-gdb -# Summary: rtems gdb for sh-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-sh-rtems4.9-gdb -GNU gdb targetting sh-rtems4.9. - -%files -n rtems-4.9-sh-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sh-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/sh-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/rtems4.9/sparc/Makefile.am b/contrib/crossrpms/rtems4.9/sparc/Makefile.am deleted file mode 100644 index 8aedd58c7f..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/Makefile.am +++ /dev/null @@ -1,26 +0,0 @@ -# $Id$ - -TARGET = sparc-rtems4.9 - -include $(top_srcdir)/mkspec.am - -BINUTILS_VERS = 2.19 -BINUTILS_PKGVERS = $(BINUTILS_VERS) -BINUTILS_RPMREL = 3 -include ../binutils.am -BINUTILS_OPTS += - -GCC_VERS = 4.3.2 -GCC_PKGVERS = $(GCC_VERS) -GCC_RPMREL = 25 -NEWLIB_VERS = 1.16.0 -NEWLIB_PKGVERS = $(NEWLIB_VERS) -NEWLIB_RPMREL = $(GCC_RPMREL) -include ../gcc.am -GCC_OPTS += --languages=cxx - -GDB_VERS = 6.8 -GDB_PKGVERS = $(GDB_VERS) -GDB_RPMREL = 11 -include ../gdb.am -GDB_OPTS += diff --git a/contrib/crossrpms/rtems4.9/sparc/binutils-sources.add b/contrib/crossrpms/rtems4.9/sparc/binutils-sources.add deleted file mode 100644 index a62b3075f9..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/binutils-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/sparc/gcc-sources.add b/contrib/crossrpms/rtems4.9/sparc/gcc-sources.add deleted file mode 100644 index 925adef17d..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/gcc-sources.add +++ /dev/null @@ -1,43 +0,0 @@ -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if %build_cxx -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -%endif -%if %build_fortran -Source2: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-fortran-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 2} - -%endif -%if %build_gcj -Source3: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-java-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 3} - -%endif -%if %build_gnat -Source4: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-ada-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 4} - -%endif -%if %build_objc -Source5: ftp://ftp.gnu.org/gnu/gcc/gcc-%{gcc_version}/gcc-objc-%{gcc_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 5} - -%endif -%if %build_newlib -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} -%endif diff --git a/contrib/crossrpms/rtems4.9/sparc/gdb-sources.add b/contrib/crossrpms/rtems4.9/sparc/gdb-sources.add deleted file mode 100644 index 1e13562fae..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/gdb-sources.add +++ /dev/null @@ -1,5 +0,0 @@ -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec deleted file mode 100644 index 7e88dc420c..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-binutils.spec +++ /dev/null @@ -1,277 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define binutils_pkgvers 2.19 -%define binutils_version 2.19 -%define binutils_rpmvers %{expand:%(echo "2.19" | tr - _ )} - -Name: rtems-4.9-sparc-rtems4.9-binutils -Summary: Binutils for target sparc-rtems4.9 -Group: Development/Tools -Version: %{binutils_rpmvers} -Release: 3%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/binutils -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%if "%{binutils_version}" >= "2.18" -# Bug in bfd: Doesn't build without texinfo installed -BuildRequires: texinfo >= 4.2 -%else -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 -%endif -BuildRequires: flex -BuildRequires: bison - -Requires: rtems-4.9-binutils-common - -Source0: ftp://ftp.gnu.org/pub/gnu/binutils/binutils-%{binutils_pkgvers}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{binutils_version}" == "2.18" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/binutils-2.18-rtems4.9-20080211.diff -%endif - -%description -Cross binutils for target sparc-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd binutils-%{binutils_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%build - export PATH="%{_bindir}:${PATH}" -%if "sparc-rtems4.9" == "i686-pc-cygwin" -# The cygwin sources are leaking memory - RPM_OPT_FLAGS="$(echo "$RPM_OPT_FLAGS"|sed -e 's; -Wp,-D_FORTIFY_SOURCE=2;;')" -%endif - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../binutils-%{binutils_pkgvers}/configure \ - --build=%_build --host=%_host \ - --target=sparc-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - --prefix=%{_prefix} --bindir=%{_bindir} \ - --exec-prefix=%{_exec_prefix} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - make prefix=$RPM_BUILD_ROOT%{_prefix} \ - bindir=$RPM_BUILD_ROOT%{_bindir} \ - includedir=$RPM_BUILD_ROOT%{_includedir} \ - libdir=$RPM_BUILD_ROOT%{_libdir} \ - infodir=$RPM_BUILD_ROOT%{_infodir} \ - mandir=$RPM_BUILD_ROOT%{_mandir} \ - exec_prefix=$RPM_BUILD_ROOT%{_exec_prefix} \ - install-info - -# Dropped in FSF-binutils-2.9.5, but Cygwin still ships it. - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure.info* - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# binutils does not install share/locale, however it uses it - mkdir -p $RPM_BUILD_ROOT%{_prefix}/share/locale - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# manpages without corresponding tools - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.9-dlltool%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.9-dlltool* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.9-nlmconv%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.9-nlmconv* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.9-windres%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.9-windres* - fi - if test ! -f ${RPM_BUILD_ROOT}%{_bindir}/sparc-rtems4.9-windmc%{_exeext}; then - rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/sparc-rtems4.9-windmc* - fi - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# sparc-rtems4.9-binutils -# ============================================================== -# %package -n rtems-4.9-sparc-rtems4.9-binutils -# Summary: rtems binutils for sparc-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-binutils-common -# %endif - -%description -n rtems-4.9-sparc-rtems4.9-binutils -GNU binutils targetting sparc-rtems4.9. - -%files -n rtems-4.9-sparc-rtems4.9-binutils -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sparc-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/sparc-rtems4.9-* - -%dir %{_exec_prefix}/sparc-rtems4.9 -%dir %{_exec_prefix}/sparc-rtems4.9/bin -%{_exec_prefix}/sparc-rtems4.9/bin/* - -%dir %{_exec_prefix}/sparc-rtems4.9/lib -%{_exec_prefix}/sparc-rtems4.9/lib/ldscripts -# ============================================================== -# rtems-4.9-binutils-common -# ============================================================== -%package -n rtems-4.9-binutils-common -Summary: Base package for RTEMS binutils -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-binutils-common - -RTEMS is an open source operating system for embedded systems. - -This is the base for binutils regardless of target CPU. - -%post -n rtems-4.9-binutils-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif - -%preun -n rtems-4.9-binutils-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/as.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/bfd.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/binutils.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/ld.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/standards.info.gz || : -%if "%{binutils_version}" > "2.17" - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gprof.info.gz || : -%endif -fi - -%files -n rtems-4.9-binutils-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/as.info* -%{_infodir}/bfd.info* -%{_infodir}/binutils.info* -%{_infodir}/ld.info* -%{_infodir}/standards.info* -%if "%{binutils_version}" > "2.17" -%{_infodir}/gprof.info* -%endif - -%dir %{_prefix}/share -%dir %{_prefix}/share/locale - diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec deleted file mode 100644 index f92d885d4c..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gcc.spec +++ /dev/null @@ -1,845 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - - -%define gcc_pkgvers 4.3.2 -%define gcc_version 4.3.2 -%define gcc_rpmvers %{expand:%(echo "4.3.2" | tr - _ )} - -%define newlib_pkgvers 1.16.0 -%define newlib_version 1.16.0 - -Name: rtems-4.9-sparc-rtems4.9-gcc -Summary: sparc-rtems4.9 gcc - -Group: Development/Tools -Version: %{gcc_rpmvers} -Release: 25%{?dist} -License: GPL -URL: http://gcc.gnu.org -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -%define _use_internal_dependency_generator 0 - -BuildRequires: %{_host_rpmprefix}gcc - -# versions of libraries, we conditionally bundle if necessary -%global mpc_version 0.8.1 -%global mpfr_version 2.4.2 -%global gmp_version 4.3.2 -%global libelf_version 0.8.13 - -# versions of libraries these distros are known to ship -%if 0%{?fc16} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc15} -%global mpc_provided 0.8.3 -%global mpfr_provided 3.0.0 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?fc14} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el6} -%global mpc_provided %{nil} -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?el5} -%global mpc_provided %{nil} -%global mpfr_provided %{nil} -%global gmp_provided 4.1.4 -%endif - -%if 0%{?suse11_3} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.2 -%global gmp_provided 4.3.2 -%endif - -%if 0%{?suse11_4} -%global mpc_provided 0.8.2 -%global mpfr_provided 3.0.0 -%global gmp_provided 5.0.1 -%endif - -%if 0%{?cygwin} -%global mpc_provided 0.8 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.1 -%endif - -%if 0%{?mingw32} -%global mpc_provided 0.8.1 -%global mpfr_provided 2.4.1 -%global gmp_provided 4.3.2 -%endif - -%if "%{gcc_version}" >= "4.2.0" -%endif - -%if "%{gcc_version}" >= "4.3.0" -%define gmp_required 4.1 -%define mpfr_required 2.3.1 -%endif - -%if "%{gcc_version}" >= "4.3.3" -%define cloog_required 0.15 -%endif - -%if "%{gcc_version}" >= "4.4.0" -%define mpfr_required 2.3.2 -%endif - -%if "%{gcc_version}" >= "4.5.0" -%define mpc_required 0.8 -%if %{with lto} -%define libelf_required 0.8.12 -%endif -%endif - -%if %{defined mpc_required} -%if "%{mpc_provided}" >= "%{mpc_required}" -%{?fedora:BuildRequires: libmpc-devel >= %{mpc_required}} -%{?suse:BuildRequires: mpc-devel >= %{mpc_required}} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpc-devel >= %{mpc_required} -%endif -%else -%define _build_mpc 1 -%define gmp_required 4.2 -%endif -%endif - -%if %{defined gmp_required} -%if "%{gmp_provided}" >= "%{gmp_required}" -BuildRequires: gmp-devel >= %{gmp_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}gmp-devel >= %{gmp_required} -%endif -%else -%define _build_gmp 1 -%endif -%endif - -%if %{defined libelf_required} -%if "%{libelf_provided}" >= "%{libelf_required}" -BuildRequires: libelf-devel >= %{libelf_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}libelf-devel >= %{libelf_required} -%endif -%else -%define _build_libelf 1 -%endif -%endif - - -%if %{defined cloog_required} -%{?fc14:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc15:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?fc16:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?el6:BuildRequires: cloog-ppl-devel >= %cloog_required} -%{?suse11_4:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%{?suse11_3:BuildRequires: cloog-devel >= %cloog_required, ppl-devel} -%endif - - -%if %{defined mpfr_required} -%if "%{mpfr_provided}" >= "%{mpfr_required}" -BuildRequires: mpfr-devel >= %{mpfr_required} -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}mpfr-devel >= %{mpfr_required} -%endif -%else -%define _build_mpfr 1 -%endif -%endif - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sparc-rtems4.9-gcc = %{gcc_rpmvers} -%endif - -%if "%{gcc_version}" >= "4.2.0" -BuildRequires: flex bison -%endif - - -BuildRequires: texinfo >= 4.2 -BuildRequires: rtems-4.9-sparc-rtems4.9-binutils - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-sparc-rtems4.9-binutils -Requires: rtems-4.9-sparc-rtems4.9-gcc-libgcc = %{gcc_rpmvers}-%{release} -Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-25%{?dist} - -%if "%{gcc_version}" >= "4.5.0" -BuildRequires: zlib-devel -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}zlib-devel -%endif -%else -%endif - -%global _gcclibdir %{_prefix}/lib - -%if "%{gcc_version}" == "4.3.2" -Source0: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-core-%{gcc_pkgvers}.tar.bz2 -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gcc-core-4.3.2-rtems4.9-20090825.diff -%endif -%{?_without_sources:NoSource: 0} - -%if "%{gcc_version}" == "4.3.2" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%if "%{gcc_version}" == "4.3.1" -Source1: ftp://ftp.gnu.org/pub/gnu/gcc/%{gcc_pkgvers}/gcc-g++-%{gcc_pkgvers}.tar.bz2 -%endif -%{?_without_sources:NoSource: 1} - -Source50: ftp://sources.redhat.com/pub/newlib/newlib-%{newlib_version}.tar.gz -%if "%{newlib_version}" == "1.16.0" -Patch50: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/newlib-1.16.0-rtems4.9-20090324.diff -%endif -%{?_without_sources:NoSource: 50} - -%if 0%{?_build_mpfr} -Source60: http://www.mpfr.org/mpfr-%{mpfr_version}/mpfr-%{mpfr_version}.tar.bz2 -%endif - -%if 0%{?_build_mpc} -Source61: http://www.multiprecision.org/mpc/download/mpc-%{mpc_version}.tar.gz -%endif - -%if 0%{?_build_gmp} -Source62: ftp://ftp.gnu.org/gnu/gmp/gmp-%{gmp_version}.tar.bz2 -%endif - -%if 0%{?_build_libelf} -Source63: http://www.mr511.de/software/libelf-%{libelf_version}.tar.gz -%endif - -%description -Cross gcc for sparc-rtems4.9. - -%prep -%setup -c -T -n %{name}-%{version} - -%setup -q -T -D -n %{name}-%{version} -a0 -cd gcc-%{gcc_pkgvers} -%{?PATCH0:%patch0 -p1} -cd .. - -%setup -q -T -D -n %{name}-%{version} -a1 -cd gcc-%{gcc_pkgvers} -%{?PATCH1:%patch1 -p1} -cd .. - - - - - -%setup -q -T -D -n %{name}-%{version} -a50 -cd newlib-%{newlib_version} -%{?PATCH50:%patch50 -p1} -cd .. - # Copy the C library into gcc's source tree - ln -s ../newlib-%{newlib_version}/newlib gcc-%{gcc_pkgvers} - # Make sure not to be using GPL'ed sources - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/linux - rm -rf gcc-%{gcc_pkgvers}/newlib/libc/sys/rdos - -%if 0%{?_build_mpfr} -%setup -q -T -D -n %{name}-%{version} -a60 -%{?PATCH60:%patch60 -p1} - # Build mpfr one-tree style - ln -s ../mpfr-%{mpfr_version} gcc-%{gcc_pkgvers}/mpfr -%endif - -%if 0%{?_build_mpc} -%setup -q -T -D -n %{name}-%{version} -a61 -%{?PATCH61:%patch61 -p1} - # Build mpc one-tree style - ln -s ../mpc-%{mpc_version} gcc-%{gcc_pkgvers}/mpc -%endif - -%if 0%{?_build_gmp} -%setup -q -T -D -n %{name}-%{version} -a62 -%{?PATCH62:%patch62 -p1} - # Build gmp one-tree style - ln -s ../gmp-%{gmp_version} gcc-%{gcc_pkgvers}/gmp -%endif - -%if 0%{?_build_libelf} -%setup -q -T -D -n %{name}-%{version} -a63 -%{?PATCH63:%patch63 -p1} - # Build libelf one-tree style - ln -s ../libelf-%{libelf_version} gcc-%{gcc_pkgvers}/libelf -%endif - -echo "RTEMS gcc-%{gcc_version}-25%{?dist}\/newlib-%{newlib_version}-25%{?dist}" > gcc-%{gcc_pkgvers}/gcc/DEV-PHASE - - - # Fix timestamps - cd gcc-%{gcc_pkgvers} - contrib/gcc_update --touch - cd .. -%build - mkdir -p build - - cd build - - languages="c" - languages="$languages,c++" - export PATH="%{_bindir}:${PATH}" -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ - CC="%{_host}-gcc ${RPM_OPT_FLAGS}" \ -%else -# gcc is not ready to be compiled with -std=gnu99 - CC=$(echo "%{__cc} ${RPM_OPT_FLAGS}" | sed -e 's,-std=gnu99 ,,') \ -%endif - ../gcc-%{gcc_pkgvers}/configure \ - --prefix=%{_prefix} \ - --bindir=%{_bindir} \ - --exec_prefix=%{_exec_prefix} \ - --includedir=%{_includedir} \ - --libdir=%{_gcclibdir} \ - --libexecdir=%{_libexecdir} \ - --mandir=%{_mandir} \ - --infodir=%{_infodir} \ - --datadir=%{_datadir} \ - --build=%_build --host=%_host \ - --target=sparc-rtems4.9 \ - --disable-libstdcxx-pch \ - --with-gnu-as --with-gnu-ld --verbose \ - --with-newlib \ - --with-system-zlib \ - --disable-nls --without-included-gettext \ - --disable-win32-registry \ - --enable-version-specific-runtime-libs \ - --enable-threads \ - --enable-newlib-io-c99-formats \ - --enable-languages="$languages" - -%if "%_host" != "%_build" - # Bug in gcc-3.2.1: - # Somehow, gcc doesn't get syslimits.h right for Cdn-Xs - mkdir -p gcc/include - cp ../gcc-%{gcc_pkgvers}/gcc/gsyslimits.h gcc/include/syslimits.h -%endif - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - - make DESTDIR=$RPM_BUILD_ROOT install - cd .. - - cd build/sparc-rtems4.9/newlib - make DESTDIR=$RPM_BUILD_ROOT install-info - cd ../../.. - -%if "%{gcc_version}" <= "4.1.2" -# Misplaced header file - if test -f $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h; then - mv $RPM_BUILD_ROOT%{_includedir}/mf-runtime.h \ - $RPM_BUILD_ROOT%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include/ - fi -%endif - - # host library -%if "%{gcc_version}" >= "4.2.0" - # libiberty doesn't honor --libdir, but always installs to a - # magically guessed _libdir - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty.a -%else - # libiberty installs to --libdir=... - rm -f ${RPM_BUILD_ROOT}%{_gcclibdir}/libiberty.a -%endif - - # We use the version from binutils - rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.9-c++filt%{_exeext} - - - # We don't ship info/dir - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - - # We don't want libffi's man-pages - rm -f $RPM_BUILD_ROOT%{_mandir}/man3/*ffi* - - # Bug in gcc-3.4.0pre - rm -f $RPM_BUILD_ROOT%{_bindir}/sparc-rtems4.9-sparc-rtems4.9-gcjh%{_exeext} - - # Bug in gcc-3.3.x/gcc-3.4.x: Despite we don't need fixincludes, it installs - # the fixinclude-install-tools - rm -rf ${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/install-tools - rm -rf ${RPM_BUILD_ROOT}%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/install-tools - - # Bug in gcc > 4.1.0: Installs an unused, empty directory - if test -d ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.9/include/bits; then - rmdir ${RPM_BUILD_ROOT}%{_prefix}/sparc-rtems4.9/include/bits - fi - - # Collect multilib subdirectories - multilibs=`build/gcc/xgcc -Bbuild/gcc/ --print-multi-lib | sed -e 's,;.*$,,'` - - echo "%defattr(-,root,root,-)" > build/files.newlib - TGTDIR="%{_exec_prefix}/sparc-rtems4.9/lib" - for i in $multilibs; do - case $i in - \.) echo "%dir ${TGTDIR}" >> build/files.newlib - ;; - *) echo "%dir ${TGTDIR}/$i" >> build/files.newlib - ;; - esac - done - - rm -f dirs ; - echo "%defattr(-,root,root,-)" >> dirs - TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}" - for i in $multilibs; do - case $i in - \.) ;; # ignore, handled elsewhere - *) echo "%dir ${TGTDIR}/$i" >> dirs - ;; - esac - done - - # Collect files to go into different packages - cp dirs build/files.gcc - cp dirs build/files.gfortran - cp dirs build/files.objc - cp dirs build/files.gcj - cp dirs build/files.g++ - - TGTDIR="%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i ;; # ignore: gcc produces bogus libtool libs - *f771) ;; - *f951) ;; - *cc1) ;; - *cc1obj) ;; - *cc1plus) ;; # ignore: explicitly put into rpm elsewhere - *collect2) ;; - *libobjc*) echo "$i" >> build/files.objc ;; - *include/objc*) ;; - *include/g++*);; - *include/c++*);; - *include-fixed/*);; - *finclude/*);; - *adainclude*);; - *adalib*);; - *gnat1);; - *jc1) ;; - *jvgenmain) ;; - */libgfortran*.*) echo "$i" >> build/files.gfortran ;; - */libstdc++.*) echo "$i" >> build/files.g++ ;; - */libsupc++.*) echo "$i" >> build/files.g++ ;; - *) echo "$i" >> build/files.gcc ;; - esac - done - - TGTDIR="%{_exec_prefix}/sparc-rtems4.9/lib" - f=`find ${RPM_BUILD_ROOT}${TGTDIR} ! -type d -print | sed -e "s,^$RPM_BUILD_ROOT,,g"`; - for i in $f; do - case $i in - *lib*.la) rm ${RPM_BUILD_ROOT}/$i;; # ignore - gcc produces bogus libtool libs - *libiberty.a) rm ${RPM_BUILD_ROOT}/$i ;; # ignore - GPL'ed -# all other files belong to newlib - *) echo "$i" >> build/files.newlib ;; - esac - done -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.9/'} | %__find_provides -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides -%define __find_provides %{_builddir}/%{name}-%{gcc_rpmvers}/find-provides - -cat << EOF > %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -#!/bin/sh -grep -E -v '^${RPM_BUILD_ROOT}%{_exec_prefix}/sparc-rtems4.9/(lib|include|sys-root)' \ - %{?_gcclibdir:| grep -v '^${RPM_BUILD_ROOT}%{_gcclibdir}/gcc/sparc-rtems4.9/'} | %__find_requires -EOF -chmod +x %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires -%define __find_requires %{_builddir}/%{name}-%{gcc_rpmvers}/find-requires - -%ifnarch noarch -# Extract %%__debug_install_post into debug_install_post~ -cat << \EOF > debug_install_post~ -%__debug_install_post -EOF - -# Generate customized debug_install_post script -cat debug_install_post~ | while read a x y; do -case $a in -# Prevent find-debuginfo.sh* from trying to handle foreign binaries -*/find-debuginfo.sh) - b=$(basename $a) - sed -e 's,find "$RPM_BUILD_ROOT" !,find "$RPM_BUILD_ROOT"%_bindir "$RPM_BUILD_ROOT"%_libexecdir !,' $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm/find-debuginfo.sh,./find-debuginfo.sh,' \ -< debug_install_post~ > debug_install_post -%define __debug_install_post . ./debug_install_post - -%endif - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# rtems-4.9-sparc-rtems4.9-gcc -# ============================================================== -# %package -n rtems-4.9-sparc-rtems4.9-gcc -# Summary: GNU cc compiler for sparc-rtems4.9 -# Group: Development/Tools -# Version: %{gcc_rpmvers} -# Requires: rtems-4.9-sparc-rtems4.9-binutils -# Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-25%{?dist} -# License: GPL - -# %if %build_infos -# Requires: rtems-4.9-gcc-common -# %endif - -%description -n rtems-4.9-sparc-rtems4.9-gcc -GNU cc compiler for sparc-rtems4.9. - -# ============================================================== -# rtems-4.9-sparc-rtems4.9-gcc-libgcc -# ============================================================== -%package -n rtems-4.9-sparc-rtems4.9-gcc-libgcc -Summary: libgcc for sparc-rtems4.9-gcc -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -Requires: rtems-4.9-sparc-rtems4.9-newlib = %{newlib_version}-25%{?dist} -License: GPL - -%description -n rtems-4.9-sparc-rtems4.9-gcc-libgcc -libgcc sparc-rtems4.9-gcc. - - -%files -n rtems-4.9-sparc-rtems4.9-gcc -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sparc-rtems4.9-gcc.1* -%{_mandir}/man1/sparc-rtems4.9-cpp.1* -%{_mandir}/man1/sparc-rtems4.9-gcov.1* - -%dir %{_bindir} -%{_bindir}/sparc-rtems4.9-cpp%{_exeext} -%{_bindir}/sparc-rtems4.9-gcc%{_exeext} -%{_bindir}/sparc-rtems4.9-gcc-%{gcc_version}%{_exeext} -%{_bindir}/sparc-rtems4.9-gcov%{_exeext} -%if "%{gcc_version}" < "4.6.0" -%{_bindir}/sparc-rtems4.9-gccbug -%endif - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/sparc-rtems4.9 -%dir %{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/cc1%{_exeext} -%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/collect2%{_exeext} -%if "%{gcc_version}" >= "4.5.0" -%{?with_lto:%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/lto%{_exeext}} -%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/lto-wrapper%{_exeext} -%endif - -%files -n rtems-4.9-sparc-rtems4.9-gcc-libgcc -f build/files.gcc -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/sparc-rtems4.9 -%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include - -%if "%{gcc_version}" > "4.0.3" -%if "sparc-rtems4.9" != "bfin-rtems4.9" -%if "sparc-rtems4.9" != "avr-rtems4.9" -%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include/ssp -%endif -%endif -%endif - -%if "%{gcc_version}" >= "4.3.0" -%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include-fixed -%endif - -# ============================================================== -# rtems-4.9-gcc-common -# ============================================================== -%package -n rtems-4.9-gcc-common -Summary: Base package for rtems gcc and newlib C Library -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-gcc-common -GCC files that are shared by all targets. - -%files -n rtems-4.9-gcc-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/cpp.info* -%{_infodir}/cppinternals.info* -%{_infodir}/gcc.info* -%{_infodir}/gccint.info* -%{_infodir}/gccinstall.info* -%if "%{gcc_version}" >= "4.6.0" -%{_infodir}/libquadmath.info* -%endif - -%dir %{_mandir} -%dir %{_mandir}/man7 -%{_mandir}/man7/fsf-funding.7* -%{_mandir}/man7/gfdl.7* -%{_mandir}/man7/gpl.7* - -%post -n rtems-4.9-gcc-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : - -%preun -n rtems-4.9-gcc-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cpp.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/cppinternals.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gcc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gccinstall.info.gz || : -fi - -# ============================================================== -# rtems-4.9-sparc-rtems4.9-gcc-c++ -# ============================================================== -%package -n rtems-4.9-sparc-rtems4.9-gcc-c++ -Summary: GCC c++ compiler for sparc-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -License: GPL -Requires: rtems-4.9-sparc-rtems4.9-gcc-libstdc++ = %{gcc_rpmvers}-%{release} - -%if "%{_build}" != "%{_host}" -BuildRequires: rtems-4.9-sparc-rtems4.9-gcc-c++ = %{gcc_rpmvers} -%endif - -Requires: rtems-4.9-gcc-common -Requires: rtems-4.9-sparc-rtems4.9-gcc = %{gcc_rpmvers}-%{release} - -%description -n rtems-4.9-sparc-rtems4.9-gcc-c++ -GCC c++ compiler for sparc-rtems4.9. - - -%package -n rtems-4.9-sparc-rtems4.9-gcc-libstdc++ -Summary: libstdc++ for sparc-rtems4.9 -Group: Development/Tools -Version: %{gcc_rpmvers} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: GPL - -%description -n rtems-4.9-sparc-rtems4.9-gcc-libstdc++ -%{summary} - - -%files -n rtems-4.9-sparc-rtems4.9-gcc-c++ -%defattr(-,root,root) -%dir %{_prefix} - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sparc-rtems4.9-g++.1* - -%dir %{_bindir} -%{_bindir}/sparc-rtems4.9-c++%{_exeext} -%{_bindir}/sparc-rtems4.9-g++%{_exeext} - -%dir %{_libexecdir} -%dir %{_libexecdir}/gcc -%dir %{_libexecdir}/gcc/sparc-rtems4.9 -%dir %{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version} -%{_libexecdir}/gcc/sparc-rtems4.9/%{gcc_version}/cc1plus%{_exeext} - - -%files -n rtems-4.9-sparc-rtems4.9-gcc-libstdc++ -f build/files.g++ -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_gcclibdir} -%dir %{_gcclibdir}/gcc -%dir %{_gcclibdir}/gcc/sparc-rtems4.9 -%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version} -%dir %{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include -%{_gcclibdir}/gcc/sparc-rtems4.9/%{gcc_version}/include/c++ - - - -# ============================================================== -# rtems-4.9-sparc-rtems4.9-newlib -# ============================================================== -%package -n rtems-4.9-sparc-rtems4.9-newlib -Summary: C Library (newlib) for sparc-rtems4.9 -Group: Development/Tools -License: Distributable -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} - -Requires: rtems-4.9-newlib-common - -%description -n rtems-4.9-sparc-rtems4.9-newlib -Newlib C Library for sparc-rtems4.9. - -%files -n rtems-4.9-sparc-rtems4.9-newlib -f build/files.newlib -%defattr(-,root,root) -%dir %{_exec_prefix} -%dir %{_exec_prefix}/sparc-rtems4.9 -%{_exec_prefix}/sparc-rtems4.9/include - -# ============================================================== -# rtems-4.9-newlib-common -# ============================================================== -%package -n rtems-4.9-newlib-common -Summary: Base package for RTEMS newlib C Library -Group: Development/Tools -Version: %{newlib_version} -Release: 25%{?dist} -%{?_with_noarch_subpackages:BuildArch: noarch} -License: Distributable - -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info - -%description -n rtems-4.9-newlib-common -newlib files that are shared by all targets. - -%files -n rtems-4.9-newlib-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/libc.info* -%{_infodir}/libm.info* - -%post -n rtems-4.9-newlib-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : - -%preun -n rtems-4.9-newlib-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/libm.info.gz || : -fi - diff --git a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec b/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec deleted file mode 100644 index d3b2f79f17..0000000000 --- a/contrib/crossrpms/rtems4.9/sparc/rtems-4.9-sparc-rtems4.9-gdb.spec +++ /dev/null @@ -1,301 +0,0 @@ -# -# Please send bugfixes or comments to -# http://www.rtems.org/bugzilla -# - -%define _prefix /opt/rtems-4.9 -%define _exec_prefix %{_prefix} -%define _bindir %{_exec_prefix}/bin -%define _sbindir %{_exec_prefix}/sbin -%define _libexecdir %{_exec_prefix}/libexec -%define _datarootdir %{_prefix}/share -%define _datadir %{_datarootdir} -%define _sysconfdir %{_prefix}/etc -%define _sharedstatedir %{_prefix}/com -%define _localstatedir %{_prefix}/var -%define _includedir %{_prefix}/include -%define _libdir %{_exec_prefix}/%{_lib} -%define _mandir %{_datarootdir}/man -%define _infodir %{_datarootdir}/info -%define _localedir %{_datarootdir}/locale - -%ifos cygwin cygwin32 mingw mingw32 -%define _exeext .exe -%define debug_package %{nil} -%define _libdir %{_exec_prefix}/lib -%else -%define _exeext %{nil} -%endif - -%ifos cygwin cygwin32 -%define optflags -O3 -pipe -march=i486 -funroll-loops -%endif - -%ifos mingw mingw32 -%if %{defined _mingw32_cflags} -%define optflags %{_mingw32_cflags} -%else -%define optflags -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions --param=ssp-buffer-size=4 -mms-bitfields -%endif -%endif - -%if "%{_build}" != "%{_host}" -%define _host_rpmprefix %{_host}- -%else -%define _host_rpmprefix %{nil} -%endif - -%define gdb_version 6.8 -%define gdb_rpmvers %{expand:%(echo 6.8 | tr - _)} - -Name: rtems-4.9-sparc-rtems4.9-gdb -Summary: Gdb for target sparc-rtems4.9 -Group: Development/Tools -Version: %{gdb_rpmvers} -Release: 11%{?dist} -License: GPL/LGPL -URL: http://sources.redhat.com/gdb -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: %{_host_rpmprefix}gcc - -%define build_sim --enable-sim -%if "%{_build}" != "%{_host}" -# psim doesn't support Cdn-X -%if "sparc-rtems4.9" == "powerpc-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%ifos mingw mingw32 -# Mingw lacks functions required by the simulator -%if "sparc-rtems4.9" == "sparc-rtems4.9" -%define build_sim --disable-sim -%endif -%if "sparc-rtems4.9" == "h8300-rtems4.9" -%define build_sim --disable-sim -%endif -%if "%{gdb_version}" >= "6.8.50" -%if "sparc-rtems4.9" == "m32c-rtems4.9" -%define build_sim --disable-sim -%endif -%endif -%if "sparc-rtems4.9" == "lm32-rtems4.9" -%define build_sim --disable-sim -%endif -%if "sparc-rtems4.9" == "mipstx39-rtems4.9" -%define build_sim --disable-sim -%endif -%endif - -%if "%{gdb_version}" >= "6.6" -# suse -%if "%{?suse}" >= "10.3" -BuildRequires: libexpat-devel -%else -# Fedora/CentOS/Cygwin/MinGW -BuildRequires: %{_host_rpmprefix}expat-devel -%endif -%endif - -%if "%{gdb_version}" < "6.7" -%if "%{_build}" != "%{_host}" -BuildRequires: %{_host_rpmprefix}termcap-devel -%endif -%bcond_with system_readline -%else -%bcond_without system_readline -%endif -%{?with_system_readline:BuildRequires: %{_host_rpmprefix}readline-devel} -BuildRequires: %{_host_rpmprefix}ncurses-devel - -%if "%{gdb_version}" >= "6.8.50" -%if "%{_build}" != "%{_host}" -# Can't build python Cdn-X -%bcond_with python -%else -%bcond_without python -%endif -%endif -%{?with_python:BuildRequires: %{_host_rpmprefix}python-devel} - -# Required for building the infos -BuildRequires: /sbin/install-info -BuildRequires: texinfo >= 4.2 - - -Requires: rtems-4.9-gdb-common - -Source0: ftp://ftp.gnu.org/pub/gnu/gdb/gdb-%{gdb_version}.tar.bz2 -%{?_without_sources:NoSource: 0} -%if "%{gdb_version}" == "6.8" -Patch0: ftp://ftp.rtems.org/pub/rtems/SOURCES/4.9/gdb-6.8-rtems4.9-20091111.diff -%endif - -%description -GDB for target sparc-rtems4.9 -%prep -%setup -q -c -T -n %{name}-%{version} - -%setup -q -D -T -n %{name}-%{version} -a0 -cd gdb-%{gdb_version} -%{?PATCH0:%patch0 -p1} -cd .. - -# Force using a system-provided libreadline -%{?with_system_readline:rm -f gdb-%{gdb_version}/readline/configure} -%build - export PATH="%{_bindir}:${PATH}" - mkdir -p build - cd build -%if "%{_build}" != "%{_host}" - CFLAGS_FOR_BUILD="-g -O2 -Wall" \ -%endif - CFLAGS="$RPM_OPT_FLAGS" \ - ../gdb-%{gdb_version}/configure \ - --build=%_build --host=%_host \ - --target=sparc-rtems4.9 \ - --verbose --disable-nls \ - --without-included-gettext \ - --disable-win32-registry \ - --disable-werror \ - %{build_sim} \ - %{?with_system_readline:--with-system-readline} \ -%if "%{gdb_version}" >= "6.6" - --with-expat \ -%endif -%if "%{gdb_version}" >= "6.8.50" -%if %{with python} - --with-python \ -%else - --without-python \ -%endif -%endif - --prefix=%{_prefix} --bindir=%{_bindir} \ - --includedir=%{_includedir} --libdir=%{_libdir} \ - --mandir=%{_mandir} --infodir=%{_infodir} - - make %{?_smp_mflags} all - make info - cd .. - -%install - export PATH="%{_bindir}:${PATH}" - rm -rf $RPM_BUILD_ROOT - - cd build - make DESTDIR=$RPM_BUILD_ROOT install - - rm -f $RPM_BUILD_ROOT%{_infodir}/dir - touch $RPM_BUILD_ROOT%{_infodir}/dir - -# These come from other packages - rm -rf $RPM_BUILD_ROOT%{_infodir}/bfd* - rm -rf $RPM_BUILD_ROOT%{_infodir}/configure* - rm -rf $RPM_BUILD_ROOT%{_infodir}/standards* - -# We don't ship host files - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libiberty* - -# host library, installed to a bogus directory - rm -f ${RPM_BUILD_ROOT}%{_libdir}/libsparc-rtems4.9-sim.a - - cd .. - -# Extract %%__os_install_post into os_install_post~ -cat << \EOF > os_install_post~ -%__os_install_post -EOF - -# Generate customized brp-*scripts -cat os_install_post~ | while read a x y; do -case $a in -# Prevent brp-strip* from trying to handle foreign binaries -*/brp-strip*) - b=$(basename $a) - sed -e 's,find $RPM_BUILD_ROOT,find $RPM_BUILD_ROOT%_bindir $RPM_BUILD_ROOT%_libexecdir,' $a > $b - chmod a+x $b - ;; -# Fix up brp-compress to handle %%_prefix != /usr -*/brp-compress*) - b=$(basename $a) - sed -e 's,\./usr/,.%{_prefix}/,g' < $a > $b - chmod a+x $b - ;; -esac -done - -sed -e 's,^[ ]*/usr/lib/rpm.*/brp-strip,./brp-strip,' \ - -e 's,^[ ]*/usr/lib/rpm.*/brp-compress,./brp-compress,' \ -< os_install_post~ > os_install_post -%define __os_install_post . ./os_install_post - -%clean - rm -rf $RPM_BUILD_ROOT - -# ============================================================== -# sparc-rtems4.9-gdb -# ============================================================== -# %package -n rtems-4.9-sparc-rtems4.9-gdb -# Summary: rtems gdb for sparc-rtems4.9 -# Group: Development/Tools -# %if %build_infos -# Requires: rtems-4.9-gdb-common -# %endif - -%description -n rtems-4.9-sparc-rtems4.9-gdb -GNU gdb targetting sparc-rtems4.9. - -%files -n rtems-4.9-sparc-rtems4.9-gdb -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_mandir} -%dir %{_mandir}/man1 -%{_mandir}/man1/sparc-rtems4.9-*.1* - -%dir %{_bindir} -%{_bindir}/sparc-rtems4.9-* - -# ============================================================== -# rtems-4.9-gdb-common -# ============================================================== -%package -n rtems-4.9-gdb-common -Summary: Base package for RTEMS gdbs -Group: Development/Tools -Requires(post): /sbin/install-info -Requires(preun): /sbin/install-info -%{?_with_noarch_subpackages:BuildArch: noarch} - -%description -n rtems-4.9-gdb-common - -GDB files shared by all targets. - -%post -n rtems-4.9-gdb-common - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : - -%preun -n rtems-4.9-gdb-common -if [ $1 -eq 0 ]; then - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdb.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/gdbint.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/stabs.info.gz || : - /sbin/install-info --delete --info-dir=%{_infodir} %{_infodir}/annotate.info.gz || : -fi - -%files -n rtems-4.9-gdb-common -%defattr(-,root,root) -%dir %{_prefix} -%dir %{_prefix}/share - -%dir %{_infodir} -%ghost %{_infodir}/dir -%{_infodir}/gdb.info* - -%{_infodir}/gdbint.info* -%{_infodir}/stabs.info* -%{_infodir}/annotate.info* - diff --git a/contrib/crossrpms/specstrip b/contrib/crossrpms/specstrip deleted file mode 100755 index 31c5ddfa0c..0000000000 --- a/contrib/crossrpms/specstrip +++ /dev/null @@ -1,176 +0,0 @@ -#!/usr/bin/perl -w - - -# Helper script to strip unused parts out of crossrpms's rpm.specs -# -# Usage: specstrip < infile > outfile - - -# Copyright (C) 2005,2006 Ralf Corsépius, Ulm, Germany, -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# For a copy of the GNU General Public License, visit -# http://www.gnu.org or write to the Free Software Foundation, Inc., -# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -# $Id$ - -use Getopt::Long; - -use strict; - -my $newlib = 0; -my $infos = 0; -my $prefix = '/usr'; - -my $verbose = 0; -my @languages = (); -my %options = (); - -GetOptions( - \%options, - 'prefix=s' => \$prefix, - 'enable-infos' => sub { $options{infos} = 1 }, - 'disable-infos' => sub { $options{infos} = 0 }, - 'newlib!', - 'languages=s' => \@languages, - 'verbose+' => \$verbose -) or die( "failed to GetOptions" ); - -if ( !defined($options{infos}) ) -{ # User did not override, use defaults - if ( $prefix =~ m/^\/usr$/ ) { - $infos = 0; - } elsif ( $prefix =~ m/^\/usr\/local$/ ) { - $infos = 0; - } else { - $infos = 1; - } -} else { - $infos = int($options{infos}); -} - -if ( defined($options{newlib}) ) -{ - $newlib = $options{newlib}; -} else { - $newlib = 0; -} - -if ( $verbose ) { - print STDERR "INFOS : $infos\n"; - print STDERR "PREFIX : $prefix\n"; -} - -my %langs; - -foreach ( split(/,/,join(',',@languages)) ){ - $langs{$_} = 1; -} - -my @condstack ; -my @actionstack ; - -push @condstack,'<>'; - -my @npatterns = ( - "(\"%\{_prefix\}\" (!=|==) \"/usr\")", - - "(%build_cxx)", - "(%build_gnat)", - "(%build_objc)", - "(%build_gcj)", - "(%build_libgcj)", - "(%build_fortran)", - "(%build_newlib)", - "(%build_infos)" -); - -my @ppatterns = ( -); - -push @ppatterns, "(\"%\{_prefix\}\" " . (("$prefix" eq '/usr') ? '!=' : '==' ) . " \"/usr\")"; - -push @ppatterns, "(%build_gnat " . ( ($langs{gnat}) ? "==" : "!=" ) . " 0)"; -push @ppatterns, "(%build_cxx " . ( ($langs{cxx}) ? "==" : "!=" ) . " 0)"; -push @ppatterns, "(%build_objc " . ( ($langs{objc}) ? "==" : "!=" ) . " 0)"; -push @ppatterns, "(%build_gcj " . ( ($langs{gcj}) ? "==" : "!=" ) . " 0)"; -push @ppatterns, "(%build_libgcj " . ( ($langs{libgcj}) ? "==" : "!=" ) . " 0)"; -push @ppatterns, "(%build_fortran " . ( ($langs{fortran}) ? "==" : "!=" ) . " 0)"; - -push @ppatterns, "(%build_newlib " . ( ($newlib) ? "==" : "!=" ) . " 0)"; -push @ppatterns, "(%build_infos " . ( ($infos) ? "==" : "!=" ) . " 0)"; - -my $npat = join('|',@npatterns); -my $ppat = join('|',@ppatterns); - -if ( $verbose > 1 ) { - print STDERR "PPAT: ", $ppat, "\n"; - print STDERR "NPAT: ", $npat, "\n"; -} - -my @buffer0 = <> ; - -my @buffer2 ; -foreach (@buffer0) -{ - chomp $_; - if ( /^%if(os|)\s+(.*)$/ ) - { - push @condstack,"<$2>"; - if ( $condstack[$#condstack] =~ m/$npat/ ) { - # transform unary conditionals into binary conditionals - if ( $condstack[$#condstack] =~/.*<(%[a-zA-Z_0-9]+)>.*/ ) { - $condstack[$#condstack] = "<$1 != 0>"; - } - } else { - push @buffer2, { state => join('',@condstack), line => "$_" }; - } - } elsif ( /^%else.*$/ ) - { - my %ops = ( - "!=" => "==", - "==" => "!=" - ); - - if ( $condstack[$#condstack] =~/.*<(.*) (!=|==) (.*)>.*/ ) { - $condstack[$#condstack] = "<$1 " . $ops{$2} . " $3>"; - if ( $condstack[$#condstack] =~ m/$npat/ ) { - } else { - push @buffer2, { state => join('',@condstack), line => "$_" }; - } - } else { - push @buffer2, { state => join('',@condstack), line => "$_" }; - } - } elsif ( /^%endif.*$/ ) - { - if ( $condstack[$#condstack] =~ m/$npat/ ) { - } else { - push @buffer2, { state => join('',@condstack), line => "$_" }; - } - pop @condstack; - } else { - push @buffer2, { state => join('',@condstack), line => "$_" }; - } -} - -my @buffer3; -foreach my $i ( @buffer2 ) -{ -# print STDERR $i->{state}, $i->{line}, "\n"; - if ( $i->{state} =~ m/($ppat)/ ) { - } else { - push @buffer3, $i->{line}, "\n" - } -} - -print STDOUT @buffer3; |