diff options
| author | Khem Raj <raj.khem@gmail.com> | 2009-12-29 23:56:56 -0800 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2009-12-29 23:59:19 -0800 |
| commit | 6f3c454e909d678fec3825909d18a9889f03bc36 (patch) | |
| tree | 911fceb45f6ac3c9255fc7cb8cd09f684aa2e210 | |
| parent | b657b3004d7419c59322bf46edf7a869d5109d40 (diff) | |
| download | openembedded-6f3c454e909d678fec3825909d18a9889f03bc36.tar.gz | |
gcc-svn: Move SRCREV to recipe.
* Delete the unused patches
* Add --with-system-zlib to configure options.
* Add patches needed for uclibc build.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
146 files changed, 70 insertions, 605429 deletions
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index 316027272d..f942057adb 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -86,12 +86,6 @@ SRCREV_pn-fsoraw ?= "20" SRCREV_pn-fstests ?= "204" SRCREV_pn-gabriel ?= "38" SRCREV_pn-gabriel-native ?= "38" -GCCREV ?= "155234" -SRCREV_pn-gcc ?= ${GCCREV} -SRCREV_pn-gcc-cross ?= ${GCCREV} -SRCREV_pn-gcc-cross-initial ?= ${GCCREV} -SRCREV_pn-gcc-cross-intermediate ?= ${GCCREV} -SRCREV_pn-gcc-cross-sdk ?= ${GCCREV} SRCREV_pn-gconf-dbus ?= "641" SRCREV_pn-glamo-dri-tests ?= "080b8db3d9dbfae38ebb00439887b5535ab1d380" SRCREV_pn-gnet ?= "495" diff --git a/recipes/gcc/gcc-cross_svn.bb b/recipes/gcc/gcc-cross_svn.bb index af46e3ac88..c8e75d1881 100644 --- a/recipes/gcc/gcc-cross_svn.bb +++ b/recipes/gcc/gcc-cross_svn.bb @@ -8,6 +8,6 @@ DEPENDS += "mpc-native" SRC_URI_append_fail-fast = " file://zecke-no-host-includes.patch;patch=1 " -EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native}" +EXTRA_OECONF += " --disable-libunwind-exceptions --with-mpfr=${STAGING_DIR_NATIVE}${prefix_native} --with-system-zlib" ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_DIR_TARGET}${target_includedir}" diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc index c39546dc96..0198a8ddd9 100644 --- a/recipes/gcc/gcc-svn.inc +++ b/recipes/gcc/gcc-svn.inc @@ -1,22 +1,25 @@ -# No armeb and thumb patches - really needs checking DEFAULT_PREFERENCE = "-999" ARM_INSTRUCTION_SET = "arm" +SRCREV="155514" + require gcc-common.inc DEPENDS = "mpfr gmp mpc" GCC_BASE ?= "4.5" -PV = "${GCC_BASE}+svnr${SRCPV}" +PV = "${GCC_BASE}+svnr${SRCREV}" PR = "r0" -#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take -# precedence. FILESPATHPKG .= ":gcc-svn" SRC_URI = "svn://gcc.gnu.org/svn/gcc;module=trunk \ file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \ + file://100-uclibc-conf.patch;patch=1 \ + file://gcc-uclibc-locale-ctype_touplow_t.patch;patch=1 \ + file://cache-amnesia.patch;patch=1 \ " + # Language Overrides FORTRAN = "" JAVA = "" diff --git a/recipes/gcc/gcc-svn/103-uclibc-conf-noupstream.patch b/recipes/gcc/gcc-svn/103-uclibc-conf-noupstream.patch deleted file mode 100644 index 09c9bbecfb..0000000000 --- a/recipes/gcc/gcc-svn/103-uclibc-conf-noupstream.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc/gcc/config.gcc.uclibc100-sh~ 2006-03-06 20:46:56 +0100 -+++ gcc/gcc/config.gcc 2006-03-10 15:02:41 +0100 -@@ -1905,7 +1905,7 @@ - ;; - sh-*-elf* | sh[12346l]*-*-elf* | sh*-*-kaos* | \ - sh-*-symbianelf* | sh[12346l]*-*-symbianelf* | \ -- sh-*-linux* | sh[346lbe]*-*-linux* | \ -+ sh*-*-linux* | sh[346lbe]*-*-linux* | \ - sh-*-netbsdelf* | shl*-*-netbsdelf* | sh5-*-netbsd* | sh5l*-*-netbsd* | \ - sh64-*-netbsd* | sh64l*-*-netbsd*) - tmake_file="${tmake_file} sh/t-sh sh/t-elf" diff --git a/recipes/gcc/gcc-svn/110-arm-eabi.patch b/recipes/gcc/gcc-svn/110-arm-eabi.patch deleted file mode 100644 index acebe5308f..0000000000 --- a/recipes/gcc/gcc-svn/110-arm-eabi.patch +++ /dev/null @@ -1,27 +0,0 @@ ---- gcc-2005q3-1.orig/gcc/config.gcc 2005-10-31 19:02:54.000000000 +0300 -+++ gcc-2005q3-1/gcc/config.gcc 2006-01-27 01:09:09.000000000 +0300 -@@ -674,7 +674,7 @@ - tm_file="dbxelf.h elfos.h linux.h arm/elf.h arm/linux-gas.h arm/linux-elf.h" - tmake_file="t-slibgcc-elf-ver t-linux arm/t-arm" - case ${target} in -- arm*-*-linux-gnueabi) -+ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi) - tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" - tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi" - # The BPABI long long divmod functions return a 128-bit value in - -diff -urN gcc-2005q3-2/gcc/config/arm/linux-eabi.h gcc-2005q3-2.new/gcc/config/arm/linux-eabi.h ---- gcc-2005q3-2/gcc/config/arm/linux-eabi.h 2005-12-07 23:14:16.000000000 +0300 -+++ gcc-2005q3-2.new/gcc/config/arm/linux-eabi.h 2006-03-29 19:02:34.000000000 +0400 -@@ -53,7 +53,11 @@ - /* Use ld-linux.so.3 so that it will be possible to run "classic" - GNU/Linux binaries on an EABI system. */ - #undef LINUX_TARGET_INTERPRETER -+#ifdef USE_UCLIBC -+#define LINUX_TARGET_INTERPRETER "/lib/ld-uClibc.so.0" -+#else - #define LINUX_TARGET_INTERPRETER "/lib/ld-linux.so.3" -+#endif - - /* At this point, bpabi.h will have clobbered LINK_SPEC. We want to - use the GNU/Linux version, not the generic BPABI version. */ diff --git a/recipes/gcc/gcc-svn/200-uclibc-locale.patch b/recipes/gcc/gcc-svn/200-uclibc-locale.patch deleted file mode 100644 index 70ba98eed7..0000000000 --- a/recipes/gcc/gcc-svn/200-uclibc-locale.patch +++ /dev/null @@ -1,2833 +0,0 @@ -Index: gcc-4.3.2/libstdc++-v3/acinclude.m4 -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/acinclude.m4 2008-04-25 09:52:57.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/acinclude.m4 2008-08-28 17:55:56.000000000 -0700 -@@ -1349,7 +1349,7 @@ - AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [ - GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@], - [use MODEL for target locale package], -- [permit generic|gnu|ieee_1003.1-2001|yes|no|auto]) -+ [permit generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto]) - - # Deal with gettext issues. Default to not using it (=no) until we detect - # support for it later. Let the user turn it off via --e/d, but let that -@@ -1370,6 +1370,9 @@ - # Default to "generic". - if test $enable_clocale_flag = auto; then - case ${target_os} in -+ *-uclibc*) -+ enable_clocale_flag=uclibc -+ ;; - linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) - enable_clocale_flag=gnu - ;; -@@ -1541,6 +1544,40 @@ - CTIME_CC=config/locale/generic/time_members.cc - CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h - ;; -+ uclibc) -+ AC_MSG_RESULT(uclibc) -+ -+ # Declare intention to use gettext, and add support for specific -+ # languages. -+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT -+ ALL_LINGUAS="de fr" -+ -+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc. -+ AC_CHECK_PROG(check_msgfmt, msgfmt, yes, no) -+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then -+ USE_NLS=yes -+ fi -+ # Export the build objects. -+ for ling in $ALL_LINGUAS; do \ -+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \ -+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \ -+ done -+ AC_SUBST(glibcxx_MOFILES) -+ AC_SUBST(glibcxx_POFILES) -+ -+ CLOCALE_H=config/locale/uclibc/c_locale.h -+ CLOCALE_CC=config/locale/uclibc/c_locale.cc -+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc -+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc -+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc -+ CMESSAGES_H=config/locale/uclibc/messages_members.h -+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc -+ CMONEY_CC=config/locale/uclibc/monetary_members.cc -+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc -+ CTIME_H=config/locale/uclibc/time_members.h -+ CTIME_CC=config/locale/uclibc/time_members.cc -+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h -+ ;; - esac - - # This is where the testsuite looks for locale catalogs, using the -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,63 @@ -+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*- -+ -+// Copyright (C) 2002, 2004, 2005 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// Written by Jakub Jelinek <jakub@redhat.com> -+ -+#include <bits/c++config.h> -+#include <clocale> -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning clean this up -+#endif -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ -+extern "C" __typeof(nl_langinfo_l) __nl_langinfo_l; -+extern "C" __typeof(strcoll_l) __strcoll_l; -+extern "C" __typeof(strftime_l) __strftime_l; -+extern "C" __typeof(strtod_l) __strtod_l; -+extern "C" __typeof(strtof_l) __strtof_l; -+extern "C" __typeof(strtold_l) __strtold_l; -+extern "C" __typeof(strxfrm_l) __strxfrm_l; -+extern "C" __typeof(newlocale) __newlocale; -+extern "C" __typeof(freelocale) __freelocale; -+extern "C" __typeof(duplocale) __duplocale; -+extern "C" __typeof(uselocale) __uselocale; -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+extern "C" __typeof(iswctype_l) __iswctype_l; -+extern "C" __typeof(towlower_l) __towlower_l; -+extern "C" __typeof(towupper_l) __towupper_l; -+extern "C" __typeof(wcscoll_l) __wcscoll_l; -+extern "C" __typeof(wcsftime_l) __wcsftime_l; -+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l; -+extern "C" __typeof(wctype_l) __wctype_l; -+#endif -+ -+#endif // GLIBC 2.3 and later -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,160 @@ -+// Wrapper for underlying C-language localization -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.8 Standard locale categories. -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#include <cerrno> // For errno -+#include <locale> -+#include <stdexcept> -+#include <langinfo.h> -+#include <bits/c++locale_internal.h> -+ -+#ifndef __UCLIBC_HAS_XLOCALE__ -+#define __strtol_l(S, E, B, L) strtol((S), (E), (B)) -+#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B)) -+#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B)) -+#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B)) -+#define __strtof_l(S, E, L) strtof((S), (E)) -+#define __strtod_l(S, E, L) strtod((S), (E)) -+#define __strtold_l(S, E, L) strtold((S), (E)) -+#warning should dummy __newlocale check for C|POSIX ? -+#define __newlocale(a, b, c) NULL -+#define __freelocale(a) ((void)0) -+#define __duplocale(a) __c_locale() -+#endif -+ -+namespace std -+{ -+ template<> -+ void -+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, -+ const __c_locale& __cloc) -+ { -+ if (!(__err & ios_base::failbit)) -+ { -+ char* __sanity; -+ errno = 0; -+ float __f = __strtof_l(__s, &__sanity, __cloc); -+ if (__sanity != __s && errno != ERANGE) -+ __v = __f; -+ else -+ __err |= ios_base::failbit; -+ } -+ } -+ -+ template<> -+ void -+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, -+ const __c_locale& __cloc) -+ { -+ if (!(__err & ios_base::failbit)) -+ { -+ char* __sanity; -+ errno = 0; -+ double __d = __strtod_l(__s, &__sanity, __cloc); -+ if (__sanity != __s && errno != ERANGE) -+ __v = __d; -+ else -+ __err |= ios_base::failbit; -+ } -+ } -+ -+ template<> -+ void -+ __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err, -+ const __c_locale& __cloc) -+ { -+ if (!(__err & ios_base::failbit)) -+ { -+ char* __sanity; -+ errno = 0; -+ long double __ld = __strtold_l(__s, &__sanity, __cloc); -+ if (__sanity != __s && errno != ERANGE) -+ __v = __ld; -+ else -+ __err |= ios_base::failbit; -+ } -+ } -+ -+ void -+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s, -+ __c_locale __old) -+ { -+ __cloc = __newlocale(1 << LC_ALL, __s, __old); -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ if (!__cloc) -+ { -+ // This named locale is not supported by the underlying OS. -+ __throw_runtime_error(__N("locale::facet::_S_create_c_locale " -+ "name not valid")); -+ } -+#endif -+ } -+ -+ void -+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc) -+ { -+ if (_S_get_c_locale() != __cloc) -+ __freelocale(__cloc); -+ } -+ -+ __c_locale -+ locale::facet::_S_clone_c_locale(__c_locale& __cloc) -+ { return __duplocale(__cloc); } -+} // namespace std -+ -+namespace __gnu_cxx -+{ -+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] = -+ { -+ "LC_CTYPE", -+ "LC_NUMERIC", -+ "LC_TIME", -+ "LC_COLLATE", -+ "LC_MONETARY", -+ "LC_MESSAGES", -+#if _GLIBCXX_NUM_CATEGORIES != 0 -+ "LC_PAPER", -+ "LC_NAME", -+ "LC_ADDRESS", -+ "LC_TELEPHONE", -+ "LC_MEASUREMENT", -+ "LC_IDENTIFICATION" -+#endif -+ }; -+} -+ -+namespace std -+{ -+ const char* const* const locale::_S_categories = __gnu_cxx::category_names; -+} // namespace std -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,117 @@ -+// Wrapper for underlying C-language localization -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.8 Standard locale categories. -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#ifndef _C_LOCALE_H -+#define _C_LOCALE_H 1 -+ -+#pragma GCC system_header -+ -+#include <cstring> // get std::strlen -+#include <cstdio> // get std::snprintf or std::sprintf -+#include <clocale> -+#include <langinfo.h> // For codecvt -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix this -+#endif -+#ifdef __UCLIBC_HAS_LOCALE__ -+#include <iconv.h> // For codecvt using iconv, iconv_t -+#endif -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ -+#include <libintl.h> // For messages -+#endif -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning what is _GLIBCXX_C_LOCALE_GNU for -+#endif -+#define _GLIBCXX_C_LOCALE_GNU 1 -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix categories -+#endif -+// #define _GLIBCXX_NUM_CATEGORIES 6 -+#define _GLIBCXX_NUM_CATEGORIES 0 -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+namespace __gnu_cxx -+{ -+ extern "C" __typeof(uselocale) __uselocale; -+} -+#endif -+ -+namespace std -+{ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ typedef __locale_t __c_locale; -+#else -+ typedef int* __c_locale; -+#endif -+ -+ // Convert numeric value of type _Tv to string and return length of -+ // string. If snprintf is available use it, otherwise fall back to -+ // the unsafe sprintf which, in general, can be dangerous and should -+ // be avoided. -+ template<typename _Tv> -+ int -+ __convert_from_v(char* __out, -+ const int __size __attribute__ ((__unused__)), -+ const char* __fmt, -+#ifdef __UCLIBC_HAS_XCLOCALE__ -+ _Tv __v, const __c_locale& __cloc, int __prec) -+ { -+ __c_locale __old = __gnu_cxx::__uselocale(__cloc); -+#else -+ _Tv __v, const __c_locale&, int __prec) -+ { -+# ifdef __UCLIBC_HAS_LOCALE__ -+ char* __old = std::setlocale(LC_ALL, NULL); -+ char* __sav = new char[std::strlen(__old) + 1]; -+ std::strcpy(__sav, __old); -+ std::setlocale(LC_ALL, "C"); -+# endif -+#endif -+ -+ const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v); -+ -+#ifdef __UCLIBC_HAS_XCLOCALE__ -+ __gnu_cxx::__uselocale(__old); -+#elif defined __UCLIBC_HAS_LOCALE__ -+ std::setlocale(LC_ALL, __sav); -+ delete [] __sav; -+#endif -+ return __ret; -+ } -+} -+ -+#endif -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,308 @@ -+// std::codecvt implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2002, 2003 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.1.5 - Template class codecvt -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#include <locale> -+#include <cstdlib> // For MB_CUR_MAX -+#include <climits> // For MB_LEN_MAX -+#include <bits/c++locale_internal.h> -+ -+namespace std -+{ -+ // Specializations. -+#ifdef _GLIBCXX_USE_WCHAR_T -+ codecvt_base::result -+ codecvt<wchar_t, char, mbstate_t>:: -+ do_out(state_type& __state, const intern_type* __from, -+ const intern_type* __from_end, const intern_type*& __from_next, -+ extern_type* __to, extern_type* __to_end, -+ extern_type*& __to_next) const -+ { -+ result __ret = ok; -+ state_type __tmp_state(__state); -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_codecvt); -+#endif -+ -+ // wcsnrtombs is *very* fast but stops if encounters NUL characters: -+ // in case we fall back to wcrtomb and then continue, in a loop. -+ // NB: wcsnrtombs is a GNU extension -+ for (__from_next = __from, __to_next = __to; -+ __from_next < __from_end && __to_next < __to_end -+ && __ret == ok;) -+ { -+ const intern_type* __from_chunk_end = wmemchr(__from_next, L'\0', -+ __from_end - __from_next); -+ if (!__from_chunk_end) -+ __from_chunk_end = __from_end; -+ -+ __from = __from_next; -+ const size_t __conv = wcsnrtombs(__to_next, &__from_next, -+ __from_chunk_end - __from_next, -+ __to_end - __to_next, &__state); -+ if (__conv == static_cast<size_t>(-1)) -+ { -+ // In case of error, in order to stop at the exact place we -+ // have to start again from the beginning with a series of -+ // wcrtomb. -+ for (; __from < __from_next; ++__from) -+ __to_next += wcrtomb(__to_next, *__from, &__tmp_state); -+ __state = __tmp_state; -+ __ret = error; -+ } -+ else if (__from_next && __from_next < __from_chunk_end) -+ { -+ __to_next += __conv; -+ __ret = partial; -+ } -+ else -+ { -+ __from_next = __from_chunk_end; -+ __to_next += __conv; -+ } -+ -+ if (__from_next < __from_end && __ret == ok) -+ { -+ extern_type __buf[MB_LEN_MAX]; -+ __tmp_state = __state; -+ const size_t __conv = wcrtomb(__buf, *__from_next, &__tmp_state); -+ if (__conv > static_cast<size_t>(__to_end - __to_next)) -+ __ret = partial; -+ else -+ { -+ memcpy(__to_next, __buf, __conv); -+ __state = __tmp_state; -+ __to_next += __conv; -+ ++__from_next; -+ } -+ } -+ } -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ -+ return __ret; -+ } -+ -+ codecvt_base::result -+ codecvt<wchar_t, char, mbstate_t>:: -+ do_in(state_type& __state, const extern_type* __from, -+ const extern_type* __from_end, const extern_type*& __from_next, -+ intern_type* __to, intern_type* __to_end, -+ intern_type*& __to_next) const -+ { -+ result __ret = ok; -+ state_type __tmp_state(__state); -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_codecvt); -+#endif -+ -+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters: -+ // in case we store a L'\0' and then continue, in a loop. -+ // NB: mbsnrtowcs is a GNU extension -+ for (__from_next = __from, __to_next = __to; -+ __from_next < __from_end && __to_next < __to_end -+ && __ret == ok;) -+ { -+ const extern_type* __from_chunk_end; -+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from_next, '\0', -+ __from_end -+ - __from_next)); -+ if (!__from_chunk_end) -+ __from_chunk_end = __from_end; -+ -+ __from = __from_next; -+ size_t __conv = mbsnrtowcs(__to_next, &__from_next, -+ __from_chunk_end - __from_next, -+ __to_end - __to_next, &__state); -+ if (__conv == static_cast<size_t>(-1)) -+ { -+ // In case of error, in order to stop at the exact place we -+ // have to start again from the beginning with a series of -+ // mbrtowc. -+ for (;; ++__to_next, __from += __conv) -+ { -+ __conv = mbrtowc(__to_next, __from, __from_end - __from, -+ &__tmp_state); -+ if (__conv == static_cast<size_t>(-1) -+ || __conv == static_cast<size_t>(-2)) -+ break; -+ } -+ __from_next = __from; -+ __state = __tmp_state; -+ __ret = error; -+ } -+ else if (__from_next && __from_next < __from_chunk_end) -+ { -+ // It is unclear what to return in this case (see DR 382). -+ __to_next += __conv; -+ __ret = partial; -+ } -+ else -+ { -+ __from_next = __from_chunk_end; -+ __to_next += __conv; -+ } -+ -+ if (__from_next < __from_end && __ret == ok) -+ { -+ if (__to_next < __to_end) -+ { -+ // XXX Probably wrong for stateful encodings -+ __tmp_state = __state; -+ ++__from_next; -+ *__to_next++ = L'\0'; -+ } -+ else -+ __ret = partial; -+ } -+ } -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ -+ return __ret; -+ } -+ -+ int -+ codecvt<wchar_t, char, mbstate_t>:: -+ do_encoding() const throw() -+ { -+ // XXX This implementation assumes that the encoding is -+ // stateless and is either single-byte or variable-width. -+ int __ret = 0; -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_codecvt); -+#endif -+ if (MB_CUR_MAX == 1) -+ __ret = 1; -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ return __ret; -+ } -+ -+ int -+ codecvt<wchar_t, char, mbstate_t>:: -+ do_max_length() const throw() -+ { -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_codecvt); -+#endif -+ // XXX Probably wrong for stateful encodings. -+ int __ret = MB_CUR_MAX; -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ return __ret; -+ } -+ -+ int -+ codecvt<wchar_t, char, mbstate_t>:: -+ do_length(state_type& __state, const extern_type* __from, -+ const extern_type* __end, size_t __max) const -+ { -+ int __ret = 0; -+ state_type __tmp_state(__state); -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_codecvt); -+#endif -+ -+ // mbsnrtowcs is *very* fast but stops if encounters NUL characters: -+ // in case we advance past it and then continue, in a loop. -+ // NB: mbsnrtowcs is a GNU extension -+ -+ // A dummy internal buffer is needed in order for mbsnrtocws to consider -+ // its fourth parameter (it wouldn't with NULL as first parameter). -+ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t) -+ * __max)); -+ while (__from < __end && __max) -+ { -+ const extern_type* __from_chunk_end; -+ __from_chunk_end = static_cast<const extern_type*>(memchr(__from, '\0', -+ __end -+ - __from)); -+ if (!__from_chunk_end) -+ __from_chunk_end = __end; -+ -+ const extern_type* __tmp_from = __from; -+ size_t __conv = mbsnrtowcs(__to, &__from, -+ __from_chunk_end - __from, -+ __max, &__state); -+ if (__conv == static_cast<size_t>(-1)) -+ { -+ // In case of error, in order to stop at the exact place we -+ // have to start again from the beginning with a series of -+ // mbrtowc. -+ for (__from = __tmp_from;; __from += __conv) -+ { -+ __conv = mbrtowc(NULL, __from, __end - __from, -+ &__tmp_state); -+ if (__conv == static_cast<size_t>(-1) -+ || __conv == static_cast<size_t>(-2)) -+ break; -+ } -+ __state = __tmp_state; -+ __ret += __from - __tmp_from; -+ break; -+ } -+ if (!__from) -+ __from = __from_chunk_end; -+ -+ __ret += __from - __tmp_from; -+ __max -= __conv; -+ -+ if (__from < __end && __max) -+ { -+ // XXX Probably wrong for stateful encodings -+ __tmp_state = __state; -+ ++__from; -+ ++__ret; -+ --__max; -+ } -+ } -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ -+ return __ret; -+ } -+#endif -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,80 @@ -+// std::collate implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.4.1.2 collate virtual functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#include <locale> -+#include <bits/c++locale_internal.h> -+ -+#ifndef __UCLIBC_HAS_XLOCALE__ -+#define __strcoll_l(S1, S2, L) strcoll((S1), (S2)) -+#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N)) -+#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) -+#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) -+#endif -+ -+namespace std -+{ -+ // These are basically extensions to char_traits, and perhaps should -+ // be put there instead of here. -+ template<> -+ int -+ collate<char>::_M_compare(const char* __one, const char* __two) const -+ { -+ int __cmp = __strcoll_l(__one, __two, _M_c_locale_collate); -+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); -+ } -+ -+ template<> -+ size_t -+ collate<char>::_M_transform(char* __to, const char* __from, -+ size_t __n) const -+ { return __strxfrm_l(__to, __from, __n, _M_c_locale_collate); } -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+ template<> -+ int -+ collate<wchar_t>::_M_compare(const wchar_t* __one, -+ const wchar_t* __two) const -+ { -+ int __cmp = __wcscoll_l(__one, __two, _M_c_locale_collate); -+ return (__cmp >> (8 * sizeof (int) - 2)) | (__cmp != 0); -+ } -+ -+ template<> -+ size_t -+ collate<wchar_t>::_M_transform(wchar_t* __to, const wchar_t* __from, -+ size_t __n) const -+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); } -+#endif -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,300 @@ -+// std::ctype implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.1.1.2 ctype virtual functions. -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#define _LIBC -+#include <locale> -+#undef _LIBC -+#include <bits/c++locale_internal.h> -+ -+#ifndef __UCLIBC_HAS_XLOCALE__ -+#define __wctype_l(S, L) wctype((S)) -+#define __towupper_l(C, L) towupper((C)) -+#define __towlower_l(C, L) towlower((C)) -+#define __iswctype_l(C, M, L) iswctype((C), (M)) -+#endif -+ -+namespace std -+{ -+ // NB: The other ctype<char> specializations are in src/locale.cc and -+ // various /config/os/* files. -+ template<> -+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) -+ : ctype<char>(0, false, __refs) -+ { -+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) -+ { -+ this->_S_destroy_c_locale(this->_M_c_locale_ctype); -+ this->_S_create_c_locale(this->_M_c_locale_ctype, __s); -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ this->_M_toupper = this->_M_c_locale_ctype->__ctype_toupper; -+ this->_M_tolower = this->_M_c_locale_ctype->__ctype_tolower; -+ this->_M_table = this->_M_c_locale_ctype->__ctype_b; -+#endif -+ } -+ } -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+ ctype<wchar_t>::__wmask_type -+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const -+ { -+ __wmask_type __ret; -+ switch (__m) -+ { -+ case space: -+ __ret = __wctype_l("space", _M_c_locale_ctype); -+ break; -+ case print: -+ __ret = __wctype_l("print", _M_c_locale_ctype); -+ break; -+ case cntrl: -+ __ret = __wctype_l("cntrl", _M_c_locale_ctype); -+ break; -+ case upper: -+ __ret = __wctype_l("upper", _M_c_locale_ctype); -+ break; -+ case lower: -+ __ret = __wctype_l("lower", _M_c_locale_ctype); -+ break; -+ case alpha: -+ __ret = __wctype_l("alpha", _M_c_locale_ctype); -+ break; -+ case digit: -+ __ret = __wctype_l("digit", _M_c_locale_ctype); -+ break; -+ case punct: -+ __ret = __wctype_l("punct", _M_c_locale_ctype); -+ break; -+ case xdigit: -+ __ret = __wctype_l("xdigit", _M_c_locale_ctype); -+ break; -+ case alnum: -+ __ret = __wctype_l("alnum", _M_c_locale_ctype); -+ break; -+ case graph: -+ __ret = __wctype_l("graph", _M_c_locale_ctype); -+ break; -+ default: -+ __ret = __wmask_type(); -+ } -+ return __ret; -+ } -+ -+ wchar_t -+ ctype<wchar_t>::do_toupper(wchar_t __c) const -+ { return __towupper_l(__c, _M_c_locale_ctype); } -+ -+ const wchar_t* -+ ctype<wchar_t>::do_toupper(wchar_t* __lo, const wchar_t* __hi) const -+ { -+ while (__lo < __hi) -+ { -+ *__lo = __towupper_l(*__lo, _M_c_locale_ctype); -+ ++__lo; -+ } -+ return __hi; -+ } -+ -+ wchar_t -+ ctype<wchar_t>::do_tolower(wchar_t __c) const -+ { return __towlower_l(__c, _M_c_locale_ctype); } -+ -+ const wchar_t* -+ ctype<wchar_t>::do_tolower(wchar_t* __lo, const wchar_t* __hi) const -+ { -+ while (__lo < __hi) -+ { -+ *__lo = __towlower_l(*__lo, _M_c_locale_ctype); -+ ++__lo; -+ } -+ return __hi; -+ } -+ -+ bool -+ ctype<wchar_t>:: -+ do_is(mask __m, wchar_t __c) const -+ { -+ // Highest bitmask in ctype_base == 10, but extra in "C" -+ // library for blank. -+ bool __ret = false; -+ const size_t __bitmasksize = 11; -+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) -+ if (__m & _M_bit[__bitcur] -+ && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) -+ { -+ __ret = true; -+ break; -+ } -+ return __ret; -+ } -+ -+ const wchar_t* -+ ctype<wchar_t>:: -+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const -+ { -+ for (; __lo < __hi; ++__vec, ++__lo) -+ { -+ // Highest bitmask in ctype_base == 10, but extra in "C" -+ // library for blank. -+ const size_t __bitmasksize = 11; -+ mask __m = 0; -+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) -+ if (__iswctype_l(*__lo, _M_wmask[__bitcur], _M_c_locale_ctype)) -+ __m |= _M_bit[__bitcur]; -+ *__vec = __m; -+ } -+ return __hi; -+ } -+ -+ const wchar_t* -+ ctype<wchar_t>:: -+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const -+ { -+ while (__lo < __hi && !this->do_is(__m, *__lo)) -+ ++__lo; -+ return __lo; -+ } -+ -+ const wchar_t* -+ ctype<wchar_t>:: -+ do_scan_not(mask __m, const char_type* __lo, const char_type* __hi) const -+ { -+ while (__lo < __hi && this->do_is(__m, *__lo) != 0) -+ ++__lo; -+ return __lo; -+ } -+ -+ wchar_t -+ ctype<wchar_t>:: -+ do_widen(char __c) const -+ { return _M_widen[static_cast<unsigned char>(__c)]; } -+ -+ const char* -+ ctype<wchar_t>:: -+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const -+ { -+ while (__lo < __hi) -+ { -+ *__dest = _M_widen[static_cast<unsigned char>(*__lo)]; -+ ++__lo; -+ ++__dest; -+ } -+ return __hi; -+ } -+ -+ char -+ ctype<wchar_t>:: -+ do_narrow(wchar_t __wc, char __dfault) const -+ { -+ if (__wc >= 0 && __wc < 128 && _M_narrow_ok) -+ return _M_narrow[__wc]; -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_ctype); -+#endif -+ const int __c = wctob(__wc); -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ return (__c == EOF ? __dfault : static_cast<char>(__c)); -+ } -+ -+ const wchar_t* -+ ctype<wchar_t>:: -+ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault, -+ char* __dest) const -+ { -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_ctype); -+#endif -+ if (_M_narrow_ok) -+ while (__lo < __hi) -+ { -+ if (*__lo >= 0 && *__lo < 128) -+ *__dest = _M_narrow[*__lo]; -+ else -+ { -+ const int __c = wctob(*__lo); -+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c)); -+ } -+ ++__lo; -+ ++__dest; -+ } -+ else -+ while (__lo < __hi) -+ { -+ const int __c = wctob(*__lo); -+ *__dest = (__c == EOF ? __dfault : static_cast<char>(__c)); -+ ++__lo; -+ ++__dest; -+ } -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ return __hi; -+ } -+ -+ void -+ ctype<wchar_t>::_M_initialize_ctype() -+ { -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_ctype); -+#endif -+ wint_t __i; -+ for (__i = 0; __i < 128; ++__i) -+ { -+ const int __c = wctob(__i); -+ if (__c == EOF) -+ break; -+ else -+ _M_narrow[__i] = static_cast<char>(__c); -+ } -+ if (__i == 128) -+ _M_narrow_ok = true; -+ else -+ _M_narrow_ok = false; -+ for (size_t __j = 0; -+ __j < sizeof(_M_widen) / sizeof(wint_t); ++__j) -+ _M_widen[__j] = btowc(__j); -+ -+ for (size_t __k = 0; __k <= 11; ++__k) -+ { -+ _M_bit[__k] = static_cast<mask>(_ISbit(__k)); -+ _M_wmask[__k] = _M_convert_to_wmask(_M_bit[__k]); -+ } -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#endif -+ } -+#endif // _GLIBCXX_USE_WCHAR_T -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,100 @@ -+// std::messages implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.7.1.2 messages virtual functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#include <locale> -+#include <bits/c++locale_internal.h> -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix gettext stuff -+#endif -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ -+extern "C" char *__dcgettext(const char *domainname, -+ const char *msgid, int category); -+#undef gettext -+#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES) -+#else -+#undef gettext -+#define gettext(msgid) (msgid) -+#endif -+ -+namespace std -+{ -+ // Specializations. -+ template<> -+ string -+ messages<char>::do_get(catalog, int, int, const string& __dfault) const -+ { -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_messages); -+ const char* __msg = const_cast<const char*>(gettext(__dfault.c_str())); -+ __uselocale(__old); -+ return string(__msg); -+#elif defined __UCLIBC_HAS_LOCALE__ -+ char* __old = strdup(setlocale(LC_ALL, NULL)); -+ setlocale(LC_ALL, _M_name_messages); -+ const char* __msg = gettext(__dfault.c_str()); -+ setlocale(LC_ALL, __old); -+ free(__old); -+ return string(__msg); -+#else -+ const char* __msg = gettext(__dfault.c_str()); -+ return string(__msg); -+#endif -+ } -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+ template<> -+ wstring -+ messages<wchar_t>::do_get(catalog, int, int, const wstring& __dfault) const -+ { -+# ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(_M_c_locale_messages); -+ char* __msg = gettext(_M_convert_to_char(__dfault)); -+ __uselocale(__old); -+ return _M_convert_from_char(__msg); -+# elif defined __UCLIBC_HAS_LOCALE__ -+ char* __old = strdup(setlocale(LC_ALL, NULL)); -+ setlocale(LC_ALL, _M_name_messages); -+ char* __msg = gettext(_M_convert_to_char(__dfault)); -+ setlocale(LC_ALL, __old); -+ free(__old); -+ return _M_convert_from_char(__msg); -+# else -+ char* __msg = gettext(_M_convert_to_char(__dfault)); -+ return _M_convert_from_char(__msg); -+# endif -+ } -+#endif -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,118 @@ -+// std::messages implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.7.1.2 messages functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix prototypes for *textdomain funcs -+#endif -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ -+extern "C" char *__textdomain(const char *domainname); -+extern "C" char *__bindtextdomain(const char *domainname, -+ const char *dirname); -+#else -+#undef __textdomain -+#undef __bindtextdomain -+#define __textdomain(D) ((void)0) -+#define __bindtextdomain(D,P) ((void)0) -+#endif -+ -+ // Non-virtual member functions. -+ template<typename _CharT> -+ messages<_CharT>::messages(size_t __refs) -+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()), -+ _M_name_messages(_S_get_c_name()) -+ { } -+ -+ template<typename _CharT> -+ messages<_CharT>::messages(__c_locale __cloc, const char* __s, -+ size_t __refs) -+ : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)), -+ _M_name_messages(__s) -+ { -+ char* __tmp = new char[std::strlen(__s) + 1]; -+ std::strcpy(__tmp, __s); -+ _M_name_messages = __tmp; -+ } -+ -+ template<typename _CharT> -+ typename messages<_CharT>::catalog -+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, -+ const char* __dir) const -+ { -+ __bindtextdomain(__s.c_str(), __dir); -+ return this->do_open(__s, __loc); -+ } -+ -+ // Virtual member functions. -+ template<typename _CharT> -+ messages<_CharT>::~messages() -+ { -+ if (_M_name_messages != _S_get_c_name()) -+ delete [] _M_name_messages; -+ _S_destroy_c_locale(_M_c_locale_messages); -+ } -+ -+ template<typename _CharT> -+ typename messages<_CharT>::catalog -+ messages<_CharT>::do_open(const basic_string<char>& __s, -+ const locale&) const -+ { -+ // No error checking is done, assume the catalog exists and can -+ // be used. -+ __textdomain(__s.c_str()); -+ return 0; -+ } -+ -+ template<typename _CharT> -+ void -+ messages<_CharT>::do_close(catalog) const -+ { } -+ -+ // messages_byname -+ template<typename _CharT> -+ messages_byname<_CharT>::messages_byname(const char* __s, size_t __refs) -+ : messages<_CharT>(__refs) -+ { -+ if (this->_M_name_messages != locale::facet::_S_get_c_name()) -+ delete [] this->_M_name_messages; -+ char* __tmp = new char[std::strlen(__s) + 1]; -+ std::strcpy(__tmp, __s); -+ this->_M_name_messages = __tmp; -+ -+ if (std::strcmp(__s, "C") != 0 && std::strcmp(__s, "POSIX") != 0) -+ { -+ this->_S_destroy_c_locale(this->_M_c_locale_messages); -+ this->_S_create_c_locale(this->_M_c_locale_messages, __s); -+ } -+ } -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,692 @@ -+// std::moneypunct implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.6.3.2 moneypunct virtual functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#define _LIBC -+#include <locale> -+#undef _LIBC -+#include <bits/c++locale_internal.h> -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning optimize this for uclibc -+#warning tailor for stub locale support -+#endif -+ -+#ifndef __UCLIBC_HAS_XLOCALE__ -+#define __nl_langinfo_l(N, L) nl_langinfo((N)) -+#endif -+ -+namespace std -+{ -+ // Construct and return valid pattern consisting of some combination of: -+ // space none symbol sign value -+ money_base::pattern -+ money_base::_S_construct_pattern(char __precedes, char __space, char __posn) -+ { -+ pattern __ret; -+ -+ // This insanely complicated routine attempts to construct a valid -+ // pattern for use with monyepunct. A couple of invariants: -+ -+ // if (__precedes) symbol -> value -+ // else value -> symbol -+ -+ // if (__space) space -+ // else none -+ -+ // none == never first -+ // space never first or last -+ -+ // Any elegant implementations of this are welcome. -+ switch (__posn) -+ { -+ case 0: -+ case 1: -+ // 1 The sign precedes the value and symbol. -+ __ret.field[0] = sign; -+ if (__space) -+ { -+ // Pattern starts with sign. -+ if (__precedes) -+ { -+ __ret.field[1] = symbol; -+ __ret.field[3] = value; -+ } -+ else -+ { -+ __ret.field[1] = value; -+ __ret.field[3] = symbol; -+ } -+ __ret.field[2] = space; -+ } -+ else -+ { -+ // Pattern starts with sign and ends with none. -+ if (__precedes) -+ { -+ __ret.field[1] = symbol; -+ __ret.field[2] = value; -+ } -+ else -+ { -+ __ret.field[1] = value; -+ __ret.field[2] = symbol; -+ } -+ __ret.field[3] = none; -+ } -+ break; -+ case 2: -+ // 2 The sign follows the value and symbol. -+ if (__space) -+ { -+ // Pattern either ends with sign. -+ if (__precedes) -+ { -+ __ret.field[0] = symbol; -+ __ret.field[2] = value; -+ } -+ else -+ { -+ __ret.field[0] = value; -+ __ret.field[2] = symbol; -+ } -+ __ret.field[1] = space; -+ __ret.field[3] = sign; -+ } -+ else -+ { -+ // Pattern ends with sign then none. -+ if (__precedes) -+ { -+ __ret.field[0] = symbol; -+ __ret.field[1] = value; -+ } -+ else -+ { -+ __ret.field[0] = value; -+ __ret.field[1] = symbol; -+ } -+ __ret.field[2] = sign; -+ __ret.field[3] = none; -+ } -+ break; -+ case 3: -+ // 3 The sign immediately precedes the symbol. -+ if (__precedes) -+ { -+ __ret.field[0] = sign; -+ __ret.field[1] = symbol; -+ if (__space) -+ { -+ __ret.field[2] = space; -+ __ret.field[3] = value; -+ } -+ else -+ { -+ __ret.field[2] = value; -+ __ret.field[3] = none; -+ } -+ } -+ else -+ { -+ __ret.field[0] = value; -+ if (__space) -+ { -+ __ret.field[1] = space; -+ __ret.field[2] = sign; -+ __ret.field[3] = symbol; -+ } -+ else -+ { -+ __ret.field[1] = sign; -+ __ret.field[2] = symbol; -+ __ret.field[3] = none; -+ } -+ } -+ break; -+ case 4: -+ // 4 The sign immediately follows the symbol. -+ if (__precedes) -+ { -+ __ret.field[0] = symbol; -+ __ret.field[1] = sign; -+ if (__space) -+ { -+ __ret.field[2] = space; -+ __ret.field[3] = value; -+ } -+ else -+ { -+ __ret.field[2] = value; -+ __ret.field[3] = none; -+ } -+ } -+ else -+ { -+ __ret.field[0] = value; -+ if (__space) -+ { -+ __ret.field[1] = space; -+ __ret.field[2] = symbol; -+ __ret.field[3] = sign; -+ } -+ else -+ { -+ __ret.field[1] = symbol; -+ __ret.field[2] = sign; -+ __ret.field[3] = none; -+ } -+ } -+ break; -+ default: -+ ; -+ } -+ return __ret; -+ } -+ -+ template<> -+ void -+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc, -+ const char*) -+ { -+ if (!_M_data) -+ _M_data = new __moneypunct_cache<char, true>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_data->_M_decimal_point = '.'; -+ _M_data->_M_thousands_sep = ','; -+ _M_data->_M_grouping = ""; -+ _M_data->_M_grouping_size = 0; -+ _M_data->_M_curr_symbol = ""; -+ _M_data->_M_curr_symbol_size = 0; -+ _M_data->_M_positive_sign = ""; -+ _M_data->_M_positive_sign_size = 0; -+ _M_data->_M_negative_sign = ""; -+ _M_data->_M_negative_sign_size = 0; -+ _M_data->_M_frac_digits = 0; -+ _M_data->_M_pos_format = money_base::_S_default_pattern; -+ _M_data->_M_neg_format = money_base::_S_default_pattern; -+ -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i) -+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i]; -+ } -+ else -+ { -+ // Named locale. -+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, -+ __cloc)); -+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, -+ __cloc)); -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); -+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); -+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign); -+ -+ char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc)); -+ if (!__nposn) -+ _M_data->_M_negative_sign = "()"; -+ else -+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, -+ __cloc); -+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign); -+ -+ // _Intl == true -+ _M_data->_M_curr_symbol = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc); -+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol); -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, -+ __cloc)); -+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); -+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); -+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, -+ __pposn); -+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc)); -+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc)); -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, -+ __nposn); -+ } -+ } -+ -+ template<> -+ void -+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc, -+ const char*) -+ { -+ if (!_M_data) -+ _M_data = new __moneypunct_cache<char, false>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_data->_M_decimal_point = '.'; -+ _M_data->_M_thousands_sep = ','; -+ _M_data->_M_grouping = ""; -+ _M_data->_M_grouping_size = 0; -+ _M_data->_M_curr_symbol = ""; -+ _M_data->_M_curr_symbol_size = 0; -+ _M_data->_M_positive_sign = ""; -+ _M_data->_M_positive_sign_size = 0; -+ _M_data->_M_negative_sign = ""; -+ _M_data->_M_negative_sign_size = 0; -+ _M_data->_M_frac_digits = 0; -+ _M_data->_M_pos_format = money_base::_S_default_pattern; -+ _M_data->_M_neg_format = money_base::_S_default_pattern; -+ -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i) -+ _M_data->_M_atoms[__i] = money_base::_S_atoms[__i]; -+ } -+ else -+ { -+ // Named locale. -+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT, -+ __cloc)); -+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP, -+ __cloc)); -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); -+ _M_data->_M_positive_sign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); -+ _M_data->_M_positive_sign_size = strlen(_M_data->_M_positive_sign); -+ -+ char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc)); -+ if (!__nposn) -+ _M_data->_M_negative_sign = "()"; -+ else -+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN, -+ __cloc); -+ _M_data->_M_negative_sign_size = strlen(_M_data->_M_negative_sign); -+ -+ // _Intl == false -+ _M_data->_M_curr_symbol = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc); -+ _M_data->_M_curr_symbol_size = strlen(_M_data->_M_curr_symbol); -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc)); -+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); -+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); -+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc)); -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, -+ __pposn); -+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc)); -+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc)); -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, -+ __nposn); -+ } -+ } -+ -+ template<> -+ moneypunct<char, true>::~moneypunct() -+ { delete _M_data; } -+ -+ template<> -+ moneypunct<char, false>::~moneypunct() -+ { delete _M_data; } -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+ template<> -+ void -+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc, -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ const char*) -+#else -+ const char* __name) -+#endif -+ { -+ if (!_M_data) -+ _M_data = new __moneypunct_cache<wchar_t, true>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_data->_M_decimal_point = L'.'; -+ _M_data->_M_thousands_sep = L','; -+ _M_data->_M_grouping = ""; -+ _M_data->_M_grouping_size = 0; -+ _M_data->_M_curr_symbol = L""; -+ _M_data->_M_curr_symbol_size = 0; -+ _M_data->_M_positive_sign = L""; -+ _M_data->_M_positive_sign_size = 0; -+ _M_data->_M_negative_sign = L""; -+ _M_data->_M_negative_sign_size = 0; -+ _M_data->_M_frac_digits = 0; -+ _M_data->_M_pos_format = money_base::_S_default_pattern; -+ _M_data->_M_neg_format = money_base::_S_default_pattern; -+ -+ // Use ctype::widen code without the facet... -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i) -+ _M_data->_M_atoms[__i] = -+ static_cast<wchar_t>(money_base::_S_atoms[__i]); -+ } -+ else -+ { -+ // Named locale. -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(__cloc); -+#else -+ // Switch to named locale so that mbsrtowcs will work. -+ char* __old = strdup(setlocale(LC_ALL, NULL)); -+ setlocale(LC_ALL, __name); -+#endif -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix this... should be monetary -+#endif -+#ifdef __UCLIBC__ -+# ifdef __UCLIBC_HAS_XLOCALE__ -+ _M_data->_M_decimal_point = __cloc->decimal_point_wc; -+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; -+# else -+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc; -+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; -+# endif -+#else -+ union { char *__s; wchar_t __w; } __u; -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc); -+ _M_data->_M_decimal_point = __u.__w; -+ -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc); -+ _M_data->_M_thousands_sep = __u.__w; -+#endif -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); -+ -+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); -+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc); -+ const char* __ccurr = __nl_langinfo_l(__INT_CURR_SYMBOL, __cloc); -+ -+ wchar_t* __wcs_ps = 0; -+ wchar_t* __wcs_ns = 0; -+ const char __nposn = *(__nl_langinfo_l(__INT_N_SIGN_POSN, __cloc)); -+ try -+ { -+ mbstate_t __state; -+ size_t __len = strlen(__cpossign); -+ if (__len) -+ { -+ ++__len; -+ memset(&__state, 0, sizeof(mbstate_t)); -+ __wcs_ps = new wchar_t[__len]; -+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state); -+ _M_data->_M_positive_sign = __wcs_ps; -+ } -+ else -+ _M_data->_M_positive_sign = L""; -+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); -+ -+ __len = strlen(__cnegsign); -+ if (!__nposn) -+ _M_data->_M_negative_sign = L"()"; -+ else if (__len) -+ { -+ ++__len; -+ memset(&__state, 0, sizeof(mbstate_t)); -+ __wcs_ns = new wchar_t[__len]; -+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state); -+ _M_data->_M_negative_sign = __wcs_ns; -+ } -+ else -+ _M_data->_M_negative_sign = L""; -+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); -+ -+ // _Intl == true. -+ __len = strlen(__ccurr); -+ if (__len) -+ { -+ ++__len; -+ memset(&__state, 0, sizeof(mbstate_t)); -+ wchar_t* __wcs = new wchar_t[__len]; -+ mbsrtowcs(__wcs, &__ccurr, __len, &__state); -+ _M_data->_M_curr_symbol = __wcs; -+ } -+ else -+ _M_data->_M_curr_symbol = L""; -+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol); -+ } -+ catch (...) -+ { -+ delete _M_data; -+ _M_data = 0; -+ delete __wcs_ps; -+ delete __wcs_ns; -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#else -+ setlocale(LC_ALL, __old); -+ free(__old); -+#endif -+ __throw_exception_again; -+ } -+ -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS, -+ __cloc)); -+ char __pprecedes = *(__nl_langinfo_l(__INT_P_CS_PRECEDES, __cloc)); -+ char __pspace = *(__nl_langinfo_l(__INT_P_SEP_BY_SPACE, __cloc)); -+ char __pposn = *(__nl_langinfo_l(__INT_P_SIGN_POSN, __cloc)); -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, -+ __pposn); -+ char __nprecedes = *(__nl_langinfo_l(__INT_N_CS_PRECEDES, __cloc)); -+ char __nspace = *(__nl_langinfo_l(__INT_N_SEP_BY_SPACE, __cloc)); -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, -+ __nposn); -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#else -+ setlocale(LC_ALL, __old); -+ free(__old); -+#endif -+ } -+ } -+ -+ template<> -+ void -+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc, -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ const char*) -+#else -+ const char* __name) -+#endif -+ { -+ if (!_M_data) -+ _M_data = new __moneypunct_cache<wchar_t, false>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_data->_M_decimal_point = L'.'; -+ _M_data->_M_thousands_sep = L','; -+ _M_data->_M_grouping = ""; -+ _M_data->_M_grouping_size = 0; -+ _M_data->_M_curr_symbol = L""; -+ _M_data->_M_curr_symbol_size = 0; -+ _M_data->_M_positive_sign = L""; -+ _M_data->_M_positive_sign_size = 0; -+ _M_data->_M_negative_sign = L""; -+ _M_data->_M_negative_sign_size = 0; -+ _M_data->_M_frac_digits = 0; -+ _M_data->_M_pos_format = money_base::_S_default_pattern; -+ _M_data->_M_neg_format = money_base::_S_default_pattern; -+ -+ // Use ctype::widen code without the facet... -+ for (size_t __i = 0; __i < money_base::_S_end; ++__i) -+ _M_data->_M_atoms[__i] = -+ static_cast<wchar_t>(money_base::_S_atoms[__i]); -+ } -+ else -+ { -+ // Named locale. -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __c_locale __old = __uselocale(__cloc); -+#else -+ // Switch to named locale so that mbsrtowcs will work. -+ char* __old = strdup(setlocale(LC_ALL, NULL)); -+ setlocale(LC_ALL, __name); -+#endif -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix this... should be monetary -+#endif -+#ifdef __UCLIBC__ -+# ifdef __UCLIBC_HAS_XLOCALE__ -+ _M_data->_M_decimal_point = __cloc->decimal_point_wc; -+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; -+# else -+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc; -+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; -+# endif -+#else -+ union { char *__s; wchar_t __w; } __u; -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_DECIMAL_POINT_WC, __cloc); -+ _M_data->_M_decimal_point = __u.__w; -+ -+ __u.__s = __nl_langinfo_l(_NL_MONETARY_THOUSANDS_SEP_WC, __cloc); -+ _M_data->_M_thousands_sep = __u.__w; -+#endif -+ _M_data->_M_grouping = __nl_langinfo_l(__MON_GROUPING, __cloc); -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); -+ -+ const char* __cpossign = __nl_langinfo_l(__POSITIVE_SIGN, __cloc); -+ const char* __cnegsign = __nl_langinfo_l(__NEGATIVE_SIGN, __cloc); -+ const char* __ccurr = __nl_langinfo_l(__CURRENCY_SYMBOL, __cloc); -+ -+ wchar_t* __wcs_ps = 0; -+ wchar_t* __wcs_ns = 0; -+ const char __nposn = *(__nl_langinfo_l(__N_SIGN_POSN, __cloc)); -+ try -+ { -+ mbstate_t __state; -+ size_t __len; -+ __len = strlen(__cpossign); -+ if (__len) -+ { -+ ++__len; -+ memset(&__state, 0, sizeof(mbstate_t)); -+ __wcs_ps = new wchar_t[__len]; -+ mbsrtowcs(__wcs_ps, &__cpossign, __len, &__state); -+ _M_data->_M_positive_sign = __wcs_ps; -+ } -+ else -+ _M_data->_M_positive_sign = L""; -+ _M_data->_M_positive_sign_size = wcslen(_M_data->_M_positive_sign); -+ -+ __len = strlen(__cnegsign); -+ if (!__nposn) -+ _M_data->_M_negative_sign = L"()"; -+ else if (__len) -+ { -+ ++__len; -+ memset(&__state, 0, sizeof(mbstate_t)); -+ __wcs_ns = new wchar_t[__len]; -+ mbsrtowcs(__wcs_ns, &__cnegsign, __len, &__state); -+ _M_data->_M_negative_sign = __wcs_ns; -+ } -+ else -+ _M_data->_M_negative_sign = L""; -+ _M_data->_M_negative_sign_size = wcslen(_M_data->_M_negative_sign); -+ -+ // _Intl == true. -+ __len = strlen(__ccurr); -+ if (__len) -+ { -+ ++__len; -+ memset(&__state, 0, sizeof(mbstate_t)); -+ wchar_t* __wcs = new wchar_t[__len]; -+ mbsrtowcs(__wcs, &__ccurr, __len, &__state); -+ _M_data->_M_curr_symbol = __wcs; -+ } -+ else -+ _M_data->_M_curr_symbol = L""; -+ _M_data->_M_curr_symbol_size = wcslen(_M_data->_M_curr_symbol); -+ } -+ catch (...) -+ { -+ delete _M_data; -+ _M_data = 0; -+ delete __wcs_ps; -+ delete __wcs_ns; -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#else -+ setlocale(LC_ALL, __old); -+ free(__old); -+#endif -+ __throw_exception_again; -+ } -+ -+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__FRAC_DIGITS, __cloc)); -+ char __pprecedes = *(__nl_langinfo_l(__P_CS_PRECEDES, __cloc)); -+ char __pspace = *(__nl_langinfo_l(__P_SEP_BY_SPACE, __cloc)); -+ char __pposn = *(__nl_langinfo_l(__P_SIGN_POSN, __cloc)); -+ _M_data->_M_pos_format = _S_construct_pattern(__pprecedes, __pspace, -+ __pposn); -+ char __nprecedes = *(__nl_langinfo_l(__N_CS_PRECEDES, __cloc)); -+ char __nspace = *(__nl_langinfo_l(__N_SEP_BY_SPACE, __cloc)); -+ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace, -+ __nposn); -+ -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __uselocale(__old); -+#else -+ setlocale(LC_ALL, __old); -+ free(__old); -+#endif -+ } -+ } -+ -+ template<> -+ moneypunct<wchar_t, true>::~moneypunct() -+ { -+ if (_M_data->_M_positive_sign_size) -+ delete [] _M_data->_M_positive_sign; -+ if (_M_data->_M_negative_sign_size -+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0) -+ delete [] _M_data->_M_negative_sign; -+ if (_M_data->_M_curr_symbol_size) -+ delete [] _M_data->_M_curr_symbol; -+ delete _M_data; -+ } -+ -+ template<> -+ moneypunct<wchar_t, false>::~moneypunct() -+ { -+ if (_M_data->_M_positive_sign_size) -+ delete [] _M_data->_M_positive_sign; -+ if (_M_data->_M_negative_sign_size -+ && wcscmp(_M_data->_M_negative_sign, L"()") != 0) -+ delete [] _M_data->_M_negative_sign; -+ if (_M_data->_M_curr_symbol_size) -+ delete [] _M_data->_M_curr_symbol; -+ delete _M_data; -+ } -+#endif -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,160 @@ -+// std::numpunct implementation details, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.3.1.2 numpunct virtual functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#define _LIBC -+#include <locale> -+#undef _LIBC -+#include <bits/c++locale_internal.h> -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning tailor for stub locale support -+#endif -+#ifndef __UCLIBC_HAS_XLOCALE__ -+#define __nl_langinfo_l(N, L) nl_langinfo((N)) -+#endif -+ -+namespace std -+{ -+ template<> -+ void -+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc) -+ { -+ if (!_M_data) -+ _M_data = new __numpunct_cache<char>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_data->_M_grouping = ""; -+ _M_data->_M_grouping_size = 0; -+ _M_data->_M_use_grouping = false; -+ -+ _M_data->_M_decimal_point = '.'; -+ _M_data->_M_thousands_sep = ','; -+ -+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) -+ _M_data->_M_atoms_out[__i] = __num_base::_S_atoms_out[__i]; -+ -+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j) -+ _M_data->_M_atoms_in[__j] = __num_base::_S_atoms_in[__j]; -+ } -+ else -+ { -+ // Named locale. -+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT, -+ __cloc)); -+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP, -+ __cloc)); -+ -+ // Check for NULL, which implies no grouping. -+ if (_M_data->_M_thousands_sep == '\0') -+ _M_data->_M_grouping = ""; -+ else -+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc); -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); -+ } -+ -+ // NB: There is no way to extact this info from posix locales. -+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc); -+ _M_data->_M_truename = "true"; -+ _M_data->_M_truename_size = 4; -+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc); -+ _M_data->_M_falsename = "false"; -+ _M_data->_M_falsename_size = 5; -+ } -+ -+ template<> -+ numpunct<char>::~numpunct() -+ { delete _M_data; } -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+ template<> -+ void -+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc) -+ { -+ if (!_M_data) -+ _M_data = new __numpunct_cache<wchar_t>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_data->_M_grouping = ""; -+ _M_data->_M_grouping_size = 0; -+ _M_data->_M_use_grouping = false; -+ -+ _M_data->_M_decimal_point = L'.'; -+ _M_data->_M_thousands_sep = L','; -+ -+ // Use ctype::widen code without the facet... -+ for (size_t __i = 0; __i < __num_base::_S_oend; ++__i) -+ _M_data->_M_atoms_out[__i] = -+ static_cast<wchar_t>(__num_base::_S_atoms_out[__i]); -+ -+ for (size_t __j = 0; __j < __num_base::_S_iend; ++__j) -+ _M_data->_M_atoms_in[__j] = -+ static_cast<wchar_t>(__num_base::_S_atoms_in[__j]); -+ } -+ else -+ { -+ // Named locale. -+ // NB: In the GNU model wchar_t is always 32 bit wide. -+ union { char *__s; wchar_t __w; } __u; -+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); -+ _M_data->_M_decimal_point = __u.__w; -+ -+ __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); -+ _M_data->_M_thousands_sep = __u.__w; -+ -+ if (_M_data->_M_thousands_sep == L'\0') -+ _M_data->_M_grouping = ""; -+ else -+ _M_data->_M_grouping = __nl_langinfo_l(GROUPING, __cloc); -+ _M_data->_M_grouping_size = strlen(_M_data->_M_grouping); -+ } -+ -+ // NB: There is no way to extact this info from posix locales. -+ // _M_truename = __nl_langinfo_l(YESSTR, __cloc); -+ _M_data->_M_truename = L"true"; -+ _M_data->_M_truename_size = 4; -+ // _M_falsename = __nl_langinfo_l(NOSTR, __cloc); -+ _M_data->_M_falsename = L"false"; -+ _M_data->_M_falsename_size = 5; -+ } -+ -+ template<> -+ numpunct<wchar_t>::~numpunct() -+ { delete _M_data; } -+ #endif -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,406 @@ -+// std::time_get, std::time_put implementation, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.5.1.2 - time_get virtual functions -+// ISO C++ 14882: 22.2.5.3.2 - time_put virtual functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+#include <locale> -+#include <bits/c++locale_internal.h> -+ -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning tailor for stub locale support -+#endif -+#ifndef __UCLIBC_HAS_XLOCALE__ -+#define __nl_langinfo_l(N, L) nl_langinfo((N)) -+#endif -+ -+namespace std -+{ -+ template<> -+ void -+ __timepunct<char>:: -+ _M_put(char* __s, size_t __maxlen, const char* __format, -+ const tm* __tm) const -+ { -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ const size_t __len = __strftime_l(__s, __maxlen, __format, __tm, -+ _M_c_locale_timepunct); -+#else -+ char* __old = strdup(setlocale(LC_ALL, NULL)); -+ setlocale(LC_ALL, _M_name_timepunct); -+ const size_t __len = strftime(__s, __maxlen, __format, __tm); -+ setlocale(LC_ALL, __old); -+ free(__old); -+#endif -+ // Make sure __s is null terminated. -+ if (__len == 0) -+ __s[0] = '\0'; -+ } -+ -+ template<> -+ void -+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc) -+ { -+ if (!_M_data) -+ _M_data = new __timepunct_cache<char>; -+ -+ if (!__cloc) -+ { -+ // "C" locale -+ _M_c_locale_timepunct = _S_get_c_locale(); -+ -+ _M_data->_M_date_format = "%m/%d/%y"; -+ _M_data->_M_date_era_format = "%m/%d/%y"; -+ _M_data->_M_time_format = "%H:%M:%S"; -+ _M_data->_M_time_era_format = "%H:%M:%S"; -+ _M_data->_M_date_time_format = ""; -+ _M_data->_M_date_time_era_format = ""; -+ _M_data->_M_am = "AM"; -+ _M_data->_M_pm = "PM"; -+ _M_data->_M_am_pm_format = ""; -+ -+ // Day names, starting with "C"'s Sunday. -+ _M_data->_M_day1 = "Sunday"; -+ _M_data->_M_day2 = "Monday"; -+ _M_data->_M_day3 = "Tuesday"; -+ _M_data->_M_day4 = "Wednesday"; -+ _M_data->_M_day5 = "Thursday"; -+ _M_data->_M_day6 = "Friday"; -+ _M_data->_M_day7 = "Saturday"; -+ -+ // Abbreviated day names, starting with "C"'s Sun. -+ _M_data->_M_aday1 = "Sun"; -+ _M_data->_M_aday2 = "Mon"; -+ _M_data->_M_aday3 = "Tue"; -+ _M_data->_M_aday4 = "Wed"; -+ _M_data->_M_aday5 = "Thu"; -+ _M_data->_M_aday6 = "Fri"; -+ _M_data->_M_aday7 = "Sat"; -+ -+ // Month names, starting with "C"'s January. -+ _M_data->_M_month01 = "January"; -+ _M_data->_M_month02 = "February"; -+ _M_data->_M_month03 = "March"; -+ _M_data->_M_month04 = "April"; -+ _M_data->_M_month05 = "May"; -+ _M_data->_M_month06 = "June"; -+ _M_data->_M_month07 = "July"; -+ _M_data->_M_month08 = "August"; -+ _M_data->_M_month09 = "September"; -+ _M_data->_M_month10 = "October"; -+ _M_data->_M_month11 = "November"; -+ _M_data->_M_month12 = "December"; -+ -+ // Abbreviated month names, starting with "C"'s Jan. -+ _M_data->_M_amonth01 = "Jan"; -+ _M_data->_M_amonth02 = "Feb"; -+ _M_data->_M_amonth03 = "Mar"; -+ _M_data->_M_amonth04 = "Apr"; -+ _M_data->_M_amonth05 = "May"; -+ _M_data->_M_amonth06 = "Jun"; -+ _M_data->_M_amonth07 = "Jul"; -+ _M_data->_M_amonth08 = "Aug"; -+ _M_data->_M_amonth09 = "Sep"; -+ _M_data->_M_amonth10 = "Oct"; -+ _M_data->_M_amonth11 = "Nov"; -+ _M_data->_M_amonth12 = "Dec"; -+ } -+ else -+ { -+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc); -+ -+ _M_data->_M_date_format = __nl_langinfo_l(D_FMT, __cloc); -+ _M_data->_M_date_era_format = __nl_langinfo_l(ERA_D_FMT, __cloc); -+ _M_data->_M_time_format = __nl_langinfo_l(T_FMT, __cloc); -+ _M_data->_M_time_era_format = __nl_langinfo_l(ERA_T_FMT, __cloc); -+ _M_data->_M_date_time_format = __nl_langinfo_l(D_T_FMT, __cloc); -+ _M_data->_M_date_time_era_format = __nl_langinfo_l(ERA_D_T_FMT, -+ __cloc); -+ _M_data->_M_am = __nl_langinfo_l(AM_STR, __cloc); -+ _M_data->_M_pm = __nl_langinfo_l(PM_STR, __cloc); -+ _M_data->_M_am_pm_format = __nl_langinfo_l(T_FMT_AMPM, __cloc); -+ -+ // Day names, starting with "C"'s Sunday. -+ _M_data->_M_day1 = __nl_langinfo_l(DAY_1, __cloc); -+ _M_data->_M_day2 = __nl_langinfo_l(DAY_2, __cloc); -+ _M_data->_M_day3 = __nl_langinfo_l(DAY_3, __cloc); -+ _M_data->_M_day4 = __nl_langinfo_l(DAY_4, __cloc); -+ _M_data->_M_day5 = __nl_langinfo_l(DAY_5, __cloc); -+ _M_data->_M_day6 = __nl_langinfo_l(DAY_6, __cloc); -+ _M_data->_M_day7 = __nl_langinfo_l(DAY_7, __cloc); -+ -+ // Abbreviated day names, starting with "C"'s Sun. -+ _M_data->_M_aday1 = __nl_langinfo_l(ABDAY_1, __cloc); -+ _M_data->_M_aday2 = __nl_langinfo_l(ABDAY_2, __cloc); -+ _M_data->_M_aday3 = __nl_langinfo_l(ABDAY_3, __cloc); -+ _M_data->_M_aday4 = __nl_langinfo_l(ABDAY_4, __cloc); -+ _M_data->_M_aday5 = __nl_langinfo_l(ABDAY_5, __cloc); -+ _M_data->_M_aday6 = __nl_langinfo_l(ABDAY_6, __cloc); -+ _M_data->_M_aday7 = __nl_langinfo_l(ABDAY_7, __cloc); -+ -+ // Month names, starting with "C"'s January. -+ _M_data->_M_month01 = __nl_langinfo_l(MON_1, __cloc); -+ _M_data->_M_month02 = __nl_langinfo_l(MON_2, __cloc); -+ _M_data->_M_month03 = __nl_langinfo_l(MON_3, __cloc); -+ _M_data->_M_month04 = __nl_langinfo_l(MON_4, __cloc); -+ _M_data->_M_month05 = __nl_langinfo_l(MON_5, __cloc); -+ _M_data->_M_month06 = __nl_langinfo_l(MON_6, __cloc); -+ _M_data->_M_month07 = __nl_langinfo_l(MON_7, __cloc); -+ _M_data->_M_month08 = __nl_langinfo_l(MON_8, __cloc); -+ _M_data->_M_month09 = __nl_langinfo_l(MON_9, __cloc); -+ _M_data->_M_month10 = __nl_langinfo_l(MON_10, __cloc); -+ _M_data->_M_month11 = __nl_langinfo_l(MON_11, __cloc); -+ _M_data->_M_month12 = __nl_langinfo_l(MON_12, __cloc); -+ -+ // Abbreviated month names, starting with "C"'s Jan. -+ _M_data->_M_amonth01 = __nl_langinfo_l(ABMON_1, __cloc); -+ _M_data->_M_amonth02 = __nl_langinfo_l(ABMON_2, __cloc); -+ _M_data->_M_amonth03 = __nl_langinfo_l(ABMON_3, __cloc); -+ _M_data->_M_amonth04 = __nl_langinfo_l(ABMON_4, __cloc); -+ _M_data->_M_amonth05 = __nl_langinfo_l(ABMON_5, __cloc); -+ _M_data->_M_amonth06 = __nl_langinfo_l(ABMON_6, __cloc); -+ _M_data->_M_amonth07 = __nl_langinfo_l(ABMON_7, __cloc); -+ _M_data->_M_amonth08 = __nl_langinfo_l(ABMON_8, __cloc); -+ _M_data->_M_amonth09 = __nl_langinfo_l(ABMON_9, __cloc); -+ _M_data->_M_amonth10 = __nl_langinfo_l(ABMON_10, __cloc); -+ _M_data->_M_amonth11 = __nl_langinfo_l(ABMON_11, __cloc); -+ _M_data->_M_amonth12 = __nl_langinfo_l(ABMON_12, __cloc); -+ } -+ } -+ -+#ifdef _GLIBCXX_USE_WCHAR_T -+ template<> -+ void -+ __timepunct<wchar_t>:: -+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format, -+ const tm* __tm) const -+ { -+#ifdef __UCLIBC_HAS_XLOCALE__ -+ __wcsftime_l(__s, __maxlen, __format, __tm, _M_c_locale_timepunct); -+ const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm, -+ _M_c_locale_timepunct); -+#else -+ char* __old = strdup(setlocale(LC_ALL, NULL)); -+ setlocale(LC_ALL, _M_name_timepunct); -+ const size_t __len = wcsftime(__s, __maxlen, __format, __tm); -+ setlocale(LC_ALL, __old); -+ free(__old); -+#endif -+ // Make sure __s is null terminated. -+ if (__len == 0) -+ __s[0] = L'\0'; -+ } -+ -+ template<> -+ void -+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc) -+ { -+ if (!_M_data) -+ _M_data = new __timepunct_cache<wchar_t>; -+ -+#warning wide time stuff -+// if (!__cloc) -+ { -+ // "C" locale -+ _M_c_locale_timepunct = _S_get_c_locale(); -+ -+ _M_data->_M_date_format = L"%m/%d/%y"; -+ _M_data->_M_date_era_format = L"%m/%d/%y"; -+ _M_data->_M_time_format = L"%H:%M:%S"; -+ _M_data->_M_time_era_format = L"%H:%M:%S"; -+ _M_data->_M_date_time_format = L""; -+ _M_data->_M_date_time_era_format = L""; -+ _M_data->_M_am = L"AM"; -+ _M_data->_M_pm = L"PM"; -+ _M_data->_M_am_pm_format = L""; -+ -+ // Day names, starting with "C"'s Sunday. -+ _M_data->_M_day1 = L"Sunday"; -+ _M_data->_M_day2 = L"Monday"; -+ _M_data->_M_day3 = L"Tuesday"; -+ _M_data->_M_day4 = L"Wednesday"; -+ _M_data->_M_day5 = L"Thursday"; -+ _M_data->_M_day6 = L"Friday"; -+ _M_data->_M_day7 = L"Saturday"; -+ -+ // Abbreviated day names, starting with "C"'s Sun. -+ _M_data->_M_aday1 = L"Sun"; -+ _M_data->_M_aday2 = L"Mon"; -+ _M_data->_M_aday3 = L"Tue"; -+ _M_data->_M_aday4 = L"Wed"; -+ _M_data->_M_aday5 = L"Thu"; -+ _M_data->_M_aday6 = L"Fri"; -+ _M_data->_M_aday7 = L"Sat"; -+ -+ // Month names, starting with "C"'s January. -+ _M_data->_M_month01 = L"January"; -+ _M_data->_M_month02 = L"February"; -+ _M_data->_M_month03 = L"March"; -+ _M_data->_M_month04 = L"April"; -+ _M_data->_M_month05 = L"May"; -+ _M_data->_M_month06 = L"June"; -+ _M_data->_M_month07 = L"July"; -+ _M_data->_M_month08 = L"August"; -+ _M_data->_M_month09 = L"September"; -+ _M_data->_M_month10 = L"October"; -+ _M_data->_M_month11 = L"November"; -+ _M_data->_M_month12 = L"December"; -+ -+ // Abbreviated month names, starting with "C"'s Jan. -+ _M_data->_M_amonth01 = L"Jan"; -+ _M_data->_M_amonth02 = L"Feb"; -+ _M_data->_M_amonth03 = L"Mar"; -+ _M_data->_M_amonth04 = L"Apr"; -+ _M_data->_M_amonth05 = L"May"; -+ _M_data->_M_amonth06 = L"Jun"; -+ _M_data->_M_amonth07 = L"Jul"; -+ _M_data->_M_amonth08 = L"Aug"; -+ _M_data->_M_amonth09 = L"Sep"; -+ _M_data->_M_amonth10 = L"Oct"; -+ _M_data->_M_amonth11 = L"Nov"; -+ _M_data->_M_amonth12 = L"Dec"; -+ } -+#if 0 -+ else -+ { -+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc); -+ -+ union { char *__s; wchar_t *__w; } __u; -+ -+ __u.__s = __nl_langinfo_l(_NL_WD_FMT, __cloc); -+ _M_data->_M_date_format = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WERA_D_FMT, __cloc); -+ _M_data->_M_date_era_format = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WT_FMT, __cloc); -+ _M_data->_M_time_format = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WERA_T_FMT, __cloc); -+ _M_data->_M_time_era_format = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WD_T_FMT, __cloc); -+ _M_data->_M_date_time_format = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WERA_D_T_FMT, __cloc); -+ _M_data->_M_date_time_era_format = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WAM_STR, __cloc); -+ _M_data->_M_am = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WPM_STR, __cloc); -+ _M_data->_M_pm = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WT_FMT_AMPM, __cloc); -+ _M_data->_M_am_pm_format = __u.__w; -+ -+ // Day names, starting with "C"'s Sunday. -+ __u.__s = __nl_langinfo_l(_NL_WDAY_1, __cloc); -+ _M_data->_M_day1 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WDAY_2, __cloc); -+ _M_data->_M_day2 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WDAY_3, __cloc); -+ _M_data->_M_day3 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WDAY_4, __cloc); -+ _M_data->_M_day4 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WDAY_5, __cloc); -+ _M_data->_M_day5 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WDAY_6, __cloc); -+ _M_data->_M_day6 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WDAY_7, __cloc); -+ _M_data->_M_day7 = __u.__w; -+ -+ // Abbreviated day names, starting with "C"'s Sun. -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_1, __cloc); -+ _M_data->_M_aday1 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_2, __cloc); -+ _M_data->_M_aday2 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_3, __cloc); -+ _M_data->_M_aday3 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_4, __cloc); -+ _M_data->_M_aday4 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_5, __cloc); -+ _M_data->_M_aday5 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_6, __cloc); -+ _M_data->_M_aday6 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABDAY_7, __cloc); -+ _M_data->_M_aday7 = __u.__w; -+ -+ // Month names, starting with "C"'s January. -+ __u.__s = __nl_langinfo_l(_NL_WMON_1, __cloc); -+ _M_data->_M_month01 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_2, __cloc); -+ _M_data->_M_month02 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_3, __cloc); -+ _M_data->_M_month03 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_4, __cloc); -+ _M_data->_M_month04 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_5, __cloc); -+ _M_data->_M_month05 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_6, __cloc); -+ _M_data->_M_month06 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_7, __cloc); -+ _M_data->_M_month07 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_8, __cloc); -+ _M_data->_M_month08 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_9, __cloc); -+ _M_data->_M_month09 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_10, __cloc); -+ _M_data->_M_month10 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_11, __cloc); -+ _M_data->_M_month11 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WMON_12, __cloc); -+ _M_data->_M_month12 = __u.__w; -+ -+ // Abbreviated month names, starting with "C"'s Jan. -+ __u.__s = __nl_langinfo_l(_NL_WABMON_1, __cloc); -+ _M_data->_M_amonth01 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_2, __cloc); -+ _M_data->_M_amonth02 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_3, __cloc); -+ _M_data->_M_amonth03 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_4, __cloc); -+ _M_data->_M_amonth04 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_5, __cloc); -+ _M_data->_M_amonth05 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_6, __cloc); -+ _M_data->_M_amonth06 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_7, __cloc); -+ _M_data->_M_amonth07 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_8, __cloc); -+ _M_data->_M_amonth08 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_9, __cloc); -+ _M_data->_M_amonth09 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_10, __cloc); -+ _M_data->_M_amonth10 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_11, __cloc); -+ _M_data->_M_amonth11 = __u.__w; -+ __u.__s = __nl_langinfo_l(_NL_WABMON_12, __cloc); -+ _M_data->_M_amonth12 = __u.__w; -+ } -+#endif // 0 -+ } -+#endif -+} -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-28 17:55:56.000000000 -0700 -@@ -0,0 +1,68 @@ -+// std::time_get, std::time_put implementation, GNU version -*- C++ -*- -+ -+// Copyright (C) 2001, 2002, 2003, 2004 Free Software Foundation, Inc. -+// -+// This file is part of the GNU ISO C++ Library. This library 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, or (at your option) -+// any later version. -+ -+// This library 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 library; see the file COPYING. If not, write to the Free -+// Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, -+// USA. -+ -+// As a special exception, you may use this file as part of a free software -+// library without restriction. Specifically, if other files instantiate -+// templates or use macros or inline functions from this file, or you compile -+// this file and link it with other files to produce an executable, this -+// file does not by itself cause the resulting executable to be covered by -+// the GNU General Public License. This exception does not however -+// invalidate any other reasons why the executable file might be covered by -+// the GNU General Public License. -+ -+// -+// ISO C++ 14882: 22.2.5.1.2 - time_get functions -+// ISO C++ 14882: 22.2.5.3.2 - time_put functions -+// -+ -+// Written by Benjamin Kosnik <bkoz@redhat.com> -+ -+ template<typename _CharT> -+ __timepunct<_CharT>::__timepunct(size_t __refs) -+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), -+ _M_name_timepunct(_S_get_c_name()) -+ { _M_initialize_timepunct(); } -+ -+ template<typename _CharT> -+ __timepunct<_CharT>::__timepunct(__cache_type* __cache, size_t __refs) -+ : facet(__refs), _M_data(__cache), _M_c_locale_timepunct(NULL), -+ _M_name_timepunct(_S_get_c_name()) -+ { _M_initialize_timepunct(); } -+ -+ template<typename _CharT> -+ __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, -+ size_t __refs) -+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), -+ _M_name_timepunct(__s) -+ { -+ char* __tmp = new char[std::strlen(__s) + 1]; -+ std::strcpy(__tmp, __s); -+ _M_name_timepunct = __tmp; -+ _M_initialize_timepunct(__cloc); -+ } -+ -+ template<typename _CharT> -+ __timepunct<_CharT>::~__timepunct() -+ { -+ if (_M_name_timepunct != _S_get_c_name()) -+ delete [] _M_name_timepunct; -+ delete _M_data; -+ _S_destroy_c_locale(_M_c_locale_timepunct); -+ } -Index: gcc-4.3.2/libstdc++-v3/configure -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/configure 2008-07-07 12:49:54.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/configure 2008-08-28 18:02:13.000000000 -0700 -@@ -14003,7 +14003,7 @@ - enableval="$enable_clocale" - - case "$enableval" in -- generic|gnu|ieee_1003.1-2001|yes|no|auto) ;; -+ generic|gnu|ieee_1003.1-2001|uclibc|yes|no|auto) ;; - *) { { echo "$as_me:$LINENO: error: Unknown argument to enable/disable clocale" >&5 - echo "$as_me: error: Unknown argument to enable/disable clocale" >&2;} - { (exit 1); exit 1; }; } ;; -@@ -14036,6 +14036,9 @@ - # Default to "generic". - if test $enable_clocale_flag = auto; then - case ${target_os} in -+ *-uclibc*) -+ enable_clocale_flag=uclibc -+ ;; - linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu) - enable_clocale_flag=gnu - ;; -@@ -14424,6 +14427,76 @@ - CTIME_CC=config/locale/generic/time_members.cc - CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h - ;; -+ uclibc) -+ echo "$as_me:$LINENO: result: uclibc" >&5 -+echo "${ECHO_T}uclibc" >&6 -+ -+ # Declare intention to use gettext, and add support for specific -+ # languages. -+ # For some reason, ALL_LINGUAS has to be before AM-GNU-GETTEXT -+ ALL_LINGUAS="de fr" -+ -+ # Don't call AM-GNU-GETTEXT here. Instead, assume glibc. -+ # 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_prog_check_msgfmt+set}" = set; then -+ echo $ECHO_N "(cached) $ECHO_C" >&6 -+else -+ if test -n "$check_msgfmt"; then -+ ac_cv_prog_check_msgfmt="$check_msgfmt" # 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_check_msgfmt="yes" -+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 -+ break 2 -+ fi -+done -+done -+ -+ test -z "$ac_cv_prog_check_msgfmt" && ac_cv_prog_check_msgfmt="no" -+fi -+fi -+check_msgfmt=$ac_cv_prog_check_msgfmt -+if test -n "$check_msgfmt"; then -+ echo "$as_me:$LINENO: result: $check_msgfmt" >&5 -+echo "${ECHO_T}$check_msgfmt" >&6 -+else -+ echo "$as_me:$LINENO: result: no" >&5 -+echo "${ECHO_T}no" >&6 -+fi -+ -+ if test x"$check_msgfmt" = x"yes" && test x"$enable_nls" = x"yes"; then -+ USE_NLS=yes -+ fi -+ # Export the build objects. -+ for ling in $ALL_LINGUAS; do \ -+ glibcxx_MOFILES="$glibcxx_MOFILES $ling.mo"; \ -+ glibcxx_POFILES="$glibcxx_POFILES $ling.po"; \ -+ done -+ -+ -+ -+ CLOCALE_H=config/locale/uclibc/c_locale.h -+ CLOCALE_CC=config/locale/uclibc/c_locale.cc -+ CCODECVT_CC=config/locale/uclibc/codecvt_members.cc -+ CCOLLATE_CC=config/locale/uclibc/collate_members.cc -+ CCTYPE_CC=config/locale/uclibc/ctype_members.cc -+ CMESSAGES_H=config/locale/uclibc/messages_members.h -+ CMESSAGES_CC=config/locale/uclibc/messages_members.cc -+ CMONEY_CC=config/locale/uclibc/monetary_members.cc -+ CNUMERIC_CC=config/locale/uclibc/numeric_members.cc -+ CTIME_H=config/locale/uclibc/time_members.h -+ CTIME_CC=config/locale/uclibc/time_members.cc -+ CLOCALE_INTERNAL_H=config/locale/uclibc/c++locale_internal.h -+ ;; - esac - - # This is where the testsuite looks for locale catalogs, using the -@@ -17016,7 +17089,7 @@ - - # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style. - cat > conftest.$ac_ext << EOF --#line 17019 "configure" -+#line 17092 "configure" - int main() - { - // NB: _Atomic_word not necessarily int. -Index: gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 14:59:49.000000000 -0800 -+++ gcc-4.3.2/libstdc++-v3/include/c_compatibility/wchar.h 2008-08-28 17:55:56.000000000 -0700 -@@ -106,7 +106,9 @@ - using std::wmemcpy; - using std::wmemmove; - using std::wmemset; -+#if _GLIBCXX_HAVE_WCSFTIME - using std::wcsftime; -+#endif - - #if _GLIBCXX_USE_C99 - using std::wcstold; -Index: gcc-4.3.2/libstdc++-v3/include/c_std/cwchar -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/include/c_std/cwchar 2007-05-27 07:50:21.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/include/c_std/cwchar 2008-08-28 17:55:56.000000000 -0700 -@@ -182,7 +182,9 @@ - using ::wcscoll; - using ::wcscpy; - using ::wcscspn; -+#if _GLIBCXX_HAVE_WCSFTIME - using ::wcsftime; -+#endif - using ::wcslen; - using ::wcsncat; - using ::wcsncmp; diff --git a/recipes/gcc/gcc-svn/203-uclibc-locale-no__x.patch b/recipes/gcc/gcc-svn/203-uclibc-locale-no__x.patch deleted file mode 100644 index f39e65220c..0000000000 --- a/recipes/gcc/gcc-svn/203-uclibc-locale-no__x.patch +++ /dev/null @@ -1,233 +0,0 @@ -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-16 01:33:23.000000000 -0700 -@@ -60,4 +60,49 @@ - extern "C" __typeof(wctype_l) __wctype_l; - #endif - -+# define __nl_langinfo_l nl_langinfo_l -+# define __strcoll_l strcoll_l -+# define __strftime_l strftime_l -+# define __strtod_l strtod_l -+# define __strtof_l strtof_l -+# define __strtold_l strtold_l -+# define __strxfrm_l strxfrm_l -+# define __newlocale newlocale -+# define __freelocale freelocale -+# define __duplocale duplocale -+# define __uselocale uselocale -+ -+# ifdef _GLIBCXX_USE_WCHAR_T -+# define __iswctype_l iswctype_l -+# define __towlower_l towlower_l -+# define __towupper_l towupper_l -+# define __wcscoll_l wcscoll_l -+# define __wcsftime_l wcsftime_l -+# define __wcsxfrm_l wcsxfrm_l -+# define __wctype_l wctype_l -+# endif -+ -+#else -+# define __nl_langinfo_l(N, L) nl_langinfo((N)) -+# define __strcoll_l(S1, S2, L) strcoll((S1), (S2)) -+# define __strtod_l(S, E, L) strtod((S), (E)) -+# define __strtof_l(S, E, L) strtof((S), (E)) -+# define __strtold_l(S, E, L) strtold((S), (E)) -+# define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N)) -+# warning should dummy __newlocale check for C|POSIX ? -+# define __newlocale(a, b, c) NULL -+# define __freelocale(a) ((void)0) -+# define __duplocale(a) __c_locale() -+//# define __uselocale ? -+// -+# ifdef _GLIBCXX_USE_WCHAR_T -+# define __iswctype_l(C, M, L) iswctype((C), (M)) -+# define __towlower_l(C, L) towlower((C)) -+# define __towupper_l(C, L) towupper((C)) -+# define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) -+//# define __wcsftime_l(S, M, F, T, L) wcsftime((S), (M), (F), (T)) -+# define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) -+# define __wctype_l(S, L) wctype((S)) -+# endif -+ - #endif // GLIBC 2.3 and later -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-16 01:33:00.000000000 -0700 -@@ -39,20 +39,6 @@ - #include <langinfo.h> - #include <bits/c++locale_internal.h> - --#ifndef __UCLIBC_HAS_XLOCALE__ --#define __strtol_l(S, E, B, L) strtol((S), (E), (B)) --#define __strtoul_l(S, E, B, L) strtoul((S), (E), (B)) --#define __strtoll_l(S, E, B, L) strtoll((S), (E), (B)) --#define __strtoull_l(S, E, B, L) strtoull((S), (E), (B)) --#define __strtof_l(S, E, L) strtof((S), (E)) --#define __strtod_l(S, E, L) strtod((S), (E)) --#define __strtold_l(S, E, L) strtold((S), (E)) --#warning should dummy __newlocale check for C|POSIX ? --#define __newlocale(a, b, c) NULL --#define __freelocale(a) ((void)0) --#define __duplocale(a) __c_locale() --#endif -- - namespace std - { - template<> -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-16 01:30:31.000000000 -0700 -@@ -36,13 +36,6 @@ - #include <locale> - #include <bits/c++locale_internal.h> - --#ifndef __UCLIBC_HAS_XLOCALE__ --#define __strcoll_l(S1, S2, L) strcoll((S1), (S2)) --#define __strxfrm_l(S1, S2, N, L) strxfrm((S1), (S2), (N)) --#define __wcscoll_l(S1, S2, L) wcscoll((S1), (S2)) --#define __wcsxfrm_l(S1, S2, N, L) wcsxfrm((S1), (S2), (N)) --#endif -- - namespace std - { - // These are basically extensions to char_traits, and perhaps should -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-16 01:30:31.000000000 -0700 -@@ -43,10 +43,6 @@ - #warning tailor for stub locale support - #endif - --#ifndef __UCLIBC_HAS_XLOCALE__ --#define __nl_langinfo_l(N, L) nl_langinfo((N)) --#endif -- - namespace std - { - // Construct and return valid pattern consisting of some combination of: -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-16 01:30:31.000000000 -0700 -@@ -41,9 +41,6 @@ - #ifdef __UCLIBC_MJN3_ONLY__ - #warning tailor for stub locale support - #endif --#ifndef __UCLIBC_HAS_XLOCALE__ --#define __nl_langinfo_l(N, L) nl_langinfo((N)) --#endif - - namespace std - { -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-16 01:30:31.000000000 -0700 -@@ -40,9 +40,6 @@ - #ifdef __UCLIBC_MJN3_ONLY__ - #warning tailor for stub locale support - #endif --#ifndef __UCLIBC_HAS_XLOCALE__ --#define __nl_langinfo_l(N, L) nl_langinfo((N)) --#endif - - namespace std - { -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-16 01:30:31.000000000 -0700 -@@ -38,13 +38,6 @@ - #undef _LIBC - #include <bits/c++locale_internal.h> - --#ifndef __UCLIBC_HAS_XLOCALE__ --#define __wctype_l(S, L) wctype((S)) --#define __towupper_l(C, L) towupper((C)) --#define __towlower_l(C, L) towlower((C)) --#define __iswctype_l(C, M, L) iswctype((C), (M)) --#endif -- - namespace std - { - // NB: The other ctype<char> specializations are in src/locale.cc and -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-16 01:27:18.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-16 01:30:31.000000000 -0700 -@@ -39,13 +39,10 @@ - #ifdef __UCLIBC_MJN3_ONLY__ - #warning fix gettext stuff - #endif --#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ --extern "C" char *__dcgettext(const char *domainname, -- const char *msgid, int category); - #undef gettext --#define gettext(msgid) __dcgettext(NULL, msgid, LC_MESSAGES) -+#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ -+#define gettext(msgid) dcgettext(NULL, msgid, LC_MESSAGES) - #else --#undef gettext - #define gettext(msgid) (msgid) - #endif - -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-16 01:31:43.000000000 -0700 -@@ -36,15 +36,11 @@ - #ifdef __UCLIBC_MJN3_ONLY__ - #warning fix prototypes for *textdomain funcs - #endif --#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ --extern "C" char *__textdomain(const char *domainname); --extern "C" char *__bindtextdomain(const char *domainname, -- const char *dirname); --#else --#undef __textdomain --#undef __bindtextdomain --#define __textdomain(D) ((void)0) --#define __bindtextdomain(D,P) ((void)0) -+#ifndef __UCLIBC_HAS_GETTEXT_AWARENESS__ -+#undef textdomain -+#undef bindtextdomain -+#define textdomain(D) ((void)0) -+#define bindtextdomain(D,P) ((void)0) - #endif - - // Non-virtual member functions. -@@ -70,7 +66,7 @@ - messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc, - const char* __dir) const - { -- __bindtextdomain(__s.c_str(), __dir); -+ bindtextdomain(__s.c_str(), __dir); - return this->do_open(__s, __loc); - } - -@@ -90,7 +86,7 @@ - { - // No error checking is done, assume the catalog exists and can - // be used. -- __textdomain(__s.c_str()); -+ textdomain(__s.c_str()); - return 0; - } - -Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-16 01:29:20.000000000 -0700 -+++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-16 01:30:31.000000000 -0700 -@@ -68,6 +68,7 @@ - { - extern "C" __typeof(uselocale) __uselocale; - } -+#define __uselocale uselocale - #endif - - namespace std diff --git a/recipes/gcc/gcc-svn/204-uclibc-locale-wchar_fix.patch b/recipes/gcc/gcc-svn/204-uclibc-locale-wchar_fix.patch deleted file mode 100644 index 160ab35bb3..0000000000 --- a/recipes/gcc/gcc-svn/204-uclibc-locale-wchar_fix.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 -+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:37:27 +0100 -@@ -401,7 +401,7 @@ - # ifdef __UCLIBC_HAS_XLOCALE__ - _M_data->_M_decimal_point = __cloc->decimal_point_wc; - _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; --# else -+# elif defined __UCLIBC_HAS_LOCALE__ - _M_data->_M_decimal_point = __global_locale->decimal_point_wc; - _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; - # endif -@@ -556,7 +556,7 @@ - # ifdef __UCLIBC_HAS_XLOCALE__ - _M_data->_M_decimal_point = __cloc->decimal_point_wc; - _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; --# else -+# elif defined __UCLIBC_HAS_LOCALE__ - _M_data->_M_decimal_point = __global_locale->decimal_point_wc; - _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; - # endif ---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_wchar~ 2006-03-10 15:32:37 +0100 -+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:37:27 +0100 -@@ -127,12 +127,25 @@ - { - // Named locale. - // NB: In the GNU model wchar_t is always 32 bit wide. -+#ifdef __UCLIBC_MJN3_ONLY__ -+#warning fix this... should be numeric -+#endif -+#ifdef __UCLIBC__ -+# ifdef __UCLIBC_HAS_XLOCALE__ -+ _M_data->_M_decimal_point = __cloc->decimal_point_wc; -+ _M_data->_M_thousands_sep = __cloc->thousands_sep_wc; -+# elif defined __UCLIBC_HAS_LOCALE__ -+ _M_data->_M_decimal_point = __global_locale->decimal_point_wc; -+ _M_data->_M_thousands_sep = __global_locale->thousands_sep_wc; -+# endif -+#else - union { char *__s; wchar_t __w; } __u; - __u.__s = __nl_langinfo_l(_NL_NUMERIC_DECIMAL_POINT_WC, __cloc); - _M_data->_M_decimal_point = __u.__w; - - __u.__s = __nl_langinfo_l(_NL_NUMERIC_THOUSANDS_SEP_WC, __cloc); - _M_data->_M_thousands_sep = __u.__w; -+#endif - - if (_M_data->_M_thousands_sep == L'\0') - _M_data->_M_grouping = ""; diff --git a/recipes/gcc/gcc-svn/205-uclibc-locale-update.patch b/recipes/gcc/gcc-svn/205-uclibc-locale-update.patch deleted file mode 100644 index 48eaa1d442..0000000000 --- a/recipes/gcc/gcc-svn/205-uclibc-locale-update.patch +++ /dev/null @@ -1,519 +0,0 @@ -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-09-17 22:35:29.000000000 -0700 -@@ -39,23 +39,20 @@ - #include <langinfo.h> - #include <bits/c++locale_internal.h> - --namespace std --{ -+_GLIBCXX_BEGIN_NAMESPACE(std) -+ - template<> - void - __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err, - const __c_locale& __cloc) - { -- if (!(__err & ios_base::failbit)) -- { -- char* __sanity; -- errno = 0; -- float __f = __strtof_l(__s, &__sanity, __cloc); -- if (__sanity != __s && errno != ERANGE) -- __v = __f; -- else -- __err |= ios_base::failbit; -- } -+ char* __sanity; -+ errno = 0; -+ float __f = __strtof_l(__s, &__sanity, __cloc); -+ if (__sanity != __s && errno != ERANGE) -+ __v = __f; -+ else -+ __err |= ios_base::failbit; - } - - template<> -@@ -63,16 +60,13 @@ - __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err, - const __c_locale& __cloc) - { -- if (!(__err & ios_base::failbit)) -- { -- char* __sanity; -- errno = 0; -- double __d = __strtod_l(__s, &__sanity, __cloc); -- if (__sanity != __s && errno != ERANGE) -- __v = __d; -- else -- __err |= ios_base::failbit; -- } -+ char* __sanity; -+ errno = 0; -+ double __d = __strtod_l(__s, &__sanity, __cloc); -+ if (__sanity != __s && errno != ERANGE) -+ __v = __d; -+ else -+ __err |= ios_base::failbit; - } - - template<> -@@ -80,16 +74,13 @@ - __convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err, - const __c_locale& __cloc) - { -- if (!(__err & ios_base::failbit)) -- { -- char* __sanity; -- errno = 0; -- long double __ld = __strtold_l(__s, &__sanity, __cloc); -- if (__sanity != __s && errno != ERANGE) -- __v = __ld; -- else -- __err |= ios_base::failbit; -- } -+ char* __sanity; -+ errno = 0; -+ long double __ld = __strtold_l(__s, &__sanity, __cloc); -+ if (__sanity != __s && errno != ERANGE) -+ __v = __ld; -+ else -+ __err |= ios_base::failbit; - } - - void -@@ -110,17 +101,18 @@ - void - locale::facet::_S_destroy_c_locale(__c_locale& __cloc) - { -- if (_S_get_c_locale() != __cloc) -+ if (__cloc && _S_get_c_locale() != __cloc) - __freelocale(__cloc); - } - - __c_locale - locale::facet::_S_clone_c_locale(__c_locale& __cloc) - { return __duplocale(__cloc); } --} // namespace std - --namespace __gnu_cxx --{ -+_GLIBCXX_END_NAMESPACE -+ -+_GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) -+ - const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] = - { - "LC_CTYPE", -@@ -138,9 +130,11 @@ - "LC_IDENTIFICATION" - #endif - }; --} - --namespace std --{ -+_GLIBCXX_END_NAMESPACE -+ -+_GLIBCXX_BEGIN_NAMESPACE(std) -+ - const char* const* const locale::_S_categories = __gnu_cxx::category_names; --} // namespace std -+ -+_GLIBCXX_END_NAMESPACE -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-09-17 23:09:49.000000000 -0700 -@@ -33,16 +33,20 @@ - - // Written by Benjamin Kosnik <bkoz@redhat.com> - -+#include <features.h> -+#ifdef __UCLIBC_HAS_LOCALE__ - #define _LIBC - #include <locale> - #undef _LIBC -+#else -+#include <locale> -+#endif - #include <bits/c++locale_internal.h> - --namespace std --{ -+_GLIBCXX_BEGIN_NAMESPACE(std) -+ - // NB: The other ctype<char> specializations are in src/locale.cc and - // various /config/os/* files. -- template<> - ctype_byname<char>::ctype_byname(const char* __s, size_t __refs) - : ctype<char>(0, false, __refs) - { -@@ -57,6 +61,8 @@ - #endif - } - } -+ ctype_byname<char>::~ctype_byname() -+ { } - - #ifdef _GLIBCXX_USE_WCHAR_T - ctype<wchar_t>::__wmask_type -@@ -138,17 +144,33 @@ - ctype<wchar_t>:: - do_is(mask __m, wchar_t __c) const - { -- // Highest bitmask in ctype_base == 10, but extra in "C" -- // library for blank. -+ // The case of __m == ctype_base::space is particularly important, -+ // due to its use in many istream functions. Therefore we deal with -+ // it first, exploiting the knowledge that on GNU systems _M_bit[5] -+ // is the mask corresponding to ctype_base::space. NB: an encoding -+ // change would not affect correctness! -+ - bool __ret = false; -- const size_t __bitmasksize = 11; -- for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) -- if (__m & _M_bit[__bitcur] -- && __iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) -- { -- __ret = true; -- break; -- } -+ if (__m == _M_bit[5]) -+ __ret = __iswctype_l(__c, _M_wmask[5], _M_c_locale_ctype); -+ else -+ { -+ // Highest bitmask in ctype_base == 10, but extra in "C" -+ // library for blank. -+ const size_t __bitmasksize = 11; -+ for (size_t __bitcur = 0; __bitcur <= __bitmasksize; ++__bitcur) -+ if (__m & _M_bit[__bitcur]) -+ { -+ if (__iswctype_l(__c, _M_wmask[__bitcur], _M_c_locale_ctype)) -+ { -+ __ret = true; -+ break; -+ } -+ else if (__m == _M_bit[__bitcur]) -+ break; -+ } -+ } -+ - return __ret; - } - -@@ -290,4 +312,5 @@ - #endif - } - #endif // _GLIBCXX_USE_WCHAR_T --} -+ -+_GLIBCXX_END_NAMESPACE -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-09-17 23:13:34.000000000 -0700 -@@ -53,12 +53,16 @@ - template<typename _CharT> - messages<_CharT>::messages(__c_locale __cloc, const char* __s, - size_t __refs) -- : facet(__refs), _M_c_locale_messages(_S_clone_c_locale(__cloc)), -- _M_name_messages(__s) -+ : facet(__refs), _M_c_locale_messages(NULL), -+ _M_name_messages(NULL) - { -- char* __tmp = new char[std::strlen(__s) + 1]; -- std::strcpy(__tmp, __s); -+ const size_t __len = std::strlen(__s) + 1; -+ char* __tmp = new char[__len]; -+ std::memcpy(__tmp, __s, __len); - _M_name_messages = __tmp; -+ -+ // Last to avoid leaking memory if new throws. -+ _M_c_locale_messages = _S_clone_c_locale(__cloc); - } - - template<typename _CharT> -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-09-17 22:35:29.000000000 -0700 -@@ -33,9 +33,14 @@ - - // Written by Benjamin Kosnik <bkoz@redhat.com> - -+#include <features.h> -+#ifdef __UCLIBC_HAS_LOCALE__ - #define _LIBC - #include <locale> - #undef _LIBC -+#else -+#include <locale> -+#endif - #include <bits/c++locale_internal.h> - - #ifdef __UCLIBC_MJN3_ONLY__ -@@ -206,7 +211,7 @@ - } - break; - default: -- ; -+ __ret = pattern(); - } - return __ret; - } -@@ -390,7 +395,9 @@ - __c_locale __old = __uselocale(__cloc); - #else - // Switch to named locale so that mbsrtowcs will work. -- char* __old = strdup(setlocale(LC_ALL, NULL)); -+ char* __old = setlocale(LC_ALL, NULL); -+ const size_t __llen = strlen(__old) + 1; -+ char* __sav = new char[__llen]; - setlocale(LC_ALL, __name); - #endif - -@@ -477,8 +484,8 @@ - #ifdef __UCLIBC_HAS_XLOCALE__ - __uselocale(__old); - #else -- setlocale(LC_ALL, __old); -- free(__old); -+ setlocale(LC_ALL, __sav); -+ delete [] __sav; - #endif - __throw_exception_again; - } -@@ -498,8 +505,8 @@ - #ifdef __UCLIBC_HAS_XLOCALE__ - __uselocale(__old); - #else -- setlocale(LC_ALL, __old); -- free(__old); -+ setlocale(LC_ALL, __sav); -+ delete [] __sav; - #endif - } - } -@@ -545,8 +552,11 @@ - __c_locale __old = __uselocale(__cloc); - #else - // Switch to named locale so that mbsrtowcs will work. -- char* __old = strdup(setlocale(LC_ALL, NULL)); -- setlocale(LC_ALL, __name); -+ char* __old = setlocale(LC_ALL, NULL); -+ const size_t __llen = strlen(__old) + 1; -+ char* __sav = new char[__llen]; -+ memcpy(__sav, __old, __llen); -+ setlocale(LC_ALL, __name); - #endif - - #ifdef __UCLIBC_MJN3_ONLY__ -@@ -633,8 +643,8 @@ - #ifdef __UCLIBC_HAS_XLOCALE__ - __uselocale(__old); - #else -- setlocale(LC_ALL, __old); -- free(__old); -+ setlocale(LC_ALL, __sav); -+ delete [] __sav; - #endif - __throw_exception_again; - } -@@ -653,8 +663,8 @@ - #ifdef __UCLIBC_HAS_XLOCALE__ - __uselocale(__old); - #else -- setlocale(LC_ALL, __old); -- free(__old); -+ setlocale(LC_ALL, __sav); -+ delete [] __sav; - #endif - } - } -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-09-17 22:35:29.000000000 -0700 -@@ -33,9 +33,14 @@ - - // Written by Benjamin Kosnik <bkoz@redhat.com> - -+#include <features.h> -+#ifdef __UCLIBC_HAS_LOCALE__ - #define _LIBC - #include <locale> - #undef _LIBC -+#else -+#include <locale> -+#endif - #include <bits/c++locale_internal.h> - - #ifdef __UCLIBC_MJN3_ONLY__ -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2008-09-17 22:35:27.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.h 2008-09-17 23:13:34.000000000 -0700 -@@ -50,12 +50,21 @@ - __timepunct<_CharT>::__timepunct(__c_locale __cloc, const char* __s, - size_t __refs) - : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), -- _M_name_timepunct(__s) -+ _M_name_timepunct(NULL) - { -- char* __tmp = new char[std::strlen(__s) + 1]; -- std::strcpy(__tmp, __s); -+ const size_t __len = std::strlen(__s) + 1; -+ char* __tmp = new char[__len]; -+ std::memcpy(__tmp, __s, __len); - _M_name_timepunct = __tmp; -- _M_initialize_timepunct(__cloc); -+ -+ try -+ { _M_initialize_timepunct(__cloc); } -+ catch(...) -+ { -+ delete [] _M_name_timepunct; -+ __throw_exception_again; -+ } -+ - } - - template<typename _CharT> -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-09-17 22:35:29.000000000 -0700 -@@ -39,21 +39,23 @@ - #pragma GCC system_header - - #include <cstring> // get std::strlen --#include <cstdio> // get std::snprintf or std::sprintf -+#include <cstdio> // get std::vsnprintf or std::vsprintf - #include <clocale> - #include <langinfo.h> // For codecvt - #ifdef __UCLIBC_MJN3_ONLY__ - #warning fix this - #endif --#ifdef __UCLIBC_HAS_LOCALE__ -+#ifdef _GLIBCXX_USE_ICONV - #include <iconv.h> // For codecvt using iconv, iconv_t - #endif --#ifdef __UCLIBC_HAS_GETTEXT_AWARENESS__ --#include <libintl.h> // For messages -+#ifdef HAVE_LIBINTL_H -+#include <libintl.h> // For messages - #endif -+#include <cstdarg> - - #ifdef __UCLIBC_MJN3_ONLY__ - #warning what is _GLIBCXX_C_LOCALE_GNU for -+// psm: used in os/gnu-linux/ctype_noninline.h - #endif - #define _GLIBCXX_C_LOCALE_GNU 1 - -@@ -78,23 +80,25 @@ - #else - typedef int* __c_locale; - #endif -- -- // Convert numeric value of type _Tv to string and return length of -- // string. If snprintf is available use it, otherwise fall back to -- // the unsafe sprintf which, in general, can be dangerous and should -+ // Convert numeric value of type double to string and return length of -+ // string. If vsnprintf is available use it, otherwise fall back to -+ // the unsafe vsprintf which, in general, can be dangerous and should - // be avoided. -- template<typename _Tv> -- int -- __convert_from_v(char* __out, -- const int __size __attribute__ ((__unused__)), -- const char* __fmt, --#ifdef __UCLIBC_HAS_XCLOCALE__ -- _Tv __v, const __c_locale& __cloc, int __prec) -+ inline int -+ __convert_from_v(const __c_locale& -+#ifndef __UCLIBC_HAS_XCLOCALE__ -+ __cloc __attribute__ ((__unused__)) -+#endif -+ , -+ char* __out, -+ const int __size, -+ const char* __fmt, ...) - { -+ va_list __args; -+#ifdef __UCLIBC_HAS_XCLOCALE__ -+ - __c_locale __old = __gnu_cxx::__uselocale(__cloc); - #else -- _Tv __v, const __c_locale&, int __prec) -- { - # ifdef __UCLIBC_HAS_LOCALE__ - char* __old = std::setlocale(LC_ALL, NULL); - char* __sav = new char[std::strlen(__old) + 1]; -@@ -103,7 +107,9 @@ - # endif - #endif - -- const int __ret = std::snprintf(__out, __size, __fmt, __prec, __v); -+ va_start(__args, __fmt); -+ const int __ret = std::vsnprintf(__out, __size, __fmt, __args); -+ va_end(__args); - - #ifdef __UCLIBC_HAS_XCLOCALE__ - __gnu_cxx::__uselocale(__old); -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-09-17 22:35:29.000000000 -0700 -@@ -53,11 +53,14 @@ - const size_t __len = __strftime_l(__s, __maxlen, __format, __tm, - _M_c_locale_timepunct); - #else -- char* __old = strdup(setlocale(LC_ALL, NULL)); -+ char* __old = setlocale(LC_ALL, NULL); -+ const size_t __llen = strlen(__old) + 1; -+ char* __sav = new char[__llen]; -+ memcpy(__sav, __old, __llen); - setlocale(LC_ALL, _M_name_timepunct); - const size_t __len = strftime(__s, __maxlen, __format, __tm); -- setlocale(LC_ALL, __old); -- free(__old); -+ setlocale(LC_ALL, __sav); -+ delete [] __sav; - #endif - // Make sure __s is null terminated. - if (__len == 0) -@@ -207,11 +210,14 @@ - const size_t __len = __wcsftime_l(__s, __maxlen, __format, __tm, - _M_c_locale_timepunct); - #else -- char* __old = strdup(setlocale(LC_ALL, NULL)); -+ char* __old = setlocale(LC_ALL, NULL); -+ const size_t __llen = strlen(__old) + 1; -+ char* __sav = new char[__llen]; -+ memcpy(__sav, __old, __llen); - setlocale(LC_ALL, _M_name_timepunct); - const size_t __len = wcsftime(__s, __maxlen, __format, __tm); -- setlocale(LC_ALL, __old); -- free(__old); -+ setlocale(LC_ALL, __sav); -+ delete [] __sav; - #endif - // Make sure __s is null terminated. - if (__len == 0) -Index: gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h -=================================================================== ---- gcc-4.3.2.orig/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-09-17 22:35:28.000000000 -0700 -+++ gcc-4.3.2/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-09-17 22:35:29.000000000 -0700 -@@ -31,6 +31,9 @@ - - #include <bits/c++config.h> - #include <clocale> -+#include <cstdlib> -+#include <cstring> -+#include <cstddef> - - #ifdef __UCLIBC_MJN3_ONLY__ - #warning clean this up diff --git a/recipes/gcc/gcc-svn/300-libstdc++-pic.patch b/recipes/gcc/gcc-svn/300-libstdc++-pic.patch deleted file mode 100644 index 89d03a85e5..0000000000 --- a/recipes/gcc/gcc-svn/300-libstdc++-pic.patch +++ /dev/null @@ -1,46 +0,0 @@ -# DP: Build and install libstdc++_pic.a library. - ---- gcc-4.1.0/libstdc++-v3/src/Makefile.am 2004-11-15 17:33:05.000000000 -0600 -+++ gcc-4.1.0-patched/libstdc++-v3/src/Makefile.am 2005-04-25 20:05:59.186930896 -0500 -@@ -214,6 +214,10 @@ - $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LDFLAGS) -o $@ - - -+install-exec-local: -+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o -+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) -+ - # Added bits to build debug library. - if GLIBCXX_BUILD_DEBUG - all-local: build_debug ---- gcc-4.1.0/libstdc++-v3/src/Makefile.in 2005-04-11 19:13:08.000000000 -0500 -+++ gcc-4.1.0-patched/libstdc++-v3/src/Makefile.in 2005-04-25 20:12:33.284316275 -0500 -@@ -627,7 +627,7 @@ - - install-data-am: install-data-local - --install-exec-am: install-toolexeclibLTLIBRARIES -+install-exec-am: install-toolexeclibLTLIBRARIES install-exec-local - - install-info: install-info-am - -@@ -660,6 +660,7 @@ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-data-local install-exec \ -+ install-exec-local \ - install-exec-am install-info install-info-am install-man \ - install-strip install-toolexeclibLTLIBRARIES installcheck \ - installcheck-am installdirs maintainer-clean \ -@@ -745,6 +746,11 @@ - install_debug: - (cd ${debugdir} && $(MAKE) \ - toolexeclibdir=$(glibcxx_toolexeclibdir)/debug install) -+ -+install-exec-local: -+ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o -+ $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) -+ - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. - .NOEXPORT: diff --git a/recipes/gcc/gcc-svn/301-missing-execinfo_h.patch b/recipes/gcc/gcc-svn/301-missing-execinfo_h.patch deleted file mode 100644 index 0e2092f3fb..0000000000 --- a/recipes/gcc/gcc-svn/301-missing-execinfo_h.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gcc-4.0.0/boehm-gc/include/gc.h-orig 2005-04-28 22:28:57.000000000 -0500 -+++ gcc-4.0.0/boehm-gc/include/gc.h 2005-04-28 22:30:38.000000000 -0500 -@@ -500,7 +500,7 @@ - #ifdef __linux__ - # include <features.h> - # if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1 || __GLIBC__ > 2) \ -- && !defined(__ia64__) -+ && !defined(__ia64__) && !defined(__UCLIBC__) - # ifndef GC_HAVE_BUILTIN_BACKTRACE - # define GC_HAVE_BUILTIN_BACKTRACE - # endif diff --git a/recipes/gcc/gcc-svn/302-c99-snprintf.patch b/recipes/gcc/gcc-svn/302-c99-snprintf.patch deleted file mode 100644 index 02865865e5..0000000000 --- a/recipes/gcc/gcc-svn/302-c99-snprintf.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.3.1/libstdc++-v3/include/c_std/cstdio -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/include/c_std/cstdio 2006-12-07 01:35:57.000000000 -0800 -+++ gcc-4.3.1/libstdc++-v3/include/c_std/cstdio 2008-08-16 02:11:37.000000000 -0700 -@@ -144,7 +144,7 @@ - - _GLIBCXX_END_NAMESPACE - --#if _GLIBCXX_USE_C99 -+#if _GLIBCXX_USE_C99 || defined(__UCLIBC__) - - #undef snprintf - #undef vfscanf diff --git a/recipes/gcc/gcc-svn/303-c99-complex-ugly-hack.patch b/recipes/gcc/gcc-svn/303-c99-complex-ugly-hack.patch deleted file mode 100644 index 2ccc80d9bb..0000000000 --- a/recipes/gcc/gcc-svn/303-c99-complex-ugly-hack.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- gcc-4.0.0/libstdc++-v3/configure-old 2005-04-30 22:04:48.061603912 -0500 -+++ gcc-4.0.0/libstdc++-v3/configure 2005-04-30 22:06:13.678588152 -0500 -@@ -7194,6 +7194,9 @@ - cat >>conftest.$ac_ext <<_ACEOF - /* end confdefs.h. */ - #include <complex.h> -+#ifdef __UCLIBC__ -+#error ugly hack to make sure configure test fails here for cross until uClibc supports the complex funcs -+#endif - int - main () - { diff --git a/recipes/gcc/gcc-svn/304-index_macro.patch b/recipes/gcc/gcc-svn/304-index_macro.patch deleted file mode 100644 index d8e476555d..0000000000 --- a/recipes/gcc/gcc-svn/304-index_macro.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- gcc-4.1.0/libstdc++-v3/include/ext/rope.mps 2006-03-24 01:49:51 +0100 -+++ gcc-4.1.0/libstdc++-v3/include/ext/rope 2006-03-24 01:49:37 +0100 -@@ -59,6 +59,9 @@ - #include <bits/allocator.h> - #include <ext/hash_fun.h> - -+/* cope w/ index defined as macro, SuSv3 proposal */ -+#undef index -+ - # ifdef __GC - # define __GC_CONST const - # else ---- gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h.mps 2006-03-24 01:50:04 +0100 -+++ gcc-4.1.0/libstdc++-v3/include/ext/ropeimpl.h 2006-03-24 01:50:28 +0100 -@@ -53,6 +53,9 @@ - #include <ext/memory> // For uninitialized_copy_n - #include <ext/numeric> // For power - -+/* cope w/ index defined as macro, SuSv3 proposal */ -+#undef index -+ - _GLIBCXX_BEGIN_NAMESPACE(__gnu_cxx) - - using std::size_t; diff --git a/recipes/gcc/gcc-svn/305-libmudflap-susv3-legacy.patch b/recipes/gcc/gcc-svn/305-libmudflap-susv3-legacy.patch deleted file mode 100644 index 374b1f8659..0000000000 --- a/recipes/gcc/gcc-svn/305-libmudflap-susv3-legacy.patch +++ /dev/null @@ -1,49 +0,0 @@ -Index: gcc-4.2/libmudflap/mf-hooks2.c -=================================================================== ---- gcc-4.2/libmudflap/mf-hooks2.c (revision 119834) -+++ gcc-4.2/libmudflap/mf-hooks2.c (working copy) -@@ -427,7 +427,7 @@ - { - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, n, __MF_CHECK_WRITE, "bzero region"); -- bzero (s, n); -+ memset (s, 0, n); - } - - -@@ -437,7 +437,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(src, n, __MF_CHECK_READ, "bcopy src"); - MF_VALIDATE_EXTENT(dest, n, __MF_CHECK_WRITE, "bcopy dest"); -- bcopy (src, dest, n); -+ memmove (dest, src, n); - } - - -@@ -447,7 +447,7 @@ - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s1, n, __MF_CHECK_READ, "bcmp 1st arg"); - MF_VALIDATE_EXTENT(s2, n, __MF_CHECK_READ, "bcmp 2nd arg"); -- return bcmp (s1, s2, n); -+ return n == 0 ? 0 : memcmp (s1, s2, n); - } - - -@@ -456,7 +456,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "index region"); -- return index (s, c); -+ return strchr (s, c); - } - - -@@ -465,7 +465,7 @@ - size_t n = strlen (s); - TRACE ("%s\n", __PRETTY_FUNCTION__); - MF_VALIDATE_EXTENT(s, CLAMPADD(n, 1), __MF_CHECK_READ, "rindex region"); -- return rindex (s, c); -+ return strrchr (s, c); - } - - /* XXX: stpcpy, memccpy */ diff --git a/recipes/gcc/gcc-svn/306-libstdc++-namespace.patch b/recipes/gcc/gcc-svn/306-libstdc++-namespace.patch deleted file mode 100644 index 69587ca63a..0000000000 --- a/recipes/gcc/gcc-svn/306-libstdc++-namespace.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h ---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-12-22 13:06:56.000000000 +0100 -+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-12-22 15:23:41.000000000 +0100 -@@ -32,7 +32,8 @@ - // - - // Written by Benjamin Kosnik <bkoz@redhat.com> -- -+namespace std -+{ - #ifdef __UCLIBC_MJN3_ONLY__ - #warning fix prototypes for *textdomain funcs - #endif -@@ -115,3 +116,4 @@ - this->_S_create_c_locale(this->_M_c_locale_messages, __s); - } - } -+} -diff -rup gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h ---- gcc-4.2.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2006-12-22 13:06:56.000000000 +0100 -+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/time_members.h 2006-12-22 15:20:31.000000000 +0100 -@@ -33,7 +33,8 @@ - // - - // Written by Benjamin Kosnik <bkoz@redhat.com> -- -+namespace std -+{ - template<typename _CharT> - __timepunct<_CharT>::__timepunct(size_t __refs) - : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL), -@@ -74,3 +75,4 @@ - delete _M_data; - _S_destroy_c_locale(_M_c_locale_timepunct); - } -+} diff --git a/recipes/gcc/gcc-svn/307-locale_facets.patch b/recipes/gcc/gcc-svn/307-locale_facets.patch deleted file mode 100644 index 774fcfa2ca..0000000000 --- a/recipes/gcc/gcc-svn/307-locale_facets.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch fixes a bug into ostream::operator<<(double) due to the wrong size -passed into the __convert_from_v method. The wrong size is then passed to -std::snprintf function, that, on uClibc, doens't handle sized 0 buffer. - -Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com> - -Index: gcc-4.3.1/libstdc++-v3/include/bits/locale_facets.tcc -=================================================================== ---- gcc-4.3.1.orig/libstdc++-v3/include/bits/locale_facets.tcc 2007-11-26 17:59:41.000000000 -0800 -+++ gcc-4.3.1/libstdc++-v3/include/bits/locale_facets.tcc 2008-08-16 02:14:48.000000000 -0700 -@@ -1004,7 +1004,7 @@ - const int __cs_size = __fixed ? __max_exp + __prec + 4 - : __max_digits * 2 + __prec; - char* __cs = static_cast<char*>(__builtin_alloca(__cs_size)); -- __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, __fbuf, -+ __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf, - __prec, __v); - #endif - diff --git a/recipes/gcc/gcc-svn/402-libbackend_dep_gcov-iov.h.patch b/recipes/gcc/gcc-svn/402-libbackend_dep_gcov-iov.h.patch deleted file mode 100644 index 0bf115c45d..0000000000 --- a/recipes/gcc/gcc-svn/402-libbackend_dep_gcov-iov.h.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: gcc-4.2/gcc/Makefile.in -=================================================================== ---- gcc-4.2/gcc/Makefile.in (revision 121758) -+++ gcc-4.2/gcc/Makefile.in (working copy) -@@ -2658,7 +2658,7 @@ mips-tdump.o : mips-tdump.c $(CONFIG_H) - # FIXME: writing proper dependencies for this is a *LOT* of work. - libbackend.o : $(OBJS-common:.o=.c) $(out_file) \ - insn-config.h insn-flags.h insn-codes.h insn-constants.h \ -- insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) -+ insn-attr.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) gcov-iov.h - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ - -DTARGET_NAME=\"$(target_noncanonical)\" \ - -DLOCALEDIR=\"$(localedir)\" \ diff --git a/recipes/gcc/gcc-svn/602-sdk-libstdc++-includes.patch b/recipes/gcc/gcc-svn/602-sdk-libstdc++-includes.patch deleted file mode 100644 index 23fce7544d..0000000000 --- a/recipes/gcc/gcc-svn/602-sdk-libstdc++-includes.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gcc-4.1.0/libstdc++-v3/fragment.am 2005-03-21 11:40:14.000000000 -0600 -+++ gcc-4.1.0-patched/libstdc++-v3/fragment.am 2005-04-25 20:14:39.856251785 -0500 -@@ -21,5 +21,5 @@ - $(WARN_FLAGS) $(WERROR) -fdiagnostics-show-location=once - - # -I/-D flags to pass when compiling. --AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -+AM_CPPFLAGS = $(GLIBCXX_INCLUDES) -I$(toplevel_srcdir)/include - ---- gcc-4.1.0/libstdc++-v3/libmath/Makefile.am 2005-03-21 11:40:18.000000000 -0600 -+++ gcc-4.1.0-patched/libstdc++-v3/libmath/Makefile.am 2005-04-25 20:14:39.682280735 -0500 -@@ -35,7 +35,7 @@ - - libmath_la_SOURCES = stubs.c - --AM_CPPFLAGS = $(CANADIAN_INCLUDES) -+AM_CPPFLAGS = $(CANADIAN_INCLUDES) -I$(toplevel_srcdir)/include - - # Only compiling "C" sources in this directory. - LIBTOOL = @LIBTOOL@ --tag CC diff --git a/recipes/gcc/gcc-svn/740-sh-pr24836.patch b/recipes/gcc/gcc-svn/740-sh-pr24836.patch deleted file mode 100644 index 7992282cff..0000000000 --- a/recipes/gcc/gcc-svn/740-sh-pr24836.patch +++ /dev/null @@ -1,25 +0,0 @@ -http://sourceforge.net/mailarchive/forum.php?thread_id=8959304&forum_id=5348 -http://gcc.gnu.org/bugzilla/show_bug.cgi?id=24836 - ---- gcc/gcc/configure.ac (revision 106699) -+++ gcc/gcc/configure.ac (working copy) -@@ -2446,7 +2446,7 @@ - tls_first_minor=14 - tls_as_opt="-m64 -Aesame --fatal-warnings" - ;; -- sh-*-* | sh[34]-*-*) -+ sh-*-* | sh[34]*-*-*) - conftest_s=' - .section ".tdata","awT",@progbits - foo: .long 25 ---- gcc/gcc/configure -+++ gcc/gcc/configure -@@ -14846,7 +14846,7 @@ - tls_first_minor=14 - tls_as_opt="-m64 -Aesame --fatal-warnings" - ;; -- sh-*-* | sh[34]-*-*) -+ sh-*-* | sh[34]*-*-*) - conftest_s=' - .section ".tdata","awT",@progbits - foo: .long 25 diff --git a/recipes/gcc/gcc-svn/800-arm-bigendian.patch b/recipes/gcc/gcc-svn/800-arm-bigendian.patch deleted file mode 100644 index f433942783..0000000000 --- a/recipes/gcc/gcc-svn/800-arm-bigendian.patch +++ /dev/null @@ -1,34 +0,0 @@ -By Lennert Buytenhek <buytenh@wantstofly.org> -Adds support for arm*b-linux* big-endian ARM targets - -See http://gcc.gnu.org/PR16350 - -Index: gcc-4.3.2/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.3.2.orig/gcc/config/arm/linux-elf.h 2007-11-08 05:44:09.000000000 -0800 -+++ gcc-4.3.2/gcc/config/arm/linux-elf.h 2008-08-28 21:08:30.000000000 -0700 -@@ -51,7 +51,7 @@ - - #undef MULTILIB_DEFAULTS - #define MULTILIB_DEFAULTS \ -- { "marm", "mlittle-endian", "mhard-float", "mno-thumb-interwork" } -+ { "marm", TARGET_ENDIAN_OPTION, "mhard-float", "mno-thumb-interwork" } - - /* Now we define the strings used to build the spec file. */ - #undef LIB_SPEC -Index: gcc-4.3.2/gcc/config.gcc -=================================================================== ---- gcc-4.3.2.orig/gcc/config.gcc 2008-08-28 20:57:39.000000000 -0700 -+++ gcc-4.3.2/gcc/config.gcc 2008-08-28 21:00:11.000000000 -0700 -@@ -742,6 +742,11 @@ - esac - tmake_file="${tmake_file} t-linux arm/t-arm" - case ${target} in -+ arm*b-*) -+ tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" -+ ;; -+ esac -+ case ${target} in - arm*-*-linux-*eabi) - tm_file="$tm_file arm/bpabi.h arm/linux-eabi.h" - tmake_file="$tmake_file arm/t-arm-elf arm/t-bpabi arm/t-linux-eabi" diff --git a/recipes/gcc/gcc-svn/904-flatten-switch-stmt-00.patch b/recipes/gcc/gcc-svn/904-flatten-switch-stmt-00.patch deleted file mode 100644 index 8fac37c4df..0000000000 --- a/recipes/gcc/gcc-svn/904-flatten-switch-stmt-00.patch +++ /dev/null @@ -1,153 +0,0 @@ -Hi, - -The attached patch makes sure that we create smaller object code for -simple switch statements. We just make sure to flatten the switch -statement into an if-else chain, basically. - -This fixes a size-regression as compared to gcc-3.4, as can be seen -below. - -2007-04-15 Bernhard Fischer <..> - - * stmt.c (expand_case): Do not create a complex binary tree when - optimizing for size but rather use the simple ordered list. - (emit_case_nodes): do not emit jumps to the default_label when - optimizing for size. - -Not regtested so far. -Comments? - -Attached is the test switch.c mentioned below. - -$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do -gcc-$i -DCHAIN -Os -o switch-CHAIN-$i.o -c switch.c ;done -$ for i in 2.95 3.3 3.4 4.0 4.1 4.2.orig-HEAD 4.3.orig-HEAD 4.3-HEAD;do -gcc-$i -UCHAIN -Os -o switch-$i.o -c switch.c ;done - -$ size switch-*.o - text data bss dec hex filename - 169 0 0 169 a9 switch-2.95.o - 115 0 0 115 73 switch-3.3.o - 103 0 0 103 67 switch-3.4.o - 124 0 0 124 7c switch-4.0.o - 124 0 0 124 7c switch-4.1.o - 124 0 0 124 7c switch-4.2.orig-HEAD.o - 95 0 0 95 5f switch-4.3-HEAD.o - 124 0 0 124 7c switch-4.3.orig-HEAD.o - 166 0 0 166 a6 switch-CHAIN-2.95.o - 111 0 0 111 6f switch-CHAIN-3.3.o - 95 0 0 95 5f switch-CHAIN-3.4.o - 95 0 0 95 5f switch-CHAIN-4.0.o - 95 0 0 95 5f switch-CHAIN-4.1.o - 95 0 0 95 5f switch-CHAIN-4.2.orig-HEAD.o - 95 0 0 95 5f switch-CHAIN-4.3-HEAD.o - 95 0 0 95 5f switch-CHAIN-4.3.orig-HEAD.o - - -Content-Type: text/x-diff; charset=us-ascii -Content-Disposition: attachment; filename="gcc-4.3.gcc-flatten-switch-stmt.00.diff" - -Index: gcc-4.2.0/gcc/stmt.c -=================================================================== ---- gcc-4.2.0.orig/gcc/stmt.c (revision 123843) -+++ gcc-4.2.0/gcc/stmt.c (working copy) -@@ -2517,7 +2517,11 @@ expand_case (tree exp) - use_cost_table - = (TREE_CODE (orig_type) != ENUMERAL_TYPE - && estimate_case_costs (case_list)); -- balance_case_nodes (&case_list, NULL); -+ /* When optimizing for size, we want a straight list to avoid -+ jumps as much as possible. This basically creates an if-else -+ chain. */ -+ if (!optimize_size) -+ balance_case_nodes (&case_list, NULL); - emit_case_nodes (index, case_list, default_label, index_type); - emit_jump (default_label); - } -@@ -3075,6 +3079,7 @@ emit_case_nodes (rtx index, case_node_pt - { - if (!node_has_low_bound (node, index_type)) - { -+ if (!optimize_size) /* don't jl to the .default_label. */ - emit_cmp_and_jump_insns (index, - convert_modes - (mode, imode, - - -Content-Type: text/x-csrc; charset=us-ascii -Content-Disposition: attachment; filename="switch.c" - -int -commutative_tree_code (int code) -{ -#define CASE(val, ret) case val:/* __asm__("# val="#val ",ret="#ret);*/ return ret; -#ifndef CHAIN - switch (code) - { -# if 1 - CASE(1,3) - CASE(3,2) - CASE(5,8) - CASE(7,1) - CASE(33,4) - CASE(44,9) - CASE(55,10) - CASE(66,-1) - CASE(77,99) - CASE(666,0) -# else - case 1: - return 3; - case 3: - return 2; - case 5: - return 8; - case 7: - return 1; - case 33: - return 4; - case 44: - return 9; - case 55: - return 10; - case 66: - return -1; - case 77: - return 99; - case 666: - return 0; -# endif - default: - break; - } - return 4711; - -#else - if (code == 1) - return 3; - else if (code == 3) - return 2; - else if (code == 5) - return 8; - else if (code == 7) - return 1; - else if (code == 33) - return 4; - else if (code == 44) - return 9; - else if (code == 55) - return 10; - else if (code == 66) - return -1; - else if (code == 77) - return 99; - else if (code == 666) - return 0; - else - return 4711; -#endif -} - - ---AhhlLboLdkugWU4S-- - diff --git a/recipes/gcc/gcc-svn/arm-nolibfloat.patch b/recipes/gcc/gcc-svn/arm-nolibfloat.patch deleted file mode 100644 index c4897c0330..0000000000 --- a/recipes/gcc/gcc-svn/arm-nolibfloat.patch +++ /dev/null @@ -1,24 +0,0 @@ -# Dimitry Andric <dimitry@andric.com>, 2004-05-01 -# -# * Removed the extra -lfloat option from LIBGCC_SPEC, since it isn't needed -# anymore. (The required functions are now in libgcc.) -# -# Fixes errors like -# arm-softfloat-linux-gnu/3.4.0/../../../../arm-softfloat-linux-gnu/bin/ld: cannot find -lfloat -# collect2: ld returned 1 exit status -# make[2]: *** [arm-softfloat-linux-gnu/gcc-3.4.0-glibc-2.3.2/build-glibc/iconvdata/ISO8859-1.so] Error 1 -# when building glibc-2.3.3 with gcc-3.4.0 for arm-softfloat - -Index: gcc-4.0.2/gcc/config/arm/linux-elf.h -=================================================================== ---- gcc-4.0.2.orig/gcc/config/arm/linux-elf.h 2005-03-04 16:14:01.000000000 +0000 -+++ gcc-4.0.2/gcc/config/arm/linux-elf.h 2005-11-11 18:02:54.000000000 +0000 -@@ -56,7 +56,7 @@ - %{shared:-lc} \ - %{!shared:%{profile:-lc_p}%{!profile:-lc}}" - --#define LIBGCC_SPEC "%{msoft-float:-lfloat} %{mfloat-abi=soft*:-lfloat} -lgcc" -+#define LIBGCC_SPEC "-lgcc" - - /* Provide a STARTFILE_SPEC appropriate for GNU/Linux. Here we add - the GNU/Linux magical crtbegin.o file (see crtstuff.c) which diff --git a/recipes/gcc/gcc-svn/arm-softfloat.patch b/recipes/gcc/gcc-svn/arm-softfloat.patch deleted file mode 100644 index 5e1edd9208..0000000000 --- a/recipes/gcc/gcc-svn/arm-softfloat.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: gcc-4.0.2/gcc/config/arm/t-linux -=================================================================== ---- gcc-4.0.2.orig/gcc/config/arm/t-linux 2004-05-15 12:41:35.000000000 +0000 -+++ gcc-4.0.2/gcc/config/arm/t-linux 2005-11-11 16:07:53.000000000 +0000 -@@ -4,7 +4,10 @@ - LIBGCC2_DEBUG_CFLAGS = -g0 - - LIB1ASMSRC = arm/lib1funcs.asm --LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx -+LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ -+ _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ -+ _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ -+ _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundisf _floatundidf - - # MULTILIB_OPTIONS = mhard-float/msoft-float - # MULTILIB_DIRNAMES = hard-float soft-float diff --git a/recipes/gcc/gcc-svn/arm-thumb-cache.patch b/recipes/gcc/gcc-svn/arm-thumb-cache.patch deleted file mode 100644 index fa63846c8c..0000000000 --- a/recipes/gcc/gcc-svn/arm-thumb-cache.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- gcc-4.1.1/gcc/config/arm/linux-gas.h- 2005-06-25 03:22:41.000000000 +0200 -+++ gcc-4.1.1/gcc/config/arm/linux-gas.h 2006-06-18 10:23:46.000000000 +0200 -@@ -44,6 +44,7 @@ - - /* Clear the instruction cache from `beg' to `end'. This makes an - inline system call to SYS_cacheflush. */ -+#if !defined(__thumb__) - #define CLEAR_INSN_CACHE(BEG, END) \ - { \ - register unsigned long _beg __asm ("a1") = (unsigned long) (BEG); \ -@@ -53,3 +54,18 @@ - : "=r" (_beg) \ - : "0" (_beg), "r" (_end), "r" (_flg)); \ - } -+#else -+#define CLEAR_INSN_CACHE(BEG, END) \ -+{ \ -+ register unsigned long _beg __asm ("a1") = (unsigned long) (BEG); \ -+ register unsigned long _end __asm ("a2") = (unsigned long) (END); \ -+ register unsigned long _flg __asm ("a3") = 0; \ -+ register unsigned long _swi __asm ("a4") = 0xf0002; \ -+ __asm __volatile ("push {r7}\n" \ -+ " mov r7,a4\n" \ -+ " swi 0 @ sys_cacheflush\n" \ -+ " pop {r7}\n" \ -+ : "=r" (_beg) \ -+ : "0" (_beg), "r" (_end), "r" (_flg), "r" (_swi)); \ -+} -+#endif diff --git a/recipes/gcc/gcc-svn/arm-thumb.patch b/recipes/gcc/gcc-svn/arm-thumb.patch deleted file mode 100644 index 7b0b8b2ddc..0000000000 --- a/recipes/gcc/gcc-svn/arm-thumb.patch +++ /dev/null @@ -1,43 +0,0 @@ - -# -# Patch managed by http://www.holgerschurig.de/patcher.html -# - -Index: gcc-4.3.1/gcc/config/arm/lib1funcs.asm -=================================================================== ---- gcc-4.3.1.orig/gcc/config/arm/lib1funcs.asm 2007-05-30 12:04:09.000000000 -0700 -+++ gcc-4.3.1/gcc/config/arm/lib1funcs.asm 2008-08-28 21:51:17.000000000 -0700 -@@ -1225,11 +1225,12 @@ - code here switches to the correct mode before executing the function. */ - - .text -- .align 0 -+ .align 1 - .force_thumb - - .macro call_via register - THUMB_FUNC_START _call_via_\register -+ .hidden SYM (_call_via_\register) - - bx \register - nop -@@ -1330,6 +1331,7 @@ - .code 16 - - THUMB_FUNC_START _interwork_call_via_\register -+ .hidden SYM (_interwork_call_via_\register) - - bx pc - nop -Index: gcc-4.3.1/gcc/config/arm/t-linux -=================================================================== ---- gcc-4.3.1.orig/gcc/config/arm/t-linux 2008-08-28 21:25:24.000000000 -0700 -+++ gcc-4.3.1/gcc/config/arm/t-linux 2008-08-28 21:51:17.000000000 -0700 -@@ -6,6 +6,7 @@ - LIB1ASMFUNCS = _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_lnx \ - _negdf2 _addsubdf3 _muldivdf3 _cmpdf2 _unorddf2 _fixdfsi _fixunsdfsi \ - _truncdfsf2 _negsf2 _addsubsf3 _muldivsf3 _cmpsf2 _unordsf2 \ -+ _call_via_rX \ - _fixsfsi _fixunssfsi _floatdidf _floatdisf _floatundisf _floatundidf - - # MULTILIB_OPTIONS = mhard-float/msoft-float diff --git a/recipes/gcc/gcc-svn/cache-amnesia.patch b/recipes/gcc/gcc-svn/cache-amnesia.patch index fb4d1a26d8..b889f9b6ca 100644 --- a/recipes/gcc/gcc-svn/cache-amnesia.patch +++ b/recipes/gcc/gcc-svn/cache-amnesia.patch @@ -3,27 +3,27 @@ gcc/configure.ac | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -Index: gcc-4.3.1/gcc/configure +Index: gcc-4.5+svnr155514/gcc/configure =================================================================== ---- gcc-4.3.1.orig/gcc/configure 2008-08-20 00:27:57.000000000 -0700 -+++ gcc-4.3.1/gcc/configure 2008-08-20 00:45:11.000000000 -0700 -@@ -12813,7 +12813,7 @@ else - esac +--- gcc-4.5+svnr155514.orig/gcc/configure 2009-12-29 22:00:40.000000000 -0800 ++++ gcc-4.5+svnr155514/gcc/configure 2009-12-29 23:52:43.381592113 -0800 +@@ -10467,7 +10467,7 @@ else saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ + LDFLAGS="${LDFLAGS_FOR_BUILD}" \ - ${realsrcdir}/configure \ + CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ --target=$target_alias --host=$build_alias --build=$build_alias CFLAGS="${saved_CFLAGS}" -Index: gcc-4.3.1/gcc/configure.ac +Index: gcc-4.5+svnr155514/gcc/configure.ac =================================================================== ---- gcc-4.3.1.orig/gcc/configure.ac 2008-08-20 00:27:57.000000000 -0700 -+++ gcc-4.3.1/gcc/configure.ac 2008-08-20 00:44:52.000000000 -0700 -@@ -1480,7 +1480,7 @@ else - esac +--- gcc-4.5+svnr155514.orig/gcc/configure.ac 2009-12-29 22:00:40.000000000 -0800 ++++ gcc-4.5+svnr155514/gcc/configure.ac 2009-12-29 23:51:54.589091778 -0800 +@@ -1458,7 +1458,7 @@ else saved_CFLAGS="${CFLAGS}" CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \ + LDFLAGS="${LDFLAGS_FOR_BUILD}" \ - ${realsrcdir}/configure \ + CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \ --enable-languages=${enable_languages-all} \ diff --git a/recipes/gcc/gcc-svn/debian/ada-acats.dpatch b/recipes/gcc/gcc-svn/debian/ada-acats.dpatch deleted file mode 100644 index fc25bf901f..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-acats.dpatch +++ /dev/null @@ -1,78 +0,0 @@ -#! /bin/sh -e - -# DP: - When running the ACATS, look for the gnat tools in their new -# DP: directory (build/gnattools), and for the shared libraries in -# DP: build/gcc/ada/rts, build/libgnatvsn and build/libgnatprj. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- gcc/testsuite/ada/acats/run_acats~ -+++ gcc/testsuite/ada/acats/run_acats 2006-04-22 08:57:50.933824704 +0200 -@@ -11,23 +11,42 @@ - host_gnatmake=`type gnatmake | awk '{print $3}'` - ROOT=`${PWDCMD-pwd}` - BASE=`cd $ROOT/../../..; ${PWDCMD-pwd}` -- --PATH=$BASE:$ROOT:$PATH --ADA_INCLUDE_PATH=$BASE/ada/rts -+GNATTOOLS=`cd $BASE/../gnattools; ${PWDCMD-pwd}` -+LIBGNATVSN=`cd $BASE/../libgnatvsn; ${PWDCMD-pwd}` -+LIBGNATPRJ=`cd $BASE/../libgnatprj; ${PWDCMD-pwd}` -+ -+PATH=$GNATTOOLS:$BASE:$ROOT:$PATH -+ADA_INCLUDE_DIR=$BASE/ada/rts -+ADA_INCLUDE_PATH=$ADA_INCLUDE_DIR:$LIBGNATVSN:$LIBGNATPRJ - LD_LIBRARY_PATH=$ADA_INCLUDE_PATH:$BASE:$LD_LIBRARY_PATH - ADA_OBJECTS_PATH=$ADA_INCLUDE_PATH - --if [ ! -d $ADA_INCLUDE_PATH ]; then -+if [ ! -d $ADA_INCLUDE_DIR ]; then - echo gnatlib missing, exiting. - exit 1 - fi - --if [ ! -f $BASE/gnatchop ]; then -+if [ ! -d $GNATTOOLS ]; then -+ echo gnattools missing, exiting. -+ exit 1 -+fi -+ -+if [ ! -d $LIBGNATVSN ]; then -+ echo libgnatvsn missing, exiting. -+ exit 1 -+fi -+ -+if [ ! -d $LIBGNATPRJ ]; then -+ echo libgnatprj missing, exiting. -+ exit 1 -+fi -+ -+if [ ! -f $GNATTOOLS/gnatchop ]; then - echo gnattools missing, exiting. - exit 1 - fi - --if [ ! -f $BASE/gnatmake ]; then -+if [ ! -f $GNATTOOLS/gnatmake ]; then - echo gnattools missing, exiting. - exit 1 - fi diff --git a/recipes/gcc/gcc-svn/debian/ada-alpha.dpatch b/recipes/gcc/gcc-svn/debian/ada-alpha.dpatch deleted file mode 100644 index 1e2c47d670..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-alpha.dpatch +++ /dev/null @@ -1,88 +0,0 @@ -#! /bin/sh -e - -# DP: Fix GNAT on alpha. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2008-04-01 Aurelien Jarno <aurelien@aurel32.net> - - * s-osinte-linux-alpha.ads (SC_NPROCESSORS_ONLN): New constant - for sysconf call. - (bit_field): New packed boolean type used by cpu_set_t. - (cpu_set_t): New type corresponding to the C type with - the same name. Note that on the Ada side we use a bit - field array for the affinity mask. There is not need - for the C macro for setting individual bit. - (pthread_setaffinity_np): New imported routine. - -Index: gcc/ada/s-osinte-linux-alpha.ads -=================================================================== ---- gcc/ada/s-osinte-linux-alpha.ads (révision 133772) -+++ gcc/ada/s-osinte-linux-alpha.ads (copie de travail) -@@ -237,6 +237,7 @@ - pragma Import (C, sysconf); - - SC_CLK_TCK : constant := 2; -+ SC_NPROCESSORS_ONLN : constant := 84; - - ------------------------- - -- Priority Scheduling -- -@@ -268,6 +269,7 @@ - - type Thread_Body is access - function (arg : System.Address) return System.Address; -+ pragma Convention (C, Thread_Body); - - function Thread_Body_Access is new - Unchecked_Conversion (System.Address, Thread_Body); -@@ -448,12 +450,31 @@ - pragma Import (C, pthread_getspecific, "pthread_getspecific"); - - type destructor_pointer is access procedure (arg : System.Address); -+ pragma Convention (C, destructor_pointer); - - function pthread_key_create - (key : access pthread_key_t; - destructor : destructor_pointer) return int; - pragma Import (C, pthread_key_create, "pthread_key_create"); - -+ CPU_SETSIZE : constant := 1_024; -+ -+ type bit_field is array (1 .. CPU_SETSIZE) of Boolean; -+ for bit_field'Size use CPU_SETSIZE; -+ pragma Pack (bit_field); -+ pragma Convention (C, bit_field); -+ -+ type cpu_set_t is record -+ bits : bit_field; -+ end record; -+ pragma Convention (C, cpu_set_t); -+ -+ function pthread_setaffinity_np -+ (thread : pthread_t; -+ cpusetsize : size_t; -+ cpuset : access cpu_set_t) return int; -+ pragma Import (C, pthread_setaffinity_np, "__gnat_pthread_setaffinity_np"); -+ - private - - type sigset_t is record diff --git a/recipes/gcc/gcc-svn/debian/ada-default-project-path.dpatch b/recipes/gcc/gcc-svn/debian/ada-default-project-path.dpatch deleted file mode 100644 index b3283d75f3..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-default-project-path.dpatch +++ /dev/null @@ -1,147 +0,0 @@ -#! /bin/sh -e - -# DP: - Change the default search path for project files to the one specified -# DP: by the Debian Policy for Ada: /usr/share/ada/adainclude. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/ada/Make-lang.in -=================================================================== ---- gcc/ada/Make-lang.in.orig -+++ gcc/ada/Make-lang.in -@@ -974,7 +974,7 @@ - $(ECHO) " S1 : constant String := \"$(ADA_INCLUDE_DIR)/\";" >>tmp-sdefault.adb - $(ECHO) " S2 : constant String := \"$(ADA_RTL_OBJ_DIR)/\";" >>tmp-sdefault.adb - $(ECHO) " S3 : constant String := \"$(target)/\";" >>tmp-sdefault.adb -- $(ECHO) " S4 : constant String := \"$(libsubdir)/\";" >>tmp-sdefault.adb -+ $(ECHO) " S4 : constant String := \"/usr/share/ada/adainclude/\";" >>tmp-sdefault.adb - $(ECHO) " function Include_Dir_Default_Name return String_Ptr is" >>tmp-sdefault.adb - $(ECHO) " begin" >>tmp-sdefault.adb - $(ECHO) " return Relocate_Path (S0, S1);" >>tmp-sdefault.adb -Index: gcc/ada/prj-ext.adb -=================================================================== ---- gcc/ada/prj-ext.adb.orig -+++ gcc/ada/prj-ext.adb -@@ -24,7 +24,6 @@ - ------------------------------------------------------------------------------ - - with Hostparm; --with Makeutl; use Makeutl; - with Output; use Output; - with Osint; use Osint; - with Sdefault; -@@ -254,38 +253,10 @@ - - -- Set the initial value of Current_Project_Path - -- if Add_Default_Dir then -- declare -- Prefix : String_Ptr := Sdefault.Search_Dir_Prefix; -- begin -- if Prefix = null then -- Prefix := new String'(Executable_Prefix_Path); -- -- if Prefix.all /= "" then -- if Get_Mode = Ada_Only then -- Current_Project_Path := -- new String'(Name_Buffer (1 .. Name_Len) & -- Path_Separator & -- Prefix.all & Directory_Separator & "gnat"); -- -- else -- Current_Project_Path := -- new String'(Name_Buffer (1 .. Name_Len) & -- Path_Separator & -- Prefix.all & Directory_Separator & -- "share" & Directory_Separator & "gpr"); -- end if; -- end if; -- -- else -- Current_Project_Path := -- new String'(Name_Buffer (1 .. Name_Len) & Path_Separator & -- Prefix.all & -- ".." & Directory_Separator & -- ".." & Directory_Separator & -- ".." & Directory_Separator & "gnat"); -- end if; -- end; -+ if Add_Default_Dir and Sdefault.Search_Dir_Prefix /= null then -+ Current_Project_Path := -+ new String'(Name_Buffer (1 .. Name_Len) & Path_Separator & -+ Sdefault.Search_Dir_Prefix.all); - end if; - - if Current_Project_Path = null then -Index: gcc/ada/gnatls.adb -=================================================================== ---- gcc/ada/gnatls.adb.orig -+++ gcc/ada/gnatls.adb -@@ -1622,9 +1622,6 @@ - declare - Project_Path : String_Access := Getenv (Gpr_Project_Path); - -- Lib : constant String := -- Directory_Separator & "lib" & Directory_Separator; -- - First : Natural; - Last : Natural; - -@@ -1684,36 +1681,8 @@ - if Add_Default_Dir then - Name_Len := 0; - Add_Str_To_Name_Buffer (Sdefault.Search_Dir_Prefix.all); -- -- -- On Windows, make sure that all directory separators are '\' -- -- if Directory_Separator /= '/' then -- for J in 1 .. Name_Len loop -- if Name_Buffer (J) = '/' then -- Name_Buffer (J) := Directory_Separator; -- end if; -- end loop; -- end if; -- -- -- Find the sequence "/lib/" -- -- while Name_Len >= Lib'Length -- and then Name_Buffer (Name_Len - 4 .. Name_Len) /= Lib -- loop -- Name_Len := Name_Len - 1; -- end loop; -- -- -- If the sequence "/lib"/ was found, display the default -- -- directory <prefix>/lib/gnat/. -- -- if Name_Len >= 5 then -- Name_Buffer (Name_Len + 1 .. Name_Len + 4) := "gnat"; -- Name_Buffer (Name_Len + 5) := Directory_Separator; -- Name_Len := Name_Len + 5; -- Write_Str (" "); -- Write_Line -- (To_Host_Dir_Spec (Name_Buffer (1 .. Name_Len), True).all); -- end if; -+ Write_Str (" "); -+ Write_Line (Name_Buffer (1 .. Name_Len)); - end if; - end; - diff --git a/recipes/gcc/gcc-svn/debian/ada-driver-check.dpatch b/recipes/gcc/gcc-svn/debian/ada-driver-check.dpatch deleted file mode 100644 index 9ac1148329..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-driver-check.dpatch +++ /dev/null @@ -1,50 +0,0 @@ -#! /bin/sh -e - -# DP: Simplify Ada driver check (we always build using the required -# DP: Ada version. Needed for warnings on alpha. - -dir=./ -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir} && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm -f ${dir}configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- config/acx.m4~ 2007-09-02 19:24:08.865326043 +0200 -+++ config/acx.m4 2007-09-02 19:28:53.719623005 +0200 -@@ -380,7 +380,7 @@ - # Other compilers, like HP Tru64 UNIX cc, exit successfully when - # given a .adb file, but produce no object file. So we must check - # if an object file was really produced to guard against this. --errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` -+errors=`(${CC} -c conftest.adb) 2>/dev/null || echo failure` - if test x"$errors" = x && test -f conftest.$ac_objext; then - acx_cv_cc_gcc_supports_ada=yes - fi ---- configure~ 2007-09-02 16:50:31.206279000 +0200 -+++ configure 2007-09-02 19:28:58.259691491 +0200 -@@ -4261,7 +4261,7 @@ - # Other compilers, like HP Tru64 UNIX cc, exit successfully when - # given a .adb file, but produce no object file. So we must check - # if an object file was really produced to guard against this. --errors=`(${CC} -c conftest.adb) 2>&1 || echo failure` -+errors=`(${CC} -c conftest.adb) 2>/dev/null || echo failure` - if test x"$errors" = x && test -f conftest.$ac_objext; then - acx_cv_cc_gcc_supports_ada=yes - fi diff --git a/recipes/gcc/gcc-svn/debian/ada-driver.dpatch b/recipes/gcc/gcc-svn/debian/ada-driver.dpatch deleted file mode 100644 index 74ee94d1b6..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-driver.dpatch +++ /dev/null @@ -1,42 +0,0 @@ -#! /bin/sh -e - -# DP: Look for gcc-3.4, gcc-4.0 and gcc-4.1 as gcc with Ada support. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - - ---- gcc/aclocal.m4~ Sat Mar 2 00:37:42 2002 -+++ gcc/aclocal.m4 Sat Apr 6 13:01:36 2002 -@@ -312,6 +312,11 @@ - ${ac_tool_prefix}$user_cc $user_cc \ - ${ac_tool_prefix}gcc gcc \ - ${ac_tool_prefix}cc cc \ -+ ${ac_tool_prefix}gcc-4.3 gcc-4.3 \ -+ ${ac_tool_prefix}gcc-4.2 gcc-4.2 \ -+ ${ac_tool_prefix}gcc-4.1 gcc-4.1 \ -+ ${ac_tool_prefix}gcc-4.0 gcc-4.0 \ -+ ${ac_tool_prefix}gcc-3.4 gcc-3.4 \ - ${ac_tool_prefix}gnatgcc gnatgcc \ - ${ac_tool_prefix}gnatcc gnatcc \ - ${ac_tool_prefix}adagcc adagcc \ diff --git a/recipes/gcc/gcc-svn/debian/ada-gcc-name.dpatch b/recipes/gcc/gcc-svn/debian/ada-gcc-name.dpatch deleted file mode 100644 index 681d634480..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-gcc-name.dpatch +++ /dev/null @@ -1,87 +0,0 @@ -#! /bin/sh -e - -# DP: use gcc-4.3 instead of gcc as the command name. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/ada/comperr.adb -=================================================================== ---- gcc/ada/comperr.adb.orig 2007-09-10 18:53:41.000000000 +0200 -+++ gcc/ada/comperr.adb 2007-12-05 00:15:52.596687382 +0100 -@@ -330,7 +330,7 @@ - End_Line; - - Write_Str -- ("| Include the exact gcc or gnatmake command " & -+ ("| Include the exact gcc-4.3 or gnatmake command " & - "that you entered."); - End_Line; - -Index: gcc/ada/gnatlink.adb -=================================================================== ---- gcc/ada/gnatlink.adb.orig 2007-10-19 15:14:33.000000000 +0200 -+++ gcc/ada/gnatlink.adb 2007-12-05 00:15:52.596687382 +0100 -@@ -137,7 +137,7 @@ - -- This table collects the arguments to be passed to compile the binder - -- generated file. - -- Gcc : String_Access := Program_Name ("gcc"); -+ Gcc : String_Access := Program_Name ("gcc-4.3"); - - Read_Mode : constant String := "r" & ASCII.Nul; - -@@ -1368,7 +1368,8 @@ - end if; - - Write_Line (" --GCC=comp Use comp as the compiler"); -- Write_Line (" --LINK=nam Use 'nam' for the linking rather than 'gcc'"); -+ Write_Line (" --LINK=nam Use 'nam' for the linking rather " & -+ "than 'gcc-4.3'"); - Write_Eol; - Write_Line (" [non-Ada-objects] list of non Ada object files"); - Write_Line (" [linker-options] other options for the linker"); -Index: gcc/ada/make.adb -=================================================================== ---- gcc/ada/make.adb.orig 2007-10-19 15:14:33.000000000 +0200 -+++ gcc/ada/make.adb 2007-12-05 00:15:52.604687208 +0100 -@@ -662,7 +662,7 @@ - -- Compiler, Binder & Linker Data and Subprograms -- - ---------------------------------------------------- - -- Gcc : String_Access := Program_Name ("gcc"); -+ Gcc : String_Access := Program_Name ("gcc-4.3"); - Gnatbind : String_Access := Program_Name ("gnatbind"); - Gnatlink : String_Access := Program_Name ("gnatlink"); - -- Default compiler, binder, linker programs -Index: gcc/ada/gnatchop.adb -=================================================================== ---- gcc/ada/gnatchop.adb.orig 2007-10-19 15:14:33.000000000 +0200 -+++ gcc/ada/gnatchop.adb 2007-12-05 00:15:52.612687034 +0100 -@@ -44,7 +44,7 @@ - Config_File_Name : constant String_Access := new String'("gnat.adc"); - -- The name of the file holding the GNAT configuration pragmas - -- Gcc : String_Access := new String'("gcc"); -+ Gcc : String_Access := new String'("gcc-4.3"); - -- May be modified by switch --GCC= - - Gcc_Set : Boolean := False; diff --git a/recipes/gcc/gcc-svn/debian/ada-gnatvsn.dpatch b/recipes/gcc/gcc-svn/debian/ada-gnatvsn.dpatch deleted file mode 100644 index 365bd60bb4..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-gnatvsn.dpatch +++ /dev/null @@ -1,46 +0,0 @@ -#! /bin/sh -e - -# DP: proposed patch for PR ada/27194. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- orig/gnatvsn.adb 2005-07-01 03:29:17.000000000 +0200 -+++ gcc/ada/gnatvsn.adb 2006-04-18 10:00:05.100002000 +0200 -@@ -54,12 +54,13 @@ - ------------------------- - - function Gnat_Version_String return String is -- NUL_Pos : Positive := 1; -+ NUL_Pos : Positive := Version_String'Last; - begin -- loop -- exit when Version_String (NUL_Pos) = ASCII.NUL; -- -- NUL_Pos := NUL_Pos + 1; -+ for J in Version_String'Range loop -+ if Version_String (J) = ASCII.NUL then -+ NUL_Pos := J; -+ exit; -+ end if; - end loop; - - return Version_String (1 .. NUL_Pos - 1); diff --git a/recipes/gcc/gcc-svn/debian/ada-libgnatprj.dpatch b/recipes/gcc/gcc-svn/debian/ada-libgnatprj.dpatch deleted file mode 100644 index dcbf30aef7..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-libgnatprj.dpatch +++ /dev/null @@ -1,4809 +0,0 @@ -#! /bin/sh -e - -# DP: - Introduce a new shared library named libgnatprj, containing -# DP: the GNAT project file manager licensed under the pure GPL, for -# DP: use in GNAT tools, GLADE and GPS. Link the GNAT tools against -# DP: this new library. - -# This patch seems large, but the hunks in Makefile.in are actually -# generated from Makefile.def using autogen. - -# !!! Must be applied after ada-libgnatvsn.dpatch - -dir=./ -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - cd ${dir} && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/ada/config-lang.in -=================================================================== ---- gcc/ada/config-lang.in.orig -+++ gcc/ada/config-lang.in -@@ -34,8 +34,8 @@ - - outputs=ada/Makefile - --target_libs="target-libada target-libgnatvsn" --lang_dirs="libada libgnatvsn gnattools" -+target_libs="target-libada target-libgnatvsn target-libgnatprj" -+lang_dirs="libada libgnatvsn libgnatprj gnattools" - - # Ada will not work until the front end starts emitting GIMPLE trees. - build_by_default=no -Index: gnattools/Makefile.in -=================================================================== ---- gnattools/Makefile.in.orig -+++ gnattools/Makefile.in -@@ -35,13 +35,13 @@ - target_noncanonical=@target_noncanonical@ - - CFLAGS=-O2 -Wall --INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc - ADA_CFLAGS=-O2 -gnatn --ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn -+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn -I../libgnatprj - LIB_VERSION=$(strip $(shell grep ' Library_Version :' \ - ../libgnatvsn/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) - ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) - ADA_LIBS += -L../libgnatvsn -lgnatvsn -+ADA_LIBS += -L../libgnatprj -lgnatprj - - # We will use the just-built compiler to compile and link everything. - GCC=../gcc/xgcc -B../gcc/ -@@ -66,74 +66,18 @@ - - # Since we don't have gnatmake, we must specify the full list of - # object files necessary to build gnatmake and gnatlink. --# TODO: remove from these lists the objects that are part of --# libgnatprj. - GNATLINK_OBJS = \ --ali.o \ --butil.o \ --fmap.o \ - gnatlink.o \ - indepsw.o \ --osint.o \ --prefix.o \ --rident.o \ --sdefault.o \ --stylesw.o \ --switch.o \ --targparm.o \ - validsw.o - - GNATMAKE_OBJS = \ --ali-util.o \ --ali.o \ --binderr.o \ --butil.o \ --err_vars.o \ --erroutc.o \ --errutil.o \ --fmap.o \ - fname-sf.o \ --fname-uf.o \ - gnatmake.o \ - make.o \ - makeusg.o \ --makeutl.o \ --mlib-fil.o \ - mlib-prj.o \ --mlib-tgt.o \ --mlib-tgt-specific.o \ --mlib-utl.o \ --mlib.o \ - osint-m.o \ --osint.o \ --prefix.o \ --prj-attr-pm.o \ --prj-attr.o \ --prj-com.o \ --prj-dect.o \ --prj-env.o \ --prj-err.o \ --prj-ext.o \ --prj-nmsc.o \ --prj-pars.o \ --prj-part.o \ --prj-proc.o \ --prj-strt.o \ --prj-tree.o \ --prj-util.o \ --prj.o \ --rident.o \ --scng.o \ --sdefault.o \ --sfn_scan.o \ --sinput-c.o \ --sinput-p.o \ --styleg.o \ --stylesw.o \ --switch-m.o \ --switch.o \ --targparm.o \ --tempdir.o \ - usage.o \ - validsw.o \ - $(EXTRA_GNATMAKE_OBJS) -@@ -175,11 +119,6 @@ - for file in $(BODIES) $(SPECS); do \ - $(LN_S) -f $$file .; \ - done -- rm -f sdefault.adb; $(LN_S) ../gcc/ada/sdefault.adb . -- $(foreach PAIR,$(TOOLS_TARGET_PAIRS), \ -- rm -f $(word 1,$(subst <, ,$(PAIR)));\ -- $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \ -- $(word 1,$(subst <, ,$(PAIR)));) - touch $@ - - gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so -@@ -192,19 +131,16 @@ - vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc - vpath %.h @srcdir@/../gcc/ada - --# Because the just-built gcc is a host tool like us, we can use some --# of its object files, e.g. prefix.o. --vpath prefix.o ../gcc -- - # gnatlink - --gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o -+gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o - $(GCC) -o $@ $^ \ -+ ../libgnatprj/libgnatprj.a \ - ../libgnatvsn/libgnatvsn.a \ - ../gcc/ada/rts/libgnat.a \ - ../libiberty/libiberty.a - --gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o -+gnatlink: $(GNATLINK_OBJS) b_gnatl.o - $(GCC) -o $@ $^ $(ADA_LIBS) ../libiberty/libiberty.a - - b_gnatl.o: b_gnatl.c adaint.h -@@ -215,13 +151,14 @@ - - # gnatmake - --gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o -+gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o - $(GCC) -o $@ $(ADA_CFLAGS) $^ \ -+ ../libgnatprj/libgnatprj.a \ - ../libgnatvsn/libgnatvsn.a \ - ../gcc/ada/rts/libgnat.a \ - ../libiberty/libiberty.a - --gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o -+gnatmake: $(GNATMAKE_OBJS) b_gnatm.o - $(GCC) -o $@ $(ADA_CFLAGS) $^ $(ADA_LIBS) ../libiberty/libiberty.a - - b_gnatm.o: b_gnatm.c adaint.h -@@ -231,19 +168,11 @@ - ../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali - - # Other tools --gnatkr: -- if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi -- ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \ -- --GCC="$(GCC)" \ -- --GNATBIND=../gcc/gnatbind -- ./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \ -- --GCC="$(GCC) $(ADA_INCLUDES)" -- - gnat: gnatcmd - cp -lp $< $@ - --gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \ --link.o prefix.o -+gnatbind gnatchop gnatclean gnatcmd gnatfind gnatkr gnatls gnatname gnatprep \ -+gnatxref gprmake: - if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi - ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \ - --GCC="$(GCC)" \ -@@ -252,29 +181,19 @@ - ../libiberty/libiberty.a \ - --GCC="$(GCC) $(ADA_INCLUDES)" - --gnatbl: gnatbl.c link.o prefix.o -+gnatbl: gnatbl.c - $(GCC) -o $@ $< $(CFLAGS) \ - -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \ - -I@srcdir@/../include \ - $(filter-out %.c,$^) \ - $(ADA_LIBS) ../libiberty/libiberty.a - --# Force compiling sdefault.adb, not .ads, to produce sdefault.o --sdefault.o: sdefault.adb -- --sdefault.adb: stamp-gnattools-sources -- - %.o: %.adb - $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES) - - %.o: %.ads - $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES) - --%.o: %.c -- $(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES) -- --prefix.o: -- - # Other - # ----- - -Index: libgnatprj/configure -=================================================================== ---- /dev/null -+++ libgnatprj/configure -@@ -0,0 +1,3138 @@ -+#! /bin/sh -+# Guess values for system-dependent variables and create Makefiles. -+# Generated by GNU Autoconf 2.61. -+# -+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+# 2002, 2003, 2004, 2005, 2006 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 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 -+ # 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 -+ -+ -+ -+ -+# PATH needs CR -+# 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 -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# 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.) -+as_nl=' -+' -+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 -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_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) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+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 -+ 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'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+if test "x$CONFIG_SHELL" = x; then -+ if (eval ":") 2>/dev/null; then -+ as_have_required=yes -+else -+ as_have_required=no -+fi -+ -+ if test $as_have_required = yes && (eval ": -+(as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=\$LINENO -+ as_lineno_2=\$LINENO -+ test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && -+ test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } -+") 2> /dev/null; then -+ : -+else -+ as_candidate_shells= -+ 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=. -+ case $as_dir in -+ /*) -+ for as_base in sh bash ksh sh5; do -+ as_candidate_shells="$as_candidate_shells $as_dir/$as_base" -+ done;; -+ esac -+done -+IFS=$as_save_IFS -+ -+ -+ for as_shell in $as_candidate_shells $SHELL; do -+ # Try only shells that exist, to save several forks. -+ if { test -f "$as_shell" || test -f "$as_shell.exe"; } && -+ { ("$as_shell") 2> /dev/null <<\_ASEOF -+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+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+_ASEOF -+}; then -+ CONFIG_SHELL=$as_shell -+ as_have_required=yes -+ if { "$as_shell" 2> /dev/null <<\_ASEOF -+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+"$@"}'='"$@"' -+ setopt NO_GLOB_SUBST -+else -+ case `(set -o) 2>/dev/null` in -+ *posix*) set -o posix ;; -+esac -+ -+fi -+ -+ -+: -+(as_func_return () { -+ (exit $1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = "$1" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test $exitcode = 0) || { (exit 1); exit 1; } -+ -+( -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } -+ -+_ASEOF -+}; then -+ break -+fi -+ -+fi -+ -+ done -+ -+ if test "x$CONFIG_SHELL" != x; then -+ for as_var in BASH_ENV ENV -+ do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var -+ done -+ export CONFIG_SHELL -+ exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -+fi -+ -+ -+ if test $as_have_required = no; then -+ echo This script requires a shell more modern than all the -+ echo shells that I found on your system. Please install a -+ echo modern shell, or manually run the script under such a -+ echo shell if you do have one. -+ { (exit 1); exit 1; } -+fi -+ -+ -+fi -+ -+fi -+ -+ -+ -+(eval "as_func_return () { -+ (exit \$1) -+} -+as_func_success () { -+ as_func_return 0 -+} -+as_func_failure () { -+ as_func_return 1 -+} -+as_func_ret_success () { -+ return 0 -+} -+as_func_ret_failure () { -+ return 1 -+} -+ -+exitcode=0 -+if as_func_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_success failed. -+fi -+ -+if as_func_failure; then -+ exitcode=1 -+ echo as_func_failure succeeded. -+fi -+ -+if as_func_ret_success; then -+ : -+else -+ exitcode=1 -+ echo as_func_ret_success failed. -+fi -+ -+if as_func_ret_failure; then -+ exitcode=1 -+ echo as_func_ret_failure succeeded. -+fi -+ -+if ( set x; as_func_ret_success y && test x = \"\$1\" ); then -+ : -+else -+ exitcode=1 -+ echo positional parameters were not saved. -+fi -+ -+test \$exitcode = 0") || { -+ echo No shell found that supports shell functions. -+ echo Please tell autoconf@gnu.org about your system, -+ echo including any error possibly output before this -+ echo message -+} -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # 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 after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, 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 -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ 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; }; } -+ -+ # 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 sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi -+echo >conf$$.file -+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 -+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=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+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'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+ -+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` -+ -+# -+# 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} -+ -+# Identity of this package. -+PACKAGE_NAME= -+PACKAGE_TARNAME= -+PACKAGE_VERSION= -+PACKAGE_STRING= -+PACKAGE_BUGREPORT= -+ -+ac_unique_file="Makefile.in" -+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 -+datarootdir -+datadir -+sysconfdir -+sharedstatedir -+localstatedir -+includedir -+oldincludedir -+docdir -+infodir -+htmldir -+dvidir -+pdfdir -+psdir -+libdir -+localedir -+mandir -+DEFS -+ECHO_C -+ECHO_N -+ECHO_T -+LIBS -+build_alias -+host_alias -+target_alias -+INSTALL_PROGRAM -+INSTALL_SCRIPT -+INSTALL_DATA -+build -+build_cpu -+build_vendor -+build_os -+host -+host_cpu -+host_vendor -+host_os -+target -+target_cpu -+target_vendor -+target_os -+target_noncanonical -+LN_S -+x_ada_cflags -+default_gnattools_target -+TOOLS_TARGET_PAIRS -+LIBOBJS -+LTLIBOBJS' -+ac_subst_files='' -+ ac_precious_vars='build_alias -+host_alias -+target_alias' -+ -+ -+# 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. -+# (The list follows the same order as the GNU Coding Standards.) -+bindir='${exec_prefix}/bin' -+sbindir='${exec_prefix}/sbin' -+libexecdir='${exec_prefix}/libexec' -+datarootdir='${prefix}/share' -+datadir='${datarootdir}' -+sysconfdir='${prefix}/etc' -+sharedstatedir='${prefix}/com' -+localstatedir='${prefix}/var' -+includedir='${prefix}/include' -+oldincludedir='/usr/include' -+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 -+ ac_prev= -+ continue -+ fi -+ -+ 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_dashdash$ac_option in -+ --) -+ ac_dashdash=yes ;; -+ -+ -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) -+ ac_prev=datadir ;; -+ -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-\(.*\)'` -+ # 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 ;; -+ -+ -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-\([^=]*\)'` -+ # 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=\$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 ;; -+ -+ -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 ;; -+ -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 ;; -+ -+ -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) -+ ac_prev=localstatedir ;; -+ -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ -+ | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) -+ 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 ;; -+ -+ -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 ;; -+ -+ -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'` -+ 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; }; } -+ 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 directory names. -+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=\$$ac_var -+ case $ac_val in -+ [\\/$]* | ?:[\\/]* ) continue;; -+ NONE | '' ) case $ac_var in *prefix ) continue;; esac;; -+ esac -+ { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 -+ { (exit 1); exit 1; }; } -+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 -+ -+ -+ac_pwd=`pwd` && test -n "$ac_pwd" && -+ac_ls_di=`ls -di .` && -+ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || -+ { echo "$as_me: error: Working directory cannot be determined" >&2 -+ { (exit 1); exit 1; }; } -+test "X$ac_ls_di" = "X$ac_pwd_ls_di" || -+ { echo "$as_me: error: pwd does not report name of working directory" >&2 -+ { (exit 1); exit 1; }; } -+ -+ -+# 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 the parent directory. -+ ac_confdir=`$as_dirname -- "$0" || -+$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 -+ test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." -+ { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 -+ { (exit 1); exit 1; }; } -+fi -+ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -+ac_abs_confdir=`( -+ cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 -+ { (exit 1); exit 1; }; } -+ 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. -+# -+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 \`..'] -+ -+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] -+ --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 -+ -+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 -+ -+_ACEOF -+ac_status=$? -+fi -+ -+if test "$ac_init_help" = "recursive"; then -+ # If there are subdirs, report their specific --help. -+ for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue -+ test -d "$ac_dir" || continue -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`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 -+ .) # We are building in place. -+ ac_srcdir=. -+ 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 -+ 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" || { 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 || ac_status=$? -+ cd "$ac_pwd" || { ac_status=$?; break; } -+ done -+fi -+ -+test -n "$ac_init_help" && exit $ac_status -+if $ac_init_version; then -+ cat <<\_ACEOF -+configure -+generated by GNU Autoconf 2.61 -+ -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -+2002, 2003, 2004, 2005, 2006 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 -+fi -+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.61. 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=. -+ 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_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_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; } -+ -+# 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: 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. -+ { -+ echo -+ -+ cat <<\_ASBOX -+## ---------------- ## -+## Cache variables. ## -+## ---------------- ## -+_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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ (set) 2>&1 | -+ 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" -+ ;; #( -+ *) -+ sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) -+ echo -+ -+ cat <<\_ASBOX -+## ----------------- ## -+## Output variables. ## -+## ----------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_vars -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ -+ if test -n "$ac_subst_files"; then -+ cat <<\_ASBOX -+## ------------------- ## -+## File substitutions. ## -+## ------------------- ## -+_ASBOX -+ echo -+ for ac_var in $ac_subst_files -+ do -+ eval ac_val=\$$ac_var -+ case $ac_val in -+ *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; -+ esac -+ echo "$ac_var='\''$ac_val'\''" -+ done | sort -+ echo -+ fi -+ -+ if test -s confdefs.h; then -+ cat <<\_ASBOX -+## ----------- ## -+## confdefs.h. ## -+## ----------- ## -+_ASBOX -+ echo -+ cat confdefs.h -+ echo -+ fi -+ test "$ac_signal" != 0 && -+ echo "$as_me: caught signal $ac_signal" -+ echo "$as_me: exit $exit_status" -+ } >&5 -+ rm -f core *.core core.conftest.* && -+ rm -f -r 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 -f -r conftest* 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 -n "$CONFIG_SITE"; then -+ set x "$CONFIG_SITE" -+elif test "x$prefix" != xNONE; then -+ set x "$prefix/share/config.site" "$prefix/etc/config.site" -+else -+ set x "$ac_default_prefix/share/config.site" \ -+ "$ac_default_prefix/etc/config.site" -+fi -+shift -+for ac_site_file -+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 $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 -+ 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 -+ -+ -+ -+ -+ -+ -+# Start of actual configure tests -+ -+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 -+ -+# 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. -+ -+ -+# 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 { 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. -+ : -+ 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 -+IFS=$as_save_IFS -+ -+ -+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. 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 value is a relative name. -+ 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' -+ -+ -+# Make sure we can run config.sub. -+$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || -+ { { echo "$as_me:$LINENO: error: cannot run $SHELL $ac_aux_dir/config.sub" >&5 -+echo "$as_me: error: cannot run $SHELL $ac_aux_dir/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_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 && -+ { { 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=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $ac_build_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $ac_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; } -+case $ac_cv_build in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical build" >&5 -+echo "$as_me: error: invalid value of canonical build" >&2;} -+ { (exit 1); exit 1; }; };; -+esac -+build=$ac_cv_build -+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 -+ -+ -+{ 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 -+ 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` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $host_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_host" >&5 -+echo "${ECHO_T}$ac_cv_host" >&6; } -+case $ac_cv_host in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical host" >&5 -+echo "$as_me: error: invalid value of canonical host" >&2;} -+ { (exit 1); exit 1; }; };; -+esac -+host=$ac_cv_host -+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 -+ -+ -+{ 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 -+ 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` || -+ { { echo "$as_me:$LINENO: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&5 -+echo "$as_me: error: $SHELL $ac_aux_dir/config.sub $target_alias failed" >&2;} -+ { (exit 1); exit 1; }; } -+fi -+ -+fi -+{ echo "$as_me:$LINENO: result: $ac_cv_target" >&5 -+echo "${ECHO_T}$ac_cv_target" >&6; } -+case $ac_cv_target in -+*-*-*) ;; -+*) { { echo "$as_me:$LINENO: error: invalid value of canonical target" >&5 -+echo "$as_me: error: invalid value of canonical target" >&2;} -+ { (exit 1); exit 1; }; };; -+esac -+target=$ac_cv_target -+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. -+# will get canonicalized. -+test -n "$target_alias" && -+ test "$program_prefix$program_suffix$program_transform_name" = \ -+ NONENONEs,x,x, && -+ program_prefix=${target_alias}- -+ -+# Autoconf M4 include file defining utility macros for complex Canadian -+# cross builds. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+#### -+# _NCN_TOOL_PREFIXES: Some stuff that oughtta be done in AC_CANONICAL_SYSTEM -+# or AC_INIT. -+# These demand that AC_CANONICAL_SYSTEM be called beforehand. -+ -+#### -+# NCN_STRICT_CHECK_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path]) -+# Like plain AC_CHECK_TOOLS, but require prefix if build!=host. -+ -+ -+#### -+# NCN_STRICT_CHECK_TARGET_TOOLS(variable, progs-to-check-for,[value-if-not-found],[path]) -+# Like CVS Autoconf AC_CHECK_TARGET_TOOLS, but require prefix if build!=target. -+ -+ -+ -+# Backported from Autoconf 2.5x; can go away when and if -+# we switch. Put the OS path separator in $PATH_SEPARATOR. -+ -+ -+ -+ -+# ACX_HAVE_GCC_FOR_TARGET -+# Check if the variable GCC_FOR_TARGET really points to a GCC binary. -+ -+ -+# ACX_CHECK_INSTALLED_TARGET_TOOL(VAR, PROG) -+# Searching for installed target binutils. We need to take extra care, -+# else we may find the wrong assembler, linker, etc., and lose. -+# -+# First try --with-build-time-tools, if specified. -+# -+# For build != host, we ask the installed GCC for the name of the tool it -+# uses, and accept it if it is an absolute path. This is because the -+# only good choice for a compiler is the same GCC version that is being -+# installed (or we couldn't make target libraries), and we assume that -+# on the host system we'll have not only the same GCC version, but also -+# the same binutils version. -+# -+# For build == host, search the same directories that the installed -+# compiler will search. We used to do this for the assembler, linker, -+# and nm only; for simplicity of configuration, however, we extend this -+# criterion to tools (such as ar and ranlib) that are never invoked by -+# the compiler, to avoid mismatches. -+# -+# Also note we have to check MD_EXEC_PREFIX before checking the user's path -+# if build == target. This makes the most sense only when bootstrapping, -+# but we also do so when build != host. In this case, we hope that the -+# build and host systems will have similar contents of MD_EXEC_PREFIX. -+# -+# If we do not find a suitable binary, then try the user's path. -+ -+ -+### -+# AC_PROG_CPP_WERROR -+# Used for autoconf 2.5x to force AC_PREPROC_IFELSE to reject code which -+# triggers warnings from the preprocessor. Will be in autoconf 2.58. -+# For now, using this also overrides header checks to use only the -+# preprocessor (matches 2.13 behavior; matching 2.58's behavior is a -+# bit harder from here). -+# Eventually autoconf will default to checking headers with the compiler -+# instead, and we'll have to do this differently. -+ -+# AC_PROG_CPP_WERROR -+ -+# Test for GNAT. -+# We require the gnatbind program, and a compiler driver that -+# understands Ada. We use the user's CC setting, already found. -+# -+# Sets the shell variable have_gnat to yes or no as appropriate, and -+# substitutes GNATBIND and GNATMAKE. -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ case ${build_alias} in -+ "") build_noncanonical=${build} ;; -+ *) build_noncanonical=${build_alias} ;; -+esac -+ -+ case ${host_alias} in -+ "") host_noncanonical=${build_noncanonical} ;; -+ *) host_noncanonical=${host_alias} ;; -+esac -+ -+ case ${target_alias} in -+ "") target_noncanonical=${host_noncanonical} ;; -+ *) target_noncanonical=${target_alias} ;; -+esac -+ -+ -+ -+ -+# Need to pass this down for now :-P -+{ echo "$as_me:$LINENO: checking whether ln -s works" >&5 -+echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6; } -+LN_S=$as_ln_s -+if test "$LN_S" = "ln -s"; then -+ { echo "$as_me:$LINENO: result: yes" >&5 -+echo "${ECHO_T}yes" >&6; } -+else -+ { echo "$as_me:$LINENO: result: no, using $LN_S" >&5 -+echo "${ECHO_T}no, using $LN_S" >&6; } -+fi -+ -+ -+# Determine x_ada_cflags -+case $host in -+ hppa*) x_ada_cflags=-mdisable-indexing ;; -+ *) x_ada_cflags= ;; -+esac -+ -+ -+# Determine what to build for 'gnattools' -+if test $build = $target ; then -+ # Note that build=target is almost certainly the wrong test; FIXME -+ default_gnattools_target="gnattools-native" -+else -+ default_gnattools_target="gnattools-cross" -+fi -+ -+ -+# Target-specific stuff (defaults) -+TOOLS_TARGET_PAIRS= -+ -+ -+# Per-target case statement -+# ------------------------- -+case "${target}" in -+ alpha*-dec-vx*) # Unlike all other Vxworks -+ ;; -+ m68k*-wrs-vx* \ -+ | powerpc*-wrs-vxworks \ -+ | sparc*-wrs-vx* \ -+ | *86-wrs-vxworks \ -+ | xscale*-wrs-vx* \ -+ | xscale*-wrs-coff \ -+ | mips*-wrs-vx*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-vxworks.adb" -+ ;; -+ sparc-sun-solaris*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb" -+ ;; -+ *86-*-solaris2*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb" -+ ;; -+ *86-*-linux* \ -+ | powerpc*-*-linux* \ -+ | *ia64-*-linux* \ -+ | alpha*-*-linux* \ -+ | sparc*-*-linux* \ -+ | hppa*-*-linux* \ -+ | *x86_64-*-linux*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-linux.adb \ -+ indepsw.adb<indepsw-gnu.adb" -+ ;; -+ s390*-*-linux*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-linux.adb" -+ ;; -+ *86-*-freebsd*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-linux.adb \ -+ indepsw.adb<indepsw-gnu.adb" -+ ;; -+ mips-sgi-irix*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-irix.adb" -+ ;; -+ hppa*-hp-hpux10*) # Unlike hpux11 -+ ;; -+ hppa*-hp-hpux11*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-hpux.adb" -+ ;; -+ *-ibm-aix*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-aix.adb \ -+ indepsw.adb<indepsw-aix.adb" -+ ;; -+ alpha*-dec-osf*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-tru64.adb" -+ ;; -+ alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \ -+ | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-vms-alpha.adb \ -+ symbols.adb<symbols-vms.adb \ -+ symbols-processing.adb<symbols-processing-vms-alpha.adb" -+ ;; -+ ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \ -+ | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-vms-ia64.adb \ -+ symbols.adb<symbols-vms.adb \ -+ symbols-processing.adb<symbols-processing-vms-ia64.adb" -+ ;; -+ *-*-cygwin32* | *-*-mingw32* | *-*-pe) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-mingw.adb \ -+ indepsw.adb<indepsw-mingw.adb" -+ ;; -+ powerpc-*-darwin*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-darwin.adb" -+ ;; -+ *-*-lynxos) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-lynxos.adb \ -+ indepsw.adb<indepsw-gnu.adb" -+ ;; -+esac -+ -+# Output: create a Makefile. -+ac_config_files="$ac_config_files Makefile" -+ -+ -+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, 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_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 -+echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; -+ esac -+ case $ac_var in #( -+ _ | IFS | as_nl) ;; #( -+ *) $as_unset $ac_var ;; -+ esac ;; -+ esac -+ done -+ -+ (set) 2>&1 | -+ 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 "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" -+ ;; -+ esac | -+ sort -+) | -+ sed ' -+ /^ac_cv_env_/b end -+ t clear -+ :clear -+ s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ -+ t end -+ 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 "$as_me:$LINENO: updating cache $cache_file" >&5 -+echo "$as_me: updating cache $cache_file" >&6;} -+ cat confcache >$cache_file -+ else -+ { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 -+echo "$as_me: not updating unwritable cache $cache_file" >&6;} -+ 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}' -+ -+# Transform confdefs.h into DEFS. -+# Protect against shell expansion while executing Makefile rules. -+# Protect against Makefile macro expansion. -+# -+# If the first sed substitution is executed (which looks for macros that -+# take arguments), then branch to the quote section. Otherwise, -+# look for a macro that doesn't take arguments. -+ac_script=' -+t clear -+:clear -+s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g -+t quote -+s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g -+t quote -+b any -+:quote -+s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -+s/\[/\\&/g -+s/\]/\\&/g -+s/\$/$$/g -+H -+:any -+${ -+ g -+ s/^\n// -+ s/\n/ /g -+ p -+} -+' -+DEFS=`sed -n "$ac_script" confdefs.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_script='s/\$U\././;s/\.o$//;s/\.obj$//' -+ ac_i=`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. -+ ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" -+ ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$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 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 -+ # 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 -+ -+ -+ -+ -+# PATH needs CR -+# 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 -+ -+# Support unset when possible. -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ as_unset=unset -+else -+ as_unset=false -+fi -+ -+ -+# 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.) -+as_nl=' -+' -+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 -+ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 -+ { (exit 1); exit 1; } -+fi -+ -+# Work around bugs in pre-3.0 UWIN ksh. -+for as_var in ENV MAIL MAILPATH -+do ($as_unset $as_var) >/dev/null 2>&1 && $as_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) >/dev/null 2>&1 && $as_unset $as_var -+ fi -+done -+ -+# Required to use basename. -+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 -+ 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'` -+ -+# CDPATH. -+$as_unset CDPATH -+ -+ -+ -+ as_lineno_1=$LINENO -+ as_lineno_2=$LINENO -+ test "x$as_lineno_1" != "x$as_lineno_2" && -+ test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { -+ -+ # 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 after each line using $LINENO; the second 'sed' -+ # does the real work. The second script uses 'N' to pair each -+ # line-number line with the line containing $LINENO, 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 -+ # scripts with optimization help from Paolo Bonzini. Blame Lee -+ # E. McMahon (1931-1989) for sed's syntax. :-) -+ sed -n ' -+ p -+ /[$]LINENO/= -+ ' <$as_myself | -+ sed ' -+ s/[$]LINENO.*/&-/ -+ t lineno -+ b -+ :lineno -+ N -+ :loop -+ s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ -+ t loop -+ 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; }; } -+ -+ # 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 sensitive to this). -+ . "./$as_me.lineno" -+ # Exit status is that of the last command. -+ exit -+} -+ -+ -+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then -+ as_dirname=dirname -+else -+ as_dirname=false -+fi -+ -+ECHO_C= ECHO_N= ECHO_T= -+case `echo -n x` in -+-n*) -+ case `echo 'x\c'` in -+ *c*) ECHO_T=' ';; # ECHO_T is single tab character. -+ *) ECHO_C='\c';; -+ esac;; -+*) -+ ECHO_N='-n';; -+esac -+ -+if expr a : '\(a\)' >/dev/null 2>&1 && -+ test "X`expr 00001 : '.*\(...\)'`" = X001; then -+ as_expr=expr -+else -+ as_expr=false -+fi -+ -+rm -f conf$$ conf$$.exe conf$$.file -+if test -d conf$$.dir; then -+ rm -f conf$$.dir/conf$$.file -+else -+ rm -f conf$$.dir -+ mkdir conf$$.dir -+fi -+echo >conf$$.file -+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 -+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=: -+else -+ test -d ./-p && rmdir ./-p -+ as_mkdir_p=false -+fi -+ -+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'" -+ -+# Sed expression to map a string onto a valid variable name. -+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -+ -+ -+exec 6>&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. -+ac_log=" -+This file was extended by $as_me, which was -+generated by GNU Autoconf 2.61. Invocation command line was -+ -+ CONFIG_FILES = $CONFIG_FILES -+ CONFIG_HEADERS = $CONFIG_HEADERS -+ CONFIG_LINKS = $CONFIG_LINKS -+ CONFIG_COMMANDS = $CONFIG_COMMANDS -+ $ $0 $@ -+ -+on `(hostname || uname -n) 2>/dev/null | sed 1q` -+" -+ -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+# Files that config.status was made for. -+config_files="$ac_config_files" -+ -+_ACEOF -+ -+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 and configuration settings, 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 -+ -+Configuration files: -+$config_files -+ -+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.61, -+ with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" -+ -+Copyright (C) 2006 Free Software Foundation, Inc. -+This config.status script is free software; the Free Software Foundation -+gives unlimited permission to copy, distribute and modify it." -+ -+ac_pwd='$ac_pwd' -+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 -+ ;; -+ esac -+ -+ case $ac_option in -+ # Handling of the options. -+ -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) -+ ac_cs_recheck=: ;; -+ --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) -+ echo "$ac_cs_version"; exit ;; -+ --debug | --debu | --deb | --de | --d | -d ) -+ debug=: ;; -+ --file | --fil | --fi | --f ) -+ $ac_shift -+ CONFIG_FILES="$CONFIG_FILES $ac_optarg" -+ ac_need_defaults=false;; -+ --he | --h | --help | --hel | -h ) -+ 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: error: unrecognized option: $1 -+Try \`$0 --help' for more information." >&2 -+ { (exit 1); exit 1; }; } ;; -+ -+ *) ac_config_targets="$ac_config_targets $1" -+ ac_need_defaults=false ;; -+ -+ 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 CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 -+ CONFIG_SHELL=$SHELL -+ export CONFIG_SHELL -+ exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion -+fi -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<\_ACEOF -+exec 5>>config.log -+{ -+ echo -+ sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -+## Running $as_me. ## -+_ASBOX -+ echo "$ac_log" -+} >&5 -+ -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+ -+# Handling of arguments. -+for ac_config_target in $ac_config_targets -+do -+ case $ac_config_target in -+ "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; -+ -+ *) { { 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 -+fi -+ -+# Have a temporary directory for convenience. Make it in the build tree -+# simply because there is no reason against having it here, and in addition, -+# creating and moving files from /tmp can sometimes cause problems. -+# 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 || -+{ -+ tmp= -+ trap 'exit_status=$? -+ { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$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 "./confXXXXXX") 2>/dev/null` && -+ test -n "$tmp" && test -d "$tmp" -+} || -+{ -+ tmp=./conf$$-$RANDOM -+ (umask 077 && mkdir "$tmp") -+} || -+{ -+ echo "$me: cannot create a temporary directory in ." >&2 -+ { (exit 1); exit 1; } -+} -+ -+# -+# Set up the sed scripts for 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 -+ -+_ACEOF -+ -+ -+ -+ac_delim='%!_!# ' -+for ac_last_try in false false false false false :; do -+ cat >conf$$subs.sed <<_ACEOF -+SHELL!$SHELL$ac_delim -+PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim -+PACKAGE_NAME!$PACKAGE_NAME$ac_delim -+PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim -+PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim -+PACKAGE_STRING!$PACKAGE_STRING$ac_delim -+PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim -+exec_prefix!$exec_prefix$ac_delim -+prefix!$prefix$ac_delim -+program_transform_name!$program_transform_name$ac_delim -+bindir!$bindir$ac_delim -+sbindir!$sbindir$ac_delim -+libexecdir!$libexecdir$ac_delim -+datarootdir!$datarootdir$ac_delim -+datadir!$datadir$ac_delim -+sysconfdir!$sysconfdir$ac_delim -+sharedstatedir!$sharedstatedir$ac_delim -+localstatedir!$localstatedir$ac_delim -+includedir!$includedir$ac_delim -+oldincludedir!$oldincludedir$ac_delim -+docdir!$docdir$ac_delim -+infodir!$infodir$ac_delim -+htmldir!$htmldir$ac_delim -+dvidir!$dvidir$ac_delim -+pdfdir!$pdfdir$ac_delim -+psdir!$psdir$ac_delim -+libdir!$libdir$ac_delim -+localedir!$localedir$ac_delim -+mandir!$mandir$ac_delim -+DEFS!$DEFS$ac_delim -+ECHO_C!$ECHO_C$ac_delim -+ECHO_N!$ECHO_N$ac_delim -+ECHO_T!$ECHO_T$ac_delim -+LIBS!$LIBS$ac_delim -+build_alias!$build_alias$ac_delim -+host_alias!$host_alias$ac_delim -+target_alias!$target_alias$ac_delim -+INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim -+INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim -+INSTALL_DATA!$INSTALL_DATA$ac_delim -+build!$build$ac_delim -+build_cpu!$build_cpu$ac_delim -+build_vendor!$build_vendor$ac_delim -+build_os!$build_os$ac_delim -+host!$host$ac_delim -+host_cpu!$host_cpu$ac_delim -+host_vendor!$host_vendor$ac_delim -+host_os!$host_os$ac_delim -+target!$target$ac_delim -+target_cpu!$target_cpu$ac_delim -+target_vendor!$target_vendor$ac_delim -+target_os!$target_os$ac_delim -+target_noncanonical!$target_noncanonical$ac_delim -+LN_S!$LN_S$ac_delim -+x_ada_cflags!$x_ada_cflags$ac_delim -+default_gnattools_target!$default_gnattools_target$ac_delim -+TOOLS_TARGET_PAIRS!$TOOLS_TARGET_PAIRS$ac_delim -+LIBOBJS!$LIBOBJS$ac_delim -+LTLIBOBJS!$LTLIBOBJS$ac_delim -+_ACEOF -+ -+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 59; then -+ break -+ elif $ac_last_try; then -+ { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 -+echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} -+ { (exit 1); exit 1; }; } -+ else -+ ac_delim="$ac_delim!$ac_delim _$ac_delim!! " -+ fi -+done -+ -+ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` -+if test -n "$ac_eof"; then -+ ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` -+ ac_eof=`expr $ac_eof + 1` -+fi -+ -+cat >>$CONFIG_STATUS <<_ACEOF -+cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof -+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end -+_ACEOF -+sed ' -+s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g -+s/^/s,@/; s/!/@,|#_!!_#|/ -+:n -+t n -+s/'"$ac_delim"'$/,g/; t -+s/$/\\/; p -+N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n -+' >>$CONFIG_STATUS <conf$$subs.sed -+rm -f conf$$subs.sed -+cat >>$CONFIG_STATUS <<_ACEOF -+:end -+s/|#_!!_#|//g -+CEOF$ac_eof -+_ACEOF -+ -+ -+# 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 -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+fi # test -n "$CONFIG_FILES" -+ -+ -+for ac_tag in :F $CONFIG_FILES -+do -+ case $ac_tag in -+ :[FHLC]) ac_mode=$ac_tag; continue;; -+ esac -+ case $ac_mode$ac_tag in -+ :[FHL]*:*);; -+ :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 -+echo "$as_me: error: Invalid tag $ac_tag." >&2;} -+ { (exit 1); exit 1; }; };; -+ :[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 || -+ { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 -+echo "$as_me: error: cannot find input file: $ac_f" >&2;} -+ { (exit 1); exit 1; }; };; -+ esac -+ ac_file_inputs="$ac_file_inputs $ac_f" -+ done -+ -+ # 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 "`IFS=: -+ echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." -+ if test x"$ac_file" != x-; then -+ configure_input="$ac_file. $configure_input" -+ { echo "$as_me:$LINENO: creating $ac_file" >&5 -+echo "$as_me: creating $ac_file" >&6;} -+ fi -+ -+ case $ac_tag in -+ *:-:* | *:-) cat >"$tmp/stdin";; -+ 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 || -+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" -+ case $as_dir in #( -+ -*) as_dir=./$as_dir;; -+ esac -+ test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { -+ as_dirs= -+ while :; do -+ case $as_dir in #( -+ *\'*) as_qdir=`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 || -+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" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 -+echo "$as_me: error: cannot create directory $as_dir" >&2;} -+ { (exit 1); exit 1; }; }; } -+ ac_builddir=. -+ -+case "$ac_dir" in -+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -+*) -+ ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` -+ # A ".." for each directory in $ac_dir_suffix. -+ ac_top_builddir_sub=`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 -+ .) # We are building in place. -+ ac_srcdir=. -+ 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 -+ 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 -+ -+ -+ case $ac_mode in -+ :F) -+ # -+ # CONFIG_FILE -+ # -+ -+ case $INSTALL in -+ [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; -+ *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; -+ esac -+_ACEOF -+ -+cat >>$CONFIG_STATUS <<\_ACEOF -+# 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= -+ -+case `sed -n '/datarootdir/ { -+ p -+ q -+} -+/@datadir@/p -+/@docdir@/p -+/@infodir@/p -+/@localedir@/p -+/@mandir@/p -+' $ac_file_inputs` in -+*datarootdir*) ac_datarootdir_seen=yes;; -+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) -+ { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -+echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -+_ACEOF -+cat >>$CONFIG_STATUS <<_ACEOF -+ 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 -+ -+# 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 -+ 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&@top_builddir@&$ac_top_builddir_sub&;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 -+" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out -+ -+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"; } && -+ { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' -+which seems to be undefined. Please make sure it is defined." >&5 -+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 -+ ;; -+ -+ -+ -+ esac -+ -+done # for ac_tag -+ -+ -+{ (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 -+ -Index: libgnatprj/Makefile.in -=================================================================== ---- /dev/null -+++ libgnatprj/Makefile.in -@@ -0,0 +1,177 @@ -+# Makefile for libgnatprj. -+# Copyright (c) 2006 Ludovic Brenta <ludovic@ludovic-brenta.org> -+# -+# This file 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 St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+# Default target; must be first. -+all: libgnatprj -+ -+.SUFFIXES: -+ -+CPUS := $(shell getconf _NPROCESSORS_ONLN) -+LIB_VERSION := $(strip $(shell grep ' Library_Version :' \ -+ @srcdir@/../gcc/ada/gnatvsn.ads | \ -+ sed -e 's/.*"\(.*\)".*/\1/')) -+GCC:=../gcc/xgcc -B../gcc/ -+LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts -+LIBGNATVSN := -I../libgnatvsn -+CFLAGS := -g -O2 -+ADAFLAGS := -g -O2 -gnatn -+BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER) -+DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE) -+DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP) -+TOOLS_TARGET_PAIRS := @TOOLS_TARGET_PAIRS@ -+LN_S := @LN_S@ -+ -+ifneq (@build@,@host@) -+ CFLAGS += -b @host@ -+endif -+ -+.PHONY: libgnatprj install -+libgnatprj: libgnatprj.so.$(LIB_VERSION) libgnatprj.a -+ -+# Here we list one file per Ada unit: the body file if the unit has a -+# body, the spec file otherwise. -+PRJ_SOURCES := ali.adb ali-util.adb butil.adb binderr.adb errout.adb \ -+erroutc.adb errutil.adb err_vars.ads fname-uf.adb fmap.adb impunit.adb \ -+lib-util.adb makeutl.adb mlib.adb mlib-fil.adb mlib-tgt.adb \ -+mlib-tgt-specific.adb mlib-utl.adb osint.adb osint-c.adb prj.adb prj-attr.adb \ -+prj-attr-pm.adb prj-com.ads prj-dect.adb prj-env.adb prj-err.adb prj-ext.adb \ -+prj-nmsc.adb prj-pars.adb prj-part.adb prj-pp.adb prj-proc.adb prj-strt.adb \ -+prj-tree.adb prj-util.adb rident.ads scng.adb sfn_scan.adb sinfo-cn.adb \ -+sinput-c.adb sinput-p.adb style.ads styleg.adb styleg-c.adb stylesw.adb \ -+switch.adb switch-m.adb targparm.adb tempdir.adb -+ -+# Source files generated in build/gcc/ada, not src/gcc/ada. -+GENERATED_SOURCES := sdefault.adb -+ -+SOURCES := $(PRJ_SOURCES) $(GENERATED_SOURCES) -+ -+OBJECTS := $(patsubst %.ads,%.o,$(SOURCES:.adb=.o)) -+ -+# Add some object files compiled from C sources. prefix.o requires -+# some objects from libiberty. -+OBJECTS += concat.o link.o prefix.o xexit.o xmalloc.o xstrdup.o -+ -+vpath %.c @srcdir@/../gcc/ada -+ -+libgnatprj.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS)) -+ : # Make libgnatprj.so -+ $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \ -+ -L../gcc/ada/rts -lgnat-$(LIB_VERSION) \ -+ -L../libgnatvsn -lgnatvsn -+ $(LN_S) -f libgnatprj.so.$(LIB_VERSION) libgnatprj.so -+ chmod a=r obj-shared/*.ali -+# Make the .ali files, but not the .o files, visible to the gnat tools. -+ cp -lp obj-shared/*.ali . -+ -+$(addprefix obj-shared/,$(OBJECTS)): | stamp-libgnatprj-sources obj-shared -+ -+obj-shared/%.o: %.adb -+ $(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@ -+ -+obj-shared/%.o: %.ads -+ $(GCC) -c -fPIC $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@ -+ -+obj-shared/%.o: %.c -+ $(GCC) -c -fPIC $(CFLAGS) -I@srcdir@/../gcc $< -o $@ -+ -+obj-shared/prefix.o: @srcdir@/../gcc/prefix.c -+ $(GCC) -c -fPIC $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \ -+ -I@srcdir@/../gcc -I@srcdir@/../include -I../gcc -I../libiberty \ -+ $< -o $@ -+ -+obj-shared/%.o: @srcdir@/../libiberty/%.c -+ $(GCC) -c -fPIC $(CFLAGS) \ -+ -I@srcdir@/../libiberty -I@srcdir@/../include $< -o $@ -+ -+obj-shared: -+ -mkdir $@ -+ -+libgnatprj.a: $(addprefix obj-static/,$(OBJECTS)) -+ : # Make libgnatprj.a -+ ar rc $@ $^ -+ ranlib $@ -+ -+$(addprefix obj-static/,$(OBJECTS)): | stamp-libgnatprj-sources obj-static -+ -+obj-static/%.o: %.adb -+ $(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@ -+ -+obj-static/%.o: %.ads -+ $(GCC) -c $(ADAFLAGS) $(LIBGNAT_JUST_BUILT) $(LIBGNATVSN) $< -o $@ -+ -+obj-static/%.o: %.c -+ $(GCC) -c $(CFLAGS) -I@srcdir@/../gcc $< -o $@ -+ -+obj-static/prefix.o: @srcdir@/../gcc/prefix.c -+ $(GCC) -c $(CFLAGS) -DPREFIX=\"@prefix@\" -DBASEVER=\"$(BASEVER)\" \ -+ -I@srcdir@/../gcc -I@srcdir@/../include -I../gcc -I../libiberty \ -+ $< -o $@ -+ -+obj-static/%.o: @srcdir@/../libiberty/%.c -+ $(GCC) -c -fPIC $(CFLAGS) \ -+ -I@srcdir@/../libiberty -I@srcdir@/../include $< -o $@ -+ -+obj-static: -+ -mkdir $@ -+ -+$(SOURCES): stamp-libgnatprj-sources -+ -+stamp-libgnatprj-sources: -+ for file in $(PRJ_SOURCES); do \ -+ ads=$$(echo $$file | sed 's/\.adb/.ads/'); \ -+ if [ -f @srcdir@/../gcc/ada/$$file -a ! -L $$file ] ; then $(LN_S) @srcdir@/../gcc/ada/$$file .; fi; \ -+ if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) @srcdir@/../gcc/ada/$$ads .; fi; \ -+ done -+ for file in $(GENERATED_SOURCES); do \ -+ ads=$$(echo $$file | sed 's/\.adb/.ads/'); \ -+ if [ -f ../gcc/ada/$$file -a ! -L $$file ] ; then $(LN_S) ../gcc/ada/$$file .; fi; \ -+ if [ -f ../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) ../gcc/ada/$$ads .; \ -+ else \ -+ if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then $(LN_S) @srcdir@/../gcc/ada/$$ads .; fi; \ -+ fi; \ -+ done -+ $(foreach PAIR,$(TOOLS_TARGET_PAIRS), \ -+ rm -f $(word 1,$(subst <, ,$(PAIR)));\ -+ $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \ -+ $(word 1,$(subst <, ,$(PAIR)));) -+ touch $@ -+ -+# Generate a list of source files (.ads and .adb) to install. Almost -+# all of them are in src/gcc/ada, but some are generated during build -+# and are in build/gcc/ada. -+BODIES := $(filter %.adb,$(PRJ_SOURCES)) -+SPECS := $(filter %.ads,$(PRJ_SOURCES)) $(patsubst %.adb,%.ads,$(BODIES)) -+SOURCES_TO_INSTALL := \ -+$(addprefix @srcdir@/../gcc/ada/,$(SPECS) $(BODIES)) \ -+$(addprefix ../gcc/ada/,$(GENERATED_SOURCES)) -+ -+install: libgnatprj -+ $(INSTALL_DATA) libgnatprj.a $(DESTDIR)$(prefix)/lib -+ $(INSTALL_DATA) libgnatprj.so.$(LIB_VERSION) $(DESTDIR)$(prefix)/lib -+ cd $(DESTDIR)$(prefix)/lib; \ -+ ln -sf libgnatprj.so.$(LIB_VERSION) libgnatprj.so -+ mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj -+ $(INSTALL_DATA) $(SOURCES_TO_INSTALL) \ -+ $(DESTDIR)$(prefix)/share/ada/adainclude/gnatprj -+ mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj -+ $(INSTALL) -m 0444 obj-shared/*.ali \ -+ $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj -+ chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatprj/*.ali -+ -+.PHONY: clean -+clean: -+ rm -rf *.ali obj-static obj-shared libgnatprj* *.adb *.ads stamp* -Index: Makefile.def -=================================================================== ---- Makefile.def.orig -+++ Makefile.def -@@ -130,6 +130,13 @@ - missing= TAGS; - missing= install-info; - missing= installcheck; }; -+host_modules= { module= libgnatprj; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; - host_modules= { module= gnattools; no_check=true; - missing= info; - missing= dvi; -@@ -175,6 +182,13 @@ - missing= TAGS; - missing= install-info; - missing= installcheck; }; -+target_modules = { module= libgnatprj; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; - target_modules = { module= libgomp; lib_path=.libs; }; - - // These are (some of) the make targets to be done in each subdirectory. -@@ -346,7 +360,10 @@ - - dependencies = { module=all-gnattools; on=all-libada; }; - dependencies = { module=all-gnattools; on=all-libgnatvsn; }; -+dependencies = { module=all-gnattools; on=all-libgnatprj; }; - dependencies = { module=all-libgnatvsn; on=all-libada; }; -+dependencies = { module=all-libgnatprj; on=all-libada; }; -+dependencies = { module=all-libgnatprj; on=all-libgnatvsn; }; - - dependencies = { module=configure-mpfr; on=all-gmp; }; - -Index: Makefile.in -=================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -699,6 +699,7 @@ - maybe-configure-utils \ - maybe-configure-libada \ - maybe-configure-libgnatvsn \ -+ maybe-configure-libgnatprj \ - maybe-configure-gnattools - .PHONY: configure-target - configure-target: \ -@@ -723,6 +724,7 @@ - maybe-configure-target-rda \ - maybe-configure-target-libada \ - maybe-configure-target-libgnatvsn \ -+ maybe-configure-target-libgnatprj \ - maybe-configure-target-libgomp - - # The target built for a native non-bootstrap build. -@@ -852,6 +854,7 @@ - all-host: maybe-all-utils - all-host: maybe-all-libada - all-host: maybe-all-libgnatvsn -+all-host: maybe-all-libgnatprj - all-host: maybe-all-gnattools - - .PHONY: all-target -@@ -879,6 +882,7 @@ - all-target: maybe-all-target-rda - all-target: maybe-all-target-libada - all-target: maybe-all-target-libgnatvsn -+all-target: maybe-all-target-libgnatprj - all-target: maybe-all-target-libgomp - - # Do a target for all the subdirectories. A ``make do-X'' will do a -@@ -968,6 +972,7 @@ - info-host: maybe-info-utils - info-host: maybe-info-libada - info-host: maybe-info-libgnatvsn -+info-host: maybe-info-libgnatprj - info-host: maybe-info-gnattools - - .PHONY: info-target -@@ -993,6 +998,7 @@ - info-target: maybe-info-target-rda - info-target: maybe-info-target-libada - info-target: maybe-info-target-libgnatvsn -+info-target: maybe-info-target-libgnatprj - info-target: maybe-info-target-libgomp - - .PHONY: do-dvi -@@ -1077,6 +1083,7 @@ - dvi-host: maybe-dvi-utils - dvi-host: maybe-dvi-libada - dvi-host: maybe-dvi-libgnatvsn -+dvi-host: maybe-dvi-libgnatprj - dvi-host: maybe-dvi-gnattools - - .PHONY: dvi-target -@@ -1102,6 +1109,7 @@ - dvi-target: maybe-dvi-target-rda - dvi-target: maybe-dvi-target-libada - dvi-target: maybe-dvi-target-libgnatvsn -+dvi-target: maybe-dvi-target-libgnatprj - dvi-target: maybe-dvi-target-libgomp - - .PHONY: do-pdf -@@ -1186,6 +1194,7 @@ - pdf-host: maybe-pdf-utils - pdf-host: maybe-pdf-libada - pdf-host: maybe-pdf-libgnatvsn -+pdf-host: maybe-pdf-libgnatprj - pdf-host: maybe-pdf-gnattools - - .PHONY: pdf-target -@@ -1211,6 +1220,7 @@ - pdf-target: maybe-pdf-target-rda - pdf-target: maybe-pdf-target-libada - pdf-target: maybe-pdf-target-libgnatvsn -+pdf-target: maybe-pdf-target-libgnatprj - pdf-target: maybe-pdf-target-libgomp - - .PHONY: do-html -@@ -1295,6 +1305,7 @@ - html-host: maybe-html-utils - html-host: maybe-html-libada - html-host: maybe-html-libgnatvsn -+html-host: maybe-html-libgnatprj - html-host: maybe-html-gnattools - - .PHONY: html-target -@@ -1320,6 +1331,7 @@ - html-target: maybe-html-target-rda - html-target: maybe-html-target-libada - html-target: maybe-html-target-libgnatvsn -+html-target: maybe-html-target-libgnatprj - html-target: maybe-html-target-libgomp - - .PHONY: do-TAGS -@@ -1404,6 +1416,7 @@ - TAGS-host: maybe-TAGS-utils - TAGS-host: maybe-TAGS-libada - TAGS-host: maybe-TAGS-libgnatvsn -+TAGS-host: maybe-TAGS-libgnatprj - TAGS-host: maybe-TAGS-gnattools - - .PHONY: TAGS-target -@@ -1429,6 +1442,7 @@ - TAGS-target: maybe-TAGS-target-rda - TAGS-target: maybe-TAGS-target-libada - TAGS-target: maybe-TAGS-target-libgnatvsn -+TAGS-target: maybe-TAGS-target-libgnatprj - TAGS-target: maybe-TAGS-target-libgomp - - .PHONY: do-install-info -@@ -1513,6 +1527,7 @@ - install-info-host: maybe-install-info-utils - install-info-host: maybe-install-info-libada - install-info-host: maybe-install-info-libgnatvsn -+install-info-host: maybe-install-info-libgnatprj - install-info-host: maybe-install-info-gnattools - - .PHONY: install-info-target -@@ -1538,6 +1553,7 @@ - install-info-target: maybe-install-info-target-rda - install-info-target: maybe-install-info-target-libada - install-info-target: maybe-install-info-target-libgnatvsn -+install-info-target: maybe-install-info-target-libgnatprj - install-info-target: maybe-install-info-target-libgomp - - .PHONY: do-install-pdf -@@ -1622,6 +1638,7 @@ - install-pdf-host: maybe-install-pdf-utils - install-pdf-host: maybe-install-pdf-libada - install-pdf-host: maybe-install-pdf-libgnatvsn -+install-pdf-host: maybe-install-pdf-libgnatprj - install-pdf-host: maybe-install-pdf-gnattools - - .PHONY: install-pdf-target -@@ -1647,6 +1664,7 @@ - install-pdf-target: maybe-install-pdf-target-rda - install-pdf-target: maybe-install-pdf-target-libada - install-pdf-target: maybe-install-pdf-target-libgnatvsn -+install-pdf-target: maybe-install-pdf-target-libgnatprj - install-pdf-target: maybe-install-pdf-target-libgomp - - .PHONY: do-install-html -@@ -1731,6 +1749,7 @@ - install-html-host: maybe-install-html-utils - install-html-host: maybe-install-html-libada - install-html-host: maybe-install-html-libgnatvsn -+install-html-host: maybe-install-html-libgnatprj - install-html-host: maybe-install-html-gnattools - - .PHONY: install-html-target -@@ -1756,6 +1775,7 @@ - install-html-target: maybe-install-html-target-rda - install-html-target: maybe-install-html-target-libada - install-html-target: maybe-install-html-target-libgnatvsn -+install-html-target: maybe-install-html-target-libgnatprj - install-html-target: maybe-install-html-target-libgomp - - .PHONY: do-installcheck -@@ -1840,6 +1860,7 @@ - installcheck-host: maybe-installcheck-utils - installcheck-host: maybe-installcheck-libada - installcheck-host: maybe-installcheck-libgnatvsn -+installcheck-host: maybe-installcheck-libgnatprj - installcheck-host: maybe-installcheck-gnattools - - .PHONY: installcheck-target -@@ -1865,6 +1886,7 @@ - installcheck-target: maybe-installcheck-target-rda - installcheck-target: maybe-installcheck-target-libada - installcheck-target: maybe-installcheck-target-libgnatvsn -+installcheck-target: maybe-installcheck-target-libgnatprj - installcheck-target: maybe-installcheck-target-libgomp - - .PHONY: do-mostlyclean -@@ -1949,6 +1971,7 @@ - mostlyclean-host: maybe-mostlyclean-utils - mostlyclean-host: maybe-mostlyclean-libada - mostlyclean-host: maybe-mostlyclean-libgnatvsn -+mostlyclean-host: maybe-mostlyclean-libgnatprj - mostlyclean-host: maybe-mostlyclean-gnattools - - .PHONY: mostlyclean-target -@@ -1974,6 +1997,7 @@ - mostlyclean-target: maybe-mostlyclean-target-rda - mostlyclean-target: maybe-mostlyclean-target-libada - mostlyclean-target: maybe-mostlyclean-target-libgnatvsn -+mostlyclean-target: maybe-mostlyclean-target-libgnatprj - mostlyclean-target: maybe-mostlyclean-target-libgomp - - .PHONY: do-clean -@@ -2058,6 +2082,7 @@ - clean-host: maybe-clean-utils - clean-host: maybe-clean-libada - clean-host: maybe-clean-libgnatvsn -+clean-host: maybe-clean-libgnatprj - clean-host: maybe-clean-gnattools - - .PHONY: clean-target -@@ -2083,6 +2108,7 @@ - clean-target: maybe-clean-target-rda - clean-target: maybe-clean-target-libada - clean-target: maybe-clean-target-libgnatvsn -+clean-target: maybe-clean-target-libgnatprj - clean-target: maybe-clean-target-libgomp - - .PHONY: do-distclean -@@ -2167,6 +2193,7 @@ - distclean-host: maybe-distclean-utils - distclean-host: maybe-distclean-libada - distclean-host: maybe-distclean-libgnatvsn -+distclean-host: maybe-distclean-libgnatprj - distclean-host: maybe-distclean-gnattools - - .PHONY: distclean-target -@@ -2192,6 +2219,7 @@ - distclean-target: maybe-distclean-target-rda - distclean-target: maybe-distclean-target-libada - distclean-target: maybe-distclean-target-libgnatvsn -+distclean-target: maybe-distclean-target-libgnatprj - distclean-target: maybe-distclean-target-libgomp - - .PHONY: do-maintainer-clean -@@ -2276,6 +2304,7 @@ - maintainer-clean-host: maybe-maintainer-clean-utils - maintainer-clean-host: maybe-maintainer-clean-libada - maintainer-clean-host: maybe-maintainer-clean-libgnatvsn -+maintainer-clean-host: maybe-maintainer-clean-libgnatprj - maintainer-clean-host: maybe-maintainer-clean-gnattools - - .PHONY: maintainer-clean-target -@@ -2301,6 +2330,7 @@ - maintainer-clean-target: maybe-maintainer-clean-target-rda - maintainer-clean-target: maybe-maintainer-clean-target-libada - maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn -+maintainer-clean-target: maybe-maintainer-clean-target-libgnatprj - maintainer-clean-target: maybe-maintainer-clean-target-libgomp - - -@@ -2439,6 +2469,7 @@ - maybe-check-utils \ - maybe-check-libada \ - maybe-check-libgnatvsn \ -+ maybe-check-libgnatprj \ - maybe-check-gnattools - - .PHONY: check-target -@@ -2464,6 +2495,7 @@ - maybe-check-target-rda \ - maybe-check-target-libada \ - maybe-check-target-libgnatvsn \ -+ maybe-check-target-libgnatprj \ - maybe-check-target-libgomp - - do-check: -@@ -2574,6 +2606,7 @@ - maybe-install-utils \ - maybe-install-libada \ - maybe-install-libgnatvsn \ -+ maybe-install-libgnatprj \ - maybe-install-gnattools - - .PHONY: install-host -@@ -2649,6 +2682,7 @@ - maybe-install-utils \ - maybe-install-libada \ - maybe-install-libgnatvsn \ -+ maybe-install-libgnatprj \ - maybe-install-gnattools - - .PHONY: install-target -@@ -2674,6 +2708,7 @@ - maybe-install-target-rda \ - maybe-install-target-libada \ - maybe-install-target-libgnatvsn \ -+ maybe-install-target-libgnatprj \ - maybe-install-target-libgomp - - uninstall: -@@ -39562,6 +39597,327 @@ - - - -+.PHONY: configure-libgnatprj maybe-configure-libgnatprj -+maybe-configure-libgnatprj: -+@if gcc-bootstrap -+configure-libgnatprj: stage_current -+@endif gcc-bootstrap -+@if libgnatprj -+maybe-configure-libgnatprj: configure-libgnatprj -+configure-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ test ! -f $(HOST_SUBDIR)/libgnatprj/Makefile || exit 0; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatprj ; \ -+ $(HOST_EXPORTS) \ -+ echo Configuring in $(HOST_SUBDIR)/libgnatprj; \ -+ cd "$(HOST_SUBDIR)/libgnatprj" || exit 1; \ -+ case $(srcdir) in \ -+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ -+ *) topdir=`echo $(HOST_SUBDIR)/libgnatprj/ | \ -+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ -+ esac; \ -+ srcdiroption="--srcdir=$${topdir}/libgnatprj"; \ -+ libsrcdir="$$s/libgnatprj"; \ -+ $(SHELL) $${libsrcdir}/configure \ -+ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ -+ --target=${target_alias} $${srcdiroption} \ -+ || exit 1 -+@endif libgnatprj -+ -+ -+ -+ -+ -+.PHONY: all-libgnatprj maybe-all-libgnatprj -+maybe-all-libgnatprj: -+@if gcc-bootstrap -+all-libgnatprj: stage_current -+@endif gcc-bootstrap -+@if libgnatprj -+TARGET-libgnatprj=all -+maybe-all-libgnatprj: all-libgnatprj -+all-libgnatprj: configure-libgnatprj -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgnatprj)) -+@endif libgnatprj -+ -+ -+ -+ -+.PHONY: check-libgnatprj maybe-check-libgnatprj -+maybe-check-libgnatprj: -+@if libgnatprj -+maybe-check-libgnatprj: check-libgnatprj -+ -+check-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: install-libgnatprj maybe-install-libgnatprj -+maybe-install-libgnatprj: -+@if libgnatprj -+maybe-install-libgnatprj: install-libgnatprj -+ -+install-libgnatprj: installdirs -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(FLAGS_TO_PASS) install) -+ -+@endif libgnatprj -+ -+# Other targets (info, dvi, pdf, etc.) -+ -+.PHONY: maybe-info-libgnatprj info-libgnatprj -+maybe-info-libgnatprj: -+@if libgnatprj -+maybe-info-libgnatprj: info-libgnatprj -+ -+# libgnatprj doesn't support info. -+info-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: maybe-dvi-libgnatprj dvi-libgnatprj -+maybe-dvi-libgnatprj: -+@if libgnatprj -+maybe-dvi-libgnatprj: dvi-libgnatprj -+ -+# libgnatprj doesn't support dvi. -+dvi-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: maybe-pdf-libgnatprj pdf-libgnatprj -+maybe-pdf-libgnatprj: -+@if libgnatprj -+maybe-pdf-libgnatprj: pdf-libgnatprj -+ -+pdf-libgnatprj: \ -+ configure-libgnatprj -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing pdf in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ pdf) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+.PHONY: maybe-html-libgnatprj html-libgnatprj -+maybe-html-libgnatprj: -+@if libgnatprj -+maybe-html-libgnatprj: html-libgnatprj -+ -+# libgnatprj doesn't support html. -+html-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: maybe-TAGS-libgnatprj TAGS-libgnatprj -+maybe-TAGS-libgnatprj: -+@if libgnatprj -+maybe-TAGS-libgnatprj: TAGS-libgnatprj -+ -+# libgnatprj doesn't support TAGS. -+TAGS-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: maybe-install-info-libgnatprj install-info-libgnatprj -+maybe-install-info-libgnatprj: -+@if libgnatprj -+maybe-install-info-libgnatprj: install-info-libgnatprj -+ -+# libgnatprj doesn't support install-info. -+install-info-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: maybe-install-pdf-libgnatprj install-pdf-libgnatprj -+maybe-install-pdf-libgnatprj: -+@if libgnatprj -+maybe-install-pdf-libgnatprj: install-pdf-libgnatprj -+ -+install-pdf-libgnatprj: \ -+ configure-libgnatprj \ -+ pdf-libgnatprj -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing install-pdf in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-pdf) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+.PHONY: maybe-install-html-libgnatprj install-html-libgnatprj -+maybe-install-html-libgnatprj: -+@if libgnatprj -+maybe-install-html-libgnatprj: install-html-libgnatprj -+ -+install-html-libgnatprj: \ -+ configure-libgnatprj \ -+ html-libgnatprj -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing install-html in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-html) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+.PHONY: maybe-installcheck-libgnatprj installcheck-libgnatprj -+maybe-installcheck-libgnatprj: -+@if libgnatprj -+maybe-installcheck-libgnatprj: installcheck-libgnatprj -+ -+# libgnatprj doesn't support installcheck. -+installcheck-libgnatprj: -+ -+@endif libgnatprj -+ -+.PHONY: maybe-mostlyclean-libgnatprj mostlyclean-libgnatprj -+maybe-mostlyclean-libgnatprj: -+@if libgnatprj -+maybe-mostlyclean-libgnatprj: mostlyclean-libgnatprj -+ -+mostlyclean-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing mostlyclean in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ mostlyclean) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+.PHONY: maybe-clean-libgnatprj clean-libgnatprj -+maybe-clean-libgnatprj: -+@if libgnatprj -+maybe-clean-libgnatprj: clean-libgnatprj -+ -+clean-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing clean in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ clean) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+.PHONY: maybe-distclean-libgnatprj distclean-libgnatprj -+maybe-distclean-libgnatprj: -+@if libgnatprj -+maybe-distclean-libgnatprj: distclean-libgnatprj -+ -+distclean-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing distclean in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ distclean) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+.PHONY: maybe-maintainer-clean-libgnatprj maintainer-clean-libgnatprj -+maybe-maintainer-clean-libgnatprj: -+@if libgnatprj -+maybe-maintainer-clean-libgnatprj: maintainer-clean-libgnatprj -+ -+maintainer-clean-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatprj/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing maintainer-clean in libgnatprj" ; \ -+ (cd $(HOST_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ maintainer-clean) \ -+ || exit 1 -+ -+@endif libgnatprj -+ -+ -+ - .PHONY: configure-gnattools maybe-configure-gnattools - maybe-configure-gnattools: - @if gcc-bootstrap -@@ -49480,6 +49836,345 @@ - - - -+.PHONY: configure-target-libgnatprj maybe-configure-target-libgnatprj -+maybe-configure-target-libgnatprj: -+@if gcc-bootstrap -+configure-target-libgnatprj: stage_current -+@endif gcc-bootstrap -+@if target-libgnatprj -+maybe-configure-target-libgnatprj: configure-target-libgnatprj -+configure-target-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ echo "Checking multilib configuration for libgnatprj..."; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \ -+ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatprj/multilib.tmp 2> /dev/null ; \ -+ if test -r $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \ -+ if cmp -s $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; then \ -+ rm -f $(TARGET_SUBDIR)/libgnatprj/multilib.tmp; \ -+ else \ -+ rm -f $(TARGET_SUBDIR)/libgnatprj/Makefile; \ -+ mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \ -+ fi; \ -+ else \ -+ mv $(TARGET_SUBDIR)/libgnatprj/multilib.tmp $(TARGET_SUBDIR)/libgnatprj/multilib.out; \ -+ fi; \ -+ test ! -f $(TARGET_SUBDIR)/libgnatprj/Makefile || exit 0; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatprj ; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo Configuring in $(TARGET_SUBDIR)/libgnatprj; \ -+ cd "$(TARGET_SUBDIR)/libgnatprj" || exit 1; \ -+ case $(srcdir) in \ -+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ -+ *) topdir=`echo $(TARGET_SUBDIR)/libgnatprj/ | \ -+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ -+ esac; \ -+ srcdiroption="--srcdir=$${topdir}/libgnatprj"; \ -+ libsrcdir="$$s/libgnatprj"; \ -+ rm -f no-such-file || : ; \ -+ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ -+ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ -+ --target=${target_alias} $${srcdiroption} \ -+ || exit 1 -+@endif target-libgnatprj -+ -+ -+ -+ -+ -+.PHONY: all-target-libgnatprj maybe-all-target-libgnatprj -+maybe-all-target-libgnatprj: -+@if gcc-bootstrap -+all-target-libgnatprj: stage_current -+@endif gcc-bootstrap -+@if target-libgnatprj -+TARGET-target-libgnatprj=all -+maybe-all-target-libgnatprj: all-target-libgnatprj -+all-target-libgnatprj: configure-target-libgnatprj -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgnatprj)) -+@endif target-libgnatprj -+ -+ -+ -+ -+ -+.PHONY: check-target-libgnatprj maybe-check-target-libgnatprj -+maybe-check-target-libgnatprj: -+@if target-libgnatprj -+maybe-check-target-libgnatprj: check-target-libgnatprj -+ -+# Dummy target for uncheckable module. -+check-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: install-target-libgnatprj maybe-install-target-libgnatprj -+maybe-install-target-libgnatprj: -+@if target-libgnatprj -+maybe-install-target-libgnatprj: install-target-libgnatprj -+ -+install-target-libgnatprj: installdirs -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -+ -+@endif target-libgnatprj -+ -+# Other targets (info, dvi, pdf, etc.) -+ -+.PHONY: maybe-info-target-libgnatprj info-target-libgnatprj -+maybe-info-target-libgnatprj: -+@if target-libgnatprj -+maybe-info-target-libgnatprj: info-target-libgnatprj -+ -+# libgnatprj doesn't support info. -+info-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-dvi-target-libgnatprj dvi-target-libgnatprj -+maybe-dvi-target-libgnatprj: -+@if target-libgnatprj -+maybe-dvi-target-libgnatprj: dvi-target-libgnatprj -+ -+# libgnatprj doesn't support dvi. -+dvi-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-pdf-target-libgnatprj pdf-target-libgnatprj -+maybe-pdf-target-libgnatprj: -+@if target-libgnatprj -+maybe-pdf-target-libgnatprj: pdf-target-libgnatprj -+ -+pdf-target-libgnatprj: \ -+ configure-target-libgnatprj -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing pdf in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ pdf) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-html-target-libgnatprj html-target-libgnatprj -+maybe-html-target-libgnatprj: -+@if target-libgnatprj -+maybe-html-target-libgnatprj: html-target-libgnatprj -+ -+# libgnatprj doesn't support html. -+html-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-TAGS-target-libgnatprj TAGS-target-libgnatprj -+maybe-TAGS-target-libgnatprj: -+@if target-libgnatprj -+maybe-TAGS-target-libgnatprj: TAGS-target-libgnatprj -+ -+# libgnatprj doesn't support TAGS. -+TAGS-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-install-info-target-libgnatprj install-info-target-libgnatprj -+maybe-install-info-target-libgnatprj: -+@if target-libgnatprj -+maybe-install-info-target-libgnatprj: install-info-target-libgnatprj -+ -+# libgnatprj doesn't support install-info. -+install-info-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-install-pdf-target-libgnatprj install-pdf-target-libgnatprj -+maybe-install-pdf-target-libgnatprj: -+@if target-libgnatprj -+maybe-install-pdf-target-libgnatprj: install-pdf-target-libgnatprj -+ -+install-pdf-target-libgnatprj: \ -+ configure-target-libgnatprj \ -+ pdf-target-libgnatprj -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing install-pdf in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-pdf) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-install-html-target-libgnatprj install-html-target-libgnatprj -+maybe-install-html-target-libgnatprj: -+@if target-libgnatprj -+maybe-install-html-target-libgnatprj: install-html-target-libgnatprj -+ -+install-html-target-libgnatprj: \ -+ configure-target-libgnatprj \ -+ html-target-libgnatprj -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing install-html in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-html) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-installcheck-target-libgnatprj installcheck-target-libgnatprj -+maybe-installcheck-target-libgnatprj: -+@if target-libgnatprj -+maybe-installcheck-target-libgnatprj: installcheck-target-libgnatprj -+ -+# libgnatprj doesn't support installcheck. -+installcheck-target-libgnatprj: -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-mostlyclean-target-libgnatprj mostlyclean-target-libgnatprj -+maybe-mostlyclean-target-libgnatprj: -+@if target-libgnatprj -+maybe-mostlyclean-target-libgnatprj: mostlyclean-target-libgnatprj -+ -+mostlyclean-target-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ mostlyclean) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-clean-target-libgnatprj clean-target-libgnatprj -+maybe-clean-target-libgnatprj: -+@if target-libgnatprj -+maybe-clean-target-libgnatprj: clean-target-libgnatprj -+ -+clean-target-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing clean in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ clean) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-distclean-target-libgnatprj distclean-target-libgnatprj -+maybe-distclean-target-libgnatprj: -+@if target-libgnatprj -+maybe-distclean-target-libgnatprj: distclean-target-libgnatprj -+ -+distclean-target-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing distclean in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ distclean) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+.PHONY: maybe-maintainer-clean-target-libgnatprj maintainer-clean-target-libgnatprj -+maybe-maintainer-clean-target-libgnatprj: -+@if target-libgnatprj -+maybe-maintainer-clean-target-libgnatprj: maintainer-clean-target-libgnatprj -+ -+maintainer-clean-target-libgnatprj: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatprj/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatprj" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatprj && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ maintainer-clean) \ -+ || exit 1 -+ -+@endif target-libgnatprj -+ -+ -+ -+ -+ - .PHONY: configure-target-libgomp maybe-configure-target-libgomp - maybe-configure-target-libgomp: - @if gcc-bootstrap -@@ -52030,6 +52725,7 @@ - configure-target-rda: stage_last - configure-target-libada: stage_last - configure-target-libgnatvsn: stage_last -+configure-target-libgnatprj: stage_last - configure-target-libgomp: stage_last - @endif gcc-bootstrap - -@@ -52055,6 +52751,7 @@ - configure-target-rda: maybe-all-gcc - configure-target-libada: maybe-all-gcc - configure-target-libgnatvsn: maybe-all-gcc -+configure-target-libgnatprj: maybe-all-gcc - configure-target-libgomp: maybe-all-gcc - @endif gcc-no-bootstrap - -@@ -52310,7 +53007,10 @@ - all-fixincludes: maybe-all-libiberty - all-gnattools: maybe-all-libada - all-gnattools: maybe-all-libgnatvsn -+all-gnattools: maybe-all-libgnatprj - all-libgnatvsn: maybe-all-libada -+all-libgnatprj: maybe-all-libada -+all-libgnatprj: maybe-all-libgnatvsn - configure-mpfr: maybe-all-gmp - - configure-stage1-mpfr: maybe-all-stage1-gmp -@@ -52749,6 +53449,7 @@ - configure-target-rda: maybe-all-target-libgcc - configure-target-libada: maybe-all-target-libgcc - configure-target-libgnatvsn: maybe-all-target-libgcc -+configure-target-libgnatprj: maybe-all-target-libgcc - configure-target-libgomp: maybe-all-target-libgcc - @endif gcc-no-bootstrap - -@@ -52793,6 +53494,8 @@ - - configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss - -+configure-target-libgnatprj: maybe-all-target-newlib maybe-all-target-libgloss -+ - configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss - - -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -155,7 +155,7 @@ - - # these libraries are used by various programs built for the host environment - # --host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada libgnatvsn" -+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada libgnatvsn libgnatprj" - - # these tools are built for the host environment - # Note, the powerpc-eabi build depends on sim occurring before gdb in order to -@@ -186,7 +186,8 @@ - ${libgcj} \ - target-libobjc \ - target-libada \ -- target-libgnatvsn" -+ target-libgnatvsn \ -+ target-libgnatprj" - - # these tools are built using the target libraries, and are intended to - # run only in the target environment -@@ -264,7 +265,7 @@ - - # Similarly, some are only suitable for cross toolchains. - # Remove these if host=target. --cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn" -+cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn target-libgnatprj" - - case $is_cross_compiler in - no) skipdirs="${skipdirs} ${cross_only}" ;; -@@ -341,7 +342,7 @@ - ENABLE_LIBADA=$enableval, - ENABLE_LIBADA=yes) - if test "${ENABLE_LIBADA}" != "yes" ; then -- noconfigdirs="$noconfigdirs libgnatvsn gnattools" -+ noconfigdirs="$noconfigdirs libgnatvsn libgnatprj gnattools" - fi - - AC_ARG_ENABLE(libssp, -Index: libgnatprj/configure.ac -=================================================================== ---- /dev/null -+++ libgnatprj/configure.ac -@@ -0,0 +1,144 @@ -+# Configure script for libada. -+# Copyright 2003, 2004 Free Software Foundation, Inc. -+# -+# This file 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. -+ -+AC_INIT -+AC_PREREQ([2.59]) -+ -+AC_CONFIG_SRCDIR([Makefile.in]) -+ -+# Start of actual configure tests -+ -+AC_PROG_INSTALL -+ -+AC_CANONICAL_BUILD -+AC_CANONICAL_HOST -+AC_CANONICAL_TARGET -+ -+sinclude(../config/acx.m4) -+ACX_NONCANONICAL_TARGET -+ -+# Need to pass this down for now :-P -+AC_PROG_LN_S -+ -+# Determine x_ada_cflags -+case $host in -+ hppa*) x_ada_cflags=-mdisable-indexing ;; -+ *) x_ada_cflags= ;; -+esac -+AC_SUBST([x_ada_cflags]) -+ -+# Determine what to build for 'gnattools' -+if test $build = $target ; then -+ # Note that build=target is almost certainly the wrong test; FIXME -+ default_gnattools_target="gnattools-native" -+else -+ default_gnattools_target="gnattools-cross" -+fi -+AC_SUBST([default_gnattools_target]) -+ -+# Target-specific stuff (defaults) -+TOOLS_TARGET_PAIRS= -+AC_SUBST(TOOLS_TARGET_PAIRS) -+ -+# Per-target case statement -+# ------------------------- -+case "${target}" in -+ alpha*-dec-vx*) # Unlike all other Vxworks -+ ;; -+ m68k*-wrs-vx* \ -+ | powerpc*-wrs-vxworks \ -+ | sparc*-wrs-vx* \ -+ | *86-wrs-vxworks \ -+ | xscale*-wrs-vx* \ -+ | xscale*-wrs-coff \ -+ | mips*-wrs-vx*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-vxworks.adb" -+ ;; -+ sparc-sun-solaris*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb" -+ ;; -+ *86-*-solaris2*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-solaris.adb" -+ ;; -+ *86-*-linux* \ -+ | powerpc*-*-linux* \ -+ | *ia64-*-linux* \ -+ | alpha*-*-linux* \ -+ | sparc*-*-linux* \ -+ | hppa*-*-linux* \ -+ | *x86_64-*-linux*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-linux.adb \ -+ indepsw.adb<indepsw-gnu.adb" -+ ;; -+ s390*-*-linux*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-linux.adb" -+ ;; -+ *86-*-freebsd*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-linux.adb \ -+ indepsw.adb<indepsw-gnu.adb" -+ ;; -+ mips-sgi-irix*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-irix.adb" -+ ;; -+ hppa*-hp-hpux10*) # Unlike hpux11 -+ ;; -+ hppa*-hp-hpux11*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-hpux.adb" -+ ;; -+ *-ibm-aix*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-aix.adb \ -+ indepsw.adb<indepsw-aix.adb" -+ ;; -+ alpha*-dec-osf*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-tru64.adb" -+ ;; -+ alpha*-dec-vms* | alpha*-dec-openvms* | alpha*-dec-vms* \ -+ | alpha*-hp-vms* | alpha*-hp-openvms* | alpha*-hp-vms*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-vms-alpha.adb \ -+ symbols.adb<symbols-vms.adb \ -+ symbols-processing.adb<symbols-processing-vms-alpha.adb" -+ ;; -+ ia64*-dec-vms* | ia64*-dec-openvms* | ia64*-dec-vms* \ -+ | ia64*-hp-vms* | ia64*-hp-openvms* | ia64*-hp-vms*) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-vms-ia64.adb \ -+ symbols.adb<symbols-vms.adb \ -+ symbols-processing.adb<symbols-processing-vms-ia64.adb" -+ ;; -+ *-*-cygwin32* | *-*-mingw32* | *-*-pe) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-mingw.adb \ -+ indepsw.adb<indepsw-mingw.adb" -+ ;; -+ powerpc-*-darwin*) -+ TOOLS_TARGET_PAIRS="mlib-tgt-specific.adb<mlib-tgt-darwin.adb" -+ ;; -+ *-*-lynxos) -+ TOOLS_TARGET_PAIRS="\ -+ mlib-tgt-specific.adb<mlib-tgt-lynxos.adb \ -+ indepsw.adb<indepsw-gnu.adb" -+ ;; -+esac -+ -+# Output: create a Makefile. -+AC_CONFIG_FILES([Makefile]) -+ -+AC_OUTPUT diff --git a/recipes/gcc/gcc-svn/debian/ada-libgnatvsn.dpatch b/recipes/gcc/gcc-svn/debian/ada-libgnatvsn.dpatch deleted file mode 100644 index e7de16dce9..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-libgnatvsn.dpatch +++ /dev/null @@ -1,1598 +0,0 @@ -#! /bin/sh -e - -# DP: - Introduce a new shared library named libgnatvsn, containing -# DP: common components of GNAT under the GNAT-Modified GPL, for -# DP: use in GNAT tools, ASIS, GLADE and GPS. Link the gnat tools -# DP: against this new library. - -# This patch seems large, but the hunks in Makefile.in are actually -# generated from Makefile.def using autogen. - -# !!! Must be applied after ada-link-lib.dpatch - -dir=./ -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - cd ${dir} && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/ada/config-lang.in -=================================================================== ---- gcc/ada/config-lang.in.orig -+++ gcc/ada/config-lang.in -@@ -34,8 +34,8 @@ - - outputs=ada/Makefile - --target_libs="target-libada" --lang_dirs="libada gnattools" -+target_libs="target-libada target-libgnatvsn" -+lang_dirs="libada libgnatvsn gnattools" - - # Ada will not work until the front end starts emitting GIMPLE trees. - build_by_default=no -Index: gnattools/Makefile.in -=================================================================== ---- gnattools/Makefile.in.orig -+++ gnattools/Makefile.in -@@ -37,10 +35,11 @@ - CFLAGS=-O2 -Wall - INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc - ADA_CFLAGS=-O2 -gnatn --ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada -+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn - LIB_VERSION=$(strip $(shell grep ' Library_Version :' \ -- @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) -+ ../libgnatvsn/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) - ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -+ADA_LIBS += -L../libgnatvsn -lgnatvsn - - # We will use the just-built compiler to compile and link everything. - GCC=../gcc/xgcc -B../gcc/ -@@ -66,62 +65,34 @@ - # Since we don't have gnatmake, we must specify the full list of - # object files necessary to build gnatmake and gnatlink. - # TODO: remove from these lists the objects that are part of --# libgnatvsn and libgnatprj. -+# libgnatprj. - GNATLINK_OBJS = \ - ali.o \ --alloc.o \ - butil.o \ --casing.o \ --csets.o \ --debug.o \ - fmap.o \ --fname.o \ - gnatlink.o \ --gnatvsn.o \ --hostparm.o \ - indepsw.o \ --namet.o \ --opt.o \ - osint.o \ --output.o \ - prefix.o \ - rident.o \ - sdefault.o \ --snames.o \ - stylesw.o \ - switch.o \ --table.o \ - targparm.o \ --tree_io.o \ --types.o \ --validsw.o \ --version.o \ --widechar.o -+validsw.o - - GNATMAKE_OBJS = \ - ali-util.o \ - ali.o \ --alloc.o \ --atree.o \ - binderr.o \ - butil.o \ --casing.o \ --csets.o \ --debug.o \ --einfo.o\ --elists.o \ - err_vars.o \ - erroutc.o \ - errutil.o \ - fmap.o \ - fname-sf.o \ - fname-uf.o \ --fname.o \ - gnatmake.o \ --gnatvsn.o \ --hostparm.o \ --krunch.o \ --lib.o \ - make.o \ - makeusg.o \ - makeutl.o \ -@@ -131,12 +102,8 @@ - mlib-tgt-specific.o \ - mlib-utl.o \ - mlib.o \ --namet.o \ --nlists.o \ --opt.o \ - osint-m.o \ - osint.o \ --output.o \ - prefix.o \ - prj-attr-pm.o \ - prj-attr.o \ -@@ -154,47 +121,59 @@ - prj-util.o \ - prj.o \ - rident.o \ --scans.o \ - scng.o \ - sdefault.o \ - sfn_scan.o \ --sinfo.o \ - sinput-c.o \ - sinput-p.o \ --sinput.o \ --snames.o \ --stand.o \ --stringt.o \ - styleg.o \ - stylesw.o \ - switch-m.o \ - switch.o \ --table.o \ - targparm.o \ - tempdir.o \ --tree_io.o \ --types.o \ --uintp.o \ --uname.o \ --urealp.o \ - usage.o \ - validsw.o \ --version.o \ --widechar.o \ - $(EXTRA_GNATMAKE_OBJS) - -+ -+EXTRA_TOOLS_OBJS = \ -+bcheck.o \ -+binde.o \ -+bindgen.o \ -+bindusg.o \ -+clean.o \ -+gprep.o \ -+makegpr.o \ -+osint-b.o \ -+osint-l.o \ -+prep.o \ -+prj-makr.o \ -+prj-pp.o \ -+switch-b.o \ -+vms_conv.o \ -+vms_data.o \ -+xr_tabls.o \ -+xref_lib.o -+ -+OBJECTS = $(GNATLINK_OBJS) $(GNATMAKE_OBJS) $(EXTRA_TOOLS_OBJS) -+ - # Makefile targets - # ---------------- - - .PHONY: gnattools gnattools-native gnattools-cross regnattools - gnattools: @default_gnattools_target@ - --# Build directory for the tools. Let's copy the target-dependent --# sources using the same mechanism as for gnatlib. The other sources are --# accessed using the vpath directive. -+BODIES := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o,@srcdir@/../gcc/ada/%.adb,$(f)))) -+SPECS := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o,@srcdir@/../gcc/ada/%.ads,$(f)))) -+ -+$(notdir $(SPECS) $(BODIES)): stamp-gnattools-sources - - stamp-gnattools-sources: -- $(LN_S) ../gcc/ada/sdefault.adb . -+ for file in $(BODIES) $(SPECS); do \ -+ $(LN_S) -f $$file .; \ -+ done -+ rm -f sdefault.adb; $(LN_S) ../gcc/ada/sdefault.adb . - $(foreach PAIR,$(TOOLS_TARGET_PAIRS), \ - rm -f $(word 1,$(subst <, ,$(PAIR)));\ - $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \ -@@ -202,6 +181,7 @@ - touch $@ - - gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so -+gnattools-native: ../libgnatvsn/libgnatvsn.so - gnattools-native: stamp-gnattools-sources - gnattools-native: $(TOOLS) gnatbl - -@@ -209,18 +189,16 @@ - - vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc - vpath %.h @srcdir@/../gcc/ada --vpath %.adb .:@srcdir@/../gcc/ada --vpath %.ads @srcdir@/../gcc/ada - - # Because the just-built gcc is a host tool like us, we can use some --# of its object files, e.g. prefix.o and version.o. -+# of its object files, e.g. prefix.o. - vpath prefix.o ../gcc --vpath version.o ../gcc - - # gnatlink - - gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o - $(GCC) -o $@ $^ \ -+ ../libgnatvsn/libgnatvsn.a \ - ../gcc/ada/rts/libgnat.a \ - ../libiberty/libiberty.a - -@@ -237,6 +215,7 @@ - - gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o - $(GCC) -o $@ $(ADA_CFLAGS) $^ \ -+ ../libgnatvsn/libgnatvsn.a \ - ../gcc/ada/rts/libgnat.a \ - ../libiberty/libiberty.a - -@@ -250,7 +229,8 @@ - ../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali - - # Other tools --gnatkr: version.o -+gnatkr: -+ if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi - ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \ - --GCC="$(GCC)" \ - --GNATBIND=../gcc/gnatbind -@@ -261,7 +241,8 @@ - cp -lp $< $@ - - gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \ --link.o version.o prefix.o -+link.o prefix.o -+ if [ ! -f $@.adb ] ; then $(LN_S) ../../src/gcc/ada/$@.ad[bs] .; fi - ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \ - --GCC="$(GCC)" \ - --GNATBIND=../gcc/gnatbind -@@ -269,7 +250,7 @@ - ../libiberty/libiberty.a \ - --GCC="$(GCC) $(ADA_INCLUDES)" - --gnatbl: gnatbl.c link.o version.o prefix.o -+gnatbl: gnatbl.c link.o prefix.o - $(GCC) -o $@ $< $(CFLAGS) \ - -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \ - -I@srcdir@/../include \ -@@ -290,6 +271,8 @@ - %.o: %.c - $(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES) - -+prefix.o: -+ - # Other - # ----- - -@@ -325,13 +308,15 @@ - install-html: - - # Cleaning rules. -+.PHONY: mostlyclean clean distclean -+ - mostlyclean: - $(RM) gnatmake gnatlink $(TOOLS) gnatbl *.o *.ali - --clean: -+clean: mostlyclean - $(RM) *.ads *.adb stamp-gnattools-sources - --distclean: -+distclean: clean - $(RM) Makefile config.status config.log - - maintainer-clean: -Index: libgnatvsn/configure -=================================================================== ---- /dev/null -+++ libgnatvsn/configure -@@ -0,0 +1,43 @@ -+#!/bin/sh -+ -+# Minimal configure script for libgnatvsn. We're only interested in -+# a few parameters. -+ -+for arg in $*; do -+ case ${arg} in -+ --build=*) -+ build=`expr ${arg} : '--build=\(.\+\)'`;; -+ --host=*) -+ host=`expr ${arg} : '--host=\(.\+\)'`;; -+ --target=*) -+ target=`expr ${arg} : '--target=\(.\+\)'`;; -+ --prefix=*) -+ prefix=`expr ${arg} : '--prefix=\(.\+\)'`;; -+ --srcdir=*) -+ srcdir=`expr ${arg} : '--srcdir=\(.\+\)'`;; -+ --with-pkgversion=*) -+ pkgversion=`expr ${arg} : '--with-pkgversion=\(.\+\)'`;; -+ --with-bugurl=*) -+ bugurl=`expr ${arg} : '--with-bugurl=\(.\+\)'`;; -+ *) -+ echo "Warning: ignoring option: ${arg}" -+ esac -+done -+ -+echo "build: ${build}" | tee config.log -+echo "host: ${host}" | tee -a config.log -+echo "target: ${target}" | tee -a config.log -+echo "prefix: ${prefix}" | tee -a config.log -+echo "srcdir: ${srcdir}" | tee -a config.log -+echo "pkgversion: ${pkgversion}" | tee -a config.log -+echo "bugurl: ${bugurl}" | tee -a config.log -+ -+echo "Creating Makefile..." | tee -a config.log -+sed -e "s,@build@,${build},g" \ -+ -e "s,@host@,${host},g" \ -+ -e "s,@target@,${target},g" \ -+ -e "s,@prefix@,${prefix},g" \ -+ -e "s,@srcdir@,${srcdir},g" \ -+ -e "s,@PKGVERSION@,${pkgversion},g" \ -+ -e "s,@REPORT_BUGS_TO@,${bugurl},g" \ -+ < ${srcdir}/Makefile.in > Makefile -Index: libgnatvsn/Makefile.in -=================================================================== ---- /dev/null -+++ libgnatvsn/Makefile.in -@@ -0,0 +1,147 @@ -+# Makefile for libgnatvsn. -+# Copyright (c) 2006 Ludovic Brenta <ludovic@ludovic-brenta.org> -+# -+# This file 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 St, Fifth Floor, Boston, MA 02110-1301 USA -+ -+# Default target; must be first. -+all: libgnatvsn -+ -+.SUFFIXES: -+ -+CPUS := $(shell getconf _NPROCESSORS_ONLN) -+LIB_VERSION := $(strip $(shell grep ' Library_Version :' \ -+ @srcdir@/../gcc/ada/gnatvsn.ads | \ -+ sed -e 's/.*"\(.*\)".*/\1/')) -+GCC:=../gcc/xgcc -B../gcc/ -+LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts -+CFLAGS := -g -O2 -gnatn -+BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER) -+DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE) -+DATESTAMP := $(shell cat @srcdir@/../gcc/DATESTAMP) -+ -+# For use in version.c - double quoted strings, with appropriate -+# surrounding punctuation and spaces, and with the datestamp and -+# development phase collapsed to the empty string in release mode -+# (i.e. if DEVPHASE_c is empty). The space immediately after the -+# comma in the $(if ...) constructs is significant - do not remove it. -+BASEVER_s := "\"$(BASEVER)\"" -+DEVPHASE_s := "\"$(if $(DEVPHASE), ($(DEVPHASE)))\"" -+DATESTAMP_s := "\"$(if $(DEVPHASE), $(DATESTAMP))\"" -+PKGVERSION_s:= "\"@PKGVERSION@\"" -+BUGURL_s := "\"@REPORT_BUGS_TO@\"" -+ -+ifneq (@build@,@host@) -+ CFLAGS += -b @host@ -+endif -+ -+.PHONY: libgnatvsn install -+libgnatvsn: libgnatvsn.so.$(LIB_VERSION) libgnatvsn.a -+ -+VSN_SOURCES := alloc.ads atree.adb casing.adb csets.adb debug.adb einfo.adb \ -+elists.adb fname.adb gnatvsn.adb hostparm.ads krunch.adb lib.adb namet.adb \ -+nlists.adb opt.adb output.adb repinfo.adb scans.adb sinfo.adb sinput.adb \ -+snames.adb stand.adb stringt.adb table.adb tree_in.adb tree_io.adb types.adb \ -+uintp.adb uname.adb urealp.adb widechar.adb -+ -+VSN_SEPARATES := lib-list.adb lib-sort.adb -+ -+OBJECTS=$(patsubst %.ads,%.o,$(VSN_SOURCES:.adb=.o)) version.o -+ -+vpath %.c @srcdir@/../gcc -+ -+libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS)) -+ : # Make libgnatvsn.so -+ $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \ -+ -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -+ ln -s libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so -+ chmod a=r obj-shared/*.ali -+# Make the .ali files, but not the .o files, visible to the gnat tools. -+ cp -lp obj-shared/*.ali . -+ -+$(addprefix obj-shared/,$(OBJECTS)): | stamp-libgnatvsn-sources obj-shared -+ -+obj-shared/%.o: %.adb -+ $(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@ -+ -+obj-shared/%.o: %.ads -+ $(GCC) -c -fPIC $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@ -+ -+obj-shared/version.o: version.c -+ $(GCC) -c -fPIC -g -O2 \ -+ -DBASEVER=$(BASEVER_s) \ -+ -DDATESTAMP=$(DATESTAMP_s) \ -+ -DDEVPHASE=$(DEVPHASE_s) \ -+ -DPKGVERSION=$(PKGVERSION_s) \ -+ -DBUGURL=$(BUGURL_s) \ -+ -DREVISION= \ -+ $(realpath $<) -o $@ -+ -+obj-shared: -+ -mkdir $@ -+ -+libgnatvsn.a: $(addprefix obj-static/,$(OBJECTS)) -+ : # Make libgnatvsn.a -+ ar rc $@ $^ -+ ranlib $@ -+ -+$(addprefix obj-static/,$(OBJECTS)): | stamp-libgnatvsn-sources obj-static -+ -+obj-static/%.o: %.adb -+ $(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@ -+ -+obj-static/%.o: %.ads -+ $(GCC) -c $(CFLAGS) $(LIBGNAT_JUST_BUILT) $< -o $@ -+ -+obj-static/version.o: version.c -+ $(GCC) -c -g -O2 \ -+ -DBASEVER=$(BASEVER_s) \ -+ -DDATESTAMP=$(DATESTAMP_s) \ -+ -DDEVPHASE=$(DEVPHASE_s) \ -+ -DPKGVERSION=$(PKGVERSION_s) \ -+ -DBUGURL=$(BUGURL_s) \ -+ -DREVISION= \ -+ $< -o $@ -+ -+obj-static: -+ -mkdir $@ -+ -+$(VSN_SOURCES) $(VSN_SEPARATES): stamp-libgnatvsn-sources -+ -+stamp-libgnatvsn-sources: -+ for file in $(VSN_SOURCES) $(VSN_SEPARATES); do \ -+ ads=$$(echo $$file | sed 's/\.adb/.ads/'); \ -+ if [ -f @srcdir@/../gcc/ada/$$file -a ! -L $$file ] ; then ln -s @srcdir@/../gcc/ada/$$file .; fi; \ -+ if [ -f @srcdir@/../gcc/ada/$$ads -a ! -L $$ads ] ; then ln -s @srcdir@/../gcc/ada/$$ads .; fi; \ -+ done -+ touch $@ -+ -+install: libgnatvsn -+ $(INSTALL_DATA) libgnatvsn.a $(DESTDIR)$(prefix)/lib -+ $(INSTALL_DATA) libgnatvsn.so.$(LIB_VERSION) $(DESTDIR)$(prefix)/lib -+ cd $(DESTDIR)$(prefix)/lib; \ -+ ln -sf libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so -+ mkdir -p $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn -+ $(INSTALL_DATA) \ -+ $(addprefix @srcdir@/../gcc/ada/,$(VSN_SOURCES) $(VSN_SEPARATES)) \ -+ $(addprefix @srcdir@/../gcc/ada/,$(patsubst %.adb,%.ads,$(filter %.adb,$(VSN_SOURCES)))) \ -+ $(DESTDIR)$(prefix)/share/ada/adainclude/gnatvsn -+ mkdir -p $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn -+ $(INSTALL) -m 0444 obj-shared/*.ali \ -+ $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn -+ chmod a=r $(DESTDIR)$(prefix)/lib/ada/adalib/gnatvsn/*.ali -+ -+.PHONY: clean -+clean: -+ rm -rf *.ali obj-static obj-shared libgnatvsn* *.adb *.ads stamp* -Index: Makefile.def -=================================================================== ---- Makefile.def.orig -+++ Makefile.def -@@ -123,6 +123,13 @@ - missing= TAGS; - missing= install-info; - missing= installcheck; }; -+host_modules= { module= libgnatvsn; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; - host_modules= { module= gnattools; no_check=true; - missing= info; - missing= dvi; -@@ -161,6 +168,13 @@ - missing= TAGS; - missing= install-info; - missing= installcheck; }; -+target_modules = { module= libgnatvsn; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; - target_modules = { module= libgomp; lib_path=.libs; }; - - // These are (some of) the make targets to be done in each subdirectory. -@@ -331,6 +345,8 @@ - dependencies = { module=all-fixincludes; on=all-libiberty; }; - - dependencies = { module=all-gnattools; on=all-libada; }; -+dependencies = { module=all-gnattools; on=all-libgnatvsn; }; -+dependencies = { module=all-libgnatvsn; on=all-libada; }; - - dependencies = { module=configure-mpfr; on=all-gmp; }; - -Index: Makefile.in -=================================================================== ---- Makefile.in.orig -+++ Makefile.in -@@ -698,6 +698,7 @@ - maybe-configure-libtermcap \ - maybe-configure-utils \ - maybe-configure-libada \ -+ maybe-configure-libgnatvsn \ - maybe-configure-gnattools - .PHONY: configure-target - configure-target: \ -@@ -721,6 +722,7 @@ - maybe-configure-target-qthreads \ - maybe-configure-target-rda \ - maybe-configure-target-libada \ -+ maybe-configure-target-libgnatvsn \ - maybe-configure-target-libgomp - - # The target built for a native non-bootstrap build. -@@ -849,6 +851,7 @@ - all-host: maybe-all-libtermcap - all-host: maybe-all-utils - all-host: maybe-all-libada -+all-host: maybe-all-libgnatvsn - all-host: maybe-all-gnattools - - .PHONY: all-target -@@ -875,6 +878,7 @@ - all-target: maybe-all-target-qthreads - all-target: maybe-all-target-rda - all-target: maybe-all-target-libada -+all-target: maybe-all-target-libgnatvsn - all-target: maybe-all-target-libgomp - - # Do a target for all the subdirectories. A ``make do-X'' will do a -@@ -963,6 +967,7 @@ - info-host: maybe-info-libtermcap - info-host: maybe-info-utils - info-host: maybe-info-libada -+info-host: maybe-info-libgnatvsn - info-host: maybe-info-gnattools - - .PHONY: info-target -@@ -987,6 +992,7 @@ - info-target: maybe-info-target-qthreads - info-target: maybe-info-target-rda - info-target: maybe-info-target-libada -+info-target: maybe-info-target-libgnatvsn - info-target: maybe-info-target-libgomp - - .PHONY: do-dvi -@@ -1070,6 +1076,7 @@ - dvi-host: maybe-dvi-libtermcap - dvi-host: maybe-dvi-utils - dvi-host: maybe-dvi-libada -+dvi-host: maybe-dvi-libgnatvsn - dvi-host: maybe-dvi-gnattools - - .PHONY: dvi-target -@@ -1094,6 +1101,7 @@ - dvi-target: maybe-dvi-target-qthreads - dvi-target: maybe-dvi-target-rda - dvi-target: maybe-dvi-target-libada -+dvi-target: maybe-dvi-target-libgnatvsn - dvi-target: maybe-dvi-target-libgomp - - .PHONY: do-pdf -@@ -1177,6 +1185,7 @@ - pdf-host: maybe-pdf-libtermcap - pdf-host: maybe-pdf-utils - pdf-host: maybe-pdf-libada -+pdf-host: maybe-pdf-libgnatvsn - pdf-host: maybe-pdf-gnattools - - .PHONY: pdf-target -@@ -1201,6 +1210,7 @@ - pdf-target: maybe-pdf-target-qthreads - pdf-target: maybe-pdf-target-rda - pdf-target: maybe-pdf-target-libada -+pdf-target: maybe-pdf-target-libgnatvsn - pdf-target: maybe-pdf-target-libgomp - - .PHONY: do-html -@@ -1284,6 +1294,7 @@ - html-host: maybe-html-libtermcap - html-host: maybe-html-utils - html-host: maybe-html-libada -+html-host: maybe-html-libgnatvsn - html-host: maybe-html-gnattools - - .PHONY: html-target -@@ -1308,6 +1319,7 @@ - html-target: maybe-html-target-qthreads - html-target: maybe-html-target-rda - html-target: maybe-html-target-libada -+html-target: maybe-html-target-libgnatvsn - html-target: maybe-html-target-libgomp - - .PHONY: do-TAGS -@@ -1391,6 +1403,7 @@ - TAGS-host: maybe-TAGS-libtermcap - TAGS-host: maybe-TAGS-utils - TAGS-host: maybe-TAGS-libada -+TAGS-host: maybe-TAGS-libgnatvsn - TAGS-host: maybe-TAGS-gnattools - - .PHONY: TAGS-target -@@ -1415,6 +1428,7 @@ - TAGS-target: maybe-TAGS-target-qthreads - TAGS-target: maybe-TAGS-target-rda - TAGS-target: maybe-TAGS-target-libada -+TAGS-target: maybe-TAGS-target-libgnatvsn - TAGS-target: maybe-TAGS-target-libgomp - - .PHONY: do-install-info -@@ -1498,6 +1512,7 @@ - install-info-host: maybe-install-info-libtermcap - install-info-host: maybe-install-info-utils - install-info-host: maybe-install-info-libada -+install-info-host: maybe-install-info-libgnatvsn - install-info-host: maybe-install-info-gnattools - - .PHONY: install-info-target -@@ -1522,6 +1537,7 @@ - install-info-target: maybe-install-info-target-qthreads - install-info-target: maybe-install-info-target-rda - install-info-target: maybe-install-info-target-libada -+install-info-target: maybe-install-info-target-libgnatvsn - install-info-target: maybe-install-info-target-libgomp - - .PHONY: do-install-pdf -@@ -1605,6 +1621,7 @@ - install-pdf-host: maybe-install-pdf-libtermcap - install-pdf-host: maybe-install-pdf-utils - install-pdf-host: maybe-install-pdf-libada -+install-pdf-host: maybe-install-pdf-libgnatvsn - install-pdf-host: maybe-install-pdf-gnattools - - .PHONY: install-pdf-target -@@ -1629,6 +1646,7 @@ - install-pdf-target: maybe-install-pdf-target-qthreads - install-pdf-target: maybe-install-pdf-target-rda - install-pdf-target: maybe-install-pdf-target-libada -+install-pdf-target: maybe-install-pdf-target-libgnatvsn - install-pdf-target: maybe-install-pdf-target-libgomp - - .PHONY: do-install-html -@@ -1712,6 +1730,7 @@ - install-html-host: maybe-install-html-libtermcap - install-html-host: maybe-install-html-utils - install-html-host: maybe-install-html-libada -+install-html-host: maybe-install-html-libgnatvsn - install-html-host: maybe-install-html-gnattools - - .PHONY: install-html-target -@@ -1736,6 +1755,7 @@ - install-html-target: maybe-install-html-target-qthreads - install-html-target: maybe-install-html-target-rda - install-html-target: maybe-install-html-target-libada -+install-html-target: maybe-install-html-target-libgnatvsn - install-html-target: maybe-install-html-target-libgomp - - .PHONY: do-installcheck -@@ -1819,6 +1839,7 @@ - installcheck-host: maybe-installcheck-libtermcap - installcheck-host: maybe-installcheck-utils - installcheck-host: maybe-installcheck-libada -+installcheck-host: maybe-installcheck-libgnatvsn - installcheck-host: maybe-installcheck-gnattools - - .PHONY: installcheck-target -@@ -1843,6 +1864,7 @@ - installcheck-target: maybe-installcheck-target-qthreads - installcheck-target: maybe-installcheck-target-rda - installcheck-target: maybe-installcheck-target-libada -+installcheck-target: maybe-installcheck-target-libgnatvsn - installcheck-target: maybe-installcheck-target-libgomp - - .PHONY: do-mostlyclean -@@ -1926,6 +1948,7 @@ - mostlyclean-host: maybe-mostlyclean-libtermcap - mostlyclean-host: maybe-mostlyclean-utils - mostlyclean-host: maybe-mostlyclean-libada -+mostlyclean-host: maybe-mostlyclean-libgnatvsn - mostlyclean-host: maybe-mostlyclean-gnattools - - .PHONY: mostlyclean-target -@@ -1950,6 +1973,7 @@ - mostlyclean-target: maybe-mostlyclean-target-qthreads - mostlyclean-target: maybe-mostlyclean-target-rda - mostlyclean-target: maybe-mostlyclean-target-libada -+mostlyclean-target: maybe-mostlyclean-target-libgnatvsn - mostlyclean-target: maybe-mostlyclean-target-libgomp - - .PHONY: do-clean -@@ -2033,6 +2057,7 @@ - clean-host: maybe-clean-libtermcap - clean-host: maybe-clean-utils - clean-host: maybe-clean-libada -+clean-host: maybe-clean-libgnatvsn - clean-host: maybe-clean-gnattools - - .PHONY: clean-target -@@ -2057,6 +2082,7 @@ - clean-target: maybe-clean-target-qthreads - clean-target: maybe-clean-target-rda - clean-target: maybe-clean-target-libada -+clean-target: maybe-clean-target-libgnatvsn - clean-target: maybe-clean-target-libgomp - - .PHONY: do-distclean -@@ -2140,6 +2166,7 @@ - distclean-host: maybe-distclean-libtermcap - distclean-host: maybe-distclean-utils - distclean-host: maybe-distclean-libada -+distclean-host: maybe-distclean-libgnatvsn - distclean-host: maybe-distclean-gnattools - - .PHONY: distclean-target -@@ -2164,6 +2191,7 @@ - distclean-target: maybe-distclean-target-qthreads - distclean-target: maybe-distclean-target-rda - distclean-target: maybe-distclean-target-libada -+distclean-target: maybe-distclean-target-libgnatvsn - distclean-target: maybe-distclean-target-libgomp - - .PHONY: do-maintainer-clean -@@ -2247,6 +2275,7 @@ - maintainer-clean-host: maybe-maintainer-clean-libtermcap - maintainer-clean-host: maybe-maintainer-clean-utils - maintainer-clean-host: maybe-maintainer-clean-libada -+maintainer-clean-host: maybe-maintainer-clean-libgnatvsn - maintainer-clean-host: maybe-maintainer-clean-gnattools - - .PHONY: maintainer-clean-target -@@ -2271,6 +2300,7 @@ - maintainer-clean-target: maybe-maintainer-clean-target-qthreads - maintainer-clean-target: maybe-maintainer-clean-target-rda - maintainer-clean-target: maybe-maintainer-clean-target-libada -+maintainer-clean-target: maybe-maintainer-clean-target-libgnatvsn - maintainer-clean-target: maybe-maintainer-clean-target-libgomp - - -@@ -2408,6 +2438,7 @@ - maybe-check-libtermcap \ - maybe-check-utils \ - maybe-check-libada \ -+ maybe-check-libgnatvsn \ - maybe-check-gnattools - - .PHONY: check-target -@@ -2432,6 +2463,7 @@ - maybe-check-target-qthreads \ - maybe-check-target-rda \ - maybe-check-target-libada \ -+ maybe-check-target-libgnatvsn \ - maybe-check-target-libgomp - - do-check: -@@ -2541,6 +2573,7 @@ - maybe-install-libtermcap \ - maybe-install-utils \ - maybe-install-libada \ -+ maybe-install-libgnatvsn \ - maybe-install-gnattools - - .PHONY: install-host -@@ -2615,6 +2648,7 @@ - maybe-install-libtermcap \ - maybe-install-utils \ - maybe-install-libada \ -+ maybe-install-libgnatvsn \ - maybe-install-gnattools - - .PHONY: install-target -@@ -2639,6 +2673,7 @@ - maybe-install-target-qthreads \ - maybe-install-target-rda \ - maybe-install-target-libada \ -+ maybe-install-target-libgnatvsn \ - maybe-install-target-libgomp - - uninstall: -@@ -39206,6 +39241,327 @@ - - - -+.PHONY: configure-libgnatvsn maybe-configure-libgnatvsn -+maybe-configure-libgnatvsn: -+@if gcc-bootstrap -+configure-libgnatvsn: stage_current -+@endif gcc-bootstrap -+@if libgnatvsn -+maybe-configure-libgnatvsn: configure-libgnatvsn -+configure-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ test ! -f $(HOST_SUBDIR)/libgnatvsn/Makefile || exit 0; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgnatvsn ; \ -+ $(HOST_EXPORTS) \ -+ echo Configuring in $(HOST_SUBDIR)/libgnatvsn; \ -+ cd "$(HOST_SUBDIR)/libgnatvsn" || exit 1; \ -+ case $(srcdir) in \ -+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ -+ *) topdir=`echo $(HOST_SUBDIR)/libgnatvsn/ | \ -+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ -+ esac; \ -+ srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \ -+ libsrcdir="$$s/libgnatvsn"; \ -+ $(SHELL) $${libsrcdir}/configure \ -+ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ -+ --target=${target_alias} $${srcdiroption} \ -+ || exit 1 -+@endif libgnatvsn -+ -+ -+ -+ -+ -+.PHONY: all-libgnatvsn maybe-all-libgnatvsn -+maybe-all-libgnatvsn: -+@if gcc-bootstrap -+all-libgnatvsn: stage_current -+@endif gcc-bootstrap -+@if libgnatvsn -+TARGET-libgnatvsn=all -+maybe-all-libgnatvsn: all-libgnatvsn -+all-libgnatvsn: configure-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libgnatvsn)) -+@endif libgnatvsn -+ -+ -+ -+ -+.PHONY: check-libgnatvsn maybe-check-libgnatvsn -+maybe-check-libgnatvsn: -+@if libgnatvsn -+maybe-check-libgnatvsn: check-libgnatvsn -+ -+check-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: install-libgnatvsn maybe-install-libgnatvsn -+maybe-install-libgnatvsn: -+@if libgnatvsn -+maybe-install-libgnatvsn: install-libgnatvsn -+ -+install-libgnatvsn: installdirs -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(FLAGS_TO_PASS) install) -+ -+@endif libgnatvsn -+ -+# Other targets (info, dvi, pdf, etc.) -+ -+.PHONY: maybe-info-libgnatvsn info-libgnatvsn -+maybe-info-libgnatvsn: -+@if libgnatvsn -+maybe-info-libgnatvsn: info-libgnatvsn -+ -+# libgnatvsn doesn't support info. -+info-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-dvi-libgnatvsn dvi-libgnatvsn -+maybe-dvi-libgnatvsn: -+@if libgnatvsn -+maybe-dvi-libgnatvsn: dvi-libgnatvsn -+ -+# libgnatvsn doesn't support dvi. -+dvi-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-pdf-libgnatvsn pdf-libgnatvsn -+maybe-pdf-libgnatvsn: -+@if libgnatvsn -+maybe-pdf-libgnatvsn: pdf-libgnatvsn -+ -+pdf-libgnatvsn: \ -+ configure-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing pdf in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ pdf) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-html-libgnatvsn html-libgnatvsn -+maybe-html-libgnatvsn: -+@if libgnatvsn -+maybe-html-libgnatvsn: html-libgnatvsn -+ -+# libgnatvsn doesn't support html. -+html-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-TAGS-libgnatvsn TAGS-libgnatvsn -+maybe-TAGS-libgnatvsn: -+@if libgnatvsn -+maybe-TAGS-libgnatvsn: TAGS-libgnatvsn -+ -+# libgnatvsn doesn't support TAGS. -+TAGS-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-install-info-libgnatvsn install-info-libgnatvsn -+maybe-install-info-libgnatvsn: -+@if libgnatvsn -+maybe-install-info-libgnatvsn: install-info-libgnatvsn -+ -+# libgnatvsn doesn't support install-info. -+install-info-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-install-pdf-libgnatvsn install-pdf-libgnatvsn -+maybe-install-pdf-libgnatvsn: -+@if libgnatvsn -+maybe-install-pdf-libgnatvsn: install-pdf-libgnatvsn -+ -+install-pdf-libgnatvsn: \ -+ configure-libgnatvsn \ -+ pdf-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing install-pdf in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-pdf) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-install-html-libgnatvsn install-html-libgnatvsn -+maybe-install-html-libgnatvsn: -+@if libgnatvsn -+maybe-install-html-libgnatvsn: install-html-libgnatvsn -+ -+install-html-libgnatvsn: \ -+ configure-libgnatvsn \ -+ html-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing install-html in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-html) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-installcheck-libgnatvsn installcheck-libgnatvsn -+maybe-installcheck-libgnatvsn: -+@if libgnatvsn -+maybe-installcheck-libgnatvsn: installcheck-libgnatvsn -+ -+# libgnatvsn doesn't support installcheck. -+installcheck-libgnatvsn: -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-mostlyclean-libgnatvsn mostlyclean-libgnatvsn -+maybe-mostlyclean-libgnatvsn: -+@if libgnatvsn -+maybe-mostlyclean-libgnatvsn: mostlyclean-libgnatvsn -+ -+mostlyclean-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing mostlyclean in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ mostlyclean) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-clean-libgnatvsn clean-libgnatvsn -+maybe-clean-libgnatvsn: -+@if libgnatvsn -+maybe-clean-libgnatvsn: clean-libgnatvsn -+ -+clean-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing clean in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ clean) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-distclean-libgnatvsn distclean-libgnatvsn -+maybe-distclean-libgnatvsn: -+@if libgnatvsn -+maybe-distclean-libgnatvsn: distclean-libgnatvsn -+ -+distclean-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing distclean in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ distclean) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+.PHONY: maybe-maintainer-clean-libgnatvsn maintainer-clean-libgnatvsn -+maybe-maintainer-clean-libgnatvsn: -+@if libgnatvsn -+maybe-maintainer-clean-libgnatvsn: maintainer-clean-libgnatvsn -+ -+maintainer-clean-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libgnatvsn/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing maintainer-clean in libgnatvsn" ; \ -+ (cd $(HOST_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ maintainer-clean) \ -+ || exit 1 -+ -+@endif libgnatvsn -+ -+ -+ - .PHONY: configure-gnattools maybe-configure-gnattools - maybe-configure-gnattools: - @if gcc-bootstrap -@@ -48785,6 +49141,345 @@ - - - -+.PHONY: configure-target-libgnatvsn maybe-configure-target-libgnatvsn -+maybe-configure-target-libgnatvsn: -+@if gcc-bootstrap -+configure-target-libgnatvsn: stage_current -+@endif gcc-bootstrap -+@if target-libgnatvsn -+maybe-configure-target-libgnatvsn: configure-target-libgnatvsn -+configure-target-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ echo "Checking multilib configuration for libgnatvsn..."; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \ -+ $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp 2> /dev/null ; \ -+ if test -r $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \ -+ if cmp -s $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; then \ -+ rm -f $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp; \ -+ else \ -+ rm -f $(TARGET_SUBDIR)/libgnatvsn/Makefile; \ -+ mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \ -+ fi; \ -+ else \ -+ mv $(TARGET_SUBDIR)/libgnatvsn/multilib.tmp $(TARGET_SUBDIR)/libgnatvsn/multilib.out; \ -+ fi; \ -+ test ! -f $(TARGET_SUBDIR)/libgnatvsn/Makefile || exit 0; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgnatvsn ; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo Configuring in $(TARGET_SUBDIR)/libgnatvsn; \ -+ cd "$(TARGET_SUBDIR)/libgnatvsn" || exit 1; \ -+ case $(srcdir) in \ -+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ -+ *) topdir=`echo $(TARGET_SUBDIR)/libgnatvsn/ | \ -+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ -+ esac; \ -+ srcdiroption="--srcdir=$${topdir}/libgnatvsn"; \ -+ libsrcdir="$$s/libgnatvsn"; \ -+ rm -f no-such-file || : ; \ -+ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ -+ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ -+ --target=${target_alias} $${srcdiroption} \ -+ || exit 1 -+@endif target-libgnatvsn -+ -+ -+ -+ -+ -+.PHONY: all-target-libgnatvsn maybe-all-target-libgnatvsn -+maybe-all-target-libgnatvsn: -+@if gcc-bootstrap -+all-target-libgnatvsn: stage_current -+@endif gcc-bootstrap -+@if target-libgnatvsn -+TARGET-target-libgnatvsn=all -+maybe-all-target-libgnatvsn: all-target-libgnatvsn -+all-target-libgnatvsn: configure-target-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(TARGET_FLAGS_TO_PASS) $(TARGET-target-libgnatvsn)) -+@endif target-libgnatvsn -+ -+ -+ -+ -+ -+.PHONY: check-target-libgnatvsn maybe-check-target-libgnatvsn -+maybe-check-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-check-target-libgnatvsn: check-target-libgnatvsn -+ -+# Dummy target for uncheckable module. -+check-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: install-target-libgnatvsn maybe-install-target-libgnatvsn -+maybe-install-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-install-target-libgnatvsn: install-target-libgnatvsn -+ -+install-target-libgnatvsn: installdirs -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -+ -+@endif target-libgnatvsn -+ -+# Other targets (info, dvi, pdf, etc.) -+ -+.PHONY: maybe-info-target-libgnatvsn info-target-libgnatvsn -+maybe-info-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-info-target-libgnatvsn: info-target-libgnatvsn -+ -+# libgnatvsn doesn't support info. -+info-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-dvi-target-libgnatvsn dvi-target-libgnatvsn -+maybe-dvi-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-dvi-target-libgnatvsn: dvi-target-libgnatvsn -+ -+# libgnatvsn doesn't support dvi. -+dvi-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-pdf-target-libgnatvsn pdf-target-libgnatvsn -+maybe-pdf-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-pdf-target-libgnatvsn: pdf-target-libgnatvsn -+ -+pdf-target-libgnatvsn: \ -+ configure-target-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ pdf) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-html-target-libgnatvsn html-target-libgnatvsn -+maybe-html-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-html-target-libgnatvsn: html-target-libgnatvsn -+ -+# libgnatvsn doesn't support html. -+html-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-TAGS-target-libgnatvsn TAGS-target-libgnatvsn -+maybe-TAGS-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-TAGS-target-libgnatvsn: TAGS-target-libgnatvsn -+ -+# libgnatvsn doesn't support TAGS. -+TAGS-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-install-info-target-libgnatvsn install-info-target-libgnatvsn -+maybe-install-info-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-install-info-target-libgnatvsn: install-info-target-libgnatvsn -+ -+# libgnatvsn doesn't support install-info. -+install-info-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-install-pdf-target-libgnatvsn install-pdf-target-libgnatvsn -+maybe-install-pdf-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-install-pdf-target-libgnatvsn: install-pdf-target-libgnatvsn -+ -+install-pdf-target-libgnatvsn: \ -+ configure-target-libgnatvsn \ -+ pdf-target-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing install-pdf in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-pdf) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-install-html-target-libgnatvsn install-html-target-libgnatvsn -+maybe-install-html-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-install-html-target-libgnatvsn: install-html-target-libgnatvsn -+ -+install-html-target-libgnatvsn: \ -+ configure-target-libgnatvsn \ -+ html-target-libgnatvsn -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing install-html in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-html) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-installcheck-target-libgnatvsn installcheck-target-libgnatvsn -+maybe-installcheck-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-installcheck-target-libgnatvsn: installcheck-target-libgnatvsn -+ -+# libgnatvsn doesn't support installcheck. -+installcheck-target-libgnatvsn: -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-mostlyclean-target-libgnatvsn mostlyclean-target-libgnatvsn -+maybe-mostlyclean-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-mostlyclean-target-libgnatvsn: mostlyclean-target-libgnatvsn -+ -+mostlyclean-target-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ mostlyclean) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-clean-target-libgnatvsn clean-target-libgnatvsn -+maybe-clean-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-clean-target-libgnatvsn: clean-target-libgnatvsn -+ -+clean-target-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing clean in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ clean) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-distclean-target-libgnatvsn distclean-target-libgnatvsn -+maybe-distclean-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-distclean-target-libgnatvsn: distclean-target-libgnatvsn -+ -+distclean-target-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing distclean in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ distclean) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+.PHONY: maybe-maintainer-clean-target-libgnatvsn maintainer-clean-target-libgnatvsn -+maybe-maintainer-clean-target-libgnatvsn: -+@if target-libgnatvsn -+maybe-maintainer-clean-target-libgnatvsn: maintainer-clean-target-libgnatvsn -+ -+maintainer-clean-target-libgnatvsn: -+ @: $(MAKE); $(unstage) -+ @[ -f $(TARGET_SUBDIR)/libgnatvsn/Makefile ] || exit 0 ; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(NORMAL_TARGET_EXPORTS) \ -+ echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgnatvsn" ; \ -+ for flag in $(EXTRA_TARGET_FLAGS); do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ (cd $(TARGET_SUBDIR)/libgnatvsn && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ maintainer-clean) \ -+ || exit 1 -+ -+@endif target-libgnatvsn -+ -+ -+ -+ -+ - .PHONY: configure-target-libgomp maybe-configure-target-libgomp - maybe-configure-target-libgomp: - @if gcc-bootstrap -@@ -51334,6 +52029,7 @@ - configure-target-qthreads: stage_last - configure-target-rda: stage_last - configure-target-libada: stage_last -+configure-target-libgnatvsn: stage_last - configure-target-libgomp: stage_last - @endif gcc-bootstrap - -@@ -51358,6 +52054,7 @@ - configure-target-qthreads: maybe-all-gcc - configure-target-rda: maybe-all-gcc - configure-target-libada: maybe-all-gcc -+configure-target-libgnatvsn: maybe-all-gcc - configure-target-libgomp: maybe-all-gcc - @endif gcc-no-bootstrap - -@@ -51612,6 +52309,8 @@ - all-stagefeedback-libcpp: maybe-all-stagefeedback-intl - all-fixincludes: maybe-all-libiberty - all-gnattools: maybe-all-libada -+all-gnattools: maybe-all-libgnatvsn -+all-libgnatvsn: maybe-all-libada - configure-mpfr: maybe-all-gmp - - configure-stage1-mpfr: maybe-all-stage1-gmp -@@ -52049,6 +52748,7 @@ - configure-target-qthreads: maybe-all-target-libgcc - configure-target-rda: maybe-all-target-libgcc - configure-target-libada: maybe-all-target-libgcc -+configure-target-libgnatvsn: maybe-all-target-libgcc - configure-target-libgomp: maybe-all-target-libgcc - @endif gcc-no-bootstrap - -@@ -52091,6 +52791,8 @@ - - configure-target-libada: maybe-all-target-newlib maybe-all-target-libgloss - -+configure-target-libgnatvsn: maybe-all-target-newlib maybe-all-target-libgloss -+ - configure-target-libgomp: maybe-all-target-newlib maybe-all-target-libgloss - - -Index: configure.ac -=================================================================== ---- configure.ac.orig -+++ configure.ac -@@ -155,7 +155,7 @@ - - # these libraries are used by various programs built for the host environment - # --host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada" -+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada libgnatvsn" - - # these tools are built for the host environment - # Note, the powerpc-eabi build depends on sim occurring before gdb in order to -@@ -185,7 +185,8 @@ - target-boehm-gc \ - ${libgcj} \ - target-libobjc \ -- target-libada" -+ target-libada \ -+ target-libgnatvsn" - - # these tools are built using the target libraries, and are intended to - # run only in the target environment -@@ -263,7 +264,7 @@ - - # Similarly, some are only suitable for cross toolchains. - # Remove these if host=target. --cross_only="target-libgloss target-newlib target-opcodes target-libada" -+cross_only="target-libgloss target-newlib target-opcodes target-libada target-libgnatvsn" - - case $is_cross_compiler in - no) skipdirs="${skipdirs} ${cross_only}" ;; -@@ -340,7 +341,7 @@ - ENABLE_LIBADA=$enableval, - ENABLE_LIBADA=yes) - if test "${ENABLE_LIBADA}" != "yes" ; then -- noconfigdirs="$noconfigdirs gnattools" -+ noconfigdirs="$noconfigdirs libgnatvsn gnattools" - fi - - AC_ARG_ENABLE(libssp, diff --git a/recipes/gcc/gcc-svn/debian/ada-link-lib.dpatch b/recipes/gcc/gcc-svn/debian/ada-link-lib.dpatch deleted file mode 100644 index 2645fe034e..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-link-lib.dpatch +++ /dev/null @@ -1,1932 +0,0 @@ -#! /bin/sh -e - -# DP: - Install the shared Ada libraries as '.so.1', not '.so' to conform -# DP: to the Debian policy. -# DP: - Don't include a runtime link path (-rpath), when linking binaries. -# DP: - Build the shared libraries on hppa-linux. -# DP: - Instead of building libada as a target library only, build it as -# DP: both a host and, if different, target library. -# DP: - Build the GNAT tools in their top-level directory; do not use -# DP: recursive makefiles. -# DP: - Link the GNAT tools dynamically. -# DP: - Fix a bug in src/gnattools/configure.ac whereby a nonexistent version -# DP: of indepsw's body was selected. Regenerate configure. (PR ada/27300) - -# This patch seems large, but the hunks in Makefile.in are actually -# generated from Makefile.def using autogen. - -dir=./ -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - cd ${dir} && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/ada/config-lang.in -=================================================================== ---- gcc/ada/config-lang.in.orig 2007-09-03 15:14:47.000000000 +0200 -+++ gcc/ada/config-lang.in 2008-01-29 12:16:44.688811730 +0100 -@@ -35,7 +35,7 @@ - outputs=ada/Makefile - - target_libs="target-libada" --lang_dirs="gnattools" -+lang_dirs="libada gnattools" - - # Ada will not work until the front end starts emitting GIMPLE trees. - build_by_default=no -Index: gcc/ada/link.c -=================================================================== ---- gcc/ada/link.c.orig 2007-11-21 12:20:42.000000000 +0100 -+++ gcc/ada/link.c 2008-01-29 12:16:44.688811730 +0100 -@@ -146,8 +146,8 @@ - - #elif defined (__FreeBSD__) - const char *__gnat_object_file_option = ""; --const char *__gnat_run_path_option = "-Wl,-rpath,"; --char __gnat_shared_libgnat_default = STATIC; -+char *__gnat_run_path_option = ""; -+char __gnat_shared_libgnat_default = SHARED; - int __gnat_link_max = 8192; - unsigned char __gnat_objlist_file_supported = 1; - unsigned char __gnat_using_gnu_linker = 1; -@@ -155,8 +155,8 @@ - - #elif defined (linux) - const char *__gnat_object_file_option = ""; --const char *__gnat_run_path_option = "-Wl,-rpath,"; --char __gnat_shared_libgnat_default = STATIC; -+const char *__gnat_run_path_option = ""; -+char __gnat_shared_libgnat_default = SHARED; - int __gnat_link_max = 8192; - unsigned char __gnat_objlist_file_supported = 1; - unsigned char __gnat_using_gnu_linker = 1; -Index: gcc/ada/Makefile.in -=================================================================== ---- gcc/ada/Makefile.in.orig 2008-01-29 12:10:06.222766372 +0100 -+++ gcc/ada/Makefile.in 2008-01-29 12:17:55.465175005 +0100 -@@ -114,7 +114,7 @@ - MAKEINFO = makeinfo - TEXI2DVI = texi2dvi - TEXI2PDF = texi2pdf --GNATBIND_FLAGS = -static -x -+GNATBIND_FLAGS = -shared -x - ADA_CFLAGS = - ADAFLAGS = -W -Wall -gnatpg -gnata - SOME_ADAFLAGS =-gnata -@@ -247,7 +247,6 @@ - LIBDEPS = $(LIBINTL_DEP) $(LIBIBERTY) - # Default is no TGT_LIB; one might be passed down or something - TGT_LIB = --TOOLS_LIBS = $(EXTRA_GNATTOOLS_OBJS) targext.o link.o $(LIBGNAT) ../../../libiberty/libiberty.a $(SYSLIBS) $(TGT_LIB) - - # Specify the directories to be searched for header files. - # Both . and srcdir are used, in that order, -@@ -293,30 +292,6 @@ - # defined in this file into the environment. - .NOEXPORT: - --# Lists of files for various purposes. -- --GNATLINK_OBJS = gnatlink.o \ -- a-except.o ali.o alloc.o butil.o casing.o csets.o debug.o fmap.o fname.o \ -- gnatvsn.o hostparm.o indepsw.o interfac.o i-c.o i-cstrin.o namet.o opt.o \ -- osint.o output.o rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \ -- sdefault.o snames.o stylesw.o switch.o system.o table.o targparm.o tree_io.o \ -- types.o validsw.o widechar.o -- --GNATMAKE_OBJS = a-except.o ali.o ali-util.o s-casuti.o \ -- alloc.o atree.o binderr.o butil.o casing.o csets.o debug.o elists.o einfo.o\ -- erroutc.o errutil.o err_vars.o fmap.o fname.o fname-uf.o fname-sf.o \ -- gnatmake.o gnatvsn.o hostparm.o interfac.o i-c.o i-cstrin.o krunch.o lib.o \ -- make.o makeusg.o makeutl.o mlib.o mlib-fil.o mlib-prj.o mlib-tgt.o \ -- mlib-tgt-specific.o mlib-utl.o namet.o nlists.o opt.o osint.o osint-m.o output.o \ -- prj.o prj-attr.o prj-attr-pm.o prj-com.o prj-dect.o prj-env.o prj-err.o prj-ext.o prj-nmsc.o \ -- prj-pars.o prj-part.o prj-proc.o prj-strt.o prj-tree.o prj-util.o \ -- rident.o s-exctab.o s-secsta.o s-stalib.o s-stoele.o \ -- scans.o scng.o sdefault.o sfn_scan.o s-purexc.o s-htable.o \ -- sinfo.o sinput.o sinput-c.o sinput-p.o \ -- snames.o stand.o stringt.o styleg.o stylesw.o system.o validsw.o switch.o switch-m.o \ -- table.o targparm.o tempdir.o tree_io.o types.o \ -- uintp.o uname.o urealp.o usage.o widechar.o \ -- $(EXTRA_GNATMAKE_OBJS) - - # Convert the target variable into a space separated list of architecture, - # manufacturer, and operating system and assign each of those to its own -@@ -1017,6 +992,11 @@ - GMEM_LIB = gmemlib - endif - -+ifeq ($(strip $(filter-out hppa% unknown linux gnu,$(targ))),) -+ GNATLIB_SHARED = gnatlib-shared-dual -+ LIBRARY_VERSION := $(LIB_VERSION) -+endif -+ - ifeq ($(strip $(filter-out hppa% hp hpux10%,$(targ))),) - LIBGNAT_TARGET_PAIRS = \ - a-excpol.adb<a-excpol-abort.adb \ -@@ -1666,128 +1646,6 @@ - a-[a-o]*.adb a-[p-z]*.adb a-[a-o]*.ads a-[p-z]*.ads g-*.ad? i-*.ad? \ - s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads - --LIBGNAT=../rts/libgnat.a -- --GCC_LINK=$(CC) -static-libgcc $(ADA_INCLUDES) -- --# when compiling the tools, the runtime has to be first on the path so that --# it hides the runtime files lying with the rest of the sources --ifeq ($(TOOLSCASE),native) -- vpath %.ads ../rts ../ -- vpath %.adb ../rts ../ -- vpath %.c ../rts ../ -- vpath %.h ../rts ../ --endif -- --# in the cross tools case, everything is compiled with the native --# gnatmake/link. Therefore only -I needs to be modified in ADA_INCLUDES --ifeq ($(TOOLSCASE),cross) -- vpath %.ads ../ -- vpath %.adb ../ -- vpath %.c ../ -- vpath %.h ../ --endif -- --../../gnatchop$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatchop --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatchop -- $(GNATLINK) -v gnatchop -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnat$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatcmd --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatcmd -- $(GNATLINK) -v gnatcmd -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatkr$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatkr --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatkr -- $(GNATLINK) -v gnatkr -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatls$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatls --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatls -- $(GNATLINK) -v gnatls -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatname$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatname --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatname -- $(GNATLINK) -v gnatname -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gprmake$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gprmake --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gprmake -- $(GNATLINK) -v gprmake -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatprep$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatprep --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatprep -- $(GNATLINK) -v gnatprep -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatxref$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatxref --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatxref -- $(GNATLINK) -v gnatxref -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatfind$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatfind --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatfind -- $(GNATLINK) -v gnatfind -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatclean$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatclean --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatclean -- $(GNATLINK) -v gnatclean -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatsym$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatsym --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatsym -- $(GNATLINK) -v gnatsym -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnatdll$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatdll --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) $(GNATBIND_FLAGS) gnatdll -- $(GNATLINK) -v gnatdll -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../vxaddr2line$(exeext): targext.o -- $(GNATMAKE) -c $(ADA_INCLUDES) vxaddr2line --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vxaddr2line -- $(GNATLINK) -v vxaddr2line -o $@ --GCC="$(GCC_LINK)" targext.o $(CLIB) -- --gnatmake-re: link.o targext.o -- $(GNATMAKE) $(ADA_INCLUDES) -u sdefault --GCC="$(CC) $(MOST_ADA_FLAGS)" -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatmake --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatmake -- $(GNATLINK) -v gnatmake -o ../../gnatmake$(exeext) \ -- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --# Note the use of the "mv" command in order to allow gnatlink to be linked with --# with the former version of gnatlink itself which cannot override itself. --gnatlink-re: link.o targext.o -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatlink --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlink -- $(GNATLINK) -v gnatlink -o ../../gnatlinknew$(exeext) \ -- --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- $(MV) ../../gnatlinknew$(exeext) ../../gnatlink$(exeext) -- --# Needs to be built with CC=gcc --# Since the RTL should be built with the latest compiler, remove the --# stamp target in the parent directory whenever gnat1 is rebuilt -- --# Likewise for the tools --../../gnatmake$(exeext): $(P) b_gnatm.o link.o targext.o $(GNATMAKE_OBJS) -- $(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatm.o $(GNATMAKE_OBJS) \ -- $(TOOLS_LIBS) -- --../../gnatlink$(exeext): $(P) b_gnatl.o link.o targext.o $(GNATLINK_OBJS) -- $(GCC_LINK) $(ALL_CFLAGS) $(LDFLAGS) -o $@ b_gnatl.o $(GNATLINK_OBJS) \ -- $(TOOLS_LIBS) -- --../../gnatbl$(exeext): gnatbl.o -- $(GCC_LINK) -o $@ $(ALL_CFLAGS) $(LDFLAGS) gnatbl.o $(TOOLS_LIBS) -- --gnatbl.o: gnatbl.c adaint.h -- $(CC) $(ALL_CFLAGS) $(INCLUDES) -c $< $(OUTPUT_OPTION) -- - ../stamp-gnatlib: - @if [ ! -f stamp-gnatlib ] ; \ - then \ -@@ -1823,12 +1681,10 @@ - # permission is required. - for file in gnat gnarl; do \ - if [ -f rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \ -- $(INSTALL) rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \ -+ $(INSTALL) rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ - $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ -- fi; \ -- if [ -f rts/lib$${file}$(soext) ]; then \ -- $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(soext); \ -+ $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -+ $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext); \ - fi; \ - done - # This copy must be done preserving the date on the original file. -@@ -1838,18 +1694,6 @@ - cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb - cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads - --../stamp-gnatlib2: -- $(RM) rts/s-*.ali -- $(RM) rts/s-*$(objext) -- $(RM) rts/a-*.ali -- $(RM) rts/a-*$(objext) -- $(RM) rts/*.ali -- $(RM) rts/*$(objext) -- $(RM) rts/*$(arext) -- $(RM) rts/*$(soext) -- touch ../stamp-gnatlib2 -- $(RM) ../stamp-gnatlib -- - # NOTE: The $(foreach ...) commands assume ";" is the valid separator between - # successive target commands. Although the Gnu make documentation - # implies this is true on all systems, I suspect it may not be, So care -@@ -1859,7 +1703,7 @@ - - # GNULLI Begin ########################################################### - --../stamp-gnatlib1: Makefile ../stamp-gnatlib2 -+../stamp-gnatlib1: Makefile - $(RMDIR) rts - $(MKDIR) rts - $(CHMOD) u+w rts -@@ -1885,7 +1729,7 @@ - # Example: cd rts; ar rc libfoo.a $(LONG_LIST_OF_OBJS) - # is guaranteed to overflow the buffer. - --gnatlib: ../stamp-gnatlib1 ../stamp-gnatlib2 -+gnatlib: ../stamp-gnatlib1 - $(MAKE) -C rts \ - CC="`echo \"$(GCC_FOR_TARGET)\" \ - | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ -@@ -1924,64 +1768,75 @@ - rts/memtrack.o - $(RANLIB_FOR_TARGET) rts/libgmem$(arext) - endif -- $(CHMOD) a-wx rts/*.ali - touch ../stamp-gnatlib - - # Warning: this target assumes that LIBRARY_VERSION has been set correctly. --gnatlib-shared-default: -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(RM) rts/libgna*$(soext) -+gnatlib-shared-default: ../stamp-gnatlib1 -+ $(MAKE) -C rts \ -+ CC="`echo \"$(GCC_FOR_TARGET)\" \ -+ | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ -+ INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ -+ CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \ -+ srcdir=$(fsrcdir) \ -+ -f ../Makefile $(LIBGNAT_OBJS) -+ $(MAKE) -C rts \ -+ CC="`echo \"$(GCC_FOR_TARGET)\" \ -+ | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ -+ ADA_INCLUDES="" \ -+ CFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \ -+ ADAFLAGS="$(GNATLIBFLAGS)" \ -+ THREAD_KIND="$(THREAD_KIND)" \ -+ srcdir=$(fsrcdir) \ -+ -f ../Makefile \ -+ $(GNATRTL_OBJS) -+ $(RM) rts/libgna*$(soext) rts/libgna*$(soext).1 - cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ - $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -+ -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ - $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ - g-trasym.o convert_addresses.o \ -- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -+ $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ - $(MISCLIB) -lm - cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ - $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -+ -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ - $(GNATRTL_TASKING_OBJS) \ -- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -+ $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ - $(THREADSLIB) -- cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- libgnat$(soext) -- cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- libgnarl$(soext) -+ cd rts; for lib in gnat gnarl; do \ -+ l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \ -+ $(LN_S) $$l.1 $$l; \ -+ done -+# Delete the object files, lest they be linked statically into the tools -+# executables. Only the .ali, .a and .so files must remain. -+ rm -f rts/*.o -+ $(CHMOD) a-wx rts/*.ali - - gnatlib-shared-dual: - $(MAKE) $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib-shared-default -- $(MV) rts/libgna*$(soext) . -- $(RM) ../stamp-gnatlib2 -+ gnatlib -+ $(RM) rts/*.o rts/*.ali - $(MAKE) $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(MV) libgna*$(soext) rts -+ gnatlib-shared-default - - gnatlib-shared-dual-win32: - $(MAKE) $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \ -+ GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib-shared-win32 -- $(MV) rts/libgna*$(soext) . -- $(RM) ../stamp-gnatlib2 -+ gnatlib -+ $(RM) rts/*.o rts/*.ali - $(MAKE) $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ -+ GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(MV) libgna*$(soext) rts -+ gnatlib-shared-win32 - - # ??? we need to add the option to support auto-import of arrays/records to - # the GNATLIBFLAGS when this will be supported by GNAT. At this point we will -@@ -2090,22 +1945,6 @@ - gnat-cross: force - make $(GNAT1_ADA_OBJS) CC="gcc -B../stage1/" CFLAGS="-S -gnatp" - --# Compiling object files from source files. -- --# Note that dependencies on obstack.h are not written --# because that file is not part of GCC. --# Dependencies on gvarargs.h are not written --# because all that file does, when not compiling with GCC, --# is include the system varargs.h. -- --b_gnatl.c : $(GNATLINK_OBJS) -- $(GNATBIND) -C $(ADA_INCLUDES) -o b_gnatl.c gnatlink.ali --b_gnatl.o : b_gnatl.c -- --b_gnatm.c : $(GNATMAKE_OBJS) -- $(GNATBIND) -C $(ADA_INCLUDES) -o b_gnatm.c gnatmake.ali --b_gnatm.o : b_gnatm.c -- - ADA_INCLUDE_DIR = $(libsubdir)/adainclude - ADA_RTL_OBJ_DIR = $(libsubdir)/adalib - -@@ -2225,19 +2064,3 @@ - .PHONY: risky-stage1 risky-stage2 risky-stage3 risky-stage4 - - force: -- --# Gnatlbr, Vms_help, and Gnat.hlp are only used on VMS -- --../../gnatlbr$(exeext): ../../prefix.o -- $(GNATMAKE) -c $(ADA_INCLUDES) gnatlbr --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) gnatlbr -- $(GNATLINK) -v gnatlbr -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../vms_help$(exeext): -- $(GNATMAKE) -c $(ADA_INCLUDES) vms_help --GCC="$(CC) $(ALL_ADAFLAGS)" -- $(GNATBIND) $(ADA_INCLUDES) $(GNATBIND_FLAGS) vms_help -- $(GNATLINK) -v vms_help -o $@ --GCC="$(GCC_LINK)" $(TOOLS_LIBS) -- --../../gnat.hlp: ../../vms_help$(exeext) -- ../../vms_help$(exeext) $(fsrcdir)/gnat.help_in \ -- $(fsrcdir)/vms_data.ads ../../gnat.hlp -Index: gnattools/Makefile.in -=================================================================== ---- gnattools/Makefile.in.orig 2007-07-05 10:19:48.000000000 +0200 -+++ gnattools/Makefile.in 2008-01-29 12:16:44.696811771 +0100 -@@ -18,6 +18,8 @@ - # Default target; must be first. - all: gnattools - -+.SUFFIXES: -+ - # Standard autoconf-set variables. - SHELL = @SHELL@ - srcdir = @srcdir@ -@@ -32,112 +34,16 @@ - LN_S=@LN_S@ - target_noncanonical=@target_noncanonical@ - --# Variables for the user (or the top level) to override. --objext=.o --TRACE=no --ADA_FOR_BUILD= --ADA_FOR_TARGET= --LDFLAGS= --PWD_COMMAND = $${PWDCMD-pwd} -- --# The tedious process of getting CFLAGS right. --CFLAGS=-g --LOOSE_WARN = -W -Wall -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes --GCC_WARN_CFLAGS = $(LOOSE_WARN) $(NOCOMMON_FLAG) -- --ADA_CFLAGS= --T_ADA_CFLAGS= --# HPPA is literally the only target which sets X_ADA_CFLAGS --X_ADA_CFLAGS=@x_ada_cflags@ --ALL_ADA_CFLAGS=$(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS) -- --# Variables for gnattools. --ADAFLAGS= -gnatpg -gnata --ADA_INCLUDE_DIR = $(libsubdir)/adainclude --ADA_RTL_OBJ_DIR = $(libsubdir)/adalib -- --# For finding the GCC build dir, which is used far too much --GCC_DIR=../gcc --# Include fragment generated by GCC configure; shared with libada for now. --include $(GCC_DIR)/libada-mk --# Variables based on those gleaned from the GCC makefile. :-P --libsubdir=$(libdir)/gcc/$(target_noncanonical)/$(gcc_version) -- --# Get possible host-specific override for libsubdir (ick). --xmake_file=$(subst /config,/../gcc/config,$(gcc_xmake_file)) --ifneq ($(xmake_file),) --include $(xmake_file) --endif -- --# Absolute srcdir for gcc/ada (why do we want absolute? I dunno) --fsrcdir := $(shell cd $(srcdir)/../gcc/ada/; ${PWD_COMMAND}) -- --# Useful "subroutines" for the excess includes --INCLUDES_FOR_SUBDIR = -I. -I.. -I../.. -I$(fsrcdir) -I$(fsrcdir)/../config \ -- -I$(fsrcdir)/../../include -I$(fsrcdir)/.. --ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir) -- --# Variables for gnattools1, native --TOOLS_FLAGS_TO_PASS_1= \ -- "CC=../../xgcc -B../../" \ -- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ -- "LDFLAGS=$(LDFLAGS)" \ -- "ADAFLAGS=$(ADAFLAGS)" \ -- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \ -- "ADA_INCLUDES=-I- -I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\ -- "exeext=$(exeext)" \ -- "fsrcdir=$(fsrcdir)" \ -- "srcdir=$(fsrcdir)" \ -- "GNATBIND=../../gnatbind" \ -- "TOOLSCASE=native" -- --# Variables for regnattools --TOOLS_FLAGS_TO_PASS_1re= \ -- "CC=../../xgcc -B../../" \ -- "CFLAGS=$(CFLAGS)" \ -- "ADAFLAGS=$(ADAFLAGS)" \ -- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \ -- "ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)"\ -- "exeext=$(exeext)" \ -- "fsrcdir=$(fsrcdir)" \ -- "srcdir=$(fsrcdir)" \ -- "GNATMAKE=../../gnatmake" \ -- "GNATLINK=../../gnatlink" \ -- "GNATBIND=../../gnatbind" \ -- "TOOLSCASE=cross" \ -- "INCLUDES=" -- --# Variables for gnattools2, native --TOOLS_FLAGS_TO_PASS_NATIVE= \ -- "CC=../../xgcc -B../../" \ -- "CFLAGS=$(CFLAGS)" \ -- "ADAFLAGS=$(ADAFLAGS)" \ -- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \ -- "ADA_INCLUDES=-I../rts $(ADA_INCLUDES_FOR_SUBDIR)" \ -- "exeext=$(exeext)" \ -- "fsrcdir=$(fsrcdir)" \ -- "srcdir=$(fsrcdir)" \ -- "GNATMAKE=../../gnatmake" \ -- "GNATLINK=../../gnatlink" \ -- "GNATBIND=../../gnatbind" \ -- "TOOLSCASE=native" -- --# Variables for gnattools, cross --TOOLS_FLAGS_TO_PASS_CROSS= \ -- "CC=$(CC)" \ -- "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" \ -- "LDFLAGS=$(LDFLAGS)" \ -- "ADAFLAGS=$(ADAFLAGS)" \ -- "INCLUDES=$(INCLUDES_FOR_SUBDIR)" \ -- "ADA_INCLUDES=-I$(RTS_DIR)../adainclude -I$(RTS_DIR) $(ADA_INCLUDES_FOR_SUBDIR)" \ -- "exeext=$(exeext)" \ -- "fsrcdir=$(fsrcdir)" \ -- "srcdir=$(fsrcdir)" \ -- "GNATMAKE=gnatmake" \ -- "GNATLINK=gnatlink" \ -- "GNATBIND=gnatbind" \ -- "TOOLSCASE=cross" \ -- "LIBGNAT=" -+CFLAGS=-O2 -Wall -+INCLUDES = -I@srcdir@/../gcc/ada -I@srcdir@/../gcc -+ADA_CFLAGS=-O2 -gnatn -+ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I@srcdir@/../gcc/ada -+LIB_VERSION=$(strip $(shell grep ' Library_Version :' \ -+ @srcdir@/../gcc/ada/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) -+ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -+ -+# We will use the just-built compiler to compile and link everything. -+GCC=../gcc/xgcc -B../gcc/ - - # File lists - # ---------- -@@ -146,17 +52,136 @@ - EXTRA_GNATTOOLS = @EXTRA_GNATTOOLS@ - TOOLS_TARGET_PAIRS = @TOOLS_TARGET_PAIRS@ - --# These are built by gnatmake, and in both native and cross configurations. --GNATTOOLS2_FILES = \ -- ../../gnatchop$(exeext) \ -- ../../gnat$(exeext) \ -- ../../gnatkr$(exeext) \ -- ../../gnatls$(exeext) \ -- ../../gnatprep$(exeext) \ -- ../../gnatxref$(exeext) \ -- ../../gnatfind$(exeext) \ -- ../../gnatname$(exeext) \ -- ../../gnatclean$(exeext) -+# Stage 1 builds xgcc and gnatbind; we can use them to build -+# gnatmake-static and gnatlink-static, then use gnatmake-static and -+# gnatlink-static to build the other tools. The reason we first build -+# statically-linked versions of gnatmake and gnatlink is so we can run -+# them with confidence on all build platforms, without LD_LIBRARY_PATH -+# or some such variable. -+ -+# The tools we will build using gnatmake-static and gnatlink-static. -+TOOLS := gnat gnatbind gnatchop gnatclean gnatfind gnatkr gnatls gnatlink -+TOOLS += gnatmake gnatname gnatprep gnatxref gprmake -+ -+# Since we don't have gnatmake, we must specify the full list of -+# object files necessary to build gnatmake and gnatlink. -+# TODO: remove from these lists the objects that are part of -+# libgnatvsn and libgnatprj. -+GNATLINK_OBJS = \ -+ali.o \ -+alloc.o \ -+butil.o \ -+casing.o \ -+csets.o \ -+debug.o \ -+fmap.o \ -+fname.o \ -+gnatlink.o \ -+gnatvsn.o \ -+hostparm.o \ -+indepsw.o \ -+namet.o \ -+opt.o \ -+osint.o \ -+output.o \ -+prefix.o \ -+rident.o \ -+sdefault.o \ -+snames.o \ -+stylesw.o \ -+switch.o \ -+table.o \ -+targparm.o \ -+tree_io.o \ -+types.o \ -+validsw.o \ -+version.o \ -+widechar.o -+ -+GNATMAKE_OBJS = \ -+ali-util.o \ -+ali.o \ -+alloc.o \ -+atree.o \ -+binderr.o \ -+butil.o \ -+casing.o \ -+csets.o \ -+debug.o \ -+einfo.o\ -+elists.o \ -+err_vars.o \ -+erroutc.o \ -+errutil.o \ -+fmap.o \ -+fname-sf.o \ -+fname-uf.o \ -+fname.o \ -+gnatmake.o \ -+gnatvsn.o \ -+hostparm.o \ -+krunch.o \ -+lib.o \ -+make.o \ -+makeusg.o \ -+makeutl.o \ -+mlib-fil.o \ -+mlib-prj.o \ -+mlib-tgt.o \ -+mlib-tgt-specific.o \ -+mlib-utl.o \ -+mlib.o \ -+namet.o \ -+nlists.o \ -+opt.o \ -+osint-m.o \ -+osint.o \ -+output.o \ -+prefix.o \ -+prj-attr-pm.o \ -+prj-attr.o \ -+prj-com.o \ -+prj-dect.o \ -+prj-env.o \ -+prj-err.o \ -+prj-ext.o \ -+prj-nmsc.o \ -+prj-pars.o \ -+prj-part.o \ -+prj-proc.o \ -+prj-strt.o \ -+prj-tree.o \ -+prj-util.o \ -+prj.o \ -+rident.o \ -+scans.o \ -+scng.o \ -+sdefault.o \ -+sfn_scan.o \ -+sinfo.o \ -+sinput-c.o \ -+sinput-p.o \ -+sinput.o \ -+snames.o \ -+stand.o \ -+stringt.o \ -+styleg.o \ -+stylesw.o \ -+switch-m.o \ -+switch.o \ -+table.o \ -+targparm.o \ -+tempdir.o \ -+tree_io.o \ -+types.o \ -+uintp.o \ -+uname.o \ -+urealp.o \ -+usage.o \ -+validsw.o \ -+version.o \ -+widechar.o \ -+$(EXTRA_GNATMAKE_OBJS) - - # Makefile targets - # ---------------- -@@ -164,126 +189,106 @@ - .PHONY: gnattools gnattools-native gnattools-cross regnattools - gnattools: @default_gnattools_target@ - --# Sanity check --$(GCC_DIR)/stamp-gnatlib: -- @if [ ! -f $(GCC_DIR)/stamp-gnatlib ] ; \ -- then \ -- echo "Cannot build gnattools while gnatlib is out of date or unbuilt" ; \ -- false; \ -- else \ -- true; \ -- fi -- -- - # Build directory for the tools. Let's copy the target-dependent - # sources using the same mechanism as for gnatlib. The other sources are --# accessed using the vpath directive in ada/Makefile.in -+# accessed using the vpath directive. -+ -+stamp-gnattools-sources: -+ $(LN_S) ../gcc/ada/sdefault.adb . -+ $(foreach PAIR,$(TOOLS_TARGET_PAIRS), \ -+ rm -f $(word 1,$(subst <, ,$(PAIR)));\ -+ $(LN_S) @srcdir@/../gcc/ada/$(word 2,$(subst <, ,$(PAIR))) \ -+ $(word 1,$(subst <, ,$(PAIR)));) -+ touch $@ -+ -+gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so -+gnattools-native: stamp-gnattools-sources -+gnattools-native: $(TOOLS) gnatbl -+ -+$(TOOLS) gnatcmd: | gnatmake-static gnatlink-static -+ -+vpath %.c @srcdir@/../gcc/ada:@srcdir@/../gcc -+vpath %.h @srcdir@/../gcc/ada -+vpath %.adb .:@srcdir@/../gcc/ada -+vpath %.ads @srcdir@/../gcc/ada -+ -+# Because the just-built gcc is a host tool like us, we can use some -+# of its object files, e.g. prefix.o and version.o. -+vpath prefix.o ../gcc -+vpath version.o ../gcc -+ -+# gnatlink -+ -+gnatlink-static: $(GNATLINK_OBJS) b_gnatl.o link.o -+ $(GCC) -o $@ $^ \ -+ ../gcc/ada/rts/libgnat.a \ -+ ../libiberty/libiberty.a -+ -+gnatlink: $(GNATLINK_OBJS) b_gnatl.o link.o -+ $(GCC) -o $@ $^ $(ADA_LIBS) ../libiberty/libiberty.a -+ -+b_gnatl.o: b_gnatl.c adaint.h -+ $(GCC) -c -o $@ $(CFLAGS) $< -+ -+b_gnatl.c: $(GNATLINK_OBJS) -+ ../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatlink.ali -+ -+# gnatmake -+ -+gnatmake-static: $(GNATMAKE_OBJS) b_gnatm.o link.o -+ $(GCC) -o $@ $(ADA_CFLAGS) $^ \ -+ ../gcc/ada/rts/libgnat.a \ -+ ../libiberty/libiberty.a -+ -+gnatmake: $(GNATMAKE_OBJS) b_gnatm.o link.o -+ $(GCC) -o $@ $(ADA_CFLAGS) $^ $(ADA_LIBS) ../libiberty/libiberty.a -+ -+b_gnatm.o: b_gnatm.c adaint.h -+ $(GCC) -c -o $@ $(CFLAGS) $< -+ -+b_gnatm.c: $(GNATMAKE_OBJS) adaint.h -+ ../gcc/gnatbind -C -o $@ $(ADA_INCLUDES) gnatmake.ali -+ -+# Other tools -+gnatkr: version.o -+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \ -+ --GCC="$(GCC)" \ -+ --GNATBIND=../gcc/gnatbind -+ ./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \ -+ --GCC="$(GCC) $(ADA_INCLUDES)" -+ -+gnat: gnatcmd -+ cp -lp $< $@ -+ -+gnatbind gnatchop gnatclean gnatcmd gnatfind gnatls gnatname gnatprep gnatxref gprmake: \ -+link.o version.o prefix.o -+ ./gnatmake-static -c -b $@ $(ADA_CFLAGS) $(ADA_INCLUDES) \ -+ --GCC="$(GCC)" \ -+ --GNATBIND=../gcc/gnatbind -+ ./gnatlink-static -o $@ $@.ali $^ $(ADA_INCLUDES) $(ADA_LIBS) \ -+ ../libiberty/libiberty.a \ -+ --GCC="$(GCC) $(ADA_INCLUDES)" -+ -+gnatbl: gnatbl.c link.o version.o prefix.o -+ $(GCC) -o $@ $< $(CFLAGS) \ -+ -I../gcc -I@srcdir@/../gcc/config -I@srcdir@/../gcc \ -+ -I@srcdir@/../include \ -+ $(filter-out %.c,$^) \ -+ $(ADA_LIBS) ../libiberty/libiberty.a -+ -+# Force compiling sdefault.adb, not .ads, to produce sdefault.o -+sdefault.o: sdefault.adb -+ -+sdefault.adb: stamp-gnattools-sources -+ -+%.o: %.adb -+ $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES) -+ -+%.o: %.ads -+ $(GCC) -c -o $@ $< $(ADA_CFLAGS) $(ADA_INCLUDES) - --$(GCC_DIR)/stamp-tools: -- -rm -rf $(GCC_DIR)/ada/tools -- -mkdir -p $(GCC_DIR)/ada/tools -- -(cd $(GCC_DIR)/ada/tools; $(LN_S) ../sdefault.adb .) -- -$(foreach PAIR,$(TOOLS_TARGET_PAIRS), \ -- rm -f $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));\ -- $(LN_S) $(fsrcdir)/$(word 2,$(subst <, ,$(PAIR))) \ -- $(GCC_DIR)/ada/tools/$(word 1,$(subst <, ,$(PAIR)));) -- touch $(GCC_DIR)/stamp-tools -- --# gnatmake/link tools cannot always be built with gnatmake/link for bootstrap --# reasons: gnatmake should be built with a recent compiler, a recent compiler --# may not generate ALI files compatible with an old gnatmake so it is important --# to be able to build gnatmake without a version of gnatmake around. Once --# everything has been compiled once, gnatmake can be recompiled with itself --# (see target regnattools) --gnattools-native: $(GCC_DIR)/stamp-tools $(GCC_DIR)/stamp-gnatlib -- # gnattools1 -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_1) \ -- ../../gnatmake$(exeext) ../../gnatlink$(exeext) ../../gnatbl$(exeext) -- # gnattools2 -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_NATIVE) \ -- $(GNATTOOLS2_FILES) -- --# gnatmake/link can be built with recent gnatmake/link if they are available. --# This is especially convenient for building cross tools or for rebuilding --# the tools when the original bootstrap has already be done. --regnattools: $(GCC_DIR)/stamp-gnatlib -- # gnattools1-re -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_1re) \ -- gnatmake-re gnatlink-re -- # gnattools2 -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_NATIVE) \ -- $(GNATTOOLS2_FILES) -- --# For cross builds of gnattools, --# put the host RTS dir first in the PATH to hide the default runtime --# files that are among the sources --# FIXME: This should be done in configure. --RTS_DIR:=$(strip $(subst \,/,$(shell gnatls -v | grep adalib ))) --gnattools-cross: $(GCC_DIR)/stamp-tools -- # gnattools1-re -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_CROSS) INCLUDES="" \ -- gnatmake-re gnatlink-re -- # gnattools2 -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_CROSS) \ -- $(GNATTOOLS2_FILES) -- # gnattools4 (cross only) -- $(MAKE) -C $(GCC_DIR)/ada/tools -f ../Makefile \ -- $(TOOLS_FLAGS_TO_PASS_CROSS) \ -- top_buildir=../../.. \ -- ../../vxaddr2line$(exeext) -- # Rename cross tools to where the GCC makefile wants them when -- # installing. FIXME: installation should be done elsewhere. -- if [ -f $(GCC_DIR)/gnatbind$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatbind$(exeext) $(GCC_DIR)/gnatbind-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatbl$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatbl$(exeext) $(GCC_DIR)/gnatbl-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatchop$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatchop$(exeext) $(GCC_DIR)/gnatchop-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnat$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnat$(exeext) $(GCC_DIR)/gnat-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatkr$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatkr$(exeext) $(GCC_DIR)/gnatkr-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatlink$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatlink$(exeext) $(GCC_DIR)/gnatlink-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatls$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatls$(exeext) $(GCC_DIR)/gnatls-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatmake$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatmake$(exeext) $(GCC_DIR)/gnatmake-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatmem$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatmem$(exeext) $(GCC_DIR)/gnatmem-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatname$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatname$(exeext) $(GCC_DIR)/gnatname-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatprep$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatprep$(exeext) $(GCC_DIR)/gnatprep-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatxref$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatxref$(exeext) $(GCC_DIR)/gnatxref-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatfind$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatfind$(exeext) $(GCC_DIR)/gnatfind-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatclean$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatclean$(exeext) $(GCC_DIR)/gnatclean-cross$(exeext); \ -- fi -- if [ -f $(GCC_DIR)/gnatsym$(exeext) ] ; then \ -- mv $(GCC_DIR)/gnatsym$(exeext) $(GCC_DIR)/gnatsym-cross$(exeext); \ -- fi -+%.o: %.c -+ $(GCC) -c -o $@ $< $(CFLAGS) $(INCLUDES) - - # Other - # ----- -@@ -311,6 +316,7 @@ - - # Installation rules. - install: -+ $(INSTALL) -s gnatmake gnatlink $(TOOLS) gnatbl $(DESTDIR)$(bindir) - - install-info: - -@@ -320,8 +326,10 @@ - - # Cleaning rules. - mostlyclean: -+ $(RM) gnatmake gnatlink $(TOOLS) gnatbl *.o *.ali - - clean: -+ $(RM) *.ads *.adb stamp-gnattools-sources - - distclean: - $(RM) Makefile config.status config.log -Index: libada/Makefile.in -=================================================================== ---- libada/Makefile.in.orig 2007-03-04 01:29:34.000000000 +0100 -+++ libada/Makefile.in 2008-01-29 12:16:44.696811771 +0100 -@@ -49,7 +49,7 @@ - - # For finding the GCC build dir, which is used far too much - host_subdir = @host_subdir@ --GCC_DIR=../../$(host_subdir)/gcc -+GCC_DIR=../$(host_subdir)/gcc - # Include fragment generated by GCC configure. - include $(GCC_DIR)/libada-mk - -Index: Makefile.def -=================================================================== ---- Makefile.def.orig 2007-11-21 12:21:09.000000000 +0100 -+++ Makefile.def 2008-01-29 12:16:44.696811771 +0100 -@@ -116,7 +116,20 @@ - missing=distclean; - missing=maintainer-clean; }; - host_modules= { module= utils; no_check=true; }; --host_modules= { module= gnattools; }; -+host_modules= { module= libada; no_install=true; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; -+host_modules= { module= gnattools; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; - - target_modules = { module= libstdc++-v3; lib_path=.libs; raw_cxx=true; }; - target_modules = { module= libmudflap; lib_path=.libs; }; -@@ -141,7 +154,13 @@ - target_modules = { module= boehm-gc; }; - target_modules = { module= qthreads; }; - target_modules = { module= rda; }; --target_modules = { module= libada; }; -+target_modules = { module= libada; no_install=true; no_check=true; -+ missing= info; -+ missing= dvi; -+ missing= html; -+ missing= TAGS; -+ missing= install-info; -+ missing= installcheck; }; - target_modules = { module= libgomp; lib_path=.libs; }; - - // These are (some of) the make targets to be done in each subdirectory. -@@ -311,7 +330,7 @@ - - dependencies = { module=all-fixincludes; on=all-libiberty; }; - --dependencies = { module=all-gnattools; on=all-target-libada; }; -+dependencies = { module=all-gnattools; on=all-libada; }; - - dependencies = { module=configure-mpfr; on=all-gmp; }; - -Index: Makefile.in -=================================================================== ---- Makefile.in.orig 2008-01-13 22:19:42.000000000 +0100 -+++ Makefile.in 2008-01-29 12:16:44.740811997 +0100 -@@ -699,6 +699,7 @@ - maybe-configure-tk \ - maybe-configure-libtermcap \ - maybe-configure-utils \ -+ maybe-configure-libada \ - maybe-configure-gnattools - .PHONY: configure-target - configure-target: \ -@@ -849,6 +850,7 @@ - all-host: maybe-all-tk - all-host: maybe-all-libtermcap - all-host: maybe-all-utils -+all-host: maybe-all-libada - all-host: maybe-all-gnattools - - .PHONY: all-target -@@ -962,6 +964,7 @@ - info-host: maybe-info-tk - info-host: maybe-info-libtermcap - info-host: maybe-info-utils -+info-host: maybe-info-libada - info-host: maybe-info-gnattools - - .PHONY: info-target -@@ -1068,6 +1071,7 @@ - dvi-host: maybe-dvi-tk - dvi-host: maybe-dvi-libtermcap - dvi-host: maybe-dvi-utils -+dvi-host: maybe-dvi-libada - dvi-host: maybe-dvi-gnattools - - .PHONY: dvi-target -@@ -1174,6 +1178,7 @@ - pdf-host: maybe-pdf-tk - pdf-host: maybe-pdf-libtermcap - pdf-host: maybe-pdf-utils -+pdf-host: maybe-pdf-libada - pdf-host: maybe-pdf-gnattools - - .PHONY: pdf-target -@@ -1280,6 +1285,7 @@ - html-host: maybe-html-tk - html-host: maybe-html-libtermcap - html-host: maybe-html-utils -+html-host: maybe-html-libada - html-host: maybe-html-gnattools - - .PHONY: html-target -@@ -1386,6 +1392,7 @@ - TAGS-host: maybe-TAGS-tk - TAGS-host: maybe-TAGS-libtermcap - TAGS-host: maybe-TAGS-utils -+TAGS-host: maybe-TAGS-libada - TAGS-host: maybe-TAGS-gnattools - - .PHONY: TAGS-target -@@ -1492,6 +1499,7 @@ - install-info-host: maybe-install-info-tk - install-info-host: maybe-install-info-libtermcap - install-info-host: maybe-install-info-utils -+install-info-host: maybe-install-info-libada - install-info-host: maybe-install-info-gnattools - - .PHONY: install-info-target -@@ -1598,6 +1606,7 @@ - install-pdf-host: maybe-install-pdf-tk - install-pdf-host: maybe-install-pdf-libtermcap - install-pdf-host: maybe-install-pdf-utils -+install-pdf-host: maybe-install-pdf-libada - install-pdf-host: maybe-install-pdf-gnattools - - .PHONY: install-pdf-target -@@ -1704,6 +1713,7 @@ - install-html-host: maybe-install-html-tk - install-html-host: maybe-install-html-libtermcap - install-html-host: maybe-install-html-utils -+install-html-host: maybe-install-html-libada - install-html-host: maybe-install-html-gnattools - - .PHONY: install-html-target -@@ -1810,6 +1820,7 @@ - installcheck-host: maybe-installcheck-tk - installcheck-host: maybe-installcheck-libtermcap - installcheck-host: maybe-installcheck-utils -+installcheck-host: maybe-installcheck-libada - installcheck-host: maybe-installcheck-gnattools - - .PHONY: installcheck-target -@@ -1916,6 +1927,7 @@ - mostlyclean-host: maybe-mostlyclean-tk - mostlyclean-host: maybe-mostlyclean-libtermcap - mostlyclean-host: maybe-mostlyclean-utils -+mostlyclean-host: maybe-mostlyclean-libada - mostlyclean-host: maybe-mostlyclean-gnattools - - .PHONY: mostlyclean-target -@@ -2022,6 +2034,7 @@ - clean-host: maybe-clean-tk - clean-host: maybe-clean-libtermcap - clean-host: maybe-clean-utils -+clean-host: maybe-clean-libada - clean-host: maybe-clean-gnattools - - .PHONY: clean-target -@@ -2128,6 +2141,7 @@ - distclean-host: maybe-distclean-tk - distclean-host: maybe-distclean-libtermcap - distclean-host: maybe-distclean-utils -+distclean-host: maybe-distclean-libada - distclean-host: maybe-distclean-gnattools - - .PHONY: distclean-target -@@ -2234,6 +2248,7 @@ - maintainer-clean-host: maybe-maintainer-clean-tk - maintainer-clean-host: maybe-maintainer-clean-libtermcap - maintainer-clean-host: maybe-maintainer-clean-utils -+maintainer-clean-host: maybe-maintainer-clean-libada - maintainer-clean-host: maybe-maintainer-clean-gnattools - - .PHONY: maintainer-clean-target -@@ -2394,6 +2409,7 @@ - maybe-check-tk \ - maybe-check-libtermcap \ - maybe-check-utils \ -+ maybe-check-libada \ - maybe-check-gnattools - - .PHONY: check-target -@@ -2526,6 +2542,7 @@ - maybe-install-tk \ - maybe-install-libtermcap \ - maybe-install-utils \ -+ maybe-install-libada \ - maybe-install-gnattools - - .PHONY: install-host -@@ -2599,6 +2616,7 @@ - maybe-install-tk \ - maybe-install-libtermcap \ - maybe-install-utils \ -+ maybe-install-libada \ - maybe-install-gnattools - - .PHONY: install-target -@@ -38875,6 +38893,321 @@ - - - -+.PHONY: configure-libada maybe-configure-libada -+maybe-configure-libada: -+@if gcc-bootstrap -+configure-libada: stage_current -+@endif gcc-bootstrap -+@if libada -+maybe-configure-libada: configure-libada -+configure-libada: -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ test ! -f $(HOST_SUBDIR)/libada/Makefile || exit 0; \ -+ $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libada ; \ -+ $(HOST_EXPORTS) \ -+ echo Configuring in $(HOST_SUBDIR)/libada; \ -+ cd "$(HOST_SUBDIR)/libada" || exit 1; \ -+ case $(srcdir) in \ -+ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ -+ *) topdir=`echo $(HOST_SUBDIR)/libada/ | \ -+ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ -+ esac; \ -+ srcdiroption="--srcdir=$${topdir}/libada"; \ -+ libsrcdir="$$s/libada"; \ -+ $(SHELL) $${libsrcdir}/configure \ -+ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ -+ --target=${target_alias} $${srcdiroption} \ -+ || exit 1 -+@endif libada -+ -+ -+ -+ -+ -+.PHONY: all-libada maybe-all-libada -+maybe-all-libada: -+@if gcc-bootstrap -+all-libada: stage_current -+@endif gcc-bootstrap -+@if libada -+TARGET-libada=all -+maybe-all-libada: all-libada -+all-libada: configure-libada -+ @: $(MAKE); $(unstage) -+ @r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(FLAGS_TO_PASS) $(TARGET-libada)) -+@endif libada -+ -+ -+ -+ -+.PHONY: check-libada maybe-check-libada -+maybe-check-libada: -+@if libada -+maybe-check-libada: check-libada -+ -+check-libada: -+ -+@endif libada -+ -+.PHONY: install-libada maybe-install-libada -+maybe-install-libada: -+@if libada -+maybe-install-libada: install-libada -+ -+install-libada: -+ -+@endif libada -+ -+# Other targets (info, dvi, pdf, etc.) -+ -+.PHONY: maybe-info-libada info-libada -+maybe-info-libada: -+@if libada -+maybe-info-libada: info-libada -+ -+# libada doesn't support info. -+info-libada: -+ -+@endif libada -+ -+.PHONY: maybe-dvi-libada dvi-libada -+maybe-dvi-libada: -+@if libada -+maybe-dvi-libada: dvi-libada -+ -+# libada doesn't support dvi. -+dvi-libada: -+ -+@endif libada -+ -+.PHONY: maybe-pdf-libada pdf-libada -+maybe-pdf-libada: -+@if libada -+maybe-pdf-libada: pdf-libada -+ -+pdf-libada: \ -+ configure-libada -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing pdf in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ pdf) \ -+ || exit 1 -+ -+@endif libada -+ -+.PHONY: maybe-html-libada html-libada -+maybe-html-libada: -+@if libada -+maybe-html-libada: html-libada -+ -+# libada doesn't support html. -+html-libada: -+ -+@endif libada -+ -+.PHONY: maybe-TAGS-libada TAGS-libada -+maybe-TAGS-libada: -+@if libada -+maybe-TAGS-libada: TAGS-libada -+ -+# libada doesn't support TAGS. -+TAGS-libada: -+ -+@endif libada -+ -+.PHONY: maybe-install-info-libada install-info-libada -+maybe-install-info-libada: -+@if libada -+maybe-install-info-libada: install-info-libada -+ -+# libada doesn't support install-info. -+install-info-libada: -+ -+@endif libada -+ -+.PHONY: maybe-install-pdf-libada install-pdf-libada -+maybe-install-pdf-libada: -+@if libada -+maybe-install-pdf-libada: install-pdf-libada -+ -+install-pdf-libada: \ -+ configure-libada \ -+ pdf-libada -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing install-pdf in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-pdf) \ -+ || exit 1 -+ -+@endif libada -+ -+.PHONY: maybe-install-html-libada install-html-libada -+maybe-install-html-libada: -+@if libada -+maybe-install-html-libada: install-html-libada -+ -+install-html-libada: \ -+ configure-libada \ -+ html-libada -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing install-html in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ install-html) \ -+ || exit 1 -+ -+@endif libada -+ -+.PHONY: maybe-installcheck-libada installcheck-libada -+maybe-installcheck-libada: -+@if libada -+maybe-installcheck-libada: installcheck-libada -+ -+# libada doesn't support installcheck. -+installcheck-libada: -+ -+@endif libada -+ -+.PHONY: maybe-mostlyclean-libada mostlyclean-libada -+maybe-mostlyclean-libada: -+@if libada -+maybe-mostlyclean-libada: mostlyclean-libada -+ -+mostlyclean-libada: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing mostlyclean in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ mostlyclean) \ -+ || exit 1 -+ -+@endif libada -+ -+.PHONY: maybe-clean-libada clean-libada -+maybe-clean-libada: -+@if libada -+maybe-clean-libada: clean-libada -+ -+clean-libada: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing clean in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ clean) \ -+ || exit 1 -+ -+@endif libada -+ -+.PHONY: maybe-distclean-libada distclean-libada -+maybe-distclean-libada: -+@if libada -+maybe-distclean-libada: distclean-libada -+ -+distclean-libada: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing distclean in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ distclean) \ -+ || exit 1 -+ -+@endif libada -+ -+.PHONY: maybe-maintainer-clean-libada maintainer-clean-libada -+maybe-maintainer-clean-libada: -+@if libada -+maybe-maintainer-clean-libada: maintainer-clean-libada -+ -+maintainer-clean-libada: -+ @: $(MAKE); $(unstage) -+ @[ -f ./libada/Makefile ] || exit 0; \ -+ r=`${PWD_COMMAND}`; export r; \ -+ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -+ $(HOST_EXPORTS) \ -+ for flag in $(EXTRA_HOST_FLAGS) ; do \ -+ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -+ done; \ -+ echo "Doing maintainer-clean in libada" ; \ -+ (cd $(HOST_SUBDIR)/libada && \ -+ $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -+ "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -+ "RANLIB=$${RANLIB}" \ -+ "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -+ maintainer-clean) \ -+ || exit 1 -+ -+@endif libada -+ -+ -+ - .PHONY: configure-gnattools maybe-configure-gnattools - maybe-configure-gnattools: - @if gcc-bootstrap -@@ -38934,12 +39267,6 @@ - maybe-check-gnattools: check-gnattools - - check-gnattools: -- @: $(MAKE); $(unstage) -- @r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(FLAGS_TO_PASS) check) - - @endif gnattools - -@@ -38965,24 +39292,8 @@ - @if gnattools - maybe-info-gnattools: info-gnattools - --info-gnattools: \ -- configure-gnattools -- @: $(MAKE); $(unstage) -- @[ -f ./gnattools/Makefile ] || exit 0; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- for flag in $(EXTRA_HOST_FLAGS) ; do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- echo "Doing info in gnattools" ; \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- info) \ -- || exit 1 -+# gnattools doesn't support info. -+info-gnattools: - - @endif gnattools - -@@ -38991,24 +39302,8 @@ - @if gnattools - maybe-dvi-gnattools: dvi-gnattools - --dvi-gnattools: \ -- configure-gnattools -- @: $(MAKE); $(unstage) -- @[ -f ./gnattools/Makefile ] || exit 0; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- for flag in $(EXTRA_HOST_FLAGS) ; do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- echo "Doing dvi in gnattools" ; \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- dvi) \ -- || exit 1 -+# gnattools doesn't support dvi. -+dvi-gnattools: - - @endif gnattools - -@@ -39043,24 +39338,8 @@ - @if gnattools - maybe-html-gnattools: html-gnattools - --html-gnattools: \ -- configure-gnattools -- @: $(MAKE); $(unstage) -- @[ -f ./gnattools/Makefile ] || exit 0; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- for flag in $(EXTRA_HOST_FLAGS) ; do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- echo "Doing html in gnattools" ; \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- html) \ -- || exit 1 -+# gnattools doesn't support html. -+html-gnattools: - - @endif gnattools - -@@ -39069,24 +39348,8 @@ - @if gnattools - maybe-TAGS-gnattools: TAGS-gnattools - --TAGS-gnattools: \ -- configure-gnattools -- @: $(MAKE); $(unstage) -- @[ -f ./gnattools/Makefile ] || exit 0; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- for flag in $(EXTRA_HOST_FLAGS) ; do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- echo "Doing TAGS in gnattools" ; \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- TAGS) \ -- || exit 1 -+# gnattools doesn't support TAGS. -+TAGS-gnattools: - - @endif gnattools - -@@ -39095,25 +39358,8 @@ - @if gnattools - maybe-install-info-gnattools: install-info-gnattools - --install-info-gnattools: \ -- configure-gnattools \ -- info-gnattools -- @: $(MAKE); $(unstage) -- @[ -f ./gnattools/Makefile ] || exit 0; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- for flag in $(EXTRA_HOST_FLAGS) ; do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- echo "Doing install-info in gnattools" ; \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- install-info) \ -- || exit 1 -+# gnattools doesn't support install-info. -+install-info-gnattools: - - @endif gnattools - -@@ -39176,24 +39422,8 @@ - @if gnattools - maybe-installcheck-gnattools: installcheck-gnattools - --installcheck-gnattools: \ -- configure-gnattools -- @: $(MAKE); $(unstage) -- @[ -f ./gnattools/Makefile ] || exit 0; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(HOST_EXPORTS) \ -- for flag in $(EXTRA_HOST_FLAGS) ; do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- echo "Doing installcheck in gnattools" ; \ -- (cd $(HOST_SUBDIR)/gnattools && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- installcheck) \ -- || exit 1 -+# gnattools doesn't support installcheck. -+installcheck-gnattools: - - @endif gnattools - -@@ -48296,13 +48526,8 @@ - @if target-libada - maybe-check-target-libada: check-target-libada - -+# Dummy target for uncheckable module. - check-target-libada: -- @: $(MAKE); $(unstage) -- @r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(TARGET_FLAGS_TO_PASS) check) - - @endif target-libada - -@@ -48311,13 +48536,8 @@ - @if target-libada - maybe-install-target-libada: install-target-libada - --install-target-libada: installdirs -- @: $(MAKE); $(unstage) -- @r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(TARGET_FLAGS_TO_PASS) install) -+# Dummy target for uninstallable. -+install-target-libada: - - @endif target-libada - -@@ -48328,24 +48548,8 @@ - @if target-libada - maybe-info-target-libada: info-target-libada - --info-target-libada: \ -- configure-target-libada -- @: $(MAKE); $(unstage) -- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- echo "Doing info in $(TARGET_SUBDIR)/libada" ; \ -- for flag in $(EXTRA_TARGET_FLAGS); do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- info) \ -- || exit 1 -+# libada doesn't support info. -+info-target-libada: - - @endif target-libada - -@@ -48354,24 +48558,8 @@ - @if target-libada - maybe-dvi-target-libada: dvi-target-libada - --dvi-target-libada: \ -- configure-target-libada -- @: $(MAKE); $(unstage) -- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- echo "Doing dvi in $(TARGET_SUBDIR)/libada" ; \ -- for flag in $(EXTRA_TARGET_FLAGS); do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- dvi) \ -- || exit 1 -+# libada doesn't support dvi. -+dvi-target-libada: - - @endif target-libada - -@@ -48406,24 +48594,8 @@ - @if target-libada - maybe-html-target-libada: html-target-libada - --html-target-libada: \ -- configure-target-libada -- @: $(MAKE); $(unstage) -- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- echo "Doing html in $(TARGET_SUBDIR)/libada" ; \ -- for flag in $(EXTRA_TARGET_FLAGS); do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- html) \ -- || exit 1 -+# libada doesn't support html. -+html-target-libada: - - @endif target-libada - -@@ -48432,24 +48604,8 @@ - @if target-libada - maybe-TAGS-target-libada: TAGS-target-libada - --TAGS-target-libada: \ -- configure-target-libada -- @: $(MAKE); $(unstage) -- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- echo "Doing TAGS in $(TARGET_SUBDIR)/libada" ; \ -- for flag in $(EXTRA_TARGET_FLAGS); do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- TAGS) \ -- || exit 1 -+# libada doesn't support TAGS. -+TAGS-target-libada: - - @endif target-libada - -@@ -48458,25 +48614,8 @@ - @if target-libada - maybe-install-info-target-libada: install-info-target-libada - --install-info-target-libada: \ -- configure-target-libada \ -- info-target-libada -- @: $(MAKE); $(unstage) -- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- echo "Doing install-info in $(TARGET_SUBDIR)/libada" ; \ -- for flag in $(EXTRA_TARGET_FLAGS); do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- install-info) \ -- || exit 1 -+# libada doesn't support install-info. -+install-info-target-libada: - - @endif target-libada - -@@ -48539,24 +48678,8 @@ - @if target-libada - maybe-installcheck-target-libada: installcheck-target-libada - --installcheck-target-libada: \ -- configure-target-libada -- @: $(MAKE); $(unstage) -- @[ -f $(TARGET_SUBDIR)/libada/Makefile ] || exit 0 ; \ -- r=`${PWD_COMMAND}`; export r; \ -- s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ -- $(NORMAL_TARGET_EXPORTS) \ -- echo "Doing installcheck in $(TARGET_SUBDIR)/libada" ; \ -- for flag in $(EXTRA_TARGET_FLAGS); do \ -- eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ -- done; \ -- (cd $(TARGET_SUBDIR)/libada && \ -- $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ -- "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ -- "RANLIB=$${RANLIB}" \ -- "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ -- installcheck) \ -- || exit 1 -+# libada doesn't support installcheck. -+installcheck-target-libada: - - @endif target-libada - -@@ -51490,7 +51613,7 @@ - all-stageprofile-libcpp: maybe-all-stageprofile-intl - all-stagefeedback-libcpp: maybe-all-stagefeedback-intl - all-fixincludes: maybe-all-libiberty --all-gnattools: maybe-all-target-libada -+all-gnattools: maybe-all-libada - configure-mpfr: maybe-all-gmp - - configure-stage1-mpfr: maybe-all-stage1-gmp -Index: configure.ac -=================================================================== ---- configure.ac.orig 2008-01-29 12:10:06.002765243 +0100 -+++ configure.ac 2008-01-29 12:16:44.744812017 +0100 -@@ -155,7 +155,7 @@ - - # these libraries are used by various programs built for the host environment - # --host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr" -+host_libs="intl mmalloc libiberty opcodes bfd readline tcl tk itcl libgui zlib libcpp libdecnumber gmp mpfr libada" - - # these tools are built for the host environment - # Note, the powerpc-eabi build depends on sim occurring before gdb in order to -@@ -263,7 +263,7 @@ - - # Similarly, some are only suitable for cross toolchains. - # Remove these if host=target. --cross_only="target-libgloss target-newlib target-opcodes" -+cross_only="target-libgloss target-newlib target-opcodes target-libada" - - case $is_cross_compiler in - no) skipdirs="${skipdirs} ${cross_only}" ;; diff --git a/recipes/gcc/gcc-svn/debian/ada-sjlj.dpatch b/recipes/gcc/gcc-svn/debian/ada-sjlj.dpatch deleted file mode 100644 index 8d480302d5..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-sjlj.dpatch +++ /dev/null @@ -1,1307 +0,0 @@ -#! /bin/sh -e - -# DP: There are two exception mechanisms to choose from: zero-cost and -# DP: setjump/longjump. The Ada run-time library uses either of them -# DP: but not both. Build both versions of the run-time library. - -# This patch changes the way the upstream Makefiles build the run-time -# library. Before the patch: libada/Makefile calls gcc/ada/Makefile, -# which builds the "rts" subdirectory containing symbolic links to -# most source files, and modified copies of a few source files (to -# take target dependencies into account, and also to select the -# exception handling mechanism in system.ads). Then, gcc/ada/Makefile -# calls itself recursively but in the "rts" subdirectory and builds -# libgnat.a and libgnarl.a (and a couple other libraries: -# libgccprefix.a, libgmem.a). Upon return from this recursive call, -# it deletes the source and object files from "rts", reconstructs the -# source files, and builds libgnat.so and libgnarl.so by calling -# itself recursively a second time in the "rts" directory. - -# Furthermore, gcc/ada/Makefile disables parallel makes, so building -# the static and then shared versions of the RTS is entirely -# sequential even on SMP systems. - -# As a consequence of the above, building the SJLJ version of the -# library would overwrite the ZCX version. Thus it is necessary to -# manually save the previous version of the library before building the -# second one. - -# After the patch: libada/Makefile calls gcc/ada/Makefile, which -# builds the source directory (named gnatlib-sources instead of rts), -# containing the symbolic links and target-dependent files. - -# In a second step, libada/Makefile calls gcc/ada/Makefile again to -# build the targets gnatlib-shared-zcx, gnatlib-static-zcx and -# gnatlib-static-sjlj (we could also build gnatlib-shared-sjlj, but -# that triggers compiler errors on PowerPC). - -# Each of these three targets copies the source directory "rts" into a -# new directory named rts-shared-zcx, rts-static-zcx or -# rts-static-sjlj. In the new directory, they change the value of -# System.ZCX_By_Default, and then they call gcc/ada/Makefile -# recursively in the new directory to build the library. - -# gcc/ada/Makefile.in has a .NOTPARALLEL directive preventing it from -# launching commands in parallel. However, libada/Makefile has no -# such directive and can invoke up to three instances of -# gcc/ada/Makefile.in in parallel. This is okay because each of them -# runs in a different directory. - -# This patch also updates libgnat{vsn,prj}/Makefile and -# gnattools/Makefile to look for the shared ZCX version of the library -# in the appropriate directory, rather than just "rts", and updates -# the "make install" and binary targets as well. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p1 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - - -Index: src/libada/Makefile.in -=================================================================== ---- src.orig/libada/Makefile.in -+++ src/libada/Makefile.in -@@ -16,7 +16,8 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - - # Default target; must be first. --all: gnatlib -+GNATLIB = gnatlib-static-zcx gnatlib-static-sjlj gnatlib-shared-zcx -+all: $(GNATLIB) - - # Standard autoconf-set variables. - SHELL = @SHELL@ -@@ -78,30 +79,38 @@ - "CFLAGS=$(CFLAGS) $(WARN_CFLAGS)" - - # Rules to build gnatlib. --.PHONY: gnatlib gnatlib-plain gnatlib-sjlj gnatlib-zcx gnatlib-shared --gnatlib: @default_gnatlib_target@ -+.PHONY: $(GNATLIB) - --gnatlib-plain: $(GCC_DIR)/ada/Makefile -- test -f stamp-libada || \ -+$(GCC_DIR)/ada/gnatlib-sources-sjlj/a-except.ads: - $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ - TRACE="$(TRACE)" \ -- gnatlib \ -- && touch stamp-libada -+ EH_MECHANISM="" \ -+ gnatlib-sources-sjlj/a-except.ads - --gnatlib-sjlj gnatlib-zcx gnatlib-shared: $(GCC_DIR)/ada/Makefile -- test -f stamp-libada || \ -+$(GCC_DIR)/ada/gnatlib-sources-zcx/a-except.ads: - $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ - TRACE="$(TRACE)" \ -- $@ \ -- && touch stamp-libada -+ EH_MECHANISM="-gcc" \ -+ gnatlib-sources-zcx/a-except.ads -+ -+$(GNATLIB): $(GCC_DIR)/ada/Makefile \ -+$(GCC_DIR)/ada/gnatlib-sources-zcx/a-except.ads \ -+$(GCC_DIR)/ada/gnatlib-sources-sjlj/a-except.ads -+ $(MAKE) -C $(GCC_DIR)/ada $(FLAGS_TO_PASS) \ -+ GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -+ GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ -+ TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ -+ THREAD_KIND="$(THREAD_KIND)" \ -+ TRACE="$(TRACE)" \ -+ $@ - - # Check uninstalled version. - check: -Index: src/libada/configure -=================================================================== ---- src.orig/libada/configure -+++ src/libada/configure -@@ -1552,17 +1552,6 @@ - *) x_ada_cflags= ;; - esac - -- --# Determine what to build for 'gnatlib' --if test $build = $target \ -- && test ${enable_shared} = yes ; then -- # Note that build=target is almost certainly the wrong test; FIXME -- default_gnatlib_target="gnatlib-shared" --else -- default_gnatlib_target="gnatlib-plain" --fi -- -- - # Output: create a Makefile. - ac_config_files="$ac_config_files Makefile" - -@@ -2222,7 +2211,6 @@ - s,@enable_shared@,$enable_shared,;t t - s,@LN_S@,$LN_S,;t t - s,@x_ada_cflags@,$x_ada_cflags,;t t --s,@default_gnatlib_target@,$default_gnatlib_target,;t t - s,@LIBOBJS@,$LIBOBJS,;t t - s,@LTLIBOBJS@,$LTLIBOBJS,;t t - CEOF -Index: src/gcc/ada/Makefile.in -=================================================================== ---- src.orig/gcc/ada/Makefile.in -+++ src/gcc/ada/Makefile.in -@@ -1324,6 +1324,50 @@ - LIBRARY_VERSION := $(LIB_VERSION) - endif - -+ifeq ($(strip $(filter-out mips linux%,$(arch) $(osys))),) -+ LIBGNAT_TARGET_PAIRS = \ -+ a-intnam.ads<a-intnam-linux.ads \ -+ g-soccon.ads<g-soccon-linux-mips.ads \ -+ s-inmaop.adb<s-inmaop-posix.adb \ -+ s-intman.adb<s-intman-posix.adb \ -+ s-osinte.adb<s-osinte-posix.adb \ -+ s-osinte.ads<s-osinte-linux.ads \ -+ s-osprim.adb<s-osprim-posix.adb \ -+ s-taprop.adb<s-taprop-linux.adb \ -+ s-taspri.ads<s-taspri-posix.ads \ -+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \ -+ system.ads<system-linux-mips.ads -+ -+ EH_MECHANISM=-gcc -+ THREADSLIB = -lpthread -+ GNATLIB_SHARED = gnatlib-shared-dual -+ GMEM_LIB = gmemlib -+ PREFIX_OBJS = $(PREFIX_REAL_OBJS) -+ LIBRARY_VERSION := $(LIB_VERSION) -+endif -+ -+ifeq ($(strip $(filter-out mipsel linux%,$(arch) $(osys))),) -+ LIBGNAT_TARGET_PAIRS = \ -+ a-intnam.ads<a-intnam-linux.ads \ -+ g-soccon.ads<g-soccon-linux-mips.ads \ -+ s-inmaop.adb<s-inmaop-posix.adb \ -+ s-intman.adb<s-intman-posix.adb \ -+ s-osinte.adb<s-osinte-posix.adb \ -+ s-osinte.ads<s-osinte-linux.ads \ -+ s-osprim.adb<s-osprim-posix.adb \ -+ s-taprop.adb<s-taprop-linux.adb \ -+ s-taspri.ads<s-taspri-posix.ads \ -+ s-tpopsp.adb<s-tpopsp-posix-foreign.adb \ -+ system.ads<system-linux-mipsel.ads -+ -+ EH_MECHANISM=-gcc -+ THREADSLIB = -lpthread -+ GNATLIB_SHARED = gnatlib-shared-dual -+ GMEM_LIB = gmemlib -+ PREFIX_OBJS = $(PREFIX_REAL_OBJS) -+ LIBRARY_VERSION := $(LIB_VERSION) -+endif -+ - ifeq ($(strip $(filter-out sparc% linux%,$(arch) $(osys))),) - LIBGNAT_TARGET_PAIRS = \ - a-intnam.ads<a-intnam-linux.ads \ -@@ -1563,53 +1607,79 @@ - a-[a-o]*.adb a-[p-z]*.adb a-[a-o]*.ads a-[p-z]*.ads g-*.ad? i-*.ad? \ - s-[a-o]*.adb s-[p-z]*.adb s-[a-o]*.ads s-[p-z]*.ads - --../stamp-gnatlib: -- @if [ ! -f stamp-gnatlib ] ; \ -- then \ -- $(ECHO) You must first build the GNAT library: make gnatlib; \ -- false; \ -- else \ -- true; \ -- fi -+libgnat = libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) -+libgnat-sjlj = libgnat$(hyphen)sjlj$(hyphen)$(LIBRARY_VERSION)$(soext) - --install-gnatlib: ../stamp-gnatlib -+install-gnatlib: rts-static-zcx/libgnat$(arext) rts-static-sjlj/libgnat$(arext) -+install-gnatlib: rts-shared-zcx/$(libgnat) - # Create the directory before deleting it, in case the directory is - # a list of directories (as it may be on VMS). This ensures we are - # deleting the right one. -- -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) -- -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) -- $(RMDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) -- $(RMDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) -- -$(MKDIR) $(DESTDIR)$(ADA_RTL_OBJ_DIR) -- -$(MKDIR) $(DESTDIR)$(ADA_INCLUDE_DIR) -- for file in rts/*.ali; do \ -- $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ -+ -$(MKDIR) $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR) -+ -$(MKDIR) $(DESTDIR)$(ADA_NATIVE_INCLUDE_DIR) -+ $(RMDIR) $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR) -+ $(RMDIR) $(DESTDIR)$(ADA_NATIVE_INCLUDE_DIR) -+ -$(MKDIR) $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR) -+ -$(MKDIR) $(DESTDIR)$(ADA_NATIVE_INCLUDE_DIR) -+ -+ -$(MKDIR) $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR) -+ -$(MKDIR) $(DESTDIR)$(ADA_SJLJ_INCLUDE_DIR) -+ $(RMDIR) $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR) -+ $(RMDIR) $(DESTDIR)$(ADA_SJLJ_INCLUDE_DIR) -+ -$(MKDIR) $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR) -+ -$(MKDIR) $(DESTDIR)$(ADA_SJLJ_INCLUDE_DIR) -+ -+ for file in rts-shared-zcx/*.ali; do \ -+ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR); \ -+ done -+ for file in rts-static-sjlj/*.ali; do \ -+ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR); \ -+ done -+ -+ -cd rts-static-zcx; for file in *$(arext);do \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR); \ -+ $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR)/$$file; \ - done -- -cd rts; for file in *$(arext);do \ -- $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ -- $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \ -+ -cd rts-static-sjlj; for file in *$(arext);do \ -+ $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR); \ -+ $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR)/$$file; \ - done -+ -+ -$(foreach file, $(EXTRA_ADALIB_FILES), \ -+ $(INSTALL_DATA_DATE) rts-static-zcx/$(file) $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR) && \ -+ ) true - -$(foreach file, $(EXTRA_ADALIB_FILES), \ -- $(INSTALL_DATA_DATE) rts/$(file) $(DESTDIR)$(ADA_RTL_OBJ_DIR) && \ -+ $(INSTALL_DATA_DATE) rts-static-sjlj/$(file) $(DESTDIR)$(ADA_SJLJ_RTL_OBJ_DIR) && \ - ) true -+ - # Install the shared libraries, if any, using $(INSTALL) instead - # of $(INSTALL_DATA). The latter may force a mode inappropriate - # for shared libraries on some targets, e.g. on HP-UX where the x - # permission is required. - for file in gnat gnarl; do \ -- if [ -f rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext) ]; then \ -- $(INSTALL) rts/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -- $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ -+ if [ -f rts-shared-zcx/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 ]; then \ -+ $(INSTALL) rts-shared-zcx/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -+ $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR); \ - $(LN_S) lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -- $(DESTDIR)$(ADA_RTL_OBJ_DIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext); \ -+ $(DESTDIR)$(ADA_NATIVE_RTL_OBJ_DIR)/lib$${file}$(hyphen)$(LIBRARY_VERSION)$(soext); \ - fi; \ - done -+ - # This copy must be done preserving the date on the original file. -- for file in rts/*.ad?; do \ -- $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_INCLUDE_DIR); \ -+ for file in rts-shared-zcx/*.adb rts-shared-zcx/*.ads; do \ -+ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_NATIVE_INCLUDE_DIR); \ -+ done -+ $(CHMOD) u=rw,go=r $(DESTDIR)$(ADA_NATIVE_INCLUDE_DIR)/*.adb -+ $(CHMOD) u=rw,go=r $(DESTDIR)$(ADA_NATIVE_INCLUDE_DIR)/*.ads -+ for file in rts-static-sjlj/*.adb rts-static-sjlj/*.ads; do \ -+ $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_SJLJ_INCLUDE_DIR); \ - done -- cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.adb -- cd $(DESTDIR)$(ADA_INCLUDE_DIR); $(CHMOD) a-wx *.ads -+ $(CHMOD) u=rw,go=r $(DESTDIR)$(ADA_SJLJ_INCLUDE_DIR)/*.adb -+ $(CHMOD) u=rw,go=r $(DESTDIR)$(ADA_SJLJ_INCLUDE_DIR)/*.ads -+ -+ (cd $(DESTDIR)$(libsubdir); \ -+ ln -s rts-native/adainclude adainclude; \ -+ ln -s rts-native/adalib adalib;) - - # NOTE: The $(foreach ...) commands assume ";" is the valid separator between - # successive target commands. Although the Gnu make documentation -@@ -1620,23 +1690,30 @@ - - # GNULLI Begin ########################################################### - --../stamp-gnatlib1: Makefile -- $(RMDIR) rts -- $(MKDIR) rts -- $(CHMOD) u+w rts -+replace_zcx_by_default=\ -+'s/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := $(zcx_by_default);/' -+ -+gnatlib-sources-zcx/a-except.ads: dir=$(dir $@) -+gnatlib-sources-zcx/a-except.ads: zcx_by_default=True -+ -+gnatlib-sources-sjlj/a-except.ads: dir=$(dir $@) -+gnatlib-sources-sjlj/a-except.ads: zcx_by_default=False -+ -+gnatlib-sources-zcx/a-except.ads gnatlib-sources-sjlj/a-except.ads: -+ $(MKDIR) $(dir) -+ $(CHMOD) u+w $(dir) - # Copy target independent sources - $(foreach f,$(ADA_INCLUDE_SRCS) $(LIBGNAT_SRCS), \ -- $(LN_S) $(fsrcpfx)$(f) rts ;) true -+ $(LN_S) $(fsrcpfx)$(f) $(dir) ;) true - # Remove files to be replaced by target dependent sources - $(RM) $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ -- rts/$(word 1,$(subst <, ,$(PAIR)))) -- $(RM) rts/*-*-*.ads rts/*-*-*.adb -+ $(dir)/$(word 1,$(subst <, ,$(PAIR)))) -+ $(RM) $(dir)/*-*-*.ads $(dir)/*-*-*.adb - # Copy new target dependent sources - $(foreach PAIR,$(LIBGNAT_TARGET_PAIRS), \ - $(LN_S) $(fsrcpfx)$(word 2,$(subst <, ,$(PAIR))) \ -- rts/$(word 1,$(subst <, ,$(PAIR)));) -- $(RM) ../stamp-gnatlib -- touch ../stamp-gnatlib1 -+ $(dir)/$(word 1,$(subst <, ,$(PAIR)));) -+ sed -e $(replace_zcx_by_default) $(dir)/system.ads > $(dir)/s.ads - - # GNULLI End ############################################################# - -@@ -1646,57 +1723,60 @@ - # Example: cd rts; ar rc libfoo.a $(LONG_LIST_OF_OBJS) - # is guaranteed to overflow the buffer. - --gnatlib: ../stamp-gnatlib1 -- $(MAKE) -C rts \ -+%/libgnat$(arext): build_dir = $(dir $@) -+%/libgnat$(arext): libgnarl = $(subst libgnat,libgnarl,$@) -+%/libgnat$(arext): libgnala = $(subst libgnat,libgnala,$@) -+%/libgnat$(arext): % -+ $(MAKE) -C $(build_dir) \ - CC="`echo \"$(GCC_FOR_TARGET)\" \ - | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ -- INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ -- CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \ -- FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \ -+ INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ -+ CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \ - srcdir=$(fsrcdir) \ -- -f ../Makefile $(LIBGNAT_OBJS) -- $(MAKE) -C rts \ -+ -f ../Makefile $(LIBGNAT_OBJS) -+ $(MAKE) -C $(build_dir) \ - CC="`echo \"$(GCC_FOR_TARGET)\" \ - | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ -- ADA_INCLUDES="" \ -- CFLAGS="$(GNATLIBCFLAGS)" \ -- ADAFLAGS="$(GNATLIBFLAGS)" \ -- FORCE_DEBUG_ADAFLAGS="$(FORCE_DEBUG_ADAFLAGS)" \ -+ ADA_INCLUDES="" \ -+ CFLAGS="$(GNATLIBCFLAGS)" \ -+ ADAFLAGS="$(GNATLIBFLAGS)" \ - srcdir=$(fsrcdir) \ -- -f ../Makefile \ -- $(GNATRTL_OBJS) -- $(RM) rts/libgnat$(arext) rts/libgnarl$(arext) -- $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgnat$(arext) \ -- $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) g-trasym.o convert_addresses.o) -+ -f ../Makefile \ -+ $(GNATRTL_OBJS) -+ $(RM) $@ $(libgnarl) -+ $(AR_FOR_TARGET) $(AR_FLAGS) $@ \ -+ $(addprefix $(build_dir),$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) g-trasym.o convert_addresses.o) - ifneq ($(PREFIX_OBJS),) -- $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgccprefix$(arext) \ -+ $(AR_FOR_TARGET) $(AR_FLAGS) $(build_dir)libgccprefix$(arext) \ - $(PREFIX_OBJS); -- $(RANLIB_FOR_TARGET) rts/libgccprefix$(arext) -+ $(RANLIB_FOR_TARGET) $(build_dir)libgccprefix$(arext) - endif -- $(RANLIB_FOR_TARGET) rts/libgnat$(arext) -- $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgnarl$(arext) \ -- $(addprefix rts/,$(GNATRTL_TASKING_OBJS)) -- $(RANLIB_FOR_TARGET) rts/libgnarl$(arext) -- $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgnala$(arext) \ -- $(addprefix rts/,$(GNATRTL_LINEARALGEBRA_OBJS)) -- $(RANLIB_FOR_TARGET) rts/libgnala$(arext) -+ $(RANLIB_FOR_TARGET) $@ -+ $(AR_FOR_TARGET) $(AR_FLAGS) $(libgnarl) \ -+ $(addprefix $(build_dir),$(GNATRTL_TASKING_OBJS)) -+ $(RANLIB_FOR_TARGET) $(libgnarl) -+ $(AR_FOR_TARGET) $(AR_FLAGS) $(libgnala) \ -+ $(addprefix $(build_dir),$(GNATRTL_LINEARALGEBRA_OBJS)) -+ $(RANLIB_FOR_TARGET) $(libgnala) - ifeq ($(GMEM_LIB),gmemlib) -- $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgmem$(arext) \ -- rts/memtrack.o -- $(RANLIB_FOR_TARGET) rts/libgmem$(arext) -+ $(AR_FOR_TARGET) $(AR_FLAGS) $(build_dir)libgmem$(arext) \ -+ $(build_dir)memtrack.o -+ $(RANLIB_FOR_TARGET) $(build_dir)libgmem$(arext) - endif -- touch ../stamp-gnatlib - - # Warning: this target assumes that LIBRARY_VERSION has been set correctly. --gnatlib-shared-default: ../stamp-gnatlib1 -- $(MAKE) -C rts \ -+%/$(libgnat) %/$(libgnat-sjlj): build_dir = $(dir $@) -+%/$(libgnat) %/$(libgnat-sjlj): libgnarl = $(notdir $(subst libgnat,libgnarl,$@)) -+%/$(libgnat) %/$(libgnat-sjlj): libgnala = $(notdir $(subst libgnat,libgnala,$@)) -+%/$(libgnat) %/$(libgnat-sjlj): % -+ $(MAKE) -C $(build_dir) \ - CC="`echo \"$(GCC_FOR_TARGET)\" \ - | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ - INCLUDES="$(INCLUDES_FOR_SUBDIR) -I./../.." \ - CFLAGS="$(GNATLIBCFLAGS_FOR_C)" \ - srcdir=$(fsrcdir) \ - -f ../Makefile $(LIBGNAT_OBJS) -- $(MAKE) -C rts \ -+ $(MAKE) -C $(build_dir) \ - CC="`echo \"$(GCC_FOR_TARGET)\" \ - | sed -e 's,^\./xgcc,../../xgcc,' -e 's,-B\./,-B../../,'`" \ - ADA_INCLUDES="" \ -@@ -1706,157 +1786,75 @@ - srcdir=$(fsrcdir) \ - -f ../Makefile \ - $(GNATRTL_OBJS) -- $(RM) rts/libgna*$(soext) rts/libgna*$(soext).1 -- cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ -+ $(RM) $(build_dir)/libgna*$(soext) $(build_dir)/libgna*$(soext).1 -+ cd $(build_dir); ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ - $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -+ -o $(notdir $@).1 \ - $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ - g-trasym.o convert_addresses.o \ -- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -+ $(SO_OPTS)$(notdir $@).1 \ - $(MISCLIB) -lm -- cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ -+ cd $(build_dir); $(LN_S) $(notdir $@).1 $(notdir $@) -+ cd $(build_dir); ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ - $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -+ -o $(libgnarl).1 \ - $(GNATRTL_TASKING_OBJS) \ -- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext).1 \ -+ $(SO_OPTS)$(libgnarl).1 \ - $(THREADSLIB) -- cd rts; for lib in gnat gnarl; do \ -- l=lib$${lib}$(hyphen)$(LIBRARY_VERSION)$(soext); \ -- $(LN_S) $$l.1 $$l; \ -- done --# Delete the object files, lest they be linked statically into the tools --# executables. Only the .ali, .a and .so files must remain. -- rm -f rts/*.o -- $(CHMOD) a-wx rts/*.ali -- --gnatlib-shared-dual: -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(RM) rts/*.o rts/*.ali -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib-shared-default -- --gnatlib-shared-dual-win32: -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(RM) rts/*.o rts/*.ali -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib-shared-win32 -- --# ??? we need to add the option to support auto-import of arrays/records to --# the GNATLIBFLAGS when this will be supported by GNAT. At this point we will --# use the gnatlib-shared-dual-win32 target to build the GNAT runtimes on --# Windows. --gnatlib-shared-win32: -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(RM) rts/libgna*$(soext) -- cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ -- $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) $(MISCLIB) -- cd rts; ../../xgcc -B../../ -shared $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- $(GNATRTL_TASKING_OBJS) \ -- $(SO_OPTS)libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) -- --gnatlib-shared-darwin: -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) \ -- -fno-common" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(RM) rts/libgnat$(soext) rts/libgnarl$(soext) -- cd rts; ../../xgcc -B../../ -dynamiclib $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ -- $(SO_OPTS) \ -- $(MISCLIB) -lm -- cd rts; ../../xgcc -B../../ -dynamiclib $(TARGET_LIBGCC2_CFLAGS) \ -- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- $(GNATRTL_TASKING_OBJS) \ -- $(SO_OPTS) \ -- $(THREADSLIB) -Wl,libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) -- cd rts; $(LN_S) libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- libgnat$(soext) -- cd rts; $(LN_S) libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- libgnarl$(soext) -- --gnatlib-shared-vms: -- $(MAKE) $(FLAGS_TO_PASS) \ -- GNATLIBFLAGS="$(GNATLIBFLAGS)" \ -- GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ -- THREAD_KIND="$(THREAD_KIND)" \ -- gnatlib -- $(RM) rts/libgna*$(soext) -- cd rts && echo "case_sensitive=yes" > SYMVEC_$$$$.opt && \ -- objdump --syms $(LIBGNAT_OBJS) $(GNATRTL_NONTASKING_OBJS) | \ -- $(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt && \ -- echo "case_sensitive=NO" >> SYMVEC_$$$$.opt && \ -- ../../xgcc -g -B../../ -shared -shared-libgcc \ -- -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) libgnat.a \ -- sys\$$library:trace.exe \ -- --for-linker=/noinform \ -- --for-linker=SYMVEC_$$$$.opt \ -- --for-linker=gsmatch=equal,$(GSMATCH_VERSION) -- cd rts && echo "case_sensitive=yes" > SYMVEC_$$$$.opt && \ -- objdump --syms $(GNATRTL_TASKING_OBJS) | \ -- $(SHLIB_SYMVEC) >> SYMVEC_$$$$.opt && \ -- echo "case_sensitive=NO" >> SYMVEC_$$$$.opt && \ -- ../../xgcc -g -B../../ -shared -shared-libgcc \ -- -o libgnarl$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- libgnarl.a libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ -- sys\$$library:trace.exe \ -- --for-linker=/noinform \ -- --for-linker=SYMVEC_$$$$.opt \ -- --for-linker=gsmatch=equal,$(GSMATCH_VERSION) -+ cd $(build_dir); $(LN_S) $(libgnarl).1 $(libgnarl) -+# TODO: enable building the shared libgnala -+ifeq (libgnala-shared-enabled,yes) -+ cd $(build_dir); ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ -+ $(TARGET_LIBGCC2_CFLAGS) \ -+ -o $(libgnala).1 \ -+ $(GNATRTL_LINEARALGEBRA_OBJS) \ -+ $(SO_OPTS)$(libgnala).1 -+ cd $(build_dir); $(LN_S) $(libgnala).1 $(libgnala) -+endif - --gnatlib-shared: -+gnatlib-shared-dual: gnatlib-static-zcx gnatlib-static-sjlj gnatlib-shared-zcx -+ -+gnatlib-shared-zcx: rts = $(subst gnatlib,rts,$@) -+gnatlib-shared-zcx: gnatlib-sources-zcx/a-except.ads -+ if [ ! -d $(rts) ] ; then \ -+ cp -a gnatlib-sources-zcx $(rts); \ -+ $(MV) $(rts)/s.ads $(rts)/system.ads; \ -+ fi - $(MAKE) $(FLAGS_TO_PASS) \ -+ EH_MECHANISM="-gcc" \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ - TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ -- $(GNATLIB_SHARED) -+ $(rts)/$(libgnat) - --gnatlib-sjlj: -- $(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="" ../stamp-gnatlib1 -- sed -e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := False;/' rts/system.ads > rts/s.ads -- $(MV) rts/s.ads rts/system.ads -+gnatlib-static-sjlj: rts = $(subst gnatlib,rts,$@) -+gnatlib-static-sjlj: gnatlib-sources-sjlj/a-except.ads -+ if [ ! -d $(rts) ] ; then \ -+ cp -a gnatlib-sources-sjlj $(rts); \ -+ $(MV) $(rts)/s.ads $(rts)/system.ads; \ -+ fi - $(MAKE) $(FLAGS_TO_PASS) \ - EH_MECHANISM="" \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ -- TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" gnatlib -+ TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ -+ $(rts)/libgnat$(arext) - --gnatlib-zcx: -- $(MAKE) $(FLAGS_TO_PASS) EH_MECHANISM="-gcc" ../stamp-gnatlib1 -- sed -e 's/ZCX_By_Default.*/ZCX_By_Default : constant Boolean := True;/' rts/system.ads > rts/s.ads -- $(MV) rts/s.ads rts/system.ads -+gnatlib-static-zcx: rts = $(subst gnatlib,rts,$@) -+gnatlib-static-zcx: gnatlib-sources-zcx/a-except.ads -+ if [ ! -d $(rts) ] ; then \ -+ cp -a gnatlib-sources-zcx $(rts); \ -+ $(MV) $(rts)/s.ads $(rts)/system.ads; \ -+ fi - $(MAKE) $(FLAGS_TO_PASS) \ - EH_MECHANISM="-gcc" \ - GNATLIBFLAGS="$(GNATLIBFLAGS)" \ - GNATLIBCFLAGS="$(GNATLIBCFLAGS)" \ - THREAD_KIND="$(THREAD_KIND)" \ -- TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" gnatlib -+ TARGET_LIBGCC2_CFLAGS="$(TARGET_LIBGCC2_CFLAGS)" \ -+ $(rts)/libgnat$(arext) - - # .s files for cross-building - gnat-cross: force -@@ -1864,6 +1862,10 @@ - - ADA_INCLUDE_DIR = $(libsubdir)/adainclude - ADA_RTL_OBJ_DIR = $(libsubdir)/adalib -+ADA_NATIVE_INCLUDE_DIR = $(libsubdir)/rts-native/adainclude -+ADA_NATIVE_RTL_OBJ_DIR = $(libsubdir)/rts-native/adalib -+ADA_SJLJ_INCLUDE_DIR = $(libsubdir)/rts-sjlj/adainclude -+ADA_SJLJ_RTL_OBJ_DIR = $(libsubdir)/rts-sjlj/adalib - - # force no sibling call optimization on s-traceb.o so the number of stack - # frames to be skipped when computing a call chain is not modified by -Index: src/gnattools/Makefile.in -=================================================================== ---- src.orig/gnattools/Makefile.in -+++ src/gnattools/Makefile.in -@@ -34,12 +34,13 @@ - LN_S=@LN_S@ - target_noncanonical=@target_noncanonical@ - -+RTS=../gcc/ada/rts-shared-zcx - CFLAGS=-O2 -Wall - ADA_CFLAGS=-O2 -gnatn --ADA_INCLUDES=-nostdinc -I- -I. -I../gcc/ada/rts -I../libgnatvsn -I../libgnatprj -+ADA_INCLUDES=-nostdinc -I- -I. -I$(RTS) -I../libgnatvsn -I../libgnatprj - LIB_VERSION=$(strip $(shell grep ' Library_Version :' \ - ../libgnatvsn/gnatvsn.ads | sed -e 's/.*"\(.*\)".*/\1/')) --ADA_LIBS := -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -+ADA_LIBS := -L$(RTS) -lgnat-$(LIB_VERSION) - ADA_LIBS += -L../libgnatvsn -lgnatvsn - ADA_LIBS += -L../libgnatprj -lgnatprj - -@@ -109,6 +110,7 @@ - - .PHONY: gnattools gnattools-native gnattools-cross regnattools - gnattools: @default_gnattools_target@ -+ (cd $(RTS); if [ -d obj ]; then mv obj/* .; rmdir obj; fi) - - BODIES := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o,@srcdir@/../gcc/ada/%.adb,$(f)))) - SPECS := $(foreach f,$(OBJECTS),$(wildcard $(patsubst %.o,@srcdir@/../gcc/ada/%.ads,$(f)))) -@@ -119,9 +121,12 @@ - for file in $(BODIES) $(SPECS); do \ - $(LN_S) -f $$file .; \ - done -+# Move the RTS object files away lest they be linked statically into the -+# tools. Only the .ali, .a and .so files must remain. -+ (cd $(RTS); mkdir obj; mv *.o obj; chmod a-wx *.ali) - touch $@ - --gnattools-native: ../gcc/ada/rts/libgnat-$(LIB_VERSION).so -+gnattools-native: $(RTS)/libgnat-$(LIB_VERSION).so - gnattools-native: ../libgnatvsn/libgnatvsn.so - gnattools-native: stamp-gnattools-sources - gnattools-native: $(TOOLS) gnatbl -@@ -137,7 +142,7 @@ - $(GCC) -o $@ $^ \ - ../libgnatprj/libgnatprj.a \ - ../libgnatvsn/libgnatvsn.a \ -- ../gcc/ada/rts/libgnat.a \ -+ ../gcc/ada/rts-static-zcx/libgnat.a \ - ../libiberty/libiberty.a - - gnatlink: $(GNATLINK_OBJS) b_gnatl.o -@@ -155,7 +160,7 @@ - $(GCC) -o $@ $(ADA_CFLAGS) $^ \ - ../libgnatprj/libgnatprj.a \ - ../libgnatvsn/libgnatvsn.a \ -- ../gcc/ada/rts/libgnat.a \ -+ ../gcc/ada/rts-static-zcx/libgnat.a \ - ../libiberty/libiberty.a - - gnatmake: $(GNATMAKE_OBJS) b_gnatm.o -Index: src/libgnatprj/Makefile.in -=================================================================== ---- src.orig/libgnatprj/Makefile.in -+++ src/libgnatprj/Makefile.in -@@ -25,7 +25,8 @@ - @srcdir@/../gcc/ada/gnatvsn.ads | \ - sed -e 's/.*"\(.*\)".*/\1/')) - GCC:=../gcc/xgcc -B../gcc/ --LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts -+RTS:=../gcc/ada/rts-shared-zcx -+LIBGNAT_JUST_BUILT := -nostdinc -I$(RTS) - LIBGNATVSN := -I../libgnatvsn - CFLAGS := -g -O2 - ADAFLAGS := -g -O2 -gnatn -@@ -65,7 +66,7 @@ - libgnatprj.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS)) - : # Make libgnatprj.so - $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \ -- -L../gcc/ada/rts -lgnat-$(LIB_VERSION) \ -+ -L$(RTS) -lgnat-$(LIB_VERSION) \ - -L../libgnatvsn -lgnatvsn - $(LN_S) -f libgnatprj.so.$(LIB_VERSION) libgnatprj.so - chmod a=r obj-shared/*.ali -Index: src/libgnatvsn/Makefile.in -=================================================================== ---- src.orig/libgnatvsn/Makefile.in -+++ src/libgnatvsn/Makefile.in -@@ -25,7 +25,8 @@ - @srcdir@/../gcc/ada/gnatvsn.ads | \ - sed -e 's/.*"\(.*\)".*/\1/')) - GCC:=../gcc/xgcc -B../gcc/ --LIBGNAT_JUST_BUILT := -nostdinc -I../gcc/ada/rts -+RTS:=../gcc/ada/rts-shared-zcx -+LIBGNAT_JUST_BUILT := -nostdinc -I$(RTS) - CFLAGS := -g -O2 -gnatn - BASEVER := $(shell cat @srcdir@/../gcc/BASE-VER) - DEVPHASE := $(shell cat @srcdir@/../gcc/DEV-PHASE) -@@ -64,7 +65,7 @@ - libgnatvsn.so.$(LIB_VERSION): $(addprefix obj-shared/,$(OBJECTS)) - : # Make libgnatvsn.so - $(GCC) -o $@ -shared -fPIC -Wl,--soname,$@ $^ \ -- -L../gcc/ada/rts -lgnat-$(LIB_VERSION) -+ -L$(RTS) -lgnat-$(LIB_VERSION) - ln -s libgnatvsn.so.$(LIB_VERSION) libgnatvsn.so - chmod a=r obj-shared/*.ali - # Make the .ali files, but not the .o files, visible to the gnat tools. -Index: src/gcc/ada/Make-lang.in -=================================================================== ---- src.orig/gcc/ada/Make-lang.in -+++ src/gcc/ada/Make-lang.in -@@ -62,7 +62,8 @@ - "ADA_FOR_TARGET=$(ADA_FOR_TARGET)" \ - "INSTALL=$(INSTALL)" \ - "INSTALL_DATA=$(INSTALL_DATA)" \ -- "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" -+ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ -+ "GCC_FOR_TARGET=$(GCC_FOR_TARGET)" - - # Say how to compile Ada programs. - .SUFFIXES: .ada .adb .ads -Index: src/gcc/ada/system-linux-mips.ads -=================================================================== ---- /dev/null -+++ src/gcc/ada/system-linux-mips.ads -@@ -0,0 +1,154 @@ -+------------------------------------------------------------------------------ -+-- -- -+-- GNAT RUN-TIME COMPONENTS -- -+-- -- -+-- S Y S T E M -- -+-- -- -+-- S p e c -- -+-- (GNU-Linux/MIPS Version) -- -+-- -- -+-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -+-- -- -+-- This specification is derived from the Ada Reference Manual for use with -- -+-- GNAT. The copyright notice above, and the license provisions that follow -- -+-- apply solely to the contents of the part following the private keyword. -- -+-- -- -+-- GNAT is free software; you can redistribute it and/or modify it under -- -+-- terms of the GNU General Public License as published by the Free Soft- -- -+-- ware Foundation; either version 2, or (at your option) any later ver- -- -+-- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- -+-- OUT 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 distributed with GNAT; see file COPYING. If not, write -- -+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- -+-- Boston, MA 02110-1301, USA. -- -+-- -- -+-- As a special exception, if other files instantiate generics from this -- -+-- unit, or you link this unit with other files to produce an executable, -- -+-- this unit does not by itself cause the resulting executable to be -- -+-- covered by the GNU General Public License. This exception does not -- -+-- however invalidate any other reasons why the executable file might be -- -+-- covered by the GNU Public License. -- -+-- -- -+-- GNAT was originally developed by the GNAT team at New York University. -- -+-- Extensive contributions were provided by Ada Core Technologies Inc. -- -+-- -- -+------------------------------------------------------------------------------ -+ -+package System is -+ pragma Pure; -+ -- Note that we take advantage of the implementation permission to make -+ -- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada -+ -- 2005, this is Pure in any case (AI-362). -+ -+ type Name is (SYSTEM_NAME_GNAT); -+ System_Name : constant Name := SYSTEM_NAME_GNAT; -+ -+ -- System-Dependent Named Numbers -+ -+ Min_Int : constant := Long_Long_Integer'First; -+ Max_Int : constant := Long_Long_Integer'Last; -+ -+ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size; -+ Max_Nonbinary_Modulus : constant := Integer'Last; -+ -+ Max_Base_Digits : constant := Long_Long_Float'Digits; -+ Max_Digits : constant := Long_Long_Float'Digits; -+ -+ Max_Mantissa : constant := 63; -+ Fine_Delta : constant := 2.0 ** (-Max_Mantissa); -+ -+ Tick : constant := 0.000_001; -+ -+ -- Storage-related Declarations -+ -+ type Address is private; -+ Null_Address : constant Address; -+ -+ Storage_Unit : constant := 8; -+ Word_Size : constant := 32; -+ Memory_Size : constant := 2 ** 32; -+ -+ -- Address comparison -+ -+ function "<" (Left, Right : Address) return Boolean; -+ function "<=" (Left, Right : Address) return Boolean; -+ function ">" (Left, Right : Address) return Boolean; -+ function ">=" (Left, Right : Address) return Boolean; -+ function "=" (Left, Right : Address) return Boolean; -+ -+ pragma Import (Intrinsic, "<"); -+ pragma Import (Intrinsic, "<="); -+ pragma Import (Intrinsic, ">"); -+ pragma Import (Intrinsic, ">="); -+ pragma Import (Intrinsic, "="); -+ -+ -- Other System-Dependent Declarations -+ -+ type Bit_Order is (High_Order_First, Low_Order_First); -+ Default_Bit_Order : constant Bit_Order := High_Order_First; -+ pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning -+ -+ -- Priority-related Declarations (RM D.1) -+ -+ Max_Priority : constant Positive := 30; -+ Max_Interrupt_Priority : constant Positive := 31; -+ -+ subtype Any_Priority is Integer range 0 .. 31; -+ subtype Priority is Any_Priority range 0 .. 30; -+ subtype Interrupt_Priority is Any_Priority range 31 .. 31; -+ -+ Default_Priority : constant Priority := 15; -+ -+private -+ -+ type Address is mod Memory_Size; -+ Null_Address : constant Address := 0; -+ -+ -------------------------------------- -+ -- System Implementation Parameters -- -+ -------------------------------------- -+ -+ -- These parameters provide information about the target that is used -+ -- by the compiler. They are in the private part of System, where they -+ -- can be accessed using the special circuitry in the Targparm unit -+ -- whose source should be consulted for more detailed descriptions -+ -- of the individual switch values. -+ -+ AAMP : constant Boolean := False; -+ Backend_Divide_Checks : constant Boolean := False; -+ Backend_Overflow_Checks : constant Boolean := False; -+ Command_Line_Args : constant Boolean := True; -+ Compiler_System_Version : constant Boolean := False; -+ Configurable_Run_Time : constant Boolean := False; -+ Denorm : constant Boolean := True; -+ Duration_32_Bits : constant Boolean := False; -+ Exit_Status_Supported : constant Boolean := True; -+ Fractional_Fixed_Ops : constant Boolean := False; -+ Frontend_Layout : constant Boolean := False; -+ Functions_Return_By_DSP : constant Boolean := False; -+ Machine_Overflows : constant Boolean := False; -+ Machine_Rounds : constant Boolean := True; -+ OpenVMS : constant Boolean := False; -+ Preallocated_Stacks : constant Boolean := False; -+ Signed_Zeros : constant Boolean := True; -+ Stack_Check_Default : constant Boolean := False; -+ Stack_Check_Probes : constant Boolean := False; -+ Support_64_Bit_Divides : constant Boolean := True; -+ Support_Aggregates : constant Boolean := True; -+ Support_Composite_Assign : constant Boolean := True; -+ Support_Composite_Compare : constant Boolean := True; -+ Support_Long_Shifts : constant Boolean := True; -+ Suppress_Standard_Library : constant Boolean := False; -+ Use_Ada_Main_Program_Name : constant Boolean := False; -+ ZCX_By_Default : constant Boolean := True; -+ GCC_ZCX_Support : constant Boolean := True; -+ Front_End_ZCX_Support : constant Boolean := False; -+ -+ -- Obsolete entries, to be removed eventually (bootstrap issues!) -+ -+ High_Integrity_Mode : constant Boolean := False; -+ Long_Shifts_Inlined : constant Boolean := True; -+ -+end System; -Index: src/gcc/ada/system-linux-mipsel.ads -=================================================================== ---- /dev/null -+++ src/gcc/ada/system-linux-mipsel.ads -@@ -0,0 +1,154 @@ -+------------------------------------------------------------------------------ -+-- -- -+-- GNAT RUN-TIME COMPONENTS -- -+-- -- -+-- S Y S T E M -- -+-- -- -+-- S p e c -- -+-- (GNU-Linux/MIPSEL Version) -- -+-- -- -+-- Copyright (C) 1992-2005, Free Software Foundation, Inc. -- -+-- -- -+-- This specification is derived from the Ada Reference Manual for use with -- -+-- GNAT. The copyright notice above, and the license provisions that follow -- -+-- apply solely to the contents of the part following the private keyword. -- -+-- -- -+-- GNAT is free software; you can redistribute it and/or modify it under -- -+-- terms of the GNU General Public License as published by the Free Soft- -- -+-- ware Foundation; either version 2, or (at your option) any later ver- -- -+-- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- -+-- OUT 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 distributed with GNAT; see file COPYING. If not, write -- -+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- -+-- Boston, MA 02110-1301, USA. -- -+-- -- -+-- As a special exception, if other files instantiate generics from this -- -+-- unit, or you link this unit with other files to produce an executable, -- -+-- this unit does not by itself cause the resulting executable to be -- -+-- covered by the GNU General Public License. This exception does not -- -+-- however invalidate any other reasons why the executable file might be -- -+-- covered by the GNU Public License. -- -+-- -- -+-- GNAT was originally developed by the GNAT team at New York University. -- -+-- Extensive contributions were provided by Ada Core Technologies Inc. -- -+-- -- -+------------------------------------------------------------------------------ -+ -+package System is -+ pragma Pure; -+ -- Note that we take advantage of the implementation permission to make -+ -- this unit Pure instead of Preelaborable; see RM 13.7.1(15). In Ada -+ -- 2005, this is Pure in any case (AI-362). -+ -+ type Name is (SYSTEM_NAME_GNAT); -+ System_Name : constant Name := SYSTEM_NAME_GNAT; -+ -+ -- System-Dependent Named Numbers -+ -+ Min_Int : constant := Long_Long_Integer'First; -+ Max_Int : constant := Long_Long_Integer'Last; -+ -+ Max_Binary_Modulus : constant := 2 ** Long_Long_Integer'Size; -+ Max_Nonbinary_Modulus : constant := Integer'Last; -+ -+ Max_Base_Digits : constant := Long_Long_Float'Digits; -+ Max_Digits : constant := Long_Long_Float'Digits; -+ -+ Max_Mantissa : constant := 63; -+ Fine_Delta : constant := 2.0 ** (-Max_Mantissa); -+ -+ Tick : constant := 0.000_001; -+ -+ -- Storage-related Declarations -+ -+ type Address is private; -+ Null_Address : constant Address; -+ -+ Storage_Unit : constant := 8; -+ Word_Size : constant := 32; -+ Memory_Size : constant := 2 ** 32; -+ -+ -- Address comparison -+ -+ function "<" (Left, Right : Address) return Boolean; -+ function "<=" (Left, Right : Address) return Boolean; -+ function ">" (Left, Right : Address) return Boolean; -+ function ">=" (Left, Right : Address) return Boolean; -+ function "=" (Left, Right : Address) return Boolean; -+ -+ pragma Import (Intrinsic, "<"); -+ pragma Import (Intrinsic, "<="); -+ pragma Import (Intrinsic, ">"); -+ pragma Import (Intrinsic, ">="); -+ pragma Import (Intrinsic, "="); -+ -+ -- Other System-Dependent Declarations -+ -+ type Bit_Order is (High_Order_First, Low_Order_First); -+ Default_Bit_Order : constant Bit_Order := Low_Order_First; -+ pragma Warnings (Off, Default_Bit_Order); -- kill constant condition warning -+ -+ -- Priority-related Declarations (RM D.1) -+ -+ Max_Priority : constant Positive := 30; -+ Max_Interrupt_Priority : constant Positive := 31; -+ -+ subtype Any_Priority is Integer range 0 .. 31; -+ subtype Priority is Any_Priority range 0 .. 30; -+ subtype Interrupt_Priority is Any_Priority range 31 .. 31; -+ -+ Default_Priority : constant Priority := 15; -+ -+private -+ -+ type Address is mod Memory_Size; -+ Null_Address : constant Address := 0; -+ -+ -------------------------------------- -+ -- System Implementation Parameters -- -+ -------------------------------------- -+ -+ -- These parameters provide information about the target that is used -+ -- by the compiler. They are in the private part of System, where they -+ -- can be accessed using the special circuitry in the Targparm unit -+ -- whose source should be consulted for more detailed descriptions -+ -- of the individual switch values. -+ -+ AAMP : constant Boolean := False; -+ Backend_Divide_Checks : constant Boolean := False; -+ Backend_Overflow_Checks : constant Boolean := False; -+ Command_Line_Args : constant Boolean := True; -+ Compiler_System_Version : constant Boolean := False; -+ Configurable_Run_Time : constant Boolean := False; -+ Denorm : constant Boolean := True; -+ Duration_32_Bits : constant Boolean := False; -+ Exit_Status_Supported : constant Boolean := True; -+ Fractional_Fixed_Ops : constant Boolean := False; -+ Frontend_Layout : constant Boolean := False; -+ Functions_Return_By_DSP : constant Boolean := False; -+ Machine_Overflows : constant Boolean := False; -+ Machine_Rounds : constant Boolean := True; -+ OpenVMS : constant Boolean := False; -+ Preallocated_Stacks : constant Boolean := False; -+ Signed_Zeros : constant Boolean := True; -+ Stack_Check_Default : constant Boolean := False; -+ Stack_Check_Probes : constant Boolean := False; -+ Support_64_Bit_Divides : constant Boolean := True; -+ Support_Aggregates : constant Boolean := True; -+ Support_Composite_Assign : constant Boolean := True; -+ Support_Composite_Compare : constant Boolean := True; -+ Support_Long_Shifts : constant Boolean := True; -+ Suppress_Standard_Library : constant Boolean := False; -+ Use_Ada_Main_Program_Name : constant Boolean := False; -+ ZCX_By_Default : constant Boolean := True; -+ GCC_ZCX_Support : constant Boolean := True; -+ Front_End_ZCX_Support : constant Boolean := False; -+ -+ -- Obsolete entries, to be removed eventually (bootstrap issues!) -+ -+ High_Integrity_Mode : constant Boolean := False; -+ Long_Shifts_Inlined : constant Boolean := True; -+ -+end System; -Index: src/gcc/ada/g-soccon-linux-mips.ads -=================================================================== ---- /dev/null -+++ src/gcc/ada/g-soccon-linux-mips.ads -@@ -0,0 +1,184 @@ -+------------------------------------------------------------------------------ -+-- -- -+-- GNAT COMPILER COMPONENTS -- -+-- -- -+-- G N A T . S O C K E T S . C O N S T A N T S -- -+-- -- -+-- S p e c -- -+-- -- -+-- Copyright (C) 2000-2005, Free Software Foundation, Inc. -- -+-- -- -+-- GNAT is free software; you can redistribute it and/or modify it under -- -+-- terms of the GNU General Public License as published by the Free Soft- -- -+-- ware Foundation; either version 2, or (at your option) any later ver- -- -+-- sion. GNAT is distributed in the hope that it will be useful, but WITH- -- -+-- OUT 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 distributed with GNAT; see file COPYING. If not, write -- -+-- to the Free Software Foundation, 51 Franklin Street, Fifth Floor, -- -+-- Boston, MA 02110-1301, USA. -- -+-- -- -+-- As a special exception, if other files instantiate generics from this -- -+-- unit, or you link this unit with other files to produce an executable, -- -+-- this unit does not by itself cause the resulting executable to be -- -+-- covered by the GNU General Public License. This exception does not -- -+-- however invalidate any other reasons why the executable file might be -- -+-- covered by the GNU Public License. -- -+-- -- -+-- GNAT was originally developed by the GNAT team at New York University. -- -+-- Extensive contributions were provided by Ada Core Technologies Inc. -- -+-- -- -+------------------------------------------------------------------------------ -+ -+-- This package provides target dependent definitions of constant for use -+-- by the GNAT.Sockets package (g-socket.ads). This package should not be -+-- directly with'ed by an applications program. -+ -+-- This is the version for mips-linux, manually edited for the first shot -+-- no mips hardware at hand -+-- using http://www.gelato.unsw.edu.au/lxr/source/include/asm-mips/socket.h -+-- in order to find differents values -+-- This file is generated automatically, do not modify it by hand! Instead, -+-- make changes to gen-soccon.c and re-run it on each target. -+ -+package GNAT.Sockets.Constants is -+ -+ -------------- -+ -- Families -- -+ -------------- -+ -+ AF_INET : constant := 2; -- IPv4 address family -+ AF_INET6 : constant := 10; -- IPv6 address family -+ -+ ----------- -+ -- Modes -- -+ ----------- -+ -+ SOCK_STREAM : constant := 1; -- Stream socket -+ SOCK_DGRAM : constant := 2; -- Datagram socket -+ -+ ------------------- -+ -- Socket errors -- -+ ------------------- -+ -+ EACCES : constant := 13; -- Permission denied -+ EADDRINUSE : constant := 98; -- Address already in use -+ EADDRNOTAVAIL : constant := 99; -- Cannot assign address -+ EAFNOSUPPORT : constant := 97; -- Addr family not supported -+ EALREADY : constant := 114; -- Operation in progress -+ EBADF : constant := 9; -- Bad file descriptor -+ ECONNABORTED : constant := 103; -- Connection aborted -+ ECONNREFUSED : constant := 111; -- Connection refused -+ ECONNRESET : constant := 104; -- Connection reset by peer -+ EDESTADDRREQ : constant := 89; -- Destination addr required -+ EFAULT : constant := 14; -- Bad address -+ EHOSTDOWN : constant := 112; -- Host is down -+ EHOSTUNREACH : constant := 113; -- No route to host -+ EINPROGRESS : constant := 115; -- Operation now in progress -+ EINTR : constant := 4; -- Interrupted system call -+ EINVAL : constant := 22; -- Invalid argument -+ EIO : constant := 5; -- Input output error -+ EISCONN : constant := 106; -- Socket already connected -+ ELOOP : constant := 40; -- Too many symbolic lynks -+ EMFILE : constant := 24; -- Too many open files -+ EMSGSIZE : constant := 90; -- Message too long -+ ENAMETOOLONG : constant := 36; -- Name too long -+ ENETDOWN : constant := 100; -- Network is down -+ ENETRESET : constant := 102; -- Disconn. on network reset -+ ENETUNREACH : constant := 101; -- Network is unreachable -+ ENOBUFS : constant := 105; -- No buffer space available -+ ENOPROTOOPT : constant := 92; -- Protocol not available -+ ENOTCONN : constant := 107; -- Socket not connected -+ ENOTSOCK : constant := 88; -- Operation on non socket -+ EOPNOTSUPP : constant := 95; -- Operation not supported -+ EPFNOSUPPORT : constant := 96; -- Unknown protocol family -+ EPROTONOSUPPORT : constant := 93; -- Unknown protocol -+ EPROTOTYPE : constant := 91; -- Unknown protocol type -+ ESHUTDOWN : constant := 108; -- Cannot send once shutdown -+ ESOCKTNOSUPPORT : constant := 94; -- Socket type not supported -+ ETIMEDOUT : constant := 110; -- Connection timed out -+ ETOOMANYREFS : constant := 109; -- Too many references -+ EWOULDBLOCK : constant := 11; -- Operation would block -+ -+ ----------------- -+ -- Host errors -- -+ ----------------- -+ -+ HOST_NOT_FOUND : constant := 1; -- Unknown host -+ TRY_AGAIN : constant := 2; -- Host name lookup failure -+ NO_DATA : constant := 4; -- No data record for name -+ NO_RECOVERY : constant := 3; -- Non recoverable errors -+ -+ ------------------- -+ -- Control flags -- -+ ------------------- -+ -+ FIONBIO : constant := 16#667e#; -- Set/clear non-blocking io -+ FIONREAD : constant := 16#467f#; -- How many bytes to read -+ -+ -------------------- -+ -- Shutdown modes -- -+ -------------------- -+ -+ SHUT_RD : constant := 0; -- No more recv -+ SHUT_WR : constant := 1; -- No more send -+ SHUT_RDWR : constant := 2; -- No more recv/send -+ -+ --------------------- -+ -- Protocol levels -- -+ --------------------- -+ -+ SOL_SOCKET : constant := 1; -- Options for socket level -+ IPPROTO_IP : constant := 0; -- Dummy protocol for IP -+ IPPROTO_UDP : constant := 17; -- UDP -+ IPPROTO_TCP : constant := 6; -- TCP -+ -+ ------------------- -+ -- Request flags -- -+ ------------------- -+ -+ MSG_OOB : constant := 1; -- Process out-of-band data -+ MSG_PEEK : constant := 2; -- Peek at incoming data -+ MSG_EOR : constant := 128; -- Send end of record -+ MSG_WAITALL : constant := 256; -- Wait for full reception -+ MSG_NOSIGNAL : constant := 16384; -- No SIGPIPE on send -+ MSG_Forced_Flags : constant := MSG_NOSIGNAL; -+ -- Flags set on all send(2) calls -+ -+ -------------------- -+ -- Socket options -- -+ -------------------- -+ -+ TCP_NODELAY : constant := 1; -- Do not coalesce packets -+ SO_REUSEADDR : constant := 4; -- Bind reuse local address -+ SO_KEEPALIVE : constant := 8; -- Enable keep-alive msgs -+ SO_LINGER : constant := 16#80#; -- Defer close to flush data -+ SO_BROADCAST : constant := 16#20#; -- Can send broadcast msgs -+ SO_SNDBUF : constant := 16#1001#; -- Set/get send buffer size -+ SO_RCVBUF : constant := 16#1002#; -- Set/get recv buffer size -+ SO_SNDTIMEO : constant := 16#1005#; -- Emission timeout -+ SO_RCVTIMEO : constant := 16#1006#; -- Reception timeout -+ SO_ERROR : constant := 16#1007#; -- Get/clear error status -+ IP_MULTICAST_IF : constant := 32; -- Set/get mcast interface -+ IP_MULTICAST_TTL : constant := 33; -- Set/get multicast TTL -+ IP_MULTICAST_LOOP : constant := 34; -- Set/get mcast loopback -+ IP_ADD_MEMBERSHIP : constant := 35; -- Join a multicast group -+ IP_DROP_MEMBERSHIP : constant := 36; -- Leave a multicast group -+ -+ ------------------- -+ -- System limits -- -+ ------------------- -+ -+ IOV_MAX : constant := 2147483647; -- Maximum writev iovcnt -+ -+ ---------------------- -+ -- Type definitions -- -+ ---------------------- -+ -+ -- Sizes (in bytes) of the components of struct timeval -+ -+ SIZEOF_tv_sec : constant := 4; -- tv_sec -+ SIZEOF_tv_usec : constant := 4; -- tv_usec -+ -+end GNAT.Sockets.Constants; diff --git a/recipes/gcc/gcc-svn/debian/ada-symbolic-tracebacks.dpatch b/recipes/gcc/gcc-svn/debian/ada-symbolic-tracebacks.dpatch deleted file mode 100644 index d39accfdb5..0000000000 --- a/recipes/gcc/gcc-svn/debian/ada-symbolic-tracebacks.dpatch +++ /dev/null @@ -1,346 +0,0 @@ -#! /bin/sh -e - -# DP: - Enable support for symbolic tracebacks in exceptions (delete the dummy -# DP: convert_addresses from adaint.c, and provide a real one separately.) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Ported Jürgen Pfeifer's patch to enable symbolic tracebacks on Debian -GNU/Linux. - -The binary distribution of GNAT 3.15p comes with an old version of -binutils that includes a library, libaddr2line.a. This library does -not exist in recent versions of binutils. The patch works around this -by calling /usr/bin/addr2line (still part of binutils) and parsing the -output. See debian/convert_addresses.c for the gory details. - -I have modified convert_addresses.c to not use a shell script anymore; -Debian controls the version of binutils which is installed. Also, I -use execve instead of execle. - --- -Ludovic Brenta. - -# ' make emacs highlighting happy - -Index: gcc/ada/Makefile.in -=================================================================== ---- gcc/ada/Makefile.in.orig 2008-01-13 22:19:26.000000000 +0100 -+++ gcc/ada/Makefile.in 2008-01-29 11:56:42.178635045 +0100 -@@ -1655,7 +1655,7 @@ - a-nucoar.o a-nurear.o i-forbla.o i-forlap.o s-gearop.o - - GNATRTL_OBJS = $(GNATRTL_NONTASKING_OBJS) $(GNATRTL_TASKING_OBJS) \ -- $(GNATRTL_LINEARALGEBRA_OBJS) g-trasym.o memtrack.o -+ $(GNATRTL_LINEARALGEBRA_OBJS) g-trasym.o memtrack.o convert_addresses.o - - # Default run time files - -@@ -1810,7 +1810,6 @@ - for file in rts/*.ali; do \ - $(INSTALL_DATA_DATE) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ - done -- -$(INSTALL_DATA) rts/g-trasym$(objext) $(DESTDIR)$(ADA_RTL_OBJ_DIR) - -cd rts; for file in *$(arext);do \ - $(INSTALL_DATA) $$file $(DESTDIR)$(ADA_RTL_OBJ_DIR); \ - $(RANLIB_FOR_TARGET) $(DESTDIR)$(ADA_RTL_OBJ_DIR)/$$file; \ -@@ -1907,7 +1906,7 @@ - $(GNATRTL_OBJS) - $(RM) rts/libgnat$(arext) rts/libgnarl$(arext) - $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgnat$(arext) \ -- $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS)) -+ $(addprefix rts/,$(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) g-trasym.o convert_addresses.o) - ifneq ($(PREFIX_OBJS),) - $(AR_FOR_TARGET) $(AR_FLAGS) rts/libgccprefix$(arext) \ - $(PREFIX_OBJS); -@@ -1940,6 +1939,7 @@ - $(TARGET_LIBGCC2_CFLAGS) \ - -o libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ - $(GNATRTL_NONTASKING_OBJS) $(LIBGNAT_OBJS) \ -+ g-trasym.o convert_addresses.o \ - $(SO_OPTS)libgnat$(hyphen)$(LIBRARY_VERSION)$(soext) \ - $(MISCLIB) -lm - cd rts; ../../xgcc -B../../ -shared $(GNATLIBCFLAGS) \ -@@ -2183,6 +2183,7 @@ - sysdep.o : sysdep.c - raise-gcc.o : raise-gcc.c raise.h - raise.o : raise.c raise.h -+convert_addresses.o : convert_addresses.c - vx_stack_info.o : vx_stack_info.c - - gen-soccon: gen-soccon.c gsocket.h -Index: gcc/ada/adaint.c -=================================================================== ---- gcc/ada/adaint.c.orig 2008-01-13 22:19:26.000000000 +0100 -+++ gcc/ada/adaint.c 2008-01-29 11:56:06.614450462 +0100 -@@ -2852,35 +2852,6 @@ - } - #endif - --#if defined (CROSS_DIRECTORY_STRUCTURE) \ -- || (! ((defined (sparc) || defined (i386)) && defined (sun) \ -- && defined (__SVR4)) \ -- && ! (defined (linux) && (defined (i386) || defined (__x86_64__))) \ -- && ! (defined (linux) && defined (__ia64__)) \ -- && ! defined (__FreeBSD__) \ -- && ! defined (__hpux__) \ -- && ! defined (__APPLE__) \ -- && ! defined (_AIX) \ -- && ! (defined (__alpha__) && defined (__osf__)) \ -- && ! defined (VMS) \ -- && ! defined (__MINGW32__) \ -- && ! (defined (__mips) && defined (__sgi))) -- --/* Dummy function to satisfy g-trasym.o. See the preprocessor conditional -- just above for a list of native platforms that provide a non-dummy -- version of this procedure in libaddr2line.a. */ -- --void --convert_addresses (const char *file_name ATTRIBUTE_UNUSED, -- void *addrs ATTRIBUTE_UNUSED, -- int n_addr ATTRIBUTE_UNUSED, -- void *buf ATTRIBUTE_UNUSED, -- int *len ATTRIBUTE_UNUSED) --{ -- *len = 0; --} --#endif -- - #if defined (_WIN32) - int __gnat_argument_needs_quote = 1; - #else -Index: gcc/ada/convert_addresses.c -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ gcc/ada/convert_addresses.c 2008-01-29 11:56:06.614450462 +0100 -@@ -0,0 +1,157 @@ -+/* -+ Copyright (C) 1999 by Juergen Pfeifer <juergen.pfeifer@gmx.net> -+ Ada for Linux Team (ALT) -+ -+ Permission is hereby granted, free of charge, to any person obtaining a -+ copy of this software and associated documentation files (the -+ "Software"), to deal in the Software without restriction, including -+ without limitation the rights to use, copy, modify, merge, publish, -+ distribute, distribute with modifications, sublicense, and/or sell -+ copies of the Software, and to permit persons to whom the Software is -+ furnished to do so, subject to the following conditions: -+ -+ The above copyright notice and this permission notice shall be included -+ in all copies or substantial portions of the Software. -+ -+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS -+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+ IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -+ DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -+ OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR -+ THE USE OR OTHER DEALINGS IN THE SOFTWARE. -+ -+ Except as contained in this notice, the name(s) of the above copyright -+ holders shall not be used in advertising or otherwise to promote the -+ sale, use or other dealings in this Software without prior written -+ authorization. -+*/ -+#include <sys/types.h> -+#include <stdlib.h> -+#include <stdio.h> -+#include <unistd.h> -+#include <string.h> -+#include <signal.h> -+ -+#define STDIN_FILENO 0 -+#define STDOUT_FILENO 1 -+#define MAX_LINE 1024 -+ -+#define CLOSE1 close(fd1[0]); close(fd1[1]) -+#define CLOSE2 close(fd2[0]); close(fd2[1]) -+#define RESTSIG sigaction(SIGPIPE,&oact,NULL) -+ -+void convert_addresses -+( void* addrs[], -+ int n_addr, -+ char* buf, -+ int* len) -+{ -+ int max_len = *len; -+ pid_t pid = getpid(); -+ pid_t child; -+ -+ struct sigaction act, oact; -+ -+ int fd1[2], fd2[2]; -+ char exe_name[128]; -+ -+ *buf = 0; *len = 0; -+ /* Thanx to the /proc filesystem we can very easily reference our own -+ executable image:-)*/ -+ snprintf(exe_name,sizeof(exe_name),"--exe=/proc/%ld/exe", (long)pid); -+ -+ act.sa_handler = SIG_IGN; -+ sigemptyset(&act.sa_mask); -+ act.sa_flags = 0; -+ if (sigaction(SIGPIPE,&act,&oact) < 0) -+ return; -+ -+ if (pipe(fd1) >= 0) { -+ if (pipe(fd2)>=0) { -+ if ((child = fork()) < 0) { -+ CLOSE1; CLOSE2; RESTSIG; -+ return; -+ } -+ else { -+ if (0==child) { -+ close(fd1[1]); -+ close(fd2[0]); -+ if (fd1[0] != STDIN_FILENO) { -+ if (dup2(fd1[0],STDIN_FILENO) != STDIN_FILENO) { -+ CLOSE1; CLOSE2; -+ } -+ close(fd1[0]); -+ } -+ if (fd2[1] != STDOUT_FILENO) { -+ if (dup2(fd2[1],STDOUT_FILENO) != STDOUT_FILENO) { -+ CLOSE1; CLOSE2; -+ } -+ close(fd2[1]); -+ } -+ { -+ /* As pointed out by Florian Weimer to me, it is a -+ security threat to call the script with a user defined -+ environment and using the path. That would be Trojans -+ pleasure. Therefore we use the absolute path to -+ addr2line and an empty environment. That should be -+ safe. -+ */ -+ char *const argv[] = { "addr2line", -+ exe_name, -+ "--demangle=gnat", -+ "--functions", -+ "--basenames", -+ NULL }; -+ char *const envp[] = { NULL }; -+ if (execve("/usr/bin/addr2line", argv, envp) < 0) { -+ CLOSE1; CLOSE2; -+ } -+ } -+ } -+ else { -+ int i, n; -+ char hex[16]; -+ char line[MAX_LINE + 1]; -+ char *p; -+ char *s = buf; -+ -+ /* Parent context */ -+ close(fd1[0]); -+ close(fd2[1]); -+ -+ for(i=0; i < n_addr; i++) { -+ snprintf(hex,sizeof(hex),"%p\n",addrs[i]); -+ write(fd1[1],hex,strlen(hex)); -+ n = read(fd2[0],line,MAX_LINE); -+ if (n<=0) -+ break; -+ line[n]=0; -+ /* We have approx. 16 additional chars for "%p in " clause. -+ We use this info to prevent a buffer overrun. -+ */ -+ if (n + 16 + (*len) > max_len) -+ break; -+ p = strchr(line,'\n'); -+ if (p) { -+ if (*(p+1)) { -+ *p = 0; -+ *len += snprintf(s, (max_len - (*len)), "%p in %s at %s",addrs[i], line, p+1); -+ } -+ else { -+ *len += snprintf(s, (max_len - (*len)), "%p at %s",addrs[i], line); -+ } -+ s = buf + (*len); -+ } -+ } -+ close(fd1[1]); -+ close(fd2[0]); -+ } -+ } -+ } -+ else { -+ CLOSE1; -+ } -+ } -+ RESTSIG; -+} -Index: gcc/ada/g-trasym.adb -=================================================================== ---- gcc/ada/g-trasym.adb.orig 2007-04-11 10:18:15.000000000 +0200 -+++ gcc/ada/g-trasym.adb 2008-01-29 11:56:06.614450462 +0100 -@@ -32,16 +32,16 @@ - ------------------------------------------------------------------------------ - - -- Run-time symbolic traceback support -+-- This file has been modified by Juergen Pfeifer (31-Dec-1999) for -+-- the purpose to support the Ada for Linux Team implementation of -+-- convert_addresses. This implementation has the advantage to run -+-- on the binutils as they are deployed on Linux. - - with System.Soft_Links; - with Ada.Exceptions.Traceback; use Ada.Exceptions.Traceback; - - package body GNAT.Traceback.Symbolic is - -- pragma Linker_Options ("-laddr2line"); -- pragma Linker_Options ("-lbfd"); -- pragma Linker_Options ("-liberty"); -- - package TSL renames System.Soft_Links; - - -- To perform the raw addresses to symbolic form translation we rely on a -@@ -79,9 +79,13 @@ - -- raw addresses provided in ADDRS, looked up in debug information from - -- FILENAME. LEN is filled with the result length. - -- -- -- This procedure is provided by libaddr2line on targets that support -- -- it. A dummy version is in adaint.c for other targets so that build -- -- of shared libraries doesn't generate unresolved symbols. -+ -- This is the ALT Linux specific version adapted to the binutils -+ -- deployed with most Linuxes. These binutils already have an -+ -- addr2line tool that demangles Ada symbolic names, but there are -+ -- version dependant variants for the option names. Therefore our -+ -- implementation spawns a shell script that does normalization of -+ -- the option and then executes addr2line and communicates with it -+ -- through a bidirectional pipe. - -- - -- Note that this procedure is *not* thread-safe. - -@@ -93,8 +97,9 @@ - (c_exename : System.Address) return System.Address; - pragma Import (C, locate_exec_on_path, "__gnat_locate_exec_on_path"); - -- Res : String (1 .. 256 * Traceback'Length); -- Len : Integer; -+ B_Size : constant Integer := 256 * Traceback'Length; -+ Len : Integer := B_Size; -+ Res : String (1 .. B_Size); - - use type System.Address; - diff --git a/recipes/gcc/gcc-svn/debian/alpha-ieee-doc.dpatch b/recipes/gcc/gcc-svn/debian/alpha-ieee-doc.dpatch deleted file mode 100644 index b4976bf847..0000000000 --- a/recipes/gcc/gcc-svn/debian/alpha-ieee-doc.dpatch +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -e - -# DP: #212912 -# DP: on alpha-linux, make -mieee default and add -mieee-disable switch -# DP: to turn default off (doc patch) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p1 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - - ---- src/gcc/doc/invoke.texi~ 2005-09-29 20:00:57.638380128 +0200 -+++ src/gcc/doc/invoke.texi 2005-09-30 22:23:22.922502992 +0200 -@@ -7670,6 +7670,13 @@ - values such as not-a-number and plus/minus infinity. Other Alpha - compilers call this option @option{-ieee_with_no_inexact}. - -+DEBIAN SPECIFIC: This option is on by default, unless -+@option{-ffinite-math-only} (which is part of the @option{-ffast-math} -+set) is specified, because the software functions in the GNU libc math -+libraries generate denormalized numbers, NaNs, and infs (all of which -+will cause a programs to SIGFPE when it attempts to use the results without -+@option{-mieee}). -+ - @item -mieee-with-inexact - @opindex mieee-with-inexact - This is like @option{-mieee} except the generated code also maintains diff --git a/recipes/gcc/gcc-svn/debian/alpha-ieee.dpatch b/recipes/gcc/gcc-svn/debian/alpha-ieee.dpatch deleted file mode 100644 index 4070b1a39e..0000000000 --- a/recipes/gcc/gcc-svn/debian/alpha-ieee.dpatch +++ /dev/null @@ -1,57 +0,0 @@ -#! /bin/sh -e - -# DP: #212912 -# DP: on alpha-linux, make -mieee default and add -mieee-disable switch -# DP: to turn default off - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p1 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - - ---- src/gcc/config/alpha/alpha.c~ 2005-06-04 21:25:45.000000000 +0200 -+++ src/gcc/config/alpha/alpha.c 2005-09-30 22:21:33.251175568 +0200 -@@ -248,6 +248,10 @@ - { 0, 0, 0 } - }; - -+ /* If not -ffinite-math-only, enable -mieee*/ -+ if (!flag_finite_math_only) -+ target_flags |= MASK_IEEE|MASK_IEEE_CONFORMANT; -+ - /* Unicos/Mk doesn't have shared libraries. */ - if (TARGET_ABI_UNICOSMK && flag_pic) - { -#--- src/gcc/doc/invoke.texi~ 2005-09-29 20:00:57.638380128 +0200 -#+++ src/gcc/doc/invoke.texi 2005-09-30 22:23:22.922502992 +0200 -#@@ -7670,6 +7670,13 @@ -# values such as not-a-number and plus/minus infinity. Other Alpha -# compilers call this option @option{-ieee_with_no_inexact}. -# -#+DEBIAN SPECIFIC: This option is on by default, unless -#+@option{-ffinite-math-only} (which is part of the @option{-ffast-math} -#+set) is specified, because the software functions in the GNU libc math -#+libraries generate denormalized numbers, NaNs, and infs (all of which -#+will cause a programs to SIGFPE when it attempts to use the results without -#+@option{-mieee}). -#+ -# @item -mieee-with-inexact -# @opindex mieee-with-inexact -# This is like @option{-mieee} except the generated code also maintains diff --git a/recipes/gcc/gcc-svn/debian/alpha-no-ev4-directive.dpatch b/recipes/gcc/gcc-svn/debian/alpha-no-ev4-directive.dpatch deleted file mode 100644 index e3f84244d2..0000000000 --- a/recipes/gcc/gcc-svn/debian/alpha-no-ev4-directive.dpatch +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/sh -e - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/config/alpha/alpha.c -=================================================================== ---- gcc/config/alpha/alpha.c (revision 115263) -+++ gcc/config/alpha/alpha.c (working copy) -@@ -9372,7 +9372,7 @@ - fputs ("\t.set nomacro\n", asm_out_file); - if (TARGET_SUPPORT_ARCH | TARGET_BWX | TARGET_MAX | TARGET_FIX | TARGET_CIX) - { -- const char *arch; -+ const char *arch = NULL; - - if (alpha_cpu == PROCESSOR_EV6 || TARGET_FIX || TARGET_CIX) - arch = "ev6"; -@@ -9382,10 +9382,9 @@ - arch = "ev56"; - else if (alpha_cpu == PROCESSOR_EV5) - arch = "ev5"; -- else -- arch = "ev4"; - -- fprintf (asm_out_file, "\t.arch %s\n", arch); -+ if (arch) -+ fprintf (asm_out_file, "\t.arch %s\n", arch); - } - } - #endif diff --git a/recipes/gcc/gcc-svn/debian/arm-unbreak-eabi-armv4t.dpatch b/recipes/gcc/gcc-svn/debian/arm-unbreak-eabi-armv4t.dpatch deleted file mode 100644 index 7bb8887068..0000000000 --- a/recipes/gcc/gcc-svn/debian/arm-unbreak-eabi-armv4t.dpatch +++ /dev/null @@ -1,36 +0,0 @@ -#! /bin/sh -e - -# DP: Fix armv4t build on ARM - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p1 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- src/gcc/config/arm/linux-eabi.h.orig 2007-11-24 12:37:38.000000000 +0000 -+++ src/gcc/config/arm/linux-eabi.h 2007-11-24 12:39:41.000000000 +0000 -@@ -44,7 +44,7 @@ - The ARM10TDMI core is the default for armv5t, so set - SUBTARGET_CPU_DEFAULT to achieve this. */ - #undef SUBTARGET_CPU_DEFAULT --#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi -+#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi - - /* TARGET_BIG_ENDIAN_DEFAULT is set in - config.gcc for big endian configurations. */ diff --git a/recipes/gcc/gcc-svn/debian/boehm-gc-getnprocs.dpatch b/recipes/gcc/gcc-svn/debian/boehm-gc-getnprocs.dpatch deleted file mode 100644 index 8d85cdcbb0..0000000000 --- a/recipes/gcc/gcc-svn/debian/boehm-gc-getnprocs.dpatch +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e - -# DP: boehm-gc/pthread_support.c (GC_get_nprocs): Use sysconf as fallback. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: boehm-gc/pthread_support.c -=================================================================== ---- boehm-gc/pthread_support.c (revision 127207) -+++ boehm-gc/pthread_support.c (working copy) -@@ -724,7 +724,8 @@ - f = open("/proc/stat", O_RDONLY); - if (f < 0 || (len = STAT_READ(f, stat_buf, STAT_BUF_SIZE)) < 100) { - WARN("Couldn't read /proc/stat\n", 0); -- return -1; -+ /* Fallback to sysconf after the warning */ -+ return sysconf(_SC_NPROCESSORS_ONLN); - } - for (i = 0; i < len - 100; ++i) { - if (stat_buf[i] == '\n' && stat_buf[i+1] == 'c' diff --git a/recipes/gcc/gcc-svn/debian/boehm-gc-nocheck.dpatch b/recipes/gcc/gcc-svn/debian/boehm-gc-nocheck.dpatch deleted file mode 100644 index f9910dc041..0000000000 --- a/recipes/gcc/gcc-svn/debian/boehm-gc-nocheck.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh -e - -# DP: Disable running the boehm-gc testsuite. Hangs the buildd at least on hppa. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- boehm-gc/Makefile.in~ 2004-06-20 16:24:06.000000000 +0200 -+++ boehm-gc/Makefile.in 2004-06-23 09:43:42.000000000 +0200 -@@ -662,7 +662,8 @@ - test "$$failed" -eq 0; \ - else :; fi - check-am: $(check_PROGRAMS) -- $(MAKE) $(AM_MAKEFLAGS) check-TESTS -+ : # $(MAKE) $(AM_MAKEFLAGS) check-TESTS -+ @echo target $@ disabled for Debian build. - check: check-recursive - all-am: Makefile $(LTLIBRARIES) all-multi - installdirs: installdirs-recursive diff --git a/recipes/gcc/gcc-svn/debian/config-ml.dpatch b/recipes/gcc/gcc-svn/debian/config-ml.dpatch deleted file mode 100644 index 12ef7b495a..0000000000 --- a/recipes/gcc/gcc-svn/debian/config-ml.dpatch +++ /dev/null @@ -1,94 +0,0 @@ -#! /bin/sh -e - -# DP: disable some biarch libraries for biarch builds - -if [ $# -eq 3 ] && [ "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;; - -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1;; -esac - -exit 0 - ---- config-ml.in.orig 2007-12-01 10:09:04.533972767 +0100 -+++ config-ml.in 2007-12-01 10:21:50.625529084 +0100 -@@ -301,6 +301,11 @@ - done - fi - ;; -+i[34567]86-*-*) -+ case " $multidirs " in -+ *" 64 "*) ac_configure_args="${ac_configure_args} --host=x86_64-linux-gnu" -+ esac -+ ;; - m68*-*-*) - if [ x$enable_softfloat = xno ] - then -@@ -472,9 +477,36 @@ - esac - done - fi -+ case " $multidirs " in -+ *" 64 "*) ac_configure_args="${ac_configure_args} --host=powerpc64-linux-gnu" -+ esac -+ ;; -+s390-*-*) -+ case " $multidirs " in -+ *" 64 "*) ac_configure_args="${ac_configure_args} --host=s390x-linux-gnu" -+ esac - ;; - esac - -+if [ -z "$biarch_multidir_names" ]; then -+ biarch_multidir_names="libiberty libstdc++-v3 libgfortran libmudflap libssp libffi libobjc libgomp" -+ echo "WARNING: biarch_multidir_names is unset. Use default value:" -+ echo " $biarch_multidir_names" -+fi -+ml_srcbase=`basename $ml_realsrcdir` -+old_multidirs="${multidirs}" -+multidirs="" -+for x in ${old_multidirs}; do -+ case " $x " in -+ " 32 "|" n32 "|" 64 " ) -+ case "$biarch_multidir_names" in -+ *"$ml_srcbase"*) multidirs="${multidirs} ${x}" ;; -+ esac -+ ;; -+ *) multidirs="${multidirs} ${x}" ;; -+ esac -+done -+ - # Remove extraneous blanks from multidirs. - # Tests like `if [ -n "$multidirs" ]' require it. - multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'` -@@ -852,9 +884,20 @@ - fi - fi - -+ ml_configure_args= -+ for arg in ${ac_configure_args} -+ do -+ case $arg in -+ *CC=*) ml_configure_args=${ml_config_env} ;; -+ *CXX=*) ml_configure_args=${ml_config_env} ;; -+ *GCJ=*) ml_configure_args=${ml_config_env} ;; -+ *) ;; -+ esac -+ done -+ - if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \ - --with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \ -- ${ac_configure_args} ${ml_config_env} ${ml_srcdiroption} ; then -+ ${ac_configure_args} ${ml_configure_args} ${ml_srcdiroption} ; then - true - else - exit 1 diff --git a/recipes/gcc/gcc-svn/debian/cpu-default-i486.dpatch b/recipes/gcc/gcc-svn/debian/cpu-default-i486.dpatch deleted file mode 100644 index 1afa60faf2..0000000000 --- a/recipes/gcc/gcc-svn/debian/cpu-default-i486.dpatch +++ /dev/null @@ -1,37 +0,0 @@ -#! /bin/sh -e - -# DP: set default 32bit ix86 architecture to i486 - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - - ---- gcc/config/i386/i386.c~ 2007-06-28 13:23:31.000000000 +0200 -+++ gcc/config/i386/i386.c 2007-06-28 13:26:33.000000000 +0200 -@@ -1953,7 +1953,7 @@ - "-mtune=generic instead as appropriate."); - - if (!ix86_arch_string) -- ix86_arch_string = TARGET_64BIT ? "x86-64" : "i386"; -+ ix86_arch_string = TARGET_64BIT ? "x86-64" : "i486"; - else - ix86_arch_specified = 1; - diff --git a/recipes/gcc/gcc-svn/debian/cross-fixes.dpatch b/recipes/gcc/gcc-svn/debian/cross-fixes.dpatch deleted file mode 100644 index 84d50bfd4a..0000000000 --- a/recipes/gcc/gcc-svn/debian/cross-fixes.dpatch +++ /dev/null @@ -1,129 +0,0 @@ -#! /bin/sh -e - -# DP: Fix the linker error when creating an xcc for ia64 - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p1 < $0 - cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p1 < $0 - cd ${dir}gcc && autoconf - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/ia64/fde-glibc.c gcc-4.0.0.new/gcc/config/ia64/fde-glibc.c ---- gcc-4.0.0.orig/gcc/config/ia64/fde-glibc.c 2003-11-02 18:35:20.000000000 +0100 -+++ gcc-4.0.0.new/gcc/config/ia64/fde-glibc.c 2005-05-15 02:42:27.675247674 +0200 -@@ -31,6 +31,7 @@ - #ifndef _GNU_SOURCE - #define _GNU_SOURCE 1 - #endif -+#ifndef inhibit_libc - #include "config.h" - #include <stddef.h> - #include <stdlib.h> -@@ -162,3 +163,5 @@ _Unwind_FindTableEntry (void *pc, unsign - - return data.ret; - } -+ -+#endif -diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/ia64/unwind-ia64.c gcc-4.0.0.new/gcc/config/ia64/unwind-ia64.c ---- gcc-4.0.0.orig/gcc/config/ia64/unwind-ia64.c 2005-04-06 05:50:36.000000000 +0200 -+++ gcc-4.0.0.new/gcc/config/ia64/unwind-ia64.c 2005-05-15 02:43:10.842199954 +0200 -@@ -30,7 +30,7 @@ - This exception does not however invalidate any other reasons why - the executable file might be covered by the GNU General Public License. */ - -- -+#ifndef inhibit_libc - #include "tconfig.h" - #include "tsystem.h" - #include "coretypes.h" -@@ -2404,3 +2404,4 @@ alias (_Unwind_SetIP); - #endif - - #endif -+#endif -diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/config/sh/linux-unwind.h gcc-4.0.0.new/gcc/config/sh/linux-unwind.h ---- gcc-4.0.0.orig/gcc/config/sh/linux-unwind.h 2005-02-11 02:12:57.000000000 +0100 -+++ gcc-4.0.0.new/gcc/config/sh/linux-unwind.h 2005-05-15 02:44:31.000000000 +0200 -@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA. */ - /* Do code reading to identify a signal frame, and set the frame - state data appropriately. See unwind-dw2.c for the structs. */ - -+#ifndef inhibit_libc - #include <signal.h> - #include <sys/ucontext.h> - #include "insn-constants.h" -@@ -169,3 +170,4 @@ sh_fallback_frame_state (struct _Unwind_ - return _URC_NO_REASON; - } - #endif /* defined (__SH5__) */ -+#endif -diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/unwind-compat.c gcc-4.0.0.new/gcc/unwind-compat.c ---- gcc-4.0.0.orig/gcc/unwind-compat.c 2004-09-04 02:15:40.000000000 +0200 -+++ gcc-4.0.0.new/gcc/unwind-compat.c 2005-05-15 02:41:17.000000000 +0200 -@@ -29,6 +29,7 @@ - 02110-1301, USA. */ - - #if defined (USE_GAS_SYMVER) && defined (USE_LIBUNWIND_EXCEPTIONS) -+#ifndef inhibit_libc - #include "tconfig.h" - #include "tsystem.h" - #include "unwind.h" -@@ -204,3 +205,4 @@ _Unwind_SetIP (struct _Unwind_Context *c - } - symver (_Unwind_SetIP, GCC_3.0); - #endif -+#endif -diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.orig/gcc/unwind-generic.h gcc-4.0.0.new/gcc/unwind-generic.h ---- gcc-4.0.0.orig/gcc/unwind-generic.h 2004-11-30 09:15:39.000000000 +0100 -+++ gcc-4.0.0.new/gcc/unwind-generic.h 2005-05-15 02:38:33.000000000 +0200 -@@ -202,6 +202,7 @@ extern _Unwind_Reason_Code _Unwind_SjLj_ - compatible with the standard ABI for IA-64, we inline these. */ - - #ifdef __ia64__ -+#ifndef inhibit_libc - #include <stdlib.h> - - static inline _Unwind_Ptr -@@ -220,6 +221,7 @@ _Unwind_GetTextRelBase (struct _Unwind_C - - /* @@@ Retrieve the Backing Store Pointer of the given context. */ - extern _Unwind_Word _Unwind_GetBSP (struct _Unwind_Context *); -+#endif - #else - extern _Unwind_Ptr _Unwind_GetDataRelBase (struct _Unwind_Context *); - extern _Unwind_Ptr _Unwind_GetTextRelBase (struct _Unwind_Context *); -diff -NurpP -x '*.orig' -x '*.libc' gcc-4.0.0.new/gcc/config/alpha/linux-unwind.h gcc-4.0.0.new2/gcc/config/alpha/linux-unwind.h ---- gcc-4.0.0.new/gcc/config/alpha/linux-unwind.h 2005-02-11 02:12:54.000000000 +0100 -+++ gcc-4.0.0.new2/gcc/config/alpha/linux-unwind.h 2005-05-15 05:09:16.000000000 +0200 -@@ -29,6 +29,7 @@ Boston, MA 02111-1307, USA. */ - /* Do code reading to identify a signal frame, and set the frame - state data appropriately. See unwind-dw2.c for the structs. */ - -+#ifndef inhibit_libc - #include <signal.h> - #include <sys/ucontext.h> - -@@ -80,3 +81,5 @@ alpha_fallback_frame_state (struct _Unwi - fs->retaddr_column = 64; - return _URC_NO_REASON; - } -+ -+#endif diff --git a/recipes/gcc/gcc-svn/debian/cross-include.dpatch b/recipes/gcc/gcc-svn/debian/cross-include.dpatch deleted file mode 100644 index c2622903ec..0000000000 --- a/recipes/gcc/gcc-svn/debian/cross-include.dpatch +++ /dev/null @@ -1,39 +0,0 @@ -#! /bin/sh -e - -# DP: Set cross include path to .../include, not .../sys-include -# DP: This should be a fix for famous limits.h issue - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - cd ${dir}gcc && autoconf - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- gcc/configure.ac.orig 2005-08-24 06:24:11.000000000 +0400 -+++ gcc/configure.ac 2005-12-06 00:40:45.000000000 +0300 -@@ -681,7 +681,7 @@ - ], [ - TARGET_SYSTEM_ROOT= - TARGET_SYSTEM_ROOT_DEFINE= -- CROSS_SYSTEM_HEADER_DIR='$(gcc_tooldir)/sys-include' -+ CROSS_SYSTEM_HEADER_DIR='$(prefix)/$(target_noncanonical)/include' - ]) - AC_SUBST(TARGET_SYSTEM_ROOT) - AC_SUBST(TARGET_SYSTEM_ROOT_DEFINE) diff --git a/recipes/gcc/gcc-svn/debian/deb-protoize.dpatch b/recipes/gcc/gcc-svn/debian/deb-protoize.dpatch deleted file mode 100644 index f86ee09942..0000000000 --- a/recipes/gcc/gcc-svn/debian/deb-protoize.dpatch +++ /dev/null @@ -1,47 +0,0 @@ -#! /bin/sh -e - -# DP: build protoize/unprotoize binaries - -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) patch $pdir -f --no-backup-if-mismatch -p0 < $0;; - -unpatch) patch $pdir -f --no-backup-if-mismatch -R -p0 < $0;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- gcc/Makefile.in.orig 2007-09-06 21:31:39.864036975 +0200 -+++ gcc/Makefile.in 2007-09-06 21:33:57.836118252 +0200 -@@ -137,7 +137,7 @@ - - # Selection of languages to be made. - CONFIG_LANGUAGES = @all_selected_languages@ --LANGUAGES = c gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES) -+LANGUAGES = c proto gcov$(exeext) gcov-dump$(exeext) $(CONFIG_LANGUAGES) - - # Various ways of specifying flags for compilations: - # CFLAGS is for the user to override to, e.g., do a cross build with -O2. -@@ -3280,14 +3280,14 @@ - protoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h $(TM_H) Makefile version.h cppdefault.h intl.h - (SHLIB_LINK='$(SHLIB_LINK)'; \ -- $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -+ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) -Wno-error \ - $(DRIVER_DEFINES) \ - $(srcdir)/protoize.c $(OUTPUT_OPTION)) - - unprotoize.o: protoize.c $(srcdir)/../include/getopt.h $(CONFIG_H) \ - $(SYSTEM_H) coretypes.h $(TM_H) Makefile version.h cppdefault.h intl.h - (SHLIB_LINK='$(SHLIB_LINK)'; \ -- $(CC) -c -DUNPROTOIZE $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -+ $(CC) -c -DUNPROTOIZE $(ALL_CFLAGS) $(ALL_CPPFLAGS) -Wno-error \ - $(DRIVER_DEFINES) \ - $(srcdir)/protoize.c $(OUTPUT_OPTION)) - diff --git a/recipes/gcc/gcc-svn/debian/gcc-d-lang.dpatch b/recipes/gcc/gcc-svn/debian/gcc-d-lang.dpatch deleted file mode 100644 index 24267ddbb3..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-d-lang.dpatch +++ /dev/null @@ -1,246 +0,0 @@ -#! /bin/sh -e - -# DP: Add D options and specs for the gcc driver. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -diff -urN gcc.orig/d/lang.opt gcc/d/lang.opt ---- gcc.orig/d/lang.opt 1970-01-01 01:00:00.000000000 +0100 -+++ gcc/d/lang.opt 2007-03-04 16:29:47.000000000 +0100 -@@ -0,0 +1,160 @@ -+; GDC -- D front-end for GCC -+; Copyright (C) 2004 David Friedman -+; -+; 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 -+ -+; This is used in GCC 3.4+ -+ -+Language -+D -+ -+I -+D Joined Separate -+-I <dir> Add <dir> to the end of the main include path. -+ -+J -+D Joined Separate -+-J <dir> Add <dir> to the end of the string import path. -+ -+fdeprecated -+D -+Allow use of deprecated features -+ -+fassert -+D -+Generate runtime code for assert()'s -+ -+frelease -+D -+Compile release version -+ -+funittest -+D -+Compile in unittest code -+ -+fversion= -+D Joined RejectNegative -+-fversion=<level|ident> Compile in version code >= <level> or identified by <ident> -+ -+fdebug= -+D Joined RejectNegative -+-fdebug,-fdebug=<level>,-fdebug=<ident> Compile in debug code, code <= level, or code identified by ident -+ -+fdebug -+D -+Compile in debug code -+ -+fdebug-c -+D -+With -g, generate C debug information for debugger compatibility -+ -+fd-verbose -+D -+Print information about D language processing to stdout -+ -+fd-version=1 -+D RejectNegative -+Compile as D language version 1 -+ -+femit-templates= -+D Joined RejectNegative -+-femit-templates=[normal|private|all|none|auto] Control template emission -+ -+femit-templates -+D -+-femit-templates Emit templates code and data even if the linker cannot merge multiple copies -+ -+nostdinc -+D -+Do not search standard system include directories -+ -+fonly= -+D Joined RejectNegative -+Process all modules specified on the command line, but only generate code for the module specified by the argument. -+ -+fod= -+D Joined RejectNegative -+-fod=<directory> Specify the object output directory. Note: this is actually a driver option; the backend ignores it. -+ -+fop -+D -+Specify that the source file's parent directories should be appended to the object output directory. Note: this is actually a driver option; the backend ignores it. -+ -+fintfc -+Generate D interface files -+ -+fintfc-dir= -+D Joined RejectNegative -+-fintfc-dir=<dir> Write D interface files to directory <dir> -+ -+fintfc-file= -+D Joined RejectNegative -+-fintfc-file=<filename> Write D interface file to <filename> -+ -+fdoc -+D -+Generate documentation -+ -+fdoc-dir= -+D Joined RejectNegative -+-fdoc-dir=<docdir> Write documentation file to docdir directory -+ -+fdoc-file= -+D Joined RejectNegative -+-fdoc-file=<filename> Write documentation file to filename -+ -+fdoc-inc= -+D Joined RejectNegative -+-fdoc-inc=<filename> Include a Ddoc macro file -+ -+fmultilib-dir= -+D Joined RejectNegative -+-fmultilib-dir=<dir> Select header multilib subdirectory -+ -+Wsign-compare -+D -+Warn about signed-unsigned comparisons -+ -+fdump-source -+D RejectNegative -+Dump decoded UTF-8 text and source from HTML -+ -+fbuiltin -+D -+Recognize built-in functions -+ -+funsigned-char -+D -+Make \"char\" unsigned by default (silently ignored in D) -+ -+fsigned-char -+D -+Make \"char\" signed by default (silently ignored in D) -+ -+iprefix -+D Joined Separate -+-iprefix <path> Specify <path> as a prefix for next two options -+ -+isysroot -+D Joined Separate -+-isysroot <dir> Set <dir> to be the system root directory -+ -+isystem -+D Joined Separate -+-isystem <dir> Add <dir> to the start of the system include path -+ -+Wall -+D -+Enable most warning messages -diff -urN gcc.orig/d/lang-specs.h gcc/d/lang-specs.h ---- gcc.orig/d/lang-specs.h 1970-01-01 01:00:00.000000000 +0100 -+++ gcc/d/lang-specs.h 2007-03-04 16:36:44.000000000 +0100 -@@ -0,0 +1,53 @@ -+/* GDC -- D front-end for GCC -+ Copyright (C) 2004 David Friedman -+ -+ 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 D_D_SPEC -+#define D_D_SPEC 0 -+#endif -+ -+/* %{!M} probably doesn't make sense because we would need -+ to do that -- -MD and -MMD doesn't sound like a plan for D.... */ -+ -+/* %(d_options) ? */ -+ -+#if GCC_SPEC_FORMAT_4 -+#define D_D_SPEC_REST 0, 1, 0 -+#else -+#define D_D_SPEC_REST 0 -+#endif -+ -+#if D_DRIVER_ONLY -+{".html", "@d", D_D_SPEC_REST }, -+{".HTML", "@d", D_D_SPEC_REST }, -+{".htm", "@d", D_D_SPEC_REST }, -+{".HTM", "@d", D_D_SPEC_REST }, -+{".xhtml", "@d", D_D_SPEC_REST }, -+{".XHTML", "@d", D_D_SPEC_REST }, -+{".d", "@d", D_D_SPEC_REST }, -+{".D", "@d", D_D_SPEC_REST }, -+{"@d", -+ "%{!E:cc1d %i %:d-all-sources() %(cc1_options) %I %N %{nostdinc*} %{+e*} %{I*} %{J*}\ -+ %{M} %{MM} %{!fsyntax-only:%(invoke_as)}}", D_D_SPEC_REST }, -+#else -+{".d", "@d", D_D_SPEC_REST }, -+{".D", "@d", D_D_SPEC_REST }, -+{"@d", -+ "%{!E:cc1d %i %(cc1_options) %I %N %{nostdinc*} %{+e*} %{I*} %{J*}\ -+ %{M} %{MM} %{!fsyntax-only:%(invoke_as)}}", D_D_SPEC_REST }, -+#endif -+ diff --git a/recipes/gcc/gcc-svn/debian/gcc-driver-extra-langs.dpatch b/recipes/gcc/gcc-svn/debian/gcc-driver-extra-langs.dpatch deleted file mode 100644 index 2a206f7edc..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-driver-extra-langs.dpatch +++ /dev/null @@ -1,40 +0,0 @@ -#! /bin/sh -e - -# DP: Add options and specs for languages that are not built from a source -# DP: (but built from separate sources). - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - - ---- gcc/Makefile.in~ 2006-07-11 14:03:25.865618000 +0200 -+++ gcc/Makefile.in 2006-07-11 21:15:30.011548776 +0200 -@@ -424,8 +424,8 @@ - xm_include_list=@xm_include_list@ - xm_defines=@xm_defines@ - lang_checks=check-gcc --lang_opt_files=@lang_opt_files@ $(srcdir)/c.opt $(srcdir)/common.opt --lang_specs_files=@lang_specs_files@ -+lang_opt_files=$(sort @lang_opt_files@ $(foreach lang,$(debian_extra_langs),$(srcdir)/$(lang)/lang.opt)) $(srcdir)/c.opt $(srcdir)/common.opt -+lang_specs_files=$(sort @lang_specs_files@ $(foreach lang,$(debian_extra_langs),$(srcdir)/$(lang)/lang-specs.h)) - lang_tree_files=@lang_tree_files@ - target_cpu_default=@target_cpu_default@ - GCC_THREAD_FILE=@thread_file@ diff --git a/recipes/gcc/gcc-svn/debian/gcc-hash-style-both.dpatch b/recipes/gcc/gcc-svn/debian/gcc-hash-style-both.dpatch deleted file mode 100644 index 8fea7586d0..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-hash-style-both.dpatch +++ /dev/null @@ -1,163 +0,0 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=both (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek <jakub@redhat.com> - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=both. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-08-04 08:55:58.000000000 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:47:26.605865578 +0200 -@@ -39,7 +39,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=both %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-08-04 08:55:59.000000000 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-08-04 08:56:01.000000000 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:47:26.605865578 +0200 -@@ -166,7 +166,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=both -Y P,/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=both -Y P,/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=both -Y P,/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=both %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-08-04 08:56:07.000000000 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:48:27.336781690 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/ia64/linux.h.orig 2006-12-12 18:59:53.000000000 +0100 -+++ gcc/config/ia64/linux.h 2007-09-01 15:47:26.605865578 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=both \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-08-08 23:37:49.000000000 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:47:26.615865729 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-08-04 08:56:12.000000000 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:47:26.615865729 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=both %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/recipes/gcc/gcc-svn/debian/gcc-hash-style-gnu.dpatch b/recipes/gcc/gcc-svn/debian/gcc-hash-style-gnu.dpatch deleted file mode 100644 index 8c6e2691b1..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-hash-style-gnu.dpatch +++ /dev/null @@ -1,163 +0,0 @@ -#! /bin/sh -e - -# DP: Link using --hash-style=gnu (alpha, amd64, ia64, i386, powerpc, ppc64, s390, sparc) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - #cd ${dir}gcc && autoconf - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - #rm ${dir}gcc/configure - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2006-07-11 Jakub Jelinek <jakub@redhat.com> - - * config/i386/linux.h (LINK_SPEC): Add --hash-style=gnu. - * config/i386/linux64.h (LINK_SPEC): Likewise. - * config/rs6000/sysv4.h (LINK_OS_LINUX_SPEC): Likewise. - * config/rs6000/linux64.h (LINK_OS_LINUX_SPEC32, - LINK_OS_LINUX_SPEC64): Likewise. - * config/s390/linux.h (LINK_SPEC): Likewise. - * config/ia64/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux.h (LINK_SPEC): Likewise. - * config/sparc/linux64.h (LINK_SPEC, LINK_ARCH32_SPEC, - LINK_ARCH64_SPEC): Likewise. - * config/alpha/linux-elf.h (LINK_SPEC): Likewise. - ---- gcc/config/alpha/linux-elf.h.orig 2007-09-01 15:49:36.997832511 +0200 -+++ gcc/config/alpha/linux-elf.h 2007-09-01 15:49:48.538006592 +0200 -@@ -39,7 +39,7 @@ - - #define ELF_DYNAMIC_LINKER LINUX_DYNAMIC_LINKER - --#define LINK_SPEC "-m elf64alpha %{G*} %{relax:-relax} \ -+#define LINK_SPEC "-m elf64alpha --hash-style=gnu %{G*} %{relax:-relax} \ - %{O*:-O3} %{!O*:-O1} \ - %{shared:-shared} \ - %{!shared: \ ---- gcc/config/s390/linux.h.orig 2007-09-01 15:49:36.997832511 +0200 -+++ gcc/config/s390/linux.h 2007-09-01 15:49:48.548006743 +0200 -@@ -77,7 +77,7 @@ - - #undef LINK_SPEC - #define LINK_SPEC \ -- "%{m31:-m elf_s390}%{m64:-m elf64_s390} \ -+ "%{m31:-m elf_s390}%{m64:-m elf64_s390} --hash-style=gnu \ - %{shared:-shared} \ - %{!shared: \ - %{static:-static} \ ---- gcc/config/sparc/linux.h.orig 2007-09-01 15:49:36.997832511 +0200 -+++ gcc/config/sparc/linux.h 2007-09-01 15:49:48.548006743 +0200 -@@ -132,7 +132,7 @@ - - - #undef LINK_SPEC --#define LINK_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \ - %{!mno-relax:%{!r:-relax}} \ - %{!shared: \ - %{!ibcs: \ ---- gcc/config/sparc/linux64.h.orig 2007-09-01 15:49:36.997832511 +0200 -+++ gcc/config/sparc/linux64.h 2007-09-01 15:49:48.548006743 +0200 -@@ -166,7 +166,7 @@ - { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ - { "link_arch", LINK_ARCH_SPEC }, - --#define LINK_ARCH32_SPEC "-m elf32_sparc -Y P,/usr/lib %{shared:-shared} \ -+#define LINK_ARCH32_SPEC "-m elf32_sparc --hash-style=gnu -Y P,/usr/lib %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -175,7 +175,7 @@ - %{static:-static}}} \ - " - --#define LINK_ARCH64_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ -+#define LINK_ARCH64_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ -@@ -256,7 +256,7 @@ - #else /* !SPARC_BI_ARCH */ - - #undef LINK_SPEC --#define LINK_SPEC "-m elf64_sparc -Y P,/usr/lib64 %{shared:-shared} \ -+#define LINK_SPEC "-m elf64_sparc --hash-style=gnu -Y P,/usr/lib64 %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux.h.orig 2007-09-01 15:49:37.007832662 +0200 -+++ gcc/config/i386/linux.h 2007-09-01 15:49:48.548006743 +0200 -@@ -108,7 +108,7 @@ - { "dynamic_linker", LINUX_DYNAMIC_LINKER } - - #undef LINK_SPEC --#define LINK_SPEC "-m %(link_emulation) %{shared:-shared} \ -+#define LINK_SPEC "-m %(link_emulation) --hash-style=gnu %{shared:-shared} \ - %{!shared: \ - %{!ibcs: \ - %{!static: \ ---- gcc/config/i386/linux64.h.orig 2007-09-01 15:49:37.007832662 +0200 -+++ gcc/config/i386/linux64.h 2007-09-01 15:50:49.068919687 +0200 -@@ -65,7 +65,7 @@ - #endif - - #undef LINK_SPEC --#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} \ -+#define LINK_SPEC "%{" SPEC_64 ":-m elf_x86_64} %{" SPEC_32 ":-m elf_i386} --hash-style=gnu \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/ia64/linux.h.orig 2007-09-01 15:49:37.007832662 +0200 -+++ gcc/config/ia64/linux.h 2007-09-01 15:49:48.548006743 +0200 -@@ -40,7 +40,7 @@ - #define GLIBC_DYNAMIC_LINKER "/lib/ld-linux-ia64.so.2" - - #undef LINK_SPEC --#define LINK_SPEC "\ -+#define LINK_SPEC "--hash-style=gnu \ - %{shared:-shared} \ - %{!shared: \ - %{!static: \ ---- gcc/config/rs6000/sysv4.h.orig 2007-09-01 15:49:37.007832662 +0200 -+++ gcc/config/rs6000/sysv4.h 2007-09-01 15:49:48.548006743 +0200 -@@ -901,7 +901,7 @@ - #define LINUX_DYNAMIC_LINKER \ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER, UCLIBC_DYNAMIC_LINKER) - --#define LINK_OS_LINUX_SPEC "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER "}}}" - ---- gcc/config/rs6000/linux64.h.orig 2007-09-01 15:49:37.007832662 +0200 -+++ gcc/config/rs6000/linux64.h 2007-09-01 15:49:48.548006743 +0200 -@@ -354,11 +354,11 @@ - CHOOSE_DYNAMIC_LINKER (GLIBC_DYNAMIC_LINKER64, UCLIBC_DYNAMIC_LINKER64) - - --#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC32 "-m elf32ppclinux --hash-style=gnu %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER32 "}}}" - --#define LINK_OS_LINUX_SPEC64 "-m elf64ppc %{!shared: %{!static: \ -+#define LINK_OS_LINUX_SPEC64 "-m elf64ppc --hash-style=gnu %{!shared: %{!static: \ - %{rdynamic:-export-dynamic} \ - %{!dynamic-linker:-dynamic-linker " LINUX_DYNAMIC_LINKER64 "}}}" - diff --git a/recipes/gcc/gcc-svn/debian/gcc-i386-emit-cld.dpatch b/recipes/gcc/gcc-svn/debian/gcc-i386-emit-cld.dpatch deleted file mode 100644 index 1267b00e18..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-i386-emit-cld.dpatch +++ /dev/null @@ -1,179 +0,0 @@ -#! /bin/sh -e - -# DP: Emit cld instruction when stringops are used (i386). - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2008-03-06 Uros Bizjak <ubizjak@gmail.com> - - * config/i386/i386.h (TARGET_CLD): New define. - (struct machine_function): Add needs_cld field. - (ix86_current_function_needs_cld): New define. - * config/i386/i386.md (UNSPEC_CLD): New unspec volatile constant. - ("cld"): New isns pattern. - ("strmov_singleop"): Set ix86_current_function_needs_cld flag. - ("rep_mov"): Ditto. - ("strset_singleop"): Ditto. - ("rep_stos"): Ditto. - ("cmpstrnqi_nz_1"): Ditto. - ("cmpstrnqi_1"): Ditto. - ("strlenqi_1"): Ditto. - * config/i386/i386.c (ix86_expand_prologue): Emit cld insn for - TARGET_CLD when ix86_current_function_needs_cld is set. - -Index: gcc/config/i386/i386.h -=================================================================== ---- gcc/config/i386/i386.h (revision 132966) -+++ gcc/config/i386/i386.h (working copy) -@@ -388,6 +388,7 @@ extern unsigned int ix86_arch_features[X - - extern int x86_prefetch_sse; - -+#define TARGET_CLD 1 - #define TARGET_ABM x86_abm - #define TARGET_CMPXCHG16B x86_cmpxchg16b - #define TARGET_POPCNT x86_popcnt -@@ -2446,8 +2447,9 @@ struct machine_function GTY(()) - int save_varrargs_registers; - int accesses_prev_frame; - int optimize_mode_switching[MAX_386_ENTITIES]; -- /* Set by ix86_compute_frame_layout and used by prologue/epilogue expander to -- determine the style used. */ -+ int needs_cld; -+ /* Set by ix86_compute_frame_layout and used by prologue/epilogue -+ expander to determine the style used. */ - int use_fast_prologue_epilogue; - /* Number of saved registers USE_FAST_PROLOGUE_EPILOGUE has been computed - for. */ -@@ -2467,6 +2469,7 @@ struct machine_function GTY(()) - #define ix86_stack_locals (cfun->machine->stack_locals) - #define ix86_save_varrargs_registers (cfun->machine->save_varrargs_registers) - #define ix86_optimize_mode_switching (cfun->machine->optimize_mode_switching) -+#define ix86_current_function_needs_cld (cfun->machine->needs_cld) - #define ix86_tls_descriptor_calls_expanded_in_cfun \ - (cfun->machine->tls_descriptor_call_expanded_p) - /* Since tls_descriptor_call_expanded is not cleared, even if all TLS -Index: gcc/config/i386/i386.md -=================================================================== ---- gcc/config/i386/i386.md (revision 132966) -+++ gcc/config/i386/i386.md (working copy) -@@ -205,6 +205,7 @@ - (UNSPECV_XCHG 12) - (UNSPECV_LOCK 13) - (UNSPECV_PROLOGUE_USE 14) -+ (UNSPECV_CLD 15) - ]) - - ;; Constants to represent pcomtrue/pcomfalse variants -@@ -18519,6 +18520,14 @@ - - ;; Block operation instructions - -+(define_insn "cld" -+ [(unspec_volatile [(const_int 0)] UNSPECV_CLD)] -+ "" -+ "cld" -+ [(set_attr "length" "1") -+ (set_attr "length_immediate" "0") -+ (set_attr "modrm" "0")]) -+ - (define_expand "movmemsi" - [(use (match_operand:BLK 0 "memory_operand" "")) - (use (match_operand:BLK 1 "memory_operand" "")) -@@ -18591,7 +18600,7 @@ - (set (match_operand 2 "register_operand" "") - (match_operand 5 "" ""))])] - "TARGET_SINGLE_STRINGOP || optimize_size" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*strmovdi_rex_1" - [(set (mem:DI (match_operand:DI 2 "register_operand" "0")) -@@ -18708,7 +18717,7 @@ - (match_operand 3 "memory_operand" "")) - (use (match_dup 4))])] - "" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*rep_movdi_rex64" - [(set (match_operand:DI 2 "register_operand" "=c") (const_int 0)) -@@ -18868,7 +18877,7 @@ - (set (match_operand 0 "register_operand" "") - (match_operand 3 "" ""))])] - "TARGET_SINGLE_STRINGOP || optimize_size" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*strsetdi_rex_1" - [(set (mem:DI (match_operand:DI 1 "register_operand" "0")) -@@ -18962,7 +18971,7 @@ - (use (match_operand 3 "register_operand" "")) - (use (match_dup 1))])] - "" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*rep_stosdi_rex64" - [(set (match_operand:DI 1 "register_operand" "=c") (const_int 0)) -@@ -19138,7 +19147,7 @@ - (clobber (match_operand 1 "register_operand" "")) - (clobber (match_dup 2))])] - "" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*cmpstrnqi_nz_1" - [(set (reg:CC FLAGS_REG) -@@ -19185,7 +19194,7 @@ - (clobber (match_operand 1 "register_operand" "")) - (clobber (match_dup 2))])] - "" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*cmpstrnqi_1" - [(set (reg:CC FLAGS_REG) -@@ -19254,7 +19263,7 @@ - (clobber (match_operand 1 "register_operand" "")) - (clobber (reg:CC FLAGS_REG))])] - "" -- "") -+ "ix86_current_function_needs_cld = 1;") - - (define_insn "*strlenqi_1" - [(set (match_operand:SI 0 "register_operand" "=&c") -Index: gcc/config/i386/i386.c -=================================================================== ---- gcc/config/i386/i386.c (revision 132966) -+++ gcc/config/i386/i386.c (working copy) -@@ -6498,6 +6498,10 @@ ix86_expand_prologue (void) - emit_insn (gen_prologue_use (pic_offset_table_rtx)); - emit_insn (gen_blockage ()); - } -+ -+ /* Emit cld instruction if stringops are used in the function. */ -+ if (TARGET_CLD && ix86_current_function_needs_cld) -+ emit_insn (gen_cld ()); - } - - /* Emit code to restore saved registers using MOV insns. First register diff --git a/recipes/gcc/gcc-svn/debian/gcc-ice-apport.dpatch b/recipes/gcc/gcc-svn/debian/gcc-ice-apport.dpatch deleted file mode 100644 index 87b8f06ea8..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-ice-apport.dpatch +++ /dev/null @@ -1,44 +0,0 @@ -#! /bin/sh -e - -# DP: Report an ICE to apport (if apport is available -# DP: and the environment variable GCC_NOAPPORT is not set) - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - ---- gcc/gcc.c~ 2007-08-05 22:17:07.000000000 +0200 -+++ gcc/gcc.c 2007-08-12 15:03:16.000000000 +0200 -@@ -6119,6 +6119,15 @@ - { - notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n", - temp_filenames[attempt * 2]); -+ if (!getenv ("GCC_NOAPPORT") -+ && !access ("/usr/share/apport/gcc_ice_hook", R_OK | X_OK)) -+ { -+ char *cmd = xmalloc (50 + strlen (temp_filenames[attempt * 2]) + strlen (new_argv[0])); -+ sprintf (cmd, "/usr/share/apport/gcc_ice_hook %s %s", -+ new_argv[0], temp_filenames[attempt * 2]); -+ system (cmd); -+ free (cmd); -+ } - /* Make sure it is not deleted. */ - free (temp_filenames[attempt * 2]); - temp_filenames[attempt * 2] = NULL; diff --git a/recipes/gcc/gcc-svn/debian/gcc-ice-hack.dpatch b/recipes/gcc/gcc-svn/debian/gcc-ice-hack.dpatch deleted file mode 100644 index 84c5ef2ebd..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-ice-hack.dpatch +++ /dev/null @@ -1,331 +0,0 @@ -#! /bin/sh -e - -# DP: Retry the build on an ice, save the calling options and preprocessed -# DP: source when the ice is reproducible. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -2004-01-23 Jakub Jelinek <jakub@redhat.com> - - * system.h (ICE_EXIT_CODE): Define. - * gcc.c (execute): Don't free first string early, but at the end - of the function. Call retry_ice if compiler exited with - ICE_EXIT_CODE. - (retry_ice): New function. - * diagnostic.c (diagnostic_count_diagnostic, - diagnostic_action_after_output, error_recursion): Exit with - ICE_EXIT_CODE instead of FATAL_EXIT_CODE. - ---- gcc/diagnostic.c.orig 2007-09-30 10:48:13.000000000 +0000 -+++ gcc/diagnostic.c 2007-09-30 10:49:57.000000000 +0000 -@@ -244,7 +244,7 @@ - fnotice (stderr, "Please submit a full bug report,\n" - "with preprocessed source if appropriate.\n" - "See %s for instructions.\n", bug_report_url); -- exit (ICE_EXIT_CODE); -+ exit (FATAL_EXIT_CODE); - - case DK_FATAL: - if (context->abort_on_error) ---- gcc/gcc.c.orig 2007-09-30 10:48:13.000000000 +0000 -+++ gcc/gcc.c 2007-09-30 10:48:39.000000000 +0000 -@@ -357,6 +357,9 @@ - #if defined(HAVE_TARGET_OBJECT_SUFFIX) || defined(HAVE_TARGET_EXECUTABLE_SUFFIX) - static const char *convert_filename (const char *, int, int); - #endif -+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) -+static void retry_ice (const char *prog, const char **argv); -+#endif - - static const char *getenv_spec_function (int, const char **); - static const char *if_exists_spec_function (int, const char **); -@@ -2999,7 +3002,7 @@ - } - } - -- if (string != commands[i].prog) -+ if (i && string != commands[i].prog) - free (CONST_CAST (char *, string)); - } - -@@ -3056,6 +3059,16 @@ - else if (WIFEXITED (status) - && WEXITSTATUS (status) >= MIN_FATAL_STATUS) - { -+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) -+ /* For ICEs in cc1, cc1obj, cc1plus see if it is -+ reproducible or not. */ -+ char *p; -+ if (WEXITSTATUS (status) == ICE_EXIT_CODE -+ && i == 0 -+ && (p = strrchr (commands[0].argv[0], DIR_SEPARATOR)) -+ && ! strncmp (p + 1, "cc1", 3)) -+ retry_ice (commands[0].prog, commands[0].argv); -+#endif - if (WEXITSTATUS (status) > greatest_status) - greatest_status = WEXITSTATUS (status); - ret_code = -1; -@@ -3076,6 +3089,9 @@ - } - } - -+ if (commands[0].argv[0] != commands[0].prog) -+ free ((PTR) commands[0].argv[0]); -+ - return ret_code; - } - } -@@ -6016,6 +6032,224 @@ - switches[switchnum].validated = 1; - } - -+#if !(defined (__MSDOS__) || defined (OS2) || defined (VMS)) -+#define RETRY_ICE_ATTEMPTS 2 -+ -+static void -+retry_ice (const char *prog, const char **argv) -+{ -+ int nargs, out_arg = -1, quiet = 0, attempt; -+ int pid, retries, sleep_interval; -+ const char **new_argv; -+ char *temp_filenames[RETRY_ICE_ATTEMPTS * 2 + 2]; -+ -+ if (input_filename == NULL || ! strcmp (input_filename, "-")) -+ return; -+ -+ for (nargs = 0; argv[nargs] != NULL; ++nargs) -+ /* Only retry compiler ICEs, not preprocessor ones. */ -+ if (! strcmp (argv[nargs], "-E")) -+ return; -+ else if (argv[nargs][0] == '-' && argv[nargs][1] == 'o') -+ { -+ if (out_arg == -1) -+ out_arg = nargs; -+ else -+ return; -+ } -+ /* If the compiler is going to output any time information, -+ it might vary between invocations. */ -+ else if (! strcmp (argv[nargs], "-quiet")) -+ quiet = 1; -+ else if (! strcmp (argv[nargs], "-ftime-report")) -+ return; -+ -+ if (out_arg == -1 || !quiet) -+ return; -+ -+ memset (temp_filenames, '\0', sizeof (temp_filenames)); -+ new_argv = alloca ((nargs + 3) * sizeof (const char *)); -+ memcpy (new_argv, argv, (nargs + 1) * sizeof (const char *)); -+ new_argv[nargs++] = "-frandom-seed=0"; -+ new_argv[nargs] = NULL; -+ if (new_argv[out_arg][2] == '\0') -+ new_argv[out_arg + 1] = "-"; -+ else -+ new_argv[out_arg] = "-o-"; -+ -+ for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS + 1; ++attempt) -+ { -+ int fd = -1; -+ int status; -+ -+ temp_filenames[attempt * 2] = make_temp_file (".out"); -+ temp_filenames[attempt * 2 + 1] = make_temp_file (".err"); -+ -+ if (attempt == RETRY_ICE_ATTEMPTS) -+ { -+ int i; -+ int fd1, fd2; -+ struct stat st1, st2; -+ size_t n, len; -+ char *buf; -+ -+ buf = xmalloc (8192); -+ -+ for (i = 0; i < 2; ++i) -+ { -+ fd1 = open (temp_filenames[i], O_RDONLY); -+ fd2 = open (temp_filenames[2 + i], O_RDONLY); -+ -+ if (fd1 < 0 || fd2 < 0) -+ { -+ i = -1; -+ close (fd1); -+ close (fd2); -+ break; -+ } -+ -+ if (fstat (fd1, &st1) < 0 || fstat (fd2, &st2) < 0) -+ { -+ i = -1; -+ close (fd1); -+ close (fd2); -+ break; -+ } -+ -+ if (st1.st_size != st2.st_size) -+ { -+ close (fd1); -+ close (fd2); -+ break; -+ } -+ -+ len = 0; -+ for (n = st1.st_size; n; n -= len) -+ { -+ len = n; -+ if (len > 4096) -+ len = 4096; -+ -+ if (read (fd1, buf, len) != (int) len -+ || read (fd2, buf + 4096, len) != (int) len) -+ { -+ i = -1; -+ break; -+ } -+ -+ if (memcmp (buf, buf + 4096, len) != 0) -+ break; -+ } -+ -+ close (fd1); -+ close (fd2); -+ -+ if (n) -+ break; -+ } -+ -+ free (buf); -+ if (i == -1) -+ break; -+ -+ if (i != 2) -+ { -+ notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n"); -+ break; -+ } -+ -+ fd = open (temp_filenames[attempt * 2], O_RDWR); -+ if (fd < 0) -+ break; -+ write (fd, "//", 2); -+ for (i = 0; i < nargs; i++) -+ { -+ write (fd, " ", 1); -+ write (fd, new_argv[i], strlen (new_argv[i])); -+ } -+ write (fd, "\n", 1); -+ new_argv[nargs] = "-E"; -+ new_argv[nargs + 1] = NULL; -+ } -+ -+ /* Fork a subprocess; wait and retry if it fails. */ -+ sleep_interval = 1; -+ pid = -1; -+ for (retries = 0; retries < 4; retries++) -+ { -+ pid = fork (); -+ if (pid >= 0) -+ break; -+ sleep (sleep_interval); -+ sleep_interval *= 2; -+ } -+ -+ if (pid < 0) -+ break; -+ else if (pid == 0) -+ { -+ if (attempt != RETRY_ICE_ATTEMPTS) -+ fd = open (temp_filenames[attempt * 2], O_RDWR); -+ if (fd < 0) -+ exit (-1); -+ if (fd != 1) -+ { -+ close (1); -+ dup (fd); -+ close (fd); -+ } -+ -+ fd = open (temp_filenames[attempt * 2 + 1], O_RDWR); -+ if (fd < 0) -+ exit (-1); -+ if (fd != 2) -+ { -+ close (2); -+ dup (fd); -+ close (fd); -+ } -+ -+ if (prog == new_argv[0]) -+ execvp (prog, (char *const *) new_argv); -+ else -+ execv (new_argv[0], (char *const *) new_argv); -+ exit (-1); -+ } -+ -+ if (waitpid (pid, &status, 0) < 0) -+ break; -+ -+ if (attempt < RETRY_ICE_ATTEMPTS -+ && (! WIFEXITED (status) || WEXITSTATUS (status) != ICE_EXIT_CODE)) -+ { -+ notice ("The bug is not reproducible, so it is likely a hardware or OS problem.\n"); -+ break; -+ } -+ else if (attempt == RETRY_ICE_ATTEMPTS) -+ { -+ close (fd); -+ if (WIFEXITED (status) -+ && WEXITSTATUS (status) == SUCCESS_EXIT_CODE) -+ { -+ notice ("Preprocessed source stored into %s file, please attach this to your bugreport.\n", -+ temp_filenames[attempt * 2]); -+ /* Make sure it is not deleted. */ -+ free (temp_filenames[attempt * 2]); -+ temp_filenames[attempt * 2] = NULL; -+ break; -+ } -+ } -+ } -+ -+ for (attempt = 0; attempt < RETRY_ICE_ATTEMPTS * 2 + 2; attempt++) -+ if (temp_filenames[attempt]) -+ { -+ unlink (temp_filenames[attempt]); -+ free (temp_filenames[attempt]); -+ } -+} -+#endif -+ - /* Search for a file named NAME trying various prefixes including the - user's -B prefix and some standard ones. - Return the absolute file name found. If nothing is found, return NAME. */ ---- gcc/Makefile.in.orig 2007-09-30 10:48:13.000000000 +0000 -+++ gcc/Makefile.in 2007-09-30 10:48:39.000000000 +0000 -@@ -192,6 +192,7 @@ - build/gengtype-lex.o-warn = -Wno-error - # SYSCALLS.c misses prototypes - SYSCALLS.c.X-warn = -Wno-strict-prototypes -Wno-error -+build/gcc.o-warn = -Wno-error - - # All warnings have to be shut off in stage1 if the compiler used then - # isn't gcc; configure determines that. WARN_CFLAGS will be either diff --git a/recipes/gcc/gcc-svn/debian/gcc-multilib64dir.dpatch b/recipes/gcc/gcc-svn/debian/gcc-multilib64dir.dpatch deleted file mode 100644 index fe8f5a1a41..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-multilib64dir.dpatch +++ /dev/null @@ -1,62 +0,0 @@ -#! /bin/sh -e - -# DP: Use lib instead of lib64 as multilibdir on amd64 and ppc64. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -Index: gcc/config/i386/t-linux64 -=================================================================== ---- gcc/config/i386/t-linux64 (revision 130706) -+++ gcc/config/i386/t-linux64 (working copy) -@@ -13,7 +13,7 @@ - - MULTILIB_OPTIONS = m64/m32 - MULTILIB_DIRNAMES = 64 32 --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) - - LIBGCC = stmp-multilib - INSTALL_LIBGCC = install-multilib -Index: gcc/config/rs6000/t-linux64 -=================================================================== ---- gcc/config/rs6000/t-linux64 (revision 130706) -+++ gcc/config/rs6000/t-linux64 (working copy) -@@ -14,13 +14,13 @@ - # it doesn't tell anything about the 32bit libraries on those systems. Set - # MULTILIB_OSDIRNAMES according to what is found on the target. - --MULTILIB_OPTIONS = m64/m32 msoft-float --MULTILIB_DIRNAMES = 64 32 nof -+MULTILIB_OPTIONS = m64/m32 -+MULTILIB_DIRNAMES = 64 32 - MULTILIB_EXTRA_OPTS = fPIC mstrict-align --MULTILIB_EXCEPTIONS = m64/msoft-float --MULTILIB_EXCLUSIONS = m64/!m32/msoft-float --MULTILIB_OSDIRNAMES = ../lib64 $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) nof --MULTILIB_MATCHES = $(MULTILIB_MATCHES_FLOAT) -+MULTILIB_EXCEPTIONS = -+MULTILIB_EXCLUSIONS = -+MULTILIB_OSDIRNAMES = ../lib $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib32),../lib32,../lib) -+MULTILIB_MATCHES = - - softfp_wrap_start := '\#ifndef __powerpc64__' - softfp_wrap_end := '\#endif' diff --git a/recipes/gcc/gcc-svn/debian/gcc-pascal-lang.dpatch b/recipes/gcc/gcc-svn/debian/gcc-pascal-lang.dpatch deleted file mode 100644 index eab416ad63..0000000000 --- a/recipes/gcc/gcc-svn/debian/gcc-pascal-lang.dpatch +++ /dev/null @@ -1,726 +0,0 @@ -#! /bin/sh -e - -# DP: Add pascal options and specs for the gcc driver. - -dir= -if [ $# -eq 3 -a "$2" = '-d' ]; then - pdir="-d $3" - dir="$3/" -elif [ $# -ne 1 ]; then - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -fi -case "$1" in - -patch) - patch $pdir -f --no-backup-if-mismatch -p0 < $0 - ln -sf p ${dir}/gcc/pascal - ;; - -unpatch) - patch $pdir -f --no-backup-if-mismatch -R -p0 < $0 - ;; - *) - echo >&2 "`basename $0`: script expects -patch|-unpatch as argument" - exit 1 -esac -exit 0 - -diff -urN gcc.orig/p/lang.opt gcc/p/lang.opt ---- gcc.orig/p/lang.opt 1970-01-01 01:00:00.000000000 +0100 -+++ gcc/p/lang.opt 2006-03-03 20:17:49.000000000 +0100 -@@ -0,0 +1,635 @@ -+; This file was generated automatically by mk-lang_opt. -+; DO NOT CHANGE THIS FILE MANUALLY! -+; -+; Options for the Pascal front end. -+; Copyright (C) 2004-2006 Free Software Foundation, Inc. -+; -+; This file |