summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/busybox/busybox-1.9.2/topmem.patch28
-rw-r--r--packages/busybox/busybox_1.9.2.bb1
-rw-r--r--packages/cacao/cacaoh-cldc-native_0.98.bb10
-rw-r--r--packages/dbus-java/dbus-java_2.3.bb9
-rw-r--r--packages/dbus-java/dbus-java_2.4.bb9
-rw-r--r--packages/dbus-java/dbus-java_2.5.bb87
-rw-r--r--packages/ffmpeg/ffmpeg_git.bb9
-rw-r--r--packages/flumotion/flumotion_0.4.1.bb2
-rw-r--r--packages/gcc/gcc-4.2.4.inc2
-rw-r--r--packages/gcc/gcc-4.3.1.inc24
-rw-r--r--packages/gcc/gcc-4.3.1/100-uclibc-conf.patch179
-rw-r--r--packages/gcc/gcc-4.3.1/200-uclibc-locale.patch423
-rw-r--r--packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch74
-rw-r--r--packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch315
-rw-r--r--packages/gcc/gcc-4.3.1/302-c99-snprintf.patch12
-rw-r--r--packages/gcc/gcc-4.3.1/307-locale_facets.patch19
-rw-r--r--packages/gcc/gcc-4.3.1/cache-amnesia.patch28
-rw-r--r--packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch2077
-rw-r--r--packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch12
-rw-r--r--packages/gcc/gcc-configure-common.inc8
-rw-r--r--packages/gcc/gcc-cross-sdk_4.2.4.bb6
-rw-r--r--packages/gcc/gcc-cross-sdk_4.3.1.bb2
-rw-r--r--packages/gcc/gcc-cross_4.3.1.bb2
-rw-r--r--packages/gcc/gcc_4.3.1.bb3
-rw-r--r--packages/gnome/gnome-games_2.23.6.bb3
-rw-r--r--packages/gnome/gnome-panel_2.18.1.bb4
-rw-r--r--packages/gnome/gnome-python-desktop/acinclude.m490
-rw-r--r--packages/gstreamer/gst-ffmpeg/autotools.patch21
-rw-r--r--packages/gstreamer/gst-ffmpeg_0.10.2.bb6
-rw-r--r--packages/guile/guile-amd64.patch13
-rw-r--r--packages/guile/guile_1.8.5.bb2
-rw-r--r--packages/jamvm/jamvm.inc1
-rw-r--r--packages/linux/linux-nokia800.inc2
-rw-r--r--packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb2
-rw-r--r--packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb2
-rw-r--r--packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb2
-rw-r--r--packages/mozilla/firefox-3.0.1/mozconfig2
-rw-r--r--packages/mozilla/firefox.inc12
-rw-r--r--packages/mozilla/firefox_3.0.1.bb2
-rw-r--r--packages/mythtv/gmyth-upnp_0.7.0.bb6
-rw-r--r--packages/openjade/openjade-native_1.3.2.bb6
-rw-r--r--packages/openjade/openjade_1.3.2.bb6
-rw-r--r--packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb2
-rw-r--r--packages/phoneme/phoneme-advanced.inc2
-rw-r--r--packages/php/php-5.2.6/acinclude-xml2-config.patch18
-rw-r--r--packages/php/php-5.2.6/pear-makefile.patch11
-rw-r--r--packages/portaudio/portaudio-v19_svn.bb2
-rw-r--r--packages/python/python-numpy_1.1.1.bb16
-rw-r--r--packages/python/python-pygame_1.8.1.bb2
-rw-r--r--packages/sugar/sugar-base_0.82.0.bb25
-rw-r--r--packages/sugar/sugar-toolkit_0.82.1.bb2
-rw-r--r--packages/sugar/sugar_0.82.0.bb3
-rw-r--r--packages/tasks/task-openmoko-feed.bb8
-rw-r--r--packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch (renamed from packages/uclibc/files/arm_fix_alignment.patch)0
-rw-r--r--packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch34
-rw-r--r--packages/uclibc/uclibc-initial_nptl.bb35
-rw-r--r--packages/uclibc/uclibc-nptl/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-nptl/arm_fix_alignment.patch19
-rw-r--r--packages/uclibc/uclibc-nptl/uClibc.distro147
-rw-r--r--packages/uclibc/uclibc-nptl/uClibc.machine.armv5te70
-rw-r--r--packages/uclibc/uclibc-svn/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/arm/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/arm/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/armeb/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/arm/uClibc.config (renamed from packages/uclibc/uclibc-cvs/arm/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/arm_fix_alignment.patch19
-rw-r--r--packages/uclibc/uclibc-svn/armeb/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/armeb/uClibc.config (renamed from packages/uclibc/uclibc-cvs/armeb/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/dht-walnut/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/efika/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/dht-walnut/uClibc.config (renamed from packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/efika/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/i386/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/efika/uClibc.config (renamed from packages/uclibc/uclibc-cvs/efika/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/errno_values.h.patch (renamed from packages/uclibc/uclibc-cvs/errno_values.h.patch)0
-rw-r--r--packages/uclibc/uclibc-svn/error_print_progname.patch (renamed from packages/uclibc/uclibc-cvs/error_print_progname.patch)0
-rw-r--r--packages/uclibc/uclibc-svn/i386/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/i486/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/i386/uClibc.config (renamed from packages/uclibc/uclibc-cvs/i386/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/i486/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/i586/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/i486/uClibc.config (renamed from packages/uclibc/uclibc-cvs/i486/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/i586/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/i686/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/i586/uClibc.config (renamed from packages/uclibc/uclibc-cvs/i586/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/i686/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/ixp4xx/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/i686/uClibc.config (renamed from packages/uclibc/uclibc-cvs/i686/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/ixp4xx/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/magicbox/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/ixp4xx/uClibc.distro (renamed from packages/uclibc/uclibc-cvs/ixp4xx/uClibc.distro)0
-rw-r--r--packages/uclibc/uclibc-svn/ixp4xx/uClibc.machine (renamed from packages/uclibc/uclibc-cvs/ixp4xx/uClibc.machine)0
-rw-r--r--packages/uclibc/uclibc-svn/magicbox/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/mipsel/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/magicbox/uClibc.config (renamed from packages/uclibc/uclibc-cvs/magicbox/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/mipsel/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/powerpc/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/mipsel/uClibc.config (renamed from packages/uclibc/uclibc-cvs/mipsel/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/powerpc/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/sh3/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/powerpc/uClibc.config (renamed from packages/uclibc/uclibc-cvs/powerpc/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/sh3/.mtn2git_empty (renamed from packages/uclibc/uclibc-cvs/sh4/.mtn2git_empty)0
-rw-r--r--packages/uclibc/uclibc-svn/sh3/uClibc.config (renamed from packages/uclibc/uclibc-cvs/sh3/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/sh4/.mtn2git_empty0
-rw-r--r--packages/uclibc/uclibc-svn/sh4/uClibc.config (renamed from packages/uclibc/uclibc-cvs/sh4/uClibc.config)0
-rw-r--r--packages/uclibc/uclibc-svn/thumb-asm-swi.patch (renamed from packages/uclibc/uclibc-cvs/thumb-asm-swi.patch)0
-rw-r--r--packages/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch (renamed from packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch)0
-rw-r--r--packages/uclibc/uclibc-svn/thumb-mov-pc-bx.patch (renamed from packages/uclibc/uclibc-cvs/thumb-mov-pc-bx.patch)0
-rw-r--r--packages/uclibc/uclibc_0.9.29.bb3
-rw-r--r--packages/uclibc/uclibc_nptl.bb35
-rw-r--r--packages/uclibc/uclibc_svn.bb8
-rw-r--r--packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty0
-rw-r--r--packages/xscreensaver/xscreensaver-5.07/configure.in.patch91
-rw-r--r--packages/xscreensaver/xscreensaver_5.07.bb63
102 files changed, 3087 insertions, 1051 deletions
diff --git a/packages/busybox/busybox-1.9.2/topmem.patch b/packages/busybox/busybox-1.9.2/topmem.patch
new file mode 100644
index 0000000000..d49bf58103
--- /dev/null
+++ b/packages/busybox/busybox-1.9.2/topmem.patch
@@ -0,0 +1,28 @@
+Index: busybox-1.9.2/procps/top.c
+===================================================================
+--- busybox-1.9.2.orig/procps/top.c 2008-08-21 16:19:31.004137057 +0200
++++ busybox-1.9.2/procps/top.c 2008-08-21 16:21:46.066805448 +0200
+@@ -909,17 +909,22 @@
+ #else
+ qsort(top, ntop, sizeof(top_status_t), (void*)(sort_function[0]));
+ #endif /* FEATURE_TOP_CPU_USAGE_PERCENTAGE */
+- } else { /* TOPMEM */
++ }
++#if ENABLE_FEATURE_TOPMEM
++ else { /* TOPMEM */
+ qsort(topmem, ntop, sizeof(topmem_status_t), (void*)topmem_sort);
+ }
++#endif
+ count = lines;
+ if (OPT_BATCH_MODE || count > ntop) {
+ count = ntop;
+ }
+ if (scan_mask == TOP_MASK)
+ display_process_list(count, col);
++#if ENABLE_FEATURE_TOPMEM
+ else
+ display_topmem_process_list(count, col);
++#endif
+ clearmems();
+ if (iterations >= 0 && !--iterations)
+ break;
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index 37cd2a86be..e5c0f2473c 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -5,6 +5,7 @@ SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://udhcpscript.patch;patch=1 \
file://adduser-longops.patch;patch=1 \
file://sort-z-nul.patch;patch=1;status=upstream \
+ file://topmem.patch;patch=1 \
file://busybox-cron \
file://busybox-httpd \
file://busybox-udhcpd \
diff --git a/packages/cacao/cacaoh-cldc-native_0.98.bb b/packages/cacao/cacaoh-cldc-native_0.98.bb
index e2c92cc328..eac95b8ace 100644
--- a/packages/cacao/cacaoh-cldc-native_0.98.bb
+++ b/packages/cacao/cacaoh-cldc-native_0.98.bb
@@ -1,19 +1,9 @@
require cacaoh-native.inc
-DEPENDS += "midpath-cldc-native"
-
SRC_URI = "\
http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2;md5sum=8b8907c8b925761c9410bcadb9705346 \
"
-EXTRA_OECONF += "\
- --with-classpath-includedir=${STAGING_INCDIR}/classpath \
- --enable-jni \
- --enable-java=cldc1.1 \
- --with-classpath=cldc1.1 \
- --with-classpath-classes=${STAGING_DATADIR}/midpath-cldc/midpath-cldc1.1.jar \
-"
-
do_stage() {
install -m 0755 src/cacaoh/.libs/cacaoh ${STAGING_BINDIR}/cacaoh-cldc-${PV}
}
diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb
index 756dd9ffe9..8ed5c44d94 100644
--- a/packages/dbus-java/dbus-java_2.3.bb
+++ b/packages/dbus-java/dbus-java_2.3.bb
@@ -20,10 +20,15 @@ RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
@@ -32,7 +37,7 @@ do_compile () {
.binclasses
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
diff --git a/packages/dbus-java/dbus-java_2.4.bb b/packages/dbus-java/dbus-java_2.4.bb
index 17b7ccec68..37c539b20e 100644
--- a/packages/dbus-java/dbus-java_2.4.bb
+++ b/packages/dbus-java/dbus-java_2.4.bb
@@ -17,10 +17,15 @@ S = "${WORKDIR}/dbus-java-${PV}"
inherit java-library
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
do_compile () {
# run target .binclasses first to fix a brokenness in the Makefile
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
@@ -28,7 +33,7 @@ do_compile () {
JAR="fastjar" \
.binclasses
oe_runmake \
- JCFLAGS="-source 1.5" \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
JAVAC="javac" \
JARPREFIX="${STAGING_DATADIR_JAVA}" \
JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.bb
new file mode 100644
index 0000000000..a3ab37bd9e
--- /dev/null
+++ b/packages/dbus-java/dbus-java_2.5.bb
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus@matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "LGPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java"
+PR = "r1"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
+do_compile () {
+ oe_runmake \
+ JCFLAGS="-source 1.5 ${JCFLAGS}" \
+ JAVAC="javac" \
+ JARPREFIX="${STAGING_DATADIR_JAVA}" \
+ JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+ CLASSPATH="${S}/classes" \
+ JAR="fastjar" \
+ bin
+
+ # Generated shell scripts will have staging paths inside them.
+ rm bin/*
+
+ # Generate them again with target paths.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ bin
+
+ # Generate man pages.
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ JARPREFIX=${datadir_java} \
+ JAVAUNIXPATH=${datadir_java} \
+ man
+}
+
+do_install () {
+ oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar
+ oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar
+ oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar
+
+ install -d ${D}${bindir}
+ install bin/DBusViewer ${D}${bindir}
+ install bin/DBusCall ${D}${bindir}
+ install bin/CreateInterface ${D}${bindir}
+ install bin/ListDBus ${D}${bindir}
+ install bin/DBusDaemon ${D}${bindir}
+
+ oe_runmake \
+ JAVAC="oefatal \"No Java compilation expected here.\"" \
+ JAR="oefatal \"No jar invocation expected here.\"" \
+ MANPREFIX=${D}${mandir} \
+ DOCPREFIX=${D}${docdir}/${JPN} \
+ install-man
+}
+
+do_stage () {
+ oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
diff --git a/packages/ffmpeg/ffmpeg_git.bb b/packages/ffmpeg/ffmpeg_git.bb
index 965a453aff..76dd833418 100644
--- a/packages/ffmpeg/ffmpeg_git.bb
+++ b/packages/ffmpeg/ffmpeg_git.bb
@@ -3,19 +3,19 @@ require ffmpeg.inc
DEPENDS += "libgsm"
PV = "0.4.9+${PR}+gitr${SRCREV}"
-PR = "r26"
+PR = "r27"
DEFAULT_PREFERENCE = "-1"
DEFAULT_PREFERENCE_armv5te = "1"
DEFAULT_PREFERENCE_armv6 = "1"
DEFAULT_PREFERENCE_armv7a = "1"
-FFBRANCH_arm = "arm"
+FFBRANCH_arm = "arm.qpel"
FFBRANCH ?= "master"
# When bumping SRCREV make sure you bump PR here and in dependant recipes (gst-ffmpeg, gnash, omxil, etc) to account for SOVERSION changes
SRCREV = "3692b8de9fae73860be636606cb6344f26e28b1a"
-SRCREV_arm = "a1b91f5e7bf5612ea3a5c63579f220b0af8da1f8"
+SRCREV_arm = "7c46803029e74a20ceb1327d1d599ae758aea58c"
SRC_URI = "git://git.mansr.com/ffmpeg.mru;protocol=git;branch=${FFBRANCH} \
"
@@ -55,7 +55,8 @@ EXTRA_OECONF = " \
"
do_configure() {
- cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true
+ sed -i -e s:'check_cflags -std=c99'::g ${S}/configure
+ cd ${S} ; git clone git://git.mplayerhq.hu/libswscale || true
mkdir -p ${B}
cd ${B}
${S}/configure ${EXTRA_OECONF}
diff --git a/packages/flumotion/flumotion_0.4.1.bb b/packages/flumotion/flumotion_0.4.1.bb
index 976c8c4142..c746da6c8f 100644
--- a/packages/flumotion/flumotion_0.4.1.bb
+++ b/packages/flumotion/flumotion_0.4.1.bb
@@ -1,6 +1,6 @@
DESCRIPTION = "Fluendo Streaming Server"
LICENSE = "GPL"
-DEPENDS = "gstreamer python-imaging python-gst twisted python-pygtk"
+DEPENDS = "gstreamer python-imaging python-gst python-twisted python-pygtk"
RDEPENDS = "python-resource python-pprint python-threading \
python-imaging python-xml python-curses \
python-compression python-fcntl python-pygobject \
diff --git a/packages/gcc/gcc-4.2.4.inc b/packages/gcc/gcc-4.2.4.inc
index 4078009bd5..ccca7705c1 100644
--- a/packages/gcc/gcc-4.2.4.inc
+++ b/packages/gcc/gcc-4.2.4.inc
@@ -68,6 +68,6 @@ FORTRAN = ""
FORTRAN_linux-gnueabi = ",fortran"
JAVA = ""
-EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --disable-libmudflap"
+EXTRA_OECONF_BASE = "--enable-libssp --disable-bootstrap --enable-libgomp --disable-libmudflap"
ARM_INSTRUCTION_SET = "arm"
diff --git a/packages/gcc/gcc-4.3.1.inc b/packages/gcc/gcc-4.3.1.inc
index b14dd4acf5..f1f29710a3 100644
--- a/packages/gcc/gcc-4.3.1.inc
+++ b/packages/gcc/gcc-4.3.1.inc
@@ -1,4 +1,4 @@
-# No uclibc, armeb and thumb patches - really needs checking
+# No armeb and thumb patches - really needs checking
DEFAULT_PREFERENCE = "-99"
require gcc-common.inc
@@ -24,19 +24,19 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://debian/libstdc++-pic.dpatch;patch=1;pnum=0 \
file://debian/gcc-ice-hack.dpatch;patch=1;pnum=0 \
file://debian/pr30961.dpatch;patch=1;pnum=0 \
-# file://100-uclibc-conf.patch;patch=1 \
-# file://103-uclibc-conf-noupstream.patch;patch=1 \
-# file://200-uclibc-locale.patch;patch=1 \
-# file://203-uclibc-locale-no__x.patch;patch=1 \
-# file://204-uclibc-locale-wchar_fix.patch;patch=1 \
-# file://205-uclibc-locale-update.patch;patch=1 \
+ file://100-uclibc-conf.patch;patch=1 \
+ file://103-uclibc-conf-noupstream.patch;patch=1 \
+ file://200-uclibc-locale.patch;patch=1 \
+ file://203-uclibc-locale-no__x.patch;patch=1 \
+ file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+ file://205-uclibc-locale-update.patch;patch=1 \
file://301-missing-execinfo_h.patch;patch=1 \
-# file://302-c99-snprintf.patch;patch=1 \
-# file://303-c99-complex-ugly-hack.patch;patch=1 \
+ file://302-c99-snprintf.patch;patch=1 \
+ file://303-c99-complex-ugly-hack.patch;patch=1 \
file://304-index_macro.patch;patch=1 \
file://305-libmudflap-susv3-legacy.patch;patch=1 \
-# file://306-libstdc++-namespace.patch;patch=1 \
-# file://307-locale_facets.patch;patch=1 \
+ file://306-libstdc++-namespace.patch;patch=1 \
+ file://307-locale_facets.patch;patch=1 \
# file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
file://602-sdk-libstdc++-includes.patch;patch=1 \
file://740-sh-pr24836.patch;patch=1 \
@@ -48,7 +48,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
# file://arm-thumb.patch;patch=1 \
# file://arm-thumb-cache.patch;patch=1 \
file://ldflags.patch;patch=1 \
- file://zecke-xgcc-cpp.patch;patch=1 \
file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
file://cache-amnesia.patch;patch=1 \
file://gfortran.patch;patch=1 \
@@ -60,6 +59,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc/gcc-${PV}/gcc-${PV}.tar.bz2 \
file://gcc-release-branch/PR-36500-fix-neon.patch;patch=1 \
file://gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch;patch=1 \
file://gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch;patch=1 \
+ file://zecke-xgcc-cpp.patch;patch=1 \
"
SRC_URI_append_sh3 = " file://sh3-installfix-fixheaders.patch;patch=1 "
diff --git a/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch b/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
index 4243ff7b91..0b799607e8 100644
--- a/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
+++ b/packages/gcc/gcc-4.3.1/100-uclibc-conf.patch
@@ -1,119 +1,7 @@
---- gcc/libgomp/configure
-+++ gcc/libgomp/configure
-@@ -3771,7 +3771,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/gcc/config/cris/linux.h
-+++ gcc/gcc/config/cris/linux.h
-@@ -74,7 +74,11 @@
- #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG
-
- #undef CRIS_SUBTARGET_VERSION
--#define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#if UCLIBC_DEFAULT
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-uclibc"
-+#else
-+# define CRIS_SUBTARGET_VERSION " - cris-axis-linux-gnu"
-+#endif
-
- #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1"
-
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -4276,7 +4276,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/zlib/configure
-+++ gcc/zlib/configure
-@@ -3422,7 +3422,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libobjc/configure
-+++ gcc/libobjc/configure
-@@ -3309,7 +3309,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libgfortran/configure
-+++ gcc/libgfortran/configure
-@@ -3695,7 +3695,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libmudflap/configure
-+++ gcc/libmudflap/configure
-@@ -5378,7 +5378,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/boehm-gc/configure
-+++ gcc/boehm-gc/configure
-@@ -4316,7 +4316,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libffi/configure
-+++ gcc/libffi/configure
-@@ -3453,7 +3453,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libssp/configure
-+++ gcc/libssp/configure
-@@ -4409,7 +4409,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/contrib/regression/objs-gcc.sh
-+++ gcc/contrib/regression/objs-gcc.sh
+Index: gcc-4.3.1/contrib/regression/objs-gcc.sh
+===================================================================
+--- gcc-4.3.1.orig/contrib/regression/objs-gcc.sh 2007-12-24 15:18:57.000000000 -0800
++++ gcc-4.3.1/contrib/regression/objs-gcc.sh 2008-08-16 01:15:12.000000000 -0700
@@ -105,6 +105,10 @@
then
make all-gdb all-dejagnu all-ld || exit 1
@@ -125,61 +13,10 @@
elif [ $H_REAL_TARGET = $H_REAL_HOST ] ; then
make bootstrap || exit 1
make install || exit 1
---- gcc/libjava/classpath/ltconfig
-+++ gcc/libjava/classpath/ltconfig
-@@ -603,7 +603,7 @@
-
- # Transform linux* to *-*-linux-gnu*, to support old configure scripts.
- case $host_os in
--linux-gnu*) ;;
-+linux-gnu*|linux-uclibc*) ;;
- linux*) host=`echo $host | sed 's/^\(.*-.*-linux\)\(.*\)$/\1-gnu\2/'`
- esac
-
-@@ -1251,7 +1251,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- version_type=linux
- need_lib_prefix=no
- need_version=no
---- gcc/libjava/classpath/configure
-+++ gcc/libjava/classpath/configure
-@@ -4665,7 +4665,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libjava/configure
-+++ gcc/libjava/configure
-@@ -5212,7 +5212,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/libtool.m4
-+++ gcc/libtool.m4
-@@ -739,7 +739,7 @@
- ;;
-
- # This must be Linux ELF.
--linux-gnu*)
-+linux*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
---- gcc/ltconfig
-+++ gcc/ltconfig
+Index: gcc-4.3.1/libjava/classpath/ltconfig
+===================================================================
+--- gcc-4.3.1.orig/libjava/classpath/ltconfig 2007-06-03 16:18:43.000000000 -0700
++++ gcc-4.3.1/libjava/classpath/ltconfig 2008-08-16 01:15:12.000000000 -0700
@@ -603,7 +603,7 @@
# Transform linux* to *-*-linux-gnu*, to support old configure scripts.
diff --git a/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch b/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
index ea21388b75..398f7a4436 100644
--- a/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
+++ b/packages/gcc/gcc-4.3.1/200-uclibc-locale.patch
@@ -1,6 +1,8 @@
---- gcc/libstdc++-v3/acinclude.m4
-+++ gcc/libstdc++-v3/acinclude.m4
-@@ -1369,7 +1369,7 @@
+Index: gcc-4.3.1/libstdc++-v3/acinclude.m4
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/acinclude.m4 2008-04-25 09:52:57.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/acinclude.m4 2008-08-19 01:15:23.000000000 -0700
+@@ -1349,7 +1349,7 @@
AC_DEFUN([GLIBCXX_ENABLE_CLOCALE], [
GLIBCXX_ENABLE(clocale,auto,[@<:@=MODEL@:>@],
[use MODEL for target locale package],
@@ -9,7 +11,7 @@
# 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
-@@ -1385,6 +1385,9 @@
+@@ -1370,6 +1370,9 @@
# Default to "generic".
if test $enable_clocale_flag = auto; then
case ${target_os} in
@@ -17,9 +19,9 @@
+ enable_clocale_flag=uclibc
+ ;;
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- AC_EGREP_CPP([_GLIBCXX_ok], [
- #include <features.h>
-@@ -1528,6 +1531,40 @@
+ 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
;;
@@ -60,8 +62,10 @@
esac
# This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,63 @@
+// Prototypes for GLIBC thread locale __-prefixed functions -*- C++ -*-
+
@@ -102,7 +106,7 @@
+#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;
@@ -123,11 +127,13 @@
+extern "C" __typeof(wcsftime_l) __wcsftime_l;
+extern "C" __typeof(wcsxfrm_l) __wcsxfrm_l;
+extern "C" __typeof(wctype_l) __wctype_l;
-+#endif
++#endif
+
+#endif // GLIBC 2.3 and later
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,160 @@
+// Wrapper for underlying C-language localization -*- C++ -*-
+
@@ -184,11 +190,11 @@
+#define __duplocale(a) __c_locale()
+#endif
+
-+namespace std
++namespace std
+{
+ template<>
+ void
-+ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
++ __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc)
+ {
+ if (!(__err & ios_base::failbit))
@@ -205,7 +211,7 @@
+
+ template<>
+ void
-+ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
++ __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
+ const __c_locale& __cloc)
+ {
+ if (!(__err & ios_base::failbit))
@@ -238,7 +244,7 @@
+ }
+
+ void
-+ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
++ locale::facet::_S_create_c_locale(__c_locale& __cloc, const char* __s,
+ __c_locale __old)
+ {
+ __cloc = __newlocale(1 << LC_ALL, __s, __old);
@@ -251,12 +257,12 @@
+ }
+#endif
+ }
-+
++
+ void
+ locale::facet::_S_destroy_c_locale(__c_locale& __cloc)
+ {
+ if (_S_get_c_locale() != __cloc)
-+ __freelocale(__cloc);
++ __freelocale(__cloc);
+ }
+
+ __c_locale
@@ -268,19 +274,19 @@
+{
+ const char* const category_names[6 + _GLIBCXX_NUM_CATEGORIES] =
+ {
-+ "LC_CTYPE",
++ "LC_CTYPE",
+ "LC_NUMERIC",
-+ "LC_TIME",
-+ "LC_COLLATE",
++ "LC_TIME",
++ "LC_COLLATE",
+ "LC_MONETARY",
-+ "LC_MESSAGES",
++ "LC_MESSAGES",
+#if _GLIBCXX_NUM_CATEGORIES != 0
-+ "LC_PAPER",
-+ "LC_NAME",
++ "LC_PAPER",
++ "LC_NAME",
+ "LC_ADDRESS",
-+ "LC_TELEPHONE",
-+ "LC_MEASUREMENT",
-+ "LC_IDENTIFICATION"
++ "LC_TELEPHONE",
++ "LC_MEASUREMENT",
++ "LC_IDENTIFICATION"
+#endif
+ };
+}
@@ -289,8 +295,10 @@
+{
+ const char* const* const locale::_S_categories = __gnu_cxx::category_names;
+} // namespace std
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,117 @@
+// Wrapper for underlying C-language localization -*- C++ -*-
+
@@ -356,7 +364,7 @@
+#endif
+// #define _GLIBCXX_NUM_CATEGORIES 6
+#define _GLIBCXX_NUM_CATEGORIES 0
-+
++
+#ifdef __UCLIBC_HAS_XLOCALE__
+namespace __gnu_cxx
+{
@@ -378,7 +386,7 @@
+ // be avoided.
+ template<typename _Tv>
+ int
-+ __convert_from_v(char* __out,
++ __convert_from_v(char* __out,
+ const int __size __attribute__ ((__unused__)),
+ const char* __fmt,
+#ifdef __UCLIBC_HAS_XCLOCALE__
@@ -409,9 +417,11 @@
+}
+
+#endif
---- gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
-@@ -0,0 +1,306 @@
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/codecvt_members.cc 2008-08-19 01:39:14.000000000 -0700
+@@ -0,0 +1,308 @@
+// std::codecvt implementation details, GNU version -*- C++ -*-
+
+// Copyright (C) 2002, 2003 Free Software Foundation, Inc.
@@ -448,6 +458,8 @@
+// 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
@@ -456,7 +468,7 @@
+#ifdef _GLIBCXX_USE_WCHAR_T
+ codecvt_base::result
+ codecvt<wchar_t, char, mbstate_t>::
-+ do_out(state_type& __state, const intern_type* __from,
++ 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
@@ -526,12 +538,12 @@
+ __uselocale(__old);
+#endif
+
-+ return __ret;
++ return __ret;
+ }
-+
++
+ codecvt_base::result
+ codecvt<wchar_t, char, mbstate_t>::
-+ do_in(state_type& __state, const extern_type* __from,
++ 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
@@ -575,12 +587,12 @@
+ break;
+ }
+ __from_next = __from;
-+ __state = __tmp_state;
++ __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).
++ // It is unclear what to return in this case (see DR 382).
+ __to_next += __conv;
+ __ret = partial;
+ }
@@ -595,7 +607,7 @@
+ if (__to_next < __to_end)
+ {
+ // XXX Probably wrong for stateful encodings
-+ __tmp_state = __state;
++ __tmp_state = __state;
+ ++__from_next;
+ *__to_next++ = L'\0';
+ }
@@ -608,10 +620,10 @@
+ __uselocale(__old);
+#endif
+
-+ return __ret;
++ return __ret;
+ }
+
-+ int
++ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_encoding() const throw()
+ {
@@ -627,9 +639,9 @@
+ __uselocale(__old);
+#endif
+ return __ret;
-+ }
++ }
+
-+ int
++ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_max_length() const throw()
+ {
@@ -643,8 +655,8 @@
+#endif
+ return __ret;
+ }
-+
-+ int
++
++ int
+ codecvt<wchar_t, char, mbstate_t>::
+ do_length(state_type& __state, const extern_type* __from,
+ const extern_type* __end, size_t __max) const
@@ -659,10 +671,10 @@
+ // 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)
++ wchar_t* __to = static_cast<wchar_t*>(__builtin_alloca(sizeof(wchar_t)
+ * __max));
+ while (__from < __end && __max)
+ {
@@ -696,7 +708,7 @@
+ }
+ if (!__from)
+ __from = __from_chunk_end;
-+
++
+ __ret += __from - __tmp_from;
+ __max -= __conv;
+
@@ -714,12 +726,14 @@
+ __uselocale(__old);
+#endif
+
-+ return __ret;
++ return __ret;
+ }
+#endif
+}
---- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/collate_members.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,80 @@
+// std::collate implementation details, GNU version -*- C++ -*-
+
@@ -771,29 +785,29 @@
+ // These are basically extensions to char_traits, and perhaps should
+ // be put there instead of here.
+ template<>
-+ int
++ 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
++ 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,
++ 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,
@@ -801,8 +815,10 @@
+ { return __wcsxfrm_l(__to, __from, __n, _M_c_locale_collate); }
+#endif
+}
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,300 @@
+// std::ctype implementation details, GNU version -*- C++ -*-
+
@@ -857,12 +873,12 @@
+ // various /config/os/* files.
+ template<>
+ ctype_byname<char>::ctype_byname(const char* __s, size_t __refs)
-+ : ctype<char>(0, false, __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);
++ 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;
@@ -871,7 +887,7 @@
+ }
+ }
+
-+#ifdef _GLIBCXX_USE_WCHAR_T
++#ifdef _GLIBCXX_USE_WCHAR_T
+ ctype<wchar_t>::__wmask_type
+ ctype<wchar_t>::_M_convert_to_wmask(const mask __m) const
+ {
@@ -916,7 +932,7 @@
+ }
+ return __ret;
+ }
-+
++
+ wchar_t
+ ctype<wchar_t>::do_toupper(wchar_t __c) const
+ { return __towupper_l(__c, _M_c_locale_ctype); }
@@ -931,11 +947,11 @@
+ }
+ 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
+ {
@@ -950,11 +966,11 @@
+ 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;
++ 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))
@@ -962,10 +978,10 @@
+ __ret = true;
+ break;
+ }
-+ return __ret;
++ return __ret;
+ }
-+
-+ const wchar_t*
++
++ const wchar_t*
+ ctype<wchar_t>::
+ do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
+ {
@@ -973,7 +989,7 @@
+ {
+ // Highest bitmask in ctype_base == 10, but extra in "C"
+ // library for blank.
-+ const size_t __bitmasksize = 11;
++ 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))
@@ -982,8 +998,8 @@
+ }
+ return __hi;
+ }
-+
-+ const wchar_t*
++
++ const wchar_t*
+ ctype<wchar_t>::
+ do_scan_is(mask __m, const wchar_t* __lo, const wchar_t* __hi) const
+ {
@@ -1006,7 +1022,7 @@
+ do_widen(char __c) const
+ { return _M_widen[static_cast<unsigned char>(__c)]; }
+
-+ const char*
++ const char*
+ ctype<wchar_t>::
+ do_widen(const char* __lo, const char* __hi, wchar_t* __dest) const
+ {
@@ -1032,12 +1048,12 @@
+#ifdef __UCLIBC_HAS_XLOCALE__
+ __uselocale(__old);
+#endif
-+ return (__c == EOF ? __dfault : static_cast<char>(__c));
++ 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,
++ do_narrow(const wchar_t* __lo, const wchar_t* __hi, char __dfault,
+ char* __dest) const
+ {
+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1094,7 +1110,7 @@
+ _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]);
+ }
@@ -1104,8 +1120,10 @@
+ }
+#endif // _GLIBCXX_USE_WCHAR_T
+}
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,100 @@
+// std::messages implementation details, GNU version -*- C++ -*-
+
@@ -1207,8 +1225,10 @@
+ }
+#endif
+}
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,118 @@
+// std::messages implementation details, GNU version -*- C++ -*-
+
@@ -1262,13 +1282,13 @@
+ // Non-virtual member functions.
+ template<typename _CharT>
+ messages<_CharT>::messages(size_t __refs)
-+ : facet(__refs), _M_c_locale_messages(_S_get_c_locale()),
++ : 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)
++ 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)
+ {
@@ -1278,28 +1298,28 @@
+ }
+
+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
++ 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);
++ 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);
++ _S_destroy_c_locale(_M_c_locale_messages);
+ }
+
+ template<typename _CharT>
-+ typename messages<_CharT>::catalog
-+ messages<_CharT>::do_open(const basic_string<char>& __s,
++ 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());
@@ -1307,15 +1327,15 @@
+ }
+
+ template<typename _CharT>
-+ void
-+ messages<_CharT>::do_close(catalog) const
++ 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)
-+ {
++ : 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];
@@ -1325,11 +1345,13 @@
+ 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);
++ this->_S_create_c_locale(this->_M_c_locale_messages, __s);
+ }
+ }
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,692 @@
+// std::moneypunct implementation details, GNU version -*- C++ -*-
+
@@ -1386,7 +1408,7 @@
+ // 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
@@ -1394,7 +1416,7 @@
+
+ // if (__precedes) symbol -> value
+ // else value -> symbol
-+
++
+ // if (__space) space
+ // else none
+
@@ -1479,7 +1501,7 @@
+ if (__precedes)
+ {
+ __ret.field[0] = sign;
-+ __ret.field[1] = symbol;
++ __ret.field[1] = symbol;
+ if (__space)
+ {
+ __ret.field[2] = space;
@@ -1487,7 +1509,7 @@
+ }
+ else
+ {
-+ __ret.field[2] = value;
++ __ret.field[2] = value;
+ __ret.field[3] = none;
+ }
+ }
@@ -1548,9 +1570,9 @@
+ return __ret;
+ }
+
-+ template<>
++ template<>
+ void
-+ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
++ moneypunct<char, true>::_M_initialize_moneypunct(__c_locale __cloc,
+ const char*)
+ {
+ if (!_M_data)
@@ -1579,9 +1601,9 @@
+ else
+ {
+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
++ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
++ _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);
@@ -1592,30 +1614,30 @@
+ if (!__nposn)
+ _M_data->_M_negative_sign = "()";
+ else
-+ _M_data->_M_negative_sign = __nl_langinfo_l(__NEGATIVE_SIGN,
++ _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,
++ _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,
++ _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,
++ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+ }
+ }
+
-+ template<>
++ template<>
+ void
-+ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
++ moneypunct<char, false>::_M_initialize_moneypunct(__c_locale __cloc,
+ const char*)
+ {
+ if (!_M_data)
@@ -1644,9 +1666,9 @@
+ else
+ {
+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
++ _M_data->_M_decimal_point = *(__nl_langinfo_l(__MON_DECIMAL_POINT,
+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(__MON_THOUSANDS_SEP,
++ _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);
@@ -1668,27 +1690,27 @@
+ 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,
++ _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,
++ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+ }
+ }
+
-+ template<>
++ template<>
+ moneypunct<char, true>::~moneypunct()
+ { delete _M_data; }
+
-+ template<>
++ template<>
+ moneypunct<char, false>::~moneypunct()
+ { delete _M_data; }
+
+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
++ template<>
+ void
-+ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
++ moneypunct<wchar_t, true>::_M_initialize_moneypunct(__c_locale __cloc,
+#ifdef __UCLIBC_HAS_XLOCALE__
+ const char*)
+#else
@@ -1775,12 +1797,12 @@
+ 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];
@@ -1790,7 +1812,7 @@
+ 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)
@@ -1810,7 +1832,7 @@
+ delete _M_data;
+ _M_data = 0;
+ delete __wcs_ps;
-+ delete __wcs_ns;
++ delete __wcs_ns;
+#ifdef __UCLIBC_HAS_XLOCALE__
+ __uselocale(__old);
+#else
@@ -1818,18 +1840,18 @@
+ free(__old);
+#endif
+ __throw_exception_again;
-+ }
-+
-+ _M_data->_M_frac_digits = *(__nl_langinfo_l(__INT_FRAC_DIGITS,
++ }
++
++ _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,
++ _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,
++ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1841,7 +1863,7 @@
+ }
+ }
+
-+ template<>
++ template<>
+ void
+ moneypunct<wchar_t, false>::_M_initialize_moneypunct(__c_locale __cloc,
+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1931,12 +1953,12 @@
+ 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];
@@ -1966,7 +1988,7 @@
+ delete _M_data;
+ _M_data = 0;
+ delete __wcs_ps;
-+ delete __wcs_ns;
++ delete __wcs_ns;
+#ifdef __UCLIBC_HAS_XLOCALE__
+ __uselocale(__old);
+#else
@@ -1980,11 +2002,11 @@
+ 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,
++ _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,
++ _M_data->_M_neg_format = _S_construct_pattern(__nprecedes, __nspace,
+ __nposn);
+
+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -1996,7 +2018,7 @@
+ }
+ }
+
-+ template<>
++ template<>
+ moneypunct<wchar_t, true>::~moneypunct()
+ {
+ if (_M_data->_M_positive_sign_size)
@@ -2009,7 +2031,7 @@
+ delete _M_data;
+ }
+
-+ template<>
++ template<>
+ moneypunct<wchar_t, false>::~moneypunct()
+ {
+ if (_M_data->_M_positive_sign_size)
@@ -2023,8 +2045,10 @@
+ }
+#endif
+}
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,160 @@
+// std::numpunct implementation details, GNU version -*- C++ -*-
+
@@ -2075,7 +2099,7 @@
+
+namespace std
+{
-+ template<>
++ template<>
+ void
+ numpunct<char>::_M_initialize_numpunct(__c_locale __cloc)
+ {
@@ -2101,9 +2125,9 @@
+ else
+ {
+ // Named locale.
-+ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
++ _M_data->_M_decimal_point = *(__nl_langinfo_l(DECIMAL_POINT,
+ __cloc));
-+ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
++ _M_data->_M_thousands_sep = *(__nl_langinfo_l(THOUSANDS_SEP,
+ __cloc));
+
+ // Check for NULL, which implies no grouping.
@@ -2122,13 +2146,13 @@
+ _M_data->_M_falsename = "false";
+ _M_data->_M_falsename_size = 5;
+ }
-+
-+ template<>
++
++ template<>
+ numpunct<char>::~numpunct()
+ { delete _M_data; }
-+
++
+#ifdef _GLIBCXX_USE_WCHAR_T
-+ template<>
++ template<>
+ void
+ numpunct<wchar_t>::_M_initialize_numpunct(__c_locale __cloc)
+ {
@@ -2181,13 +2205,15 @@
+ _M_data->_M_falsename_size = 5;
+ }
+
-+ template<>
++ template<>
+ numpunct<wchar_t>::~numpunct()
+ { delete _M_data; }
+ #endif
+}
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,406 @@
+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
+
@@ -2240,7 +2266,7 @@
+ template<>
+ void
+ __timepunct<char>::
-+ _M_put(char* __s, size_t __maxlen, const char* __format,
++ _M_put(char* __s, size_t __maxlen, const char* __format,
+ const tm* __tm) const
+ {
+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -2258,7 +2284,7 @@
+ __s[0] = '\0';
+ }
+
-+ template<>
++ template<>
+ void
+ __timepunct<char>::_M_initialize_timepunct(__c_locale __cloc)
+ {
@@ -2328,7 +2354,7 @@
+ }
+ else
+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
++ _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);
@@ -2393,7 +2419,7 @@
+ template<>
+ void
+ __timepunct<wchar_t>::
-+ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
++ _M_put(wchar_t* __s, size_t __maxlen, const wchar_t* __format,
+ const tm* __tm) const
+ {
+#ifdef __UCLIBC_HAS_XLOCALE__
@@ -2412,7 +2438,7 @@
+ __s[0] = L'\0';
+ }
+
-+ template<>
++ template<>
+ void
+ __timepunct<wchar_t>::_M_initialize_timepunct(__c_locale __cloc)
+ {
@@ -2484,7 +2510,7 @@
+#if 0
+ else
+ {
-+ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
++ _M_c_locale_timepunct = _S_clone_c_locale(__cloc);
+
+ union { char *__s; wchar_t *__w; } __u;
+
@@ -2595,8 +2621,10 @@
+ }
+#endif
+}
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.h
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-19 01:38:05.000000000 -0700
@@ -0,0 +1,68 @@
+// std::time_get, std::time_put implementation, GNU version -*- C++ -*-
+
@@ -2635,40 +2663,42 @@
+// 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),
++ __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),
++ __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),
++ 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);
++ _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);
++ delete _M_data;
++ _S_destroy_c_locale(_M_c_locale_timepunct);
+ }
---- gcc/libstdc++-v3/configure
-+++ gcc/libstdc++-v3/configure
-@@ -5764,7 +5764,7 @@
+Index: gcc-4.3.1/libstdc++-v3/configure
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/configure 2008-04-25 09:52:57.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/configure 2008-08-19 01:38:04.000000000 -0700
+@@ -14001,7 +14001,7 @@
enableval="$enable_clocale"
case "$enableval" in
@@ -2677,17 +2707,17 @@
*) { { 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; }; } ;;
-@@ -5789,6 +5789,9 @@
+@@ -14034,6 +14034,9 @@
# Default to "generic".
if test $enable_clocale_flag = auto; then
case ${target_os} in
-+ linux-uclibc*)
++ *-uclibc*)
+ enable_clocale_flag=uclibc
-+ ;;
++ ;;
linux* | gnu* | kfreebsd*-gnu | knetbsd*-gnu)
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
-@@ -6019,6 +6022,76 @@
+ enable_clocale_flag=gnu
+ ;;
+@@ -14422,6 +14425,76 @@
CTIME_CC=config/locale/generic/time_members.cc
CLOCALE_INTERNAL_H=config/locale/generic/c++locale_internal.h
;;
@@ -2764,9 +2794,20 @@
esac
# This is where the testsuite looks for locale catalogs, using the
---- gcc/libstdc++-v3/include/c_compatibility/wchar.h
-+++ gcc/libstdc++-v3/include/c_compatibility/wchar.h
-@@ -101,7 +101,9 @@
+@@ -17014,7 +17087,7 @@
+
+ # Fake what AC_TRY_COMPILE does. XXX Look at redoing this new-style.
+ cat > conftest.$ac_ext << EOF
+-#line 17017 "configure"
++#line 17090 "configure"
+ int main()
+ {
+ // NB: _Atomic_word not necessarily int.
+Index: gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/include/c_compatibility/wchar.h 2007-03-04 14:59:49.000000000 -0800
++++ gcc-4.3.1/libstdc++-v3/include/c_compatibility/wchar.h 2008-08-19 01:15:23.000000000 -0700
+@@ -106,7 +106,9 @@
using std::wmemcpy;
using std::wmemmove;
using std::wmemset;
@@ -2776,8 +2817,10 @@
#if _GLIBCXX_USE_C99
using std::wcstold;
---- gcc/libstdc++-v3/include/c_std/std_cwchar.h
-+++ gcc/libstdc++-v3/include/c_std/std_cwchar.h
+Index: gcc-4.3.1/libstdc++-v3/include/c_std/cwchar
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/include/c_std/cwchar 2007-05-27 07:50:21.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/include/c_std/cwchar 2008-08-19 01:15:23.000000000 -0700
@@ -182,7 +182,9 @@
using ::wcscoll;
using ::wcscpy;
diff --git a/packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch b/packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch
index 6ba47003b3..f39e65220c 100644
--- a/packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch
+++ b/packages/gcc/gcc-4.3.1/203-uclibc-locale-no__x.patch
@@ -1,8 +1,10 @@
---- gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2006-03-10 15:32:37 +0100
+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
+ #endif
+# define __nl_langinfo_l nl_langinfo_l
+# define __strcoll_l strcoll_l
@@ -44,14 +46,16 @@
+# 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 __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
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:32:37 +0100
+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>
@@ -70,11 +74,13 @@
-#define __duplocale(a) __c_locale()
-#endif
-
- namespace std
+ namespace std
{
template<>
---- gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/collate_members.cc 2006-03-10 15:32:37 +0100
+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>
@@ -89,8 +95,10 @@
namespace std
{
// These are basically extensions to char_traits, and perhaps should
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:32:37 +0100
+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
@@ -102,8 +110,10 @@
namespace std
{
// Construct and return valid pattern consisting of some combination of:
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:32:37 +0100
+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
@@ -114,8 +124,10 @@
namespace std
{
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.cc 2006-03-10 15:32:37 +0100
+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
@@ -126,8 +138,10 @@
namespace std
{
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:32:37 +0100
+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>
@@ -142,8 +156,10 @@
namespace std
{
// NB: The other ctype<char> specializations are in src/locale.cc and
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.cc 2006-03-10 15:32:37 +0100
+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
@@ -160,8 +176,10 @@
#define gettext(msgid) (msgid)
#endif
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:32:37 +0100
+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
@@ -184,16 +202,16 @@
// Non-virtual member functions.
@@ -70,7 +66,7 @@
- messages<_CharT>::open(const basic_string<char>& __s, const locale& __loc,
+ 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);
+ 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());
@@ -201,8 +219,10 @@
return 0;
}
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.h.uclibc200no__x~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-03-10 15:32:37 +0100
+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;
diff --git a/packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch b/packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch
index 86b2844554..8da7461145 100644
--- a/packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch
+++ b/packages/gcc/gcc-4.3.1/205-uclibc-locale-update.patch
@@ -1,7 +1,18 @@
---- gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/c_locale.cc 2006-03-10 15:39:14 +0100
-@@ -46,16 +47,13 @@
- __convert_to_v(const char* __s, float& __v, ios_base::iostate& __err,
+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-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.cc 2008-08-19 02:52:48.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))
@@ -24,8 +35,8 @@
}
template<>
-@@ -63,16 +61,13 @@
- __convert_to_v(const char* __s, double& __v, ios_base::iostate& __err,
+@@ -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))
@@ -48,7 +59,7 @@
}
template<>
-@@ -80,16 +75,13 @@
+@@ -80,16 +74,13 @@
__convert_to_v(const char* __s, long double& __v, ios_base::iostate& __err,
const __c_locale& __cloc)
{
@@ -72,18 +83,50 @@
}
void
-@@ -110,7 +102,7 @@
+@@ -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);
+ __freelocale(__cloc);
}
---- gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc.uclibc200_update~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2006-03-10 15:39:14 +0100
-@@ -33,9 +33,14 @@
+ __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.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/ctype_members.cc 2008-08-19 02:12:04.000000000 -0700
+@@ -33,16 +33,20 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
@@ -97,11 +140,20 @@
+#endif
#include <bits/c++locale_internal.h>
- namespace std
-@@ -138,20 +143,34 @@
+-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)
+ {
+@@ -138,17 +142,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,
@@ -109,8 +161,9 @@
+ // 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;
+- 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))
@@ -137,29 +190,29 @@
+ break;
+ }
+ }
- return __ret;
- }
--
+
- const wchar_t*
- ctype<wchar_t>::
- do_is(const wchar_t* __lo, const wchar_t* __hi, mask* __vec) const
---- gcc/libstdc++-v3/config/locale/uclibc/messages_members.h.uclibc200_update~ 2006-03-10 15:32:37 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/messages_members.h 2006-03-10 15:39:14 +0100
-@@ -47,18 +47,21 @@
- 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())
-+ _M_name_messages(_S_get_c_name())
- { }
+ return __ret;
+ }
+@@ -290,4 +310,5 @@
+ #endif
+ }
+ #endif // _GLIBCXX_USE_WCHAR_T
+-}
++
++_GLIBCXX_END_NAMESPACE
+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-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/messages_members.h 2008-08-19 03:00:38.000000000 -0700
+@@ -53,12 +53,16 @@
template<typename _CharT>
- messages<_CharT>::messages(__c_locale __cloc, const char* __s,
- size_t __refs)
+ 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)
++ : facet(__refs), _M_c_locale_messages(NULL),
++ _M_name_messages(NULL)
{
- char* __tmp = new char[std::strlen(__s) + 1];
- std::strcpy(__tmp, __s);
@@ -173,8 +226,10 @@
}
template<typename _CharT>
---- gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc.uclibc200_update~ 2006-03-10 15:37:27 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2006-03-10 15:39:14 +0100
+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-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/monetary_members.cc 2008-08-19 02:29:18.000000000 -0700
@@ -33,9 +33,14 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
@@ -199,8 +254,79 @@
}
return __ret;
}
---- gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc.uclibc200_update~ 2006-03-10 15:37:27 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2006-03-10 15:39:14 +0100
+@@ -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.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/numeric_members.cc 2008-08-19 01:41:34.000000000 -0700
@@ -33,9 +33,14 @@
// Written by Benjamin Kosnik <bkoz@redhat.com>
@@ -216,37 +342,24 @@
#include <bits/c++locale_internal.h>
#ifdef __UCLIBC_MJN3_ONLY__
---- gcc/libstdc++-v3/config/locale/uclibc/time_members.h.uclibc200_update~ 2006-03-10 15:06:17 +0100
-+++ gcc/libstdc++-v3/config/locale/uclibc/time_members.h 2006-03-10 15:39:14 +0100
-@@ -37,25 +37,33 @@
- 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_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_name_timepunct(_S_get_c_name())
- { _M_initialize_timepunct(); }
-
- template<typename _CharT>
+Index: gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h
+===================================================================
+--- gcc-4.3.1.orig/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.h 2008-08-19 03:00:38.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),
+ size_t __refs)
+ : facet(__refs), _M_data(NULL), _M_c_locale_timepunct(NULL),
- _M_name_timepunct(__s)
-+ _M_name_timepunct(NULL)
- {
++ _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);
+- _M_initialize_timepunct(__cloc);
+
+ try
+ { _M_initialize_timepunct(__cloc); }
@@ -255,11 +368,14 @@
+ delete [] _M_name_timepunct;
+ __throw_exception_again;
+ }
++
}
template<typename _CharT>
---- gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h.old 2006-09-28 11:39:00.000000000 +0200
-+++ gcc-4.2/libstdc++-v3/config/locale/uclibc/c_locale.h 2006-09-28 12:10:41.000000000 +0200
+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-19 01:41:34.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c_locale.h 2008-08-19 01:41:34.000000000 -0700
@@ -39,21 +39,23 @@
#pragma GCC system_header
@@ -288,19 +404,11 @@
#endif
#define _GLIBCXX_C_LOCALE_GNU 1
-@@ -62,7 +64,7 @@
- #endif
- // #define _GLIBCXX_NUM_CATEGORIES 6
- #define _GLIBCXX_NUM_CATEGORIES 0
--
-+
- #ifdef __UCLIBC_HAS_XLOCALE__
- namespace __gnu_cxx
- {
-@@ -79,22 +81,24 @@
+@@ -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
@@ -310,7 +418,7 @@
// be avoided.
- template<typename _Tv>
- int
-- __convert_from_v(char* __out,
+- __convert_from_v(char* __out,
- const int __size __attribute__ ((__unused__)),
- const char* __fmt,
-#ifdef __UCLIBC_HAS_XCLOCALE__
@@ -318,7 +426,7 @@
+ inline int
+ __convert_from_v(const __c_locale&
+#ifndef __UCLIBC_HAS_XCLOCALE__
-+ __cloc __attribute__ ((__unused__))
++ __cloc __attribute__ ((__unused__))
+#endif
+ ,
+ char* __out,
@@ -327,6 +435,7 @@
{
+ va_list __args;
+#ifdef __UCLIBC_HAS_XCLOCALE__
++
__c_locale __old = __gnu_cxx::__uselocale(__cloc);
#else
- _Tv __v, const __c_locale&, int __prec)
@@ -345,3 +454,57 @@
#ifdef __UCLIBC_HAS_XCLOCALE__
__gnu_cxx::__uselocale(__old);
+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-19 02:36:00.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/time_members.cc 2008-08-19 02:38:23.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.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-19 03:00:52.000000000 -0700
++++ gcc-4.3.1/libstdc++-v3/config/locale/uclibc/c++locale_internal.h 2008-08-19 03:01:11.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/packages/gcc/gcc-4.3.1/302-c99-snprintf.patch b/packages/gcc/gcc-4.3.1/302-c99-snprintf.patch
index dfb22d681b..02865865e5 100644
--- a/packages/gcc/gcc-4.3.1/302-c99-snprintf.patch
+++ b/packages/gcc/gcc-4.3.1/302-c99-snprintf.patch
@@ -1,8 +1,10 @@
---- gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h-orig 2005-04-29 00:08:41.000000000 -0500
-+++ gcc-4.0.0/libstdc++-v3/include/c_std/std_cstdio.h 2005-04-29 00:08:45.000000000 -0500
-@@ -142,7 +142,7 @@
- using ::vsprintf;
- }
+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__)
diff --git a/packages/gcc/gcc-4.3.1/307-locale_facets.patch b/packages/gcc/gcc-4.3.1/307-locale_facets.patch
index 412f8657dc..774fcfa2ca 100644
--- a/packages/gcc/gcc-4.3.1/307-locale_facets.patch
+++ b/packages/gcc/gcc-4.3.1/307-locale_facets.patch
@@ -4,23 +4,16 @@ std::snprintf function, that, on uClibc, doens't handle sized 0 buffer.
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
---- gcc-4.2.1/libstdc++-v3/include/bits/locale_facets.tcc 2006-10-17 18:43:47.000000000 +0200
-+++ gcc-4.2.1-st/libstdc++-v3/include/bits/locale_facets.tcc 2007-08-22 18:54:23.000000000 +0200
-@@ -1143,7 +1143,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
+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,
++ __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, __fbuf,
__prec, __v);
#endif
-@@ -1777,7 +1777,7 @@ _GLIBCXX_BEGIN_LDBL_NAMESPACE
- // max_exponent10 + 1 for the integer part, + 2 for sign and '\0'.
- const int __cs_size = numeric_limits<long double>::max_exponent10 + 3;
- char* __cs = static_cast<char*>(__builtin_alloca(__cs_size));
-- int __len = std::__convert_from_v(_S_get_c_locale(), __cs, 0, "%.*Lf",
-+ int __len = std::__convert_from_v(_S_get_c_locale(), __cs, __cs_size, "%.*Lf",
- 0, __units);
- #endif
- string_type __digits(__len, char_type());
diff --git a/packages/gcc/gcc-4.3.1/cache-amnesia.patch b/packages/gcc/gcc-4.3.1/cache-amnesia.patch
index ef7cd111c5..fb4d1a26d8 100644
--- a/packages/gcc/gcc-4.3.1/cache-amnesia.patch
+++ b/packages/gcc/gcc-4.3.1/cache-amnesia.patch
@@ -1,8 +1,26 @@
-diff --git a/gcc/configure b/gcc/configure
-index 44620ab..6e1830c 100755
---- a/gcc/configure
-+++ b/gcc/configure
-@@ -12272,7 +12272,7 @@ else
+---
+ gcc/configure | 2 +-
+ gcc/configure.ac | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: gcc-4.3.1/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
+ saved_CFLAGS="${CFLAGS}"
+ CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_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
+===================================================================
+--- 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
saved_CFLAGS="${CFLAGS}"
CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
diff --git a/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch b/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
index 2a9605c3d6..317a58b6a3 100644
--- a/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
+++ b/packages/gcc/gcc-4.3.1/gcc-4.3.1-SYSROOT_CFLAGS_FOR_TARGET.patch
@@ -54,19 +54,25 @@ gcc:
---
- Makefile.def | 24
- Makefile.in | 1802 +++++++++++++++++++++++++++++++--------------------
- Makefile.tpl | 57 -
- config/mh-ppc-darwin | 3
- configure | 36 -
- configure.ac | 32
- gcc/doc/install.texi | 56 -
- 7 files changed, 1261 insertions(+), 749 deletions(-)
+ Makefile.def | 25
+ Makefile.in | 1845 ++++++++++++++++++++++++++++++-------------------
+ Makefile.tpl | 91 +-
+ config/mh-ppc-darwin | 3
+ configure | 36
+ configure.ac | 32
+ gcc/Makefile.in | 2
+ gcc/configure | 6
+ gcc/configure.ac | 3
+ gcc/doc/install.texi | 56 -
+ libiberty/Makefile.in | 162 ++--
+ libiberty/configure | 46 -
+ libiberty/configure.ac | 43 -
+ 13 files changed, 1454 insertions(+), 896 deletions(-)
Index: gcc-4.3.1/configure.ac
===================================================================
--- gcc-4.3.1.orig/configure.ac 2008-02-01 19:29:30.000000000 -0800
-+++ gcc-4.3.1/configure.ac 2008-07-21 10:56:15.000000000 -0700
++++ gcc-4.3.1/configure.ac 2008-08-20 00:47:50.000000000 -0700
@@ -1667,6 +1667,38 @@ AC_ARG_WITH([debug-prefix-map],
[DEBUG_PREFIX_CFLAGS_FOR_TARGET=])
AC_SUBST(DEBUG_PREFIX_CFLAGS_FOR_TARGET)
@@ -109,8 +115,16 @@ Index: gcc-4.3.1/configure.ac
Index: gcc-4.3.1/Makefile.def
===================================================================
--- gcc-4.3.1.orig/Makefile.def 2007-10-23 08:53:18.000000000 -0700
-+++ gcc-4.3.1/Makefile.def 2008-07-21 10:56:15.000000000 -0700
-@@ -511,43 +511,51 @@ bootstrap_stage = {
++++ gcc-4.3.1/Makefile.def 2008-08-20 00:47:50.000000000 -0700
+@@ -214,6 +214,7 @@ flags_to_pass = { flag= INSTALL ; };
+ flags_to_pass = { flag= INSTALL_DATA ; };
+ flags_to_pass = { flag= INSTALL_PROGRAM ; };
+ flags_to_pass = { flag= INSTALL_SCRIPT ; };
++flags_to_pass = { flag= LDFLAGS_FOR_BUILD ; };
+ flags_to_pass = { flag= LEX ; };
+ flags_to_pass = { flag= M4 ; };
+ flags_to_pass = { flag= MAKE ; };
+@@ -511,43 +512,51 @@ bootstrap_stage = {
// compiler probably has never heard of them.
stage_configure_flags='--disable-intermodule $(STAGE1_CHECKING) \
--disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"' ;
@@ -172,9 +186,46 @@ Index: gcc-4.3.1/Makefile.def
+ stage_libcflags='$(STAGE3_LIBCFLAGS) -fprofile-use' ; };
Index: gcc-4.3.1/Makefile.tpl
===================================================================
---- gcc-4.3.1.orig/Makefile.tpl 2008-07-21 10:56:14.000000000 -0700
-+++ gcc-4.3.1/Makefile.tpl 2008-07-21 10:56:15.000000000 -0700
-@@ -207,10 +207,10 @@ BASE_TARGET_EXPORTS = \
+--- gcc-4.3.1.orig/Makefile.tpl 2008-08-20 00:46:50.000000000 -0700
++++ gcc-4.3.1/Makefile.tpl 2008-08-20 00:47:50.000000000 -0700
+@@ -23,6 +23,14 @@ in
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+
++# First, test for a proper version of make, but only where one is required.
++
++@if gcc
++ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
++$(error GNU make version 3.80 or newer is required.)
++endif
++@endif gcc
++
+ # -------------------------------
+ # Standard Autoconf-set variables
+ # -------------------------------
+@@ -139,6 +147,13 @@ BUILD_EXPORTS = \
+ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
+
++# These variables must be set on the make command line for directories
++# built for the build system to override those in BASE_FLAGS_TO_PASSS.
++EXTRA_BUILD_FLAGS = \
++ CFLAGS="$(CFLAGS_FOR_BUILD)" \
++ LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
++ LIBCFLAGS=""
++
+ # This is the list of directories to built for the host system.
+ SUBDIRS = @configdirs@
+ # This is set by the configure script to the arguments to use when configuring
+@@ -153,6 +168,7 @@ HOST_SUBDIR = @host_subdir@
+ HOST_EXPORTS = \
+ $(BASE_EXPORTS) \
+ CC="$(CC)"; export CC; \
++ ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+ CFLAGS="$(CFLAGS)"; export CFLAGS; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ CXX="$(CXX)"; export CXX; \
+@@ -207,10 +223,10 @@ BASE_TARGET_EXPORTS = \
AR="$(AR_FOR_TARGET)"; export AR; \
AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
CC="$(CC_FOR_TARGET)"; export CC; \
@@ -187,7 +238,15 @@ Index: gcc-4.3.1/Makefile.tpl
GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -330,14 +330,19 @@ PICFLAG =
+@@ -322,7 +338,6 @@ LDFLAGS = @LDFLAGS@
+ LIBCFLAGS = $(CFLAGS)
+ CXXFLAGS = @CXXFLAGS@
+ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+-PICFLAG =
+
+ # Only build the C compiler for stage1, because that is the only one that
+ # we can guarantee will build with the native compiler, and also it is the
+@@ -330,14 +345,19 @@ PICFLAG =
# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
# overrideable (for a bootstrap build stage1 also builds gcc.info).
@@ -208,7 +267,7 @@ Index: gcc-4.3.1/Makefile.tpl
do-compare = @do_compare@
do-compare3 = $(do-compare)
do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -376,18 +381,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
+@@ -376,22 +396,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
@@ -229,8 +288,13 @@ Index: gcc-4.3.1/Makefile.tpl
+
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
- LDFLAGS_FOR_TARGET = @LDFLAGS@
-@@ -491,19 +489,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
+-LDFLAGS_FOR_TARGET = @LDFLAGS@
+-PICFLAG_FOR_TARGET =
++LDFLAGS_FOR_TARGET = @LDFLAGS@
+
+ # ------------------------------------
+ # Miscellaneous targets and flag lists
+@@ -491,19 +503,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
# Flags to pass down to makes which are built with the target environment.
# The double $ decreases the length of the command line; those variables
# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The
@@ -256,7 +320,7 @@ Index: gcc-4.3.1/Makefile.tpl
'NM=$(COMPILER_NM_FOR_TARGET)' \
'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -851,9 +850,11 @@ configure-stage[+id+]-[+prefix+][+module
+@@ -851,9 +864,11 @@ configure-stage[+id+]-[+prefix+][+module
fi; \
[+ ENDIF check_multilibs +]test ! -f [+subdir+]/[+module+]/Makefile || exit 0; \
[+exports+][+ IF prev +] \
@@ -270,7 +334,7 @@ Index: gcc-4.3.1/Makefile.tpl
echo Configuring stage [+id+] in [+subdir+]/[+module+] ; \
$(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \
cd [+subdir+]/[+module+] || exit 1; \
-@@ -890,7 +891,8 @@ all-[+prefix+][+module+]: configure-[+pr
+@@ -890,7 +905,8 @@ all-[+prefix+][+module+]: configure-[+pr
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
[+exports+] \
(cd [+subdir+]/[+module+] && \
@@ -280,7 +344,7 @@ Index: gcc-4.3.1/Makefile.tpl
@endif [+prefix+][+module+]
[+ IF bootstrap +]
-@@ -910,8 +912,11 @@ all-stage[+id+]-[+prefix+][+module+]: co
+@@ -910,8 +926,11 @@ all-stage[+id+]-[+prefix+][+module+]: co
[+exports+][+ IF prev +] \
[+poststage1_exports+][+ ENDIF prev +] \
cd [+subdir+]/[+module+] && \
@@ -294,7 +358,17 @@ Index: gcc-4.3.1/Makefile.tpl
IF prev +][+poststage1_args+][+ ENDIF prev
+] [+extra_make_flags+] \
$(TARGET-stage[+id+]-[+prefix+][+module+])
-@@ -961,7 +966,7 @@ clean-stage[+id+]-[+prefix+][+module+]:
+@@ -944,7 +963,8 @@ clean-stage[+id+]-[+prefix+][+module+]:
+ target_alias=(get "target" "${target_alias}")
+ args="$(BUILD_CONFIGARGS)" no-config-site=true +]
+
+-[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)" +]
++[+ all prefix="build-" subdir="$(BUILD_SUBDIR)" exports="$(BUILD_EXPORTS)"
++ args="$(EXTRA_BUILD_FLAGS)" +]
+ [+ ENDFOR build_module +]
+
+ # --------------------------------------
+@@ -961,7 +981,7 @@ clean-stage[+id+]-[+prefix+][+module+]:
[+ all prefix="" subdir="$(HOST_SUBDIR)"
exports="$(HOST_EXPORTS)"
poststage1_exports="$(POSTSTAGE1_HOST_EXPORTS)"
@@ -303,7 +377,7 @@ Index: gcc-4.3.1/Makefile.tpl
poststage1_args="$(POSTSTAGE1_FLAGS_TO_PASS)" +]
.PHONY: check-[+module+] maybe-check-[+module+]
-@@ -1059,7 +1064,7 @@ maybe-[+make_target+]-[+module+]: [+make
+@@ -1059,7 +1079,7 @@ maybe-[+make_target+]-[+module+]: [+make
[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
exports="$(RAW_CXX_TARGET_EXPORTS)"
@@ -312,7 +386,7 @@ Index: gcc-4.3.1/Makefile.tpl
[+ ELSE +]
[+ configure prefix="target-" subdir="$(TARGET_SUBDIR)"
check_multilibs=true
-@@ -1070,7 +1075,7 @@ maybe-[+make_target+]-[+module+]: [+make
+@@ -1070,7 +1090,7 @@ maybe-[+make_target+]-[+module+]: [+make
[+ all prefix="target-" subdir="$(TARGET_SUBDIR)"
exports="$(NORMAL_TARGET_EXPORTS)"
@@ -321,10 +395,52 @@ Index: gcc-4.3.1/Makefile.tpl
[+ ENDIF +]
.PHONY: check-target-[+module+] maybe-check-target-[+module+]
+@@ -1300,7 +1320,7 @@ stage[+id+]-end:: [+ FOR host_modules +]
+
+ # Bubble a bug fix through all the stages up to stage [+id+]. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage[+id+]-bubble
+ stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -1439,11 +1459,11 @@ stage_current:
+ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+
+ .PHONY: restrap
+-restrap:
++restrap::
+ @: $(MAKE); $(stage)
+ rm -rf stage1-$(TARGET_SUBDIR) [+ FOR bootstrap-stage +][+ IF prev
+ +]stage[+id+]-* [+ ENDIF prev +][+ ENDFOR bootstrap-stage +]
+- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
++restrap:: all
+ @endif gcc-bootstrap
+
+ # --------------------------------------
+@@ -1474,7 +1494,7 @@ configure-target-[+module+]: maybe-all-g
+
+ [+ ;; These Scheme functions build the bulk of the dependencies.
+ ;; dep-target builds a string like "maybe-all-MODULE_KIND-gcc",
+- ;; where "maybe-" is only included if HARD is true, and all-gcc
++ ;; where "maybe-" is only included if HARD is not true, and all-gcc
+ ;; is taken from VAR-NAME.
+ (define dep-target (lambda (module-kind var-name hard)
+ (string-append
+@@ -1632,7 +1652,8 @@ config.status: configure
+
+ # Rebuilding configure.
+ AUTOCONF = autoconf
+-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4
++$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
++ $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
+ cd $(srcdir) && $(AUTOCONF)
+
+ # ------------------------------
Index: gcc-4.3.1/config/mh-ppc-darwin
===================================================================
--- gcc-4.3.1.orig/config/mh-ppc-darwin 2007-05-23 07:26:31.000000000 -0700
-+++ gcc-4.3.1/config/mh-ppc-darwin 2008-07-21 10:56:15.000000000 -0700
++++ gcc-4.3.1/config/mh-ppc-darwin 2008-08-20 00:47:50.000000000 -0700
@@ -2,5 +2,4 @@
# position-independent-code -- the usual default on Darwin. This fix speeds
# compiles by 3-5%.
@@ -335,7 +451,7 @@ Index: gcc-4.3.1/config/mh-ppc-darwin
Index: gcc-4.3.1/gcc/doc/install.texi
===================================================================
--- gcc-4.3.1.orig/gcc/doc/install.texi 2008-05-22 23:58:10.000000000 -0700
-+++ gcc-4.3.1/gcc/doc/install.texi 2008-07-21 10:56:15.000000000 -0700
++++ gcc-4.3.1/gcc/doc/install.texi 2008-08-20 00:47:50.000000000 -0700
@@ -1772,33 +1772,35 @@ same described above, but object files f
stage2 of the 3-stage bootstrap of the compiler are deleted as
soon as they are no longer needed.
@@ -410,14 +526,50 @@ Index: gcc-4.3.1/gcc/doc/install.texi
fixed name to be used for the assembler input file, instead of a
Index: gcc-4.3.1/Makefile.in
===================================================================
---- gcc-4.3.1.orig/Makefile.in 2008-07-21 10:56:14.000000000 -0700
-+++ gcc-4.3.1/Makefile.in 2008-07-21 10:56:15.000000000 -0700
-@@ -204,11 +204,10 @@ BASE_TARGET_EXPORTS = \
+--- gcc-4.3.1.orig/Makefile.in 2008-08-20 00:46:50.000000000 -0700
++++ gcc-4.3.1/Makefile.in 2008-08-20 00:47:50.000000000 -0700
+@@ -20,6 +20,14 @@
+ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ #
+
++# First, test for a proper version of make, but only where one is required.
++
++@if gcc
++ifeq (,$(.VARIABLES)) # The variable .VARIABLES, new with 3.80, is never empty.
++$(error GNU make version 3.80 or newer is required.)
++endif
++@endif gcc
++
+ # -------------------------------
+ # Standard Autoconf-set variables
+ # -------------------------------
+@@ -136,6 +144,13 @@ BUILD_EXPORTS = \
+ WINDRES="$(WINDRES_FOR_BUILD)"; export WINDRES; \
+ WINDMC="$(WINDMC_FOR_BUILD)"; export WINDMC;
+
++# These variables must be set on the make command line for directories
++# built for the build system to override those in BASE_FLAGS_TO_PASSS.
++EXTRA_BUILD_FLAGS = \
++ CFLAGS="$(CFLAGS_FOR_BUILD)" \
++ LDFLAGS="$(LDFLAGS_FOR_BUILD)" \
++ LIBCFLAGS=""
++
+ # This is the list of directories to built for the host system.
+ SUBDIRS = @configdirs@
+ # This is set by the configure script to the arguments to use when configuring
+@@ -150,6 +165,7 @@ HOST_SUBDIR = @host_subdir@
+ HOST_EXPORTS = \
+ $(BASE_EXPORTS) \
+ CC="$(CC)"; export CC; \
++ ADA_CFLAGS="$(ADA_CFLAGS)"; export ADA_CFLAGS; \
+ CFLAGS="$(CFLAGS)"; export CFLAGS; \
+ CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
+ CXX="$(CXX)"; export CXX; \
+@@ -204,10 +220,10 @@ BASE_TARGET_EXPORTS = \
AR="$(AR_FOR_TARGET)"; export AR; \
AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
CC="$(CC_FOR_TARGET)"; export CC; \
- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
-- CPP="$(CC_FOR_TARGET) -E"; export CPP; \
+ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
@@ -426,7 +578,15 @@ Index: gcc-4.3.1/Makefile.in
GCJ="$(GCJ_FOR_TARGET)"; export GCJ; \
GFORTRAN="$(GFORTRAN_FOR_TARGET)"; export GFORTRAN; \
DLLTOOL="$(DLLTOOL_FOR_TARGET)"; export DLLTOOL; \
-@@ -328,14 +327,19 @@ PICFLAG =
+@@ -319,7 +335,6 @@ LDFLAGS = @LDFLAGS@
+ LIBCFLAGS = $(CFLAGS)
+ CXXFLAGS = @CXXFLAGS@
+ LIBCXXFLAGS = $(CXXFLAGS) -fno-implicit-templates
+-PICFLAG =
+
+ # Only build the C compiler for stage1, because that is the only one that
+ # we can guarantee will build with the native compiler, and also it is the
+@@ -327,14 +342,19 @@ PICFLAG =
# MAKEINFO and MAKEINFOFLAGS are explicitly passed here to make them
# overrideable (for a bootstrap build stage1 also builds gcc.info).
@@ -447,7 +607,7 @@ Index: gcc-4.3.1/Makefile.in
do-compare = @do_compare@
do-compare3 = $(do-compare)
do-compare-debug = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
-@@ -374,18 +378,11 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
+@@ -373,22 +393,14 @@ COMPILER_AS_FOR_TARGET=@COMPILER_AS_FOR_
COMPILER_LD_FOR_TARGET=@COMPILER_LD_FOR_TARGET@
COMPILER_NM_FOR_TARGET=@COMPILER_NM_FOR_TARGET@
@@ -468,8 +628,21 @@ Index: gcc-4.3.1/Makefile.in
+
LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
LIBCXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET) -fno-implicit-templates
- LDFLAGS_FOR_TARGET = @LDFLAGS@
-@@ -592,19 +589,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
+-LDFLAGS_FOR_TARGET = @LDFLAGS@
+-PICFLAG_FOR_TARGET =
++LDFLAGS_FOR_TARGET = @LDFLAGS@
+
+ # ------------------------------------
+ # Miscellaneous targets and flag lists
+@@ -495,6 +507,7 @@ BASE_FLAGS_TO_PASS = \
+ "INSTALL_DATA=$(INSTALL_DATA)" \
+ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
+ "INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
++ "LDFLAGS_FOR_BUILD=$(LDFLAGS_FOR_BUILD)" \
+ "LEX=$(LEX)" \
+ "M4=$(M4)" \
+ "MAKE=$(MAKE)" \
+@@ -591,19 +604,20 @@ POSTSTAGE1_FLAGS_TO_PASS = \
# Flags to pass down to makes which are built with the target environment.
# The double $ decreases the length of the command line; those variables
# are set in BASE_FLAGS_TO_PASS, and the sub-make will expand them. The
@@ -495,77 +668,77 @@ Index: gcc-4.3.1/Makefile.in
'NM=$(COMPILER_NM_FOR_TARGET)' \
'OBJDUMP=$$(OBJDUMP_FOR_TARGET)' \
'RANLIB=$$(RANLIB_FOR_TARGET)' \
-@@ -2738,7 +2736,8 @@ all-build-libiberty: configure-build-lib
+@@ -2737,7 +2751,8 @@ all-build-libiberty: configure-build-lib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/libiberty && \
- $(MAKE) $(TARGET-build-libiberty))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-libiberty))
@endif build-libiberty
-@@ -2793,7 +2792,8 @@ all-build-bison: configure-build-bison
+@@ -2792,7 +2807,8 @@ all-build-bison: configure-build-bison
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/bison && \
- $(MAKE) $(TARGET-build-bison))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-bison))
@endif build-bison
-@@ -2848,7 +2848,8 @@ all-build-byacc: configure-build-byacc
+@@ -2847,7 +2863,8 @@ all-build-byacc: configure-build-byacc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/byacc && \
- $(MAKE) $(TARGET-build-byacc))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-byacc))
@endif build-byacc
-@@ -2903,7 +2904,8 @@ all-build-flex: configure-build-flex
+@@ -2902,7 +2919,8 @@ all-build-flex: configure-build-flex
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/flex && \
- $(MAKE) $(TARGET-build-flex))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-flex))
@endif build-flex
-@@ -2958,7 +2960,8 @@ all-build-m4: configure-build-m4
+@@ -2957,7 +2975,8 @@ all-build-m4: configure-build-m4
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/m4 && \
- $(MAKE) $(TARGET-build-m4))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-m4))
@endif build-m4
-@@ -3013,7 +3016,8 @@ all-build-texinfo: configure-build-texin
+@@ -3012,7 +3031,8 @@ all-build-texinfo: configure-build-texin
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/texinfo && \
- $(MAKE) $(TARGET-build-texinfo))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-texinfo))
@endif build-texinfo
-@@ -3068,7 +3072,8 @@ all-build-fixincludes: configure-build-f
+@@ -3067,7 +3087,8 @@ all-build-fixincludes: configure-build-f
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(BUILD_EXPORTS) \
(cd $(BUILD_SUBDIR)/fixincludes && \
- $(MAKE) $(TARGET-build-fixincludes))
-+ $(MAKE) $(BASE_FLAGS_TO_PASS) \
++ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_BUILD_FLAGS) \
+ $(TARGET-build-fixincludes))
@endif build-fixincludes
-@@ -3127,7 +3132,8 @@ all-ash: configure-ash
+@@ -3126,7 +3147,8 @@ all-ash: configure-ash
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/ash && \
@@ -575,7 +748,7 @@ Index: gcc-4.3.1/Makefile.in
@endif ash
-@@ -3551,7 +3557,8 @@ all-autoconf: configure-autoconf
+@@ -3550,7 +3572,8 @@ all-autoconf: configure-autoconf
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/autoconf && \
@@ -585,7 +758,7 @@ Index: gcc-4.3.1/Makefile.in
@endif autoconf
-@@ -3975,7 +3982,8 @@ all-automake: configure-automake
+@@ -3974,7 +3997,8 @@ all-automake: configure-automake
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/automake && \
@@ -595,7 +768,7 @@ Index: gcc-4.3.1/Makefile.in
@endif automake
-@@ -4399,7 +4407,8 @@ all-bash: configure-bash
+@@ -4398,7 +4422,8 @@ all-bash: configure-bash
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/bash && \
@@ -605,7 +778,7 @@ Index: gcc-4.3.1/Makefile.in
@endif bash
-@@ -4816,9 +4825,9 @@ configure-stage1-bfd:
+@@ -4815,9 +4840,9 @@ configure-stage1-bfd:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
@@ -617,7 +790,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4847,9 +4856,9 @@ configure-stage2-bfd:
+@@ -4846,9 +4871,9 @@ configure-stage2-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -629,7 +802,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4878,9 +4887,9 @@ configure-stageb2g0-bfd:
+@@ -4877,9 +4902,9 @@ configure-stageb2g0-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -641,7 +814,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4909,9 +4918,9 @@ configure-stage3-bfd:
+@@ -4908,9 +4933,9 @@ configure-stage3-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -653,7 +826,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4940,9 +4949,9 @@ configure-stageb3g2-bfd:
+@@ -4939,9 +4964,9 @@ configure-stageb3g2-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -665,7 +838,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -4971,9 +4980,9 @@ configure-stage4-bfd:
+@@ -4970,9 +4995,9 @@ configure-stage4-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -677,7 +850,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5002,9 +5011,9 @@ configure-stageprofile-bfd:
+@@ -5001,9 +5026,9 @@ configure-stageprofile-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -689,7 +862,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5033,9 +5042,9 @@ configure-stagefeedback-bfd:
+@@ -5032,9 +5057,9 @@ configure-stagefeedback-bfd:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/bfd/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -701,7 +874,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/bfd ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \
cd $(HOST_SUBDIR)/bfd || exit 1; \
-@@ -5070,7 +5079,8 @@ all-bfd: configure-bfd
+@@ -5069,7 +5094,8 @@ all-bfd: configure-bfd
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/bfd && \
@@ -711,7 +884,7 @@ Index: gcc-4.3.1/Makefile.in
@endif bfd
-@@ -5089,8 +5099,11 @@ all-stage1-bfd: configure-stage1-bfd
+@@ -5088,8 +5114,11 @@ all-stage1-bfd: configure-stage1-bfd
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -725,7 +898,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-bfd)
maybe-clean-stage1-bfd: clean-stage1-bfd
-@@ -5103,7 +5116,7 @@ clean-stage1-bfd:
+@@ -5102,7 +5131,7 @@ clean-stage1-bfd:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -734,7 +907,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif bfd-bootstrap
-@@ -5123,8 +5136,11 @@ all-stage2-bfd: configure-stage2-bfd
+@@ -5122,8 +5151,11 @@ all-stage2-bfd: configure-stage2-bfd
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -748,7 +921,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-bfd)
maybe-clean-stage2-bfd: clean-stage2-bfd
-@@ -5137,7 +5153,7 @@ clean-stage2-bfd:
+@@ -5136,7 +5168,7 @@ clean-stage2-bfd:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -757,7 +930,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5158,8 +5174,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b
+@@ -5157,8 +5189,11 @@ all-stageb2g0-bfd: configure-stageb2g0-b
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -771,7 +944,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-bfd)
maybe-clean-stageb2g0-bfd: clean-stageb2g0-bfd
-@@ -5172,7 +5191,7 @@ clean-stageb2g0-bfd:
+@@ -5171,7 +5206,7 @@ clean-stageb2g0-bfd:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -780,7 +953,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5193,8 +5212,11 @@ all-stage3-bfd: configure-stage3-bfd
+@@ -5192,8 +5227,11 @@ all-stage3-bfd: configure-stage3-bfd
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -794,7 +967,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-bfd)
maybe-clean-stage3-bfd: clean-stage3-bfd
-@@ -5207,7 +5229,7 @@ clean-stage3-bfd:
+@@ -5206,7 +5244,7 @@ clean-stage3-bfd:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -803,7 +976,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5228,8 +5250,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b
+@@ -5227,8 +5265,11 @@ all-stageb3g2-bfd: configure-stageb3g2-b
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -817,7 +990,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-bfd)
maybe-clean-stageb3g2-bfd: clean-stageb3g2-bfd
-@@ -5242,7 +5267,7 @@ clean-stageb3g2-bfd:
+@@ -5241,7 +5282,7 @@ clean-stageb3g2-bfd:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -826,7 +999,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5263,8 +5288,11 @@ all-stage4-bfd: configure-stage4-bfd
+@@ -5262,8 +5303,11 @@ all-stage4-bfd: configure-stage4-bfd
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -840,7 +1013,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-bfd)
maybe-clean-stage4-bfd: clean-stage4-bfd
-@@ -5277,7 +5305,7 @@ clean-stage4-bfd:
+@@ -5276,7 +5320,7 @@ clean-stage4-bfd:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -849,7 +1022,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5298,8 +5326,11 @@ all-stageprofile-bfd: configure-stagepro
+@@ -5297,8 +5341,11 @@ all-stageprofile-bfd: configure-stagepro
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -863,7 +1036,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-bfd)
maybe-clean-stageprofile-bfd: clean-stageprofile-bfd
-@@ -5312,7 +5343,7 @@ clean-stageprofile-bfd:
+@@ -5311,7 +5358,7 @@ clean-stageprofile-bfd:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -872,7 +1045,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5333,8 +5364,11 @@ all-stagefeedback-bfd: configure-stagefe
+@@ -5332,8 +5379,11 @@ all-stagefeedback-bfd: configure-stagefe
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/bfd && \
@@ -886,7 +1059,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-bfd)
maybe-clean-stagefeedback-bfd: clean-stagefeedback-bfd
-@@ -5347,7 +5381,7 @@ clean-stagefeedback-bfd:
+@@ -5346,7 +5396,7 @@ clean-stagefeedback-bfd:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/bfd && \
@@ -895,7 +1068,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif bfd-bootstrap
-@@ -5754,9 +5788,9 @@ configure-stage1-opcodes:
+@@ -5753,9 +5803,9 @@ configure-stage1-opcodes:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
@@ -907,7 +1080,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5785,9 +5819,9 @@ configure-stage2-opcodes:
+@@ -5784,9 +5834,9 @@ configure-stage2-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -919,7 +1092,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5816,9 +5850,9 @@ configure-stageb2g0-opcodes:
+@@ -5815,9 +5865,9 @@ configure-stageb2g0-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -931,7 +1104,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5847,9 +5881,9 @@ configure-stage3-opcodes:
+@@ -5846,9 +5896,9 @@ configure-stage3-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -943,7 +1116,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5878,9 +5912,9 @@ configure-stageb3g2-opcodes:
+@@ -5877,9 +5927,9 @@ configure-stageb3g2-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -955,7 +1128,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5909,9 +5943,9 @@ configure-stage4-opcodes:
+@@ -5908,9 +5958,9 @@ configure-stage4-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -967,7 +1140,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5940,9 +5974,9 @@ configure-stageprofile-opcodes:
+@@ -5939,9 +5989,9 @@ configure-stageprofile-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -979,7 +1152,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -5971,9 +6005,9 @@ configure-stagefeedback-opcodes:
+@@ -5970,9 +6020,9 @@ configure-stagefeedback-opcodes:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/opcodes/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -991,7 +1164,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/opcodes ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \
cd $(HOST_SUBDIR)/opcodes || exit 1; \
-@@ -6008,7 +6042,8 @@ all-opcodes: configure-opcodes
+@@ -6007,7 +6057,8 @@ all-opcodes: configure-opcodes
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/opcodes && \
@@ -1001,7 +1174,7 @@ Index: gcc-4.3.1/Makefile.in
@endif opcodes
-@@ -6027,8 +6062,11 @@ all-stage1-opcodes: configure-stage1-opc
+@@ -6026,8 +6077,11 @@ all-stage1-opcodes: configure-stage1-opc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1015,7 +1188,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-opcodes)
maybe-clean-stage1-opcodes: clean-stage1-opcodes
-@@ -6041,7 +6079,7 @@ clean-stage1-opcodes:
+@@ -6040,7 +6094,7 @@ clean-stage1-opcodes:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1024,7 +1197,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif opcodes-bootstrap
-@@ -6061,8 +6099,11 @@ all-stage2-opcodes: configure-stage2-opc
+@@ -6060,8 +6114,11 @@ all-stage2-opcodes: configure-stage2-opc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1038,7 +1211,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-opcodes)
maybe-clean-stage2-opcodes: clean-stage2-opcodes
-@@ -6075,7 +6116,7 @@ clean-stage2-opcodes:
+@@ -6074,7 +6131,7 @@ clean-stage2-opcodes:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1047,7 +1220,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6096,8 +6137,11 @@ all-stageb2g0-opcodes: configure-stageb2
+@@ -6095,8 +6152,11 @@ all-stageb2g0-opcodes: configure-stageb2
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1061,7 +1234,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-opcodes)
maybe-clean-stageb2g0-opcodes: clean-stageb2g0-opcodes
-@@ -6110,7 +6154,7 @@ clean-stageb2g0-opcodes:
+@@ -6109,7 +6169,7 @@ clean-stageb2g0-opcodes:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1070,7 +1243,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6131,8 +6175,11 @@ all-stage3-opcodes: configure-stage3-opc
+@@ -6130,8 +6190,11 @@ all-stage3-opcodes: configure-stage3-opc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1084,7 +1257,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-opcodes)
maybe-clean-stage3-opcodes: clean-stage3-opcodes
-@@ -6145,7 +6192,7 @@ clean-stage3-opcodes:
+@@ -6144,7 +6207,7 @@ clean-stage3-opcodes:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1093,7 +1266,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6166,8 +6213,11 @@ all-stageb3g2-opcodes: configure-stageb3
+@@ -6165,8 +6228,11 @@ all-stageb3g2-opcodes: configure-stageb3
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1107,7 +1280,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-opcodes)
maybe-clean-stageb3g2-opcodes: clean-stageb3g2-opcodes
-@@ -6180,7 +6230,7 @@ clean-stageb3g2-opcodes:
+@@ -6179,7 +6245,7 @@ clean-stageb3g2-opcodes:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1116,7 +1289,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6201,8 +6251,11 @@ all-stage4-opcodes: configure-stage4-opc
+@@ -6200,8 +6266,11 @@ all-stage4-opcodes: configure-stage4-opc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1130,7 +1303,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-opcodes)
maybe-clean-stage4-opcodes: clean-stage4-opcodes
-@@ -6215,7 +6268,7 @@ clean-stage4-opcodes:
+@@ -6214,7 +6283,7 @@ clean-stage4-opcodes:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1139,7 +1312,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6236,8 +6289,11 @@ all-stageprofile-opcodes: configure-stag
+@@ -6235,8 +6304,11 @@ all-stageprofile-opcodes: configure-stag
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1153,7 +1326,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-opcodes)
maybe-clean-stageprofile-opcodes: clean-stageprofile-opcodes
-@@ -6250,7 +6306,7 @@ clean-stageprofile-opcodes:
+@@ -6249,7 +6321,7 @@ clean-stageprofile-opcodes:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1162,7 +1335,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6271,8 +6327,11 @@ all-stagefeedback-opcodes: configure-sta
+@@ -6270,8 +6342,11 @@ all-stagefeedback-opcodes: configure-sta
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1176,7 +1349,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-opcodes)
maybe-clean-stagefeedback-opcodes: clean-stagefeedback-opcodes
-@@ -6285,7 +6344,7 @@ clean-stagefeedback-opcodes:
+@@ -6284,7 +6359,7 @@ clean-stagefeedback-opcodes:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/opcodes && \
@@ -1185,7 +1358,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif opcodes-bootstrap
-@@ -6692,9 +6751,9 @@ configure-stage1-binutils:
+@@ -6691,9 +6766,9 @@ configure-stage1-binutils:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
@@ -1197,7 +1370,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6723,9 +6782,9 @@ configure-stage2-binutils:
+@@ -6722,9 +6797,9 @@ configure-stage2-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1209,7 +1382,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6754,9 +6813,9 @@ configure-stageb2g0-binutils:
+@@ -6753,9 +6828,9 @@ configure-stageb2g0-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1221,7 +1394,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6785,9 +6844,9 @@ configure-stage3-binutils:
+@@ -6784,9 +6859,9 @@ configure-stage3-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1233,7 +1406,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6816,9 +6875,9 @@ configure-stageb3g2-binutils:
+@@ -6815,9 +6890,9 @@ configure-stageb3g2-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1245,7 +1418,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6847,9 +6906,9 @@ configure-stage4-binutils:
+@@ -6846,9 +6921,9 @@ configure-stage4-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1257,7 +1430,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6878,9 +6937,9 @@ configure-stageprofile-binutils:
+@@ -6877,9 +6952,9 @@ configure-stageprofile-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1269,7 +1442,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6909,9 +6968,9 @@ configure-stagefeedback-binutils:
+@@ -6908,9 +6983,9 @@ configure-stagefeedback-binutils:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/binutils/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1281,7 +1454,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/binutils ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \
cd $(HOST_SUBDIR)/binutils || exit 1; \
-@@ -6946,7 +7005,8 @@ all-binutils: configure-binutils
+@@ -6945,7 +7020,8 @@ all-binutils: configure-binutils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/binutils && \
@@ -1291,7 +1464,7 @@ Index: gcc-4.3.1/Makefile.in
@endif binutils
-@@ -6965,8 +7025,11 @@ all-stage1-binutils: configure-stage1-bi
+@@ -6964,8 +7040,11 @@ all-stage1-binutils: configure-stage1-bi
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1305,7 +1478,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-binutils)
maybe-clean-stage1-binutils: clean-stage1-binutils
-@@ -6979,7 +7042,7 @@ clean-stage1-binutils:
+@@ -6978,7 +7057,7 @@ clean-stage1-binutils:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1314,7 +1487,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif binutils-bootstrap
-@@ -6999,8 +7062,11 @@ all-stage2-binutils: configure-stage2-bi
+@@ -6998,8 +7077,11 @@ all-stage2-binutils: configure-stage2-bi
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1328,7 +1501,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-binutils)
maybe-clean-stage2-binutils: clean-stage2-binutils
-@@ -7013,7 +7079,7 @@ clean-stage2-binutils:
+@@ -7012,7 +7094,7 @@ clean-stage2-binutils:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1337,7 +1510,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7034,8 +7100,11 @@ all-stageb2g0-binutils: configure-stageb
+@@ -7033,8 +7115,11 @@ all-stageb2g0-binutils: configure-stageb
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1351,7 +1524,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-binutils)
maybe-clean-stageb2g0-binutils: clean-stageb2g0-binutils
-@@ -7048,7 +7117,7 @@ clean-stageb2g0-binutils:
+@@ -7047,7 +7132,7 @@ clean-stageb2g0-binutils:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1360,7 +1533,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7069,8 +7138,11 @@ all-stage3-binutils: configure-stage3-bi
+@@ -7068,8 +7153,11 @@ all-stage3-binutils: configure-stage3-bi
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1374,7 +1547,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-binutils)
maybe-clean-stage3-binutils: clean-stage3-binutils
-@@ -7083,7 +7155,7 @@ clean-stage3-binutils:
+@@ -7082,7 +7170,7 @@ clean-stage3-binutils:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1383,7 +1556,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7104,8 +7176,11 @@ all-stageb3g2-binutils: configure-stageb
+@@ -7103,8 +7191,11 @@ all-stageb3g2-binutils: configure-stageb
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1397,7 +1570,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-binutils)
maybe-clean-stageb3g2-binutils: clean-stageb3g2-binutils
-@@ -7118,7 +7193,7 @@ clean-stageb3g2-binutils:
+@@ -7117,7 +7208,7 @@ clean-stageb3g2-binutils:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1406,7 +1579,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7139,8 +7214,11 @@ all-stage4-binutils: configure-stage4-bi
+@@ -7138,8 +7229,11 @@ all-stage4-binutils: configure-stage4-bi
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1420,7 +1593,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-binutils)
maybe-clean-stage4-binutils: clean-stage4-binutils
-@@ -7153,7 +7231,7 @@ clean-stage4-binutils:
+@@ -7152,7 +7246,7 @@ clean-stage4-binutils:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1429,7 +1602,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7174,8 +7252,11 @@ all-stageprofile-binutils: configure-sta
+@@ -7173,8 +7267,11 @@ all-stageprofile-binutils: configure-sta
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1443,7 +1616,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-binutils)
maybe-clean-stageprofile-binutils: clean-stageprofile-binutils
-@@ -7188,7 +7269,7 @@ clean-stageprofile-binutils:
+@@ -7187,7 +7284,7 @@ clean-stageprofile-binutils:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1452,7 +1625,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7209,8 +7290,11 @@ all-stagefeedback-binutils: configure-st
+@@ -7208,8 +7305,11 @@ all-stagefeedback-binutils: configure-st
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/binutils && \
@@ -1466,7 +1639,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-binutils)
maybe-clean-stagefeedback-binutils: clean-stagefeedback-binutils
-@@ -7223,7 +7307,7 @@ clean-stagefeedback-binutils:
+@@ -7222,7 +7322,7 @@ clean-stagefeedback-binutils:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/binutils && \
@@ -1475,7 +1648,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif binutils-bootstrap
-@@ -7637,7 +7721,8 @@ all-bison: configure-bison
+@@ -7636,7 +7736,8 @@ all-bison: configure-bison
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/bison && \
@@ -1485,7 +1658,7 @@ Index: gcc-4.3.1/Makefile.in
@endif bison
-@@ -8064,7 +8149,8 @@ all-byacc: configure-byacc
+@@ -8063,7 +8164,8 @@ all-byacc: configure-byacc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/byacc && \
@@ -1495,7 +1668,7 @@ Index: gcc-4.3.1/Makefile.in
@endif byacc
-@@ -8491,7 +8577,8 @@ all-bzip2: configure-bzip2
+@@ -8490,7 +8592,8 @@ all-bzip2: configure-bzip2
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/bzip2 && \
@@ -1505,7 +1678,7 @@ Index: gcc-4.3.1/Makefile.in
@endif bzip2
-@@ -8915,7 +9002,8 @@ all-dejagnu: configure-dejagnu
+@@ -8914,7 +9017,8 @@ all-dejagnu: configure-dejagnu
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/dejagnu && \
@@ -1515,7 +1688,7 @@ Index: gcc-4.3.1/Makefile.in
@endif dejagnu
-@@ -9339,7 +9427,8 @@ all-diff: configure-diff
+@@ -9338,7 +9442,8 @@ all-diff: configure-diff
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/diff && \
@@ -1525,7 +1698,7 @@ Index: gcc-4.3.1/Makefile.in
@endif diff
-@@ -9763,7 +9852,8 @@ all-dosutils: configure-dosutils
+@@ -9762,7 +9867,8 @@ all-dosutils: configure-dosutils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/dosutils && \
@@ -1535,7 +1708,7 @@ Index: gcc-4.3.1/Makefile.in
@endif dosutils
-@@ -10181,7 +10271,8 @@ all-etc: configure-etc
+@@ -10180,7 +10286,8 @@ all-etc: configure-etc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/etc && \
@@ -1545,7 +1718,7 @@ Index: gcc-4.3.1/Makefile.in
@endif etc
-@@ -10605,7 +10696,8 @@ all-fastjar: configure-fastjar
+@@ -10604,7 +10711,8 @@ all-fastjar: configure-fastjar
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/fastjar && \
@@ -1555,7 +1728,7 @@ Index: gcc-4.3.1/Makefile.in
@endif fastjar
-@@ -11032,7 +11124,8 @@ all-fileutils: configure-fileutils
+@@ -11031,7 +11139,8 @@ all-fileutils: configure-fileutils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/fileutils && \
@@ -1565,7 +1738,7 @@ Index: gcc-4.3.1/Makefile.in
@endif fileutils
-@@ -11456,7 +11549,8 @@ all-findutils: configure-findutils
+@@ -11455,7 +11564,8 @@ all-findutils: configure-findutils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/findutils && \
@@ -1575,7 +1748,7 @@ Index: gcc-4.3.1/Makefile.in
@endif findutils
-@@ -11880,7 +11974,8 @@ all-find: configure-find
+@@ -11879,7 +11989,8 @@ all-find: configure-find
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/find && \
@@ -1585,7 +1758,7 @@ Index: gcc-4.3.1/Makefile.in
@endif find
-@@ -12304,7 +12399,8 @@ all-fixincludes: configure-fixincludes
+@@ -12303,7 +12414,8 @@ all-fixincludes: configure-fixincludes
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/fixincludes && \
@@ -1595,7 +1768,7 @@ Index: gcc-4.3.1/Makefile.in
@endif fixincludes
-@@ -12712,7 +12808,8 @@ all-flex: configure-flex
+@@ -12711,7 +12823,8 @@ all-flex: configure-flex
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/flex && \
@@ -1605,7 +1778,7 @@ Index: gcc-4.3.1/Makefile.in
@endif flex
-@@ -13132,9 +13229,9 @@ configure-stage1-gas:
+@@ -13131,9 +13244,9 @@ configure-stage1-gas:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
@@ -1617,7 +1790,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13163,9 +13260,9 @@ configure-stage2-gas:
+@@ -13162,9 +13275,9 @@ configure-stage2-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1629,7 +1802,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13194,9 +13291,9 @@ configure-stageb2g0-gas:
+@@ -13193,9 +13306,9 @@ configure-stageb2g0-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1641,7 +1814,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13225,9 +13322,9 @@ configure-stage3-gas:
+@@ -13224,9 +13337,9 @@ configure-stage3-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1653,7 +1826,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13256,9 +13353,9 @@ configure-stageb3g2-gas:
+@@ -13255,9 +13368,9 @@ configure-stageb3g2-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1665,7 +1838,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13287,9 +13384,9 @@ configure-stage4-gas:
+@@ -13286,9 +13399,9 @@ configure-stage4-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1677,7 +1850,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13318,9 +13415,9 @@ configure-stageprofile-gas:
+@@ -13317,9 +13430,9 @@ configure-stageprofile-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1689,7 +1862,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13349,9 +13446,9 @@ configure-stagefeedback-gas:
+@@ -13348,9 +13461,9 @@ configure-stagefeedback-gas:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gas/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1701,7 +1874,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/gas ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \
cd $(HOST_SUBDIR)/gas || exit 1; \
-@@ -13386,7 +13483,8 @@ all-gas: configure-gas
+@@ -13385,7 +13498,8 @@ all-gas: configure-gas
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gas && \
@@ -1711,7 +1884,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gas
-@@ -13405,8 +13503,11 @@ all-stage1-gas: configure-stage1-gas
+@@ -13404,8 +13518,11 @@ all-stage1-gas: configure-stage1-gas
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1725,7 +1898,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-gas)
maybe-clean-stage1-gas: clean-stage1-gas
-@@ -13419,7 +13520,7 @@ clean-stage1-gas:
+@@ -13418,7 +13535,7 @@ clean-stage1-gas:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1734,7 +1907,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif gas-bootstrap
-@@ -13439,8 +13540,11 @@ all-stage2-gas: configure-stage2-gas
+@@ -13438,8 +13555,11 @@ all-stage2-gas: configure-stage2-gas
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1748,7 +1921,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-gas)
maybe-clean-stage2-gas: clean-stage2-gas
-@@ -13453,7 +13557,7 @@ clean-stage2-gas:
+@@ -13452,7 +13572,7 @@ clean-stage2-gas:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1757,7 +1930,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -13474,8 +13578,11 @@ all-stageb2g0-gas: configure-stageb2g0-g
+@@ -13473,8 +13593,11 @@ all-stageb2g0-gas: configure-stageb2g0-g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1771,7 +1944,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-gas)
maybe-clean-stageb2g0-gas: clean-stageb2g0-gas
-@@ -13488,7 +13595,7 @@ clean-stageb2g0-gas:
+@@ -13487,7 +13610,7 @@ clean-stageb2g0-gas:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1780,7 +1953,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -13509,8 +13616,11 @@ all-stage3-gas: configure-stage3-gas
+@@ -13508,8 +13631,11 @@ all-stage3-gas: configure-stage3-gas
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1794,7 +1967,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-gas)
maybe-clean-stage3-gas: clean-stage3-gas
-@@ -13523,7 +13633,7 @@ clean-stage3-gas:
+@@ -13522,7 +13648,7 @@ clean-stage3-gas:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1803,7 +1976,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -13544,8 +13654,11 @@ all-stageb3g2-gas: configure-stageb3g2-g
+@@ -13543,8 +13669,11 @@ all-stageb3g2-gas: configure-stageb3g2-g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1817,7 +1990,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-gas)
maybe-clean-stageb3g2-gas: clean-stageb3g2-gas
-@@ -13558,7 +13671,7 @@ clean-stageb3g2-gas:
+@@ -13557,7 +13686,7 @@ clean-stageb3g2-gas:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1826,7 +1999,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -13579,8 +13692,11 @@ all-stage4-gas: configure-stage4-gas
+@@ -13578,8 +13707,11 @@ all-stage4-gas: configure-stage4-gas
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1840,7 +2013,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-gas)
maybe-clean-stage4-gas: clean-stage4-gas
-@@ -13593,7 +13709,7 @@ clean-stage4-gas:
+@@ -13592,7 +13724,7 @@ clean-stage4-gas:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1849,7 +2022,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -13614,8 +13730,11 @@ all-stageprofile-gas: configure-stagepro
+@@ -13613,8 +13745,11 @@ all-stageprofile-gas: configure-stagepro
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1863,7 +2036,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-gas)
maybe-clean-stageprofile-gas: clean-stageprofile-gas
-@@ -13628,7 +13747,7 @@ clean-stageprofile-gas:
+@@ -13627,7 +13762,7 @@ clean-stageprofile-gas:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1872,7 +2045,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -13649,8 +13768,11 @@ all-stagefeedback-gas: configure-stagefe
+@@ -13648,8 +13783,11 @@ all-stagefeedback-gas: configure-stagefe
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gas && \
@@ -1886,7 +2059,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-gas)
maybe-clean-stagefeedback-gas: clean-stagefeedback-gas
-@@ -13663,7 +13785,7 @@ clean-stagefeedback-gas:
+@@ -13662,7 +13800,7 @@ clean-stagefeedback-gas:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/gas && \
@@ -1895,7 +2068,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gas-bootstrap
-@@ -14070,9 +14192,9 @@ configure-stage1-gcc:
+@@ -14069,9 +14207,9 @@ configure-stage1-gcc:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
@@ -1907,7 +2080,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14101,9 +14223,9 @@ configure-stage2-gcc:
+@@ -14100,9 +14238,9 @@ configure-stage2-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1919,7 +2092,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14132,9 +14254,9 @@ configure-stageb2g0-gcc:
+@@ -14131,9 +14269,9 @@ configure-stageb2g0-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1931,7 +2104,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14163,9 +14285,9 @@ configure-stage3-gcc:
+@@ -14162,9 +14300,9 @@ configure-stage3-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1943,7 +2116,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14194,9 +14316,9 @@ configure-stageb3g2-gcc:
+@@ -14193,9 +14331,9 @@ configure-stageb3g2-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1955,7 +2128,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14225,9 +14347,9 @@ configure-stage4-gcc:
+@@ -14224,9 +14362,9 @@ configure-stage4-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1967,7 +2140,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14256,9 +14378,9 @@ configure-stageprofile-gcc:
+@@ -14255,9 +14393,9 @@ configure-stageprofile-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1979,7 +2152,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14287,9 +14409,9 @@ configure-stagefeedback-gcc:
+@@ -14286,9 +14424,9 @@ configure-stagefeedback-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gcc/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -1991,7 +2164,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/gcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \
cd $(HOST_SUBDIR)/gcc || exit 1; \
-@@ -14324,7 +14446,8 @@ all-gcc: configure-gcc
+@@ -14323,7 +14461,8 @@ all-gcc: configure-gcc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
@@ -2001,7 +2174,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gcc
-@@ -14343,8 +14466,11 @@ all-stage1-gcc: configure-stage1-gcc
+@@ -14342,8 +14481,11 @@ all-stage1-gcc: configure-stage1-gcc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2015,7 +2188,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-gcc)
maybe-clean-stage1-gcc: clean-stage1-gcc
-@@ -14357,7 +14483,7 @@ clean-stage1-gcc:
+@@ -14356,7 +14498,7 @@ clean-stage1-gcc:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2024,7 +2197,7 @@ Index: gcc-4.3.1/Makefile.in
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14377,8 +14503,11 @@ all-stage2-gcc: configure-stage2-gcc
+@@ -14376,8 +14518,11 @@ all-stage2-gcc: configure-stage2-gcc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2038,7 +2211,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-gcc)
maybe-clean-stage2-gcc: clean-stage2-gcc
-@@ -14391,7 +14520,7 @@ clean-stage2-gcc:
+@@ -14390,7 +14535,7 @@ clean-stage2-gcc:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2047,7 +2220,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14412,8 +14541,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g
+@@ -14411,8 +14556,11 @@ all-stageb2g0-gcc: configure-stageb2g0-g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2061,7 +2234,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-gcc)
maybe-clean-stageb2g0-gcc: clean-stageb2g0-gcc
-@@ -14426,7 +14558,7 @@ clean-stageb2g0-gcc:
+@@ -14425,7 +14573,7 @@ clean-stageb2g0-gcc:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2070,7 +2243,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14447,8 +14579,11 @@ all-stage3-gcc: configure-stage3-gcc
+@@ -14446,8 +14594,11 @@ all-stage3-gcc: configure-stage3-gcc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2084,7 +2257,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-gcc)
maybe-clean-stage3-gcc: clean-stage3-gcc
-@@ -14461,7 +14596,7 @@ clean-stage3-gcc:
+@@ -14460,7 +14611,7 @@ clean-stage3-gcc:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2093,7 +2266,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14482,8 +14617,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g
+@@ -14481,8 +14632,11 @@ all-stageb3g2-gcc: configure-stageb3g2-g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2107,7 +2280,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-gcc)
maybe-clean-stageb3g2-gcc: clean-stageb3g2-gcc
-@@ -14496,7 +14634,7 @@ clean-stageb3g2-gcc:
+@@ -14495,7 +14649,7 @@ clean-stageb3g2-gcc:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2116,7 +2289,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14517,8 +14655,11 @@ all-stage4-gcc: configure-stage4-gcc
+@@ -14516,8 +14670,11 @@ all-stage4-gcc: configure-stage4-gcc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2130,7 +2303,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-gcc)
maybe-clean-stage4-gcc: clean-stage4-gcc
-@@ -14531,7 +14672,7 @@ clean-stage4-gcc:
+@@ -14530,7 +14687,7 @@ clean-stage4-gcc:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2139,7 +2312,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14552,8 +14693,11 @@ all-stageprofile-gcc: configure-stagepro
+@@ -14551,8 +14708,11 @@ all-stageprofile-gcc: configure-stagepro
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2153,7 +2326,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-gcc)
maybe-clean-stageprofile-gcc: clean-stageprofile-gcc
-@@ -14566,7 +14710,7 @@ clean-stageprofile-gcc:
+@@ -14565,7 +14725,7 @@ clean-stageprofile-gcc:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2162,7 +2335,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -14587,8 +14731,11 @@ all-stagefeedback-gcc: configure-stagefe
+@@ -14586,8 +14746,11 @@ all-stagefeedback-gcc: configure-stagefe
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gcc && \
@@ -2176,7 +2349,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-gcc)
maybe-clean-stagefeedback-gcc: clean-stagefeedback-gcc
-@@ -14601,7 +14748,7 @@ clean-stagefeedback-gcc:
+@@ -14600,7 +14763,7 @@ clean-stagefeedback-gcc:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
@@ -2185,7 +2358,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
$(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
-@@ -15015,7 +15162,8 @@ all-gawk: configure-gawk
+@@ -15014,7 +15177,8 @@ all-gawk: configure-gawk
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gawk && \
@@ -2195,7 +2368,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gawk
-@@ -15439,7 +15587,8 @@ all-gettext: configure-gettext
+@@ -15438,7 +15602,8 @@ all-gettext: configure-gettext
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gettext && \
@@ -2205,7 +2378,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gettext
-@@ -15856,9 +16005,9 @@ configure-stage1-gmp:
+@@ -15855,9 +16020,9 @@ configure-stage1-gmp:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
@@ -2217,7 +2390,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15887,9 +16036,9 @@ configure-stage2-gmp:
+@@ -15886,9 +16051,9 @@ configure-stage2-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2229,7 +2402,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15918,9 +16067,9 @@ configure-stageb2g0-gmp:
+@@ -15917,9 +16082,9 @@ configure-stageb2g0-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2241,7 +2414,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15949,9 +16098,9 @@ configure-stage3-gmp:
+@@ -15948,9 +16113,9 @@ configure-stage3-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2253,7 +2426,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -15980,9 +16129,9 @@ configure-stageb3g2-gmp:
+@@ -15979,9 +16144,9 @@ configure-stageb3g2-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2265,7 +2438,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16011,9 +16160,9 @@ configure-stage4-gmp:
+@@ -16010,9 +16175,9 @@ configure-stage4-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2277,7 +2450,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16042,9 +16191,9 @@ configure-stageprofile-gmp:
+@@ -16041,9 +16206,9 @@ configure-stageprofile-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2289,7 +2462,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16073,9 +16222,9 @@ configure-stagefeedback-gmp:
+@@ -16072,9 +16237,9 @@ configure-stagefeedback-gmp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/gmp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2301,7 +2474,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/gmp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \
cd $(HOST_SUBDIR)/gmp || exit 1; \
-@@ -16110,7 +16259,8 @@ all-gmp: configure-gmp
+@@ -16109,7 +16274,8 @@ all-gmp: configure-gmp
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gmp && \
@@ -2311,7 +2484,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gmp
-@@ -16129,8 +16279,11 @@ all-stage1-gmp: configure-stage1-gmp
+@@ -16128,8 +16294,11 @@ all-stage1-gmp: configure-stage1-gmp
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2325,7 +2498,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-gmp)
maybe-clean-stage1-gmp: clean-stage1-gmp
-@@ -16143,7 +16296,7 @@ clean-stage1-gmp:
+@@ -16142,7 +16311,7 @@ clean-stage1-gmp:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2334,7 +2507,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif gmp-bootstrap
-@@ -16163,8 +16316,11 @@ all-stage2-gmp: configure-stage2-gmp
+@@ -16162,8 +16331,11 @@ all-stage2-gmp: configure-stage2-gmp
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2348,7 +2521,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-gmp)
maybe-clean-stage2-gmp: clean-stage2-gmp
-@@ -16177,7 +16333,7 @@ clean-stage2-gmp:
+@@ -16176,7 +16348,7 @@ clean-stage2-gmp:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2357,7 +2530,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16198,8 +16354,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g
+@@ -16197,8 +16369,11 @@ all-stageb2g0-gmp: configure-stageb2g0-g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2371,7 +2544,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-gmp)
maybe-clean-stageb2g0-gmp: clean-stageb2g0-gmp
-@@ -16212,7 +16371,7 @@ clean-stageb2g0-gmp:
+@@ -16211,7 +16386,7 @@ clean-stageb2g0-gmp:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2380,7 +2553,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16233,8 +16392,11 @@ all-stage3-gmp: configure-stage3-gmp
+@@ -16232,8 +16407,11 @@ all-stage3-gmp: configure-stage3-gmp
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2394,7 +2567,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-gmp)
maybe-clean-stage3-gmp: clean-stage3-gmp
-@@ -16247,7 +16409,7 @@ clean-stage3-gmp:
+@@ -16246,7 +16424,7 @@ clean-stage3-gmp:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2403,7 +2576,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16268,8 +16430,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g
+@@ -16267,8 +16445,11 @@ all-stageb3g2-gmp: configure-stageb3g2-g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2417,7 +2590,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-gmp)
maybe-clean-stageb3g2-gmp: clean-stageb3g2-gmp
-@@ -16282,7 +16447,7 @@ clean-stageb3g2-gmp:
+@@ -16281,7 +16462,7 @@ clean-stageb3g2-gmp:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2426,7 +2599,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16303,8 +16468,11 @@ all-stage4-gmp: configure-stage4-gmp
+@@ -16302,8 +16483,11 @@ all-stage4-gmp: configure-stage4-gmp
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2440,7 +2613,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-gmp)
maybe-clean-stage4-gmp: clean-stage4-gmp
-@@ -16317,7 +16485,7 @@ clean-stage4-gmp:
+@@ -16316,7 +16500,7 @@ clean-stage4-gmp:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2449,7 +2622,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16338,8 +16506,11 @@ all-stageprofile-gmp: configure-stagepro
+@@ -16337,8 +16521,11 @@ all-stageprofile-gmp: configure-stagepro
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2463,7 +2636,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-gmp)
maybe-clean-stageprofile-gmp: clean-stageprofile-gmp
-@@ -16352,7 +16523,7 @@ clean-stageprofile-gmp:
+@@ -16351,7 +16538,7 @@ clean-stageprofile-gmp:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2472,7 +2645,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16373,8 +16544,11 @@ all-stagefeedback-gmp: configure-stagefe
+@@ -16372,8 +16559,11 @@ all-stagefeedback-gmp: configure-stagefe
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/gmp && \
@@ -2486,7 +2659,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-gmp)
maybe-clean-stagefeedback-gmp: clean-stagefeedback-gmp
-@@ -16387,7 +16561,7 @@ clean-stagefeedback-gmp:
+@@ -16386,7 +16576,7 @@ clean-stagefeedback-gmp:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/gmp && \
@@ -2495,7 +2668,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif gmp-bootstrap
-@@ -16788,9 +16962,9 @@ configure-stage1-mpfr:
+@@ -16787,9 +16977,9 @@ configure-stage1-mpfr:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
@@ -2507,7 +2680,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16819,9 +16993,9 @@ configure-stage2-mpfr:
+@@ -16818,9 +17008,9 @@ configure-stage2-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2519,7 +2692,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16850,9 +17024,9 @@ configure-stageb2g0-mpfr:
+@@ -16849,9 +17039,9 @@ configure-stageb2g0-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2531,7 +2704,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16881,9 +17055,9 @@ configure-stage3-mpfr:
+@@ -16880,9 +17070,9 @@ configure-stage3-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2543,7 +2716,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16912,9 +17086,9 @@ configure-stageb3g2-mpfr:
+@@ -16911,9 +17101,9 @@ configure-stageb3g2-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2555,7 +2728,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16943,9 +17117,9 @@ configure-stage4-mpfr:
+@@ -16942,9 +17132,9 @@ configure-stage4-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2567,7 +2740,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -16974,9 +17148,9 @@ configure-stageprofile-mpfr:
+@@ -16973,9 +17163,9 @@ configure-stageprofile-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2579,7 +2752,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17005,9 +17179,9 @@ configure-stagefeedback-mpfr:
+@@ -17004,9 +17194,9 @@ configure-stagefeedback-mpfr:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/mpfr/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2591,7 +2764,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/mpfr ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \
cd $(HOST_SUBDIR)/mpfr || exit 1; \
-@@ -17042,7 +17216,8 @@ all-mpfr: configure-mpfr
+@@ -17041,7 +17231,8 @@ all-mpfr: configure-mpfr
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/mpfr && \
@@ -2601,7 +2774,7 @@ Index: gcc-4.3.1/Makefile.in
@endif mpfr
-@@ -17061,8 +17236,11 @@ all-stage1-mpfr: configure-stage1-mpfr
+@@ -17060,8 +17251,11 @@ all-stage1-mpfr: configure-stage1-mpfr
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2615,7 +2788,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-mpfr)
maybe-clean-stage1-mpfr: clean-stage1-mpfr
-@@ -17075,7 +17253,7 @@ clean-stage1-mpfr:
+@@ -17074,7 +17268,7 @@ clean-stage1-mpfr:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2624,7 +2797,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif mpfr-bootstrap
-@@ -17095,8 +17273,11 @@ all-stage2-mpfr: configure-stage2-mpfr
+@@ -17094,8 +17288,11 @@ all-stage2-mpfr: configure-stage2-mpfr
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2638,7 +2811,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-mpfr)
maybe-clean-stage2-mpfr: clean-stage2-mpfr
-@@ -17109,7 +17290,7 @@ clean-stage2-mpfr:
+@@ -17108,7 +17305,7 @@ clean-stage2-mpfr:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2647,7 +2820,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17130,8 +17311,11 @@ all-stageb2g0-mpfr: configure-stageb2g0-
+@@ -17129,8 +17326,11 @@ all-stageb2g0-mpfr: configure-stageb2g0-
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2661,7 +2834,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-mpfr)
maybe-clean-stageb2g0-mpfr: clean-stageb2g0-mpfr
-@@ -17144,7 +17328,7 @@ clean-stageb2g0-mpfr:
+@@ -17143,7 +17343,7 @@ clean-stageb2g0-mpfr:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2670,7 +2843,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17165,8 +17349,11 @@ all-stage3-mpfr: configure-stage3-mpfr
+@@ -17164,8 +17364,11 @@ all-stage3-mpfr: configure-stage3-mpfr
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2684,7 +2857,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-mpfr)
maybe-clean-stage3-mpfr: clean-stage3-mpfr
-@@ -17179,7 +17366,7 @@ clean-stage3-mpfr:
+@@ -17178,7 +17381,7 @@ clean-stage3-mpfr:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2693,7 +2866,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17200,8 +17387,11 @@ all-stageb3g2-mpfr: configure-stageb3g2-
+@@ -17199,8 +17402,11 @@ all-stageb3g2-mpfr: configure-stageb3g2-
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2707,7 +2880,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-mpfr)
maybe-clean-stageb3g2-mpfr: clean-stageb3g2-mpfr
-@@ -17214,7 +17404,7 @@ clean-stageb3g2-mpfr:
+@@ -17213,7 +17419,7 @@ clean-stageb3g2-mpfr:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2716,7 +2889,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17235,8 +17425,11 @@ all-stage4-mpfr: configure-stage4-mpfr
+@@ -17234,8 +17440,11 @@ all-stage4-mpfr: configure-stage4-mpfr
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2730,7 +2903,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-mpfr)
maybe-clean-stage4-mpfr: clean-stage4-mpfr
-@@ -17249,7 +17442,7 @@ clean-stage4-mpfr:
+@@ -17248,7 +17457,7 @@ clean-stage4-mpfr:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2739,7 +2912,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17270,8 +17463,11 @@ all-stageprofile-mpfr: configure-stagepr
+@@ -17269,8 +17478,11 @@ all-stageprofile-mpfr: configure-stagepr
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2753,7 +2926,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-mpfr)
maybe-clean-stageprofile-mpfr: clean-stageprofile-mpfr
-@@ -17284,7 +17480,7 @@ clean-stageprofile-mpfr:
+@@ -17283,7 +17495,7 @@ clean-stageprofile-mpfr:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2762,7 +2935,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17305,8 +17501,11 @@ all-stagefeedback-mpfr: configure-stagef
+@@ -17304,8 +17516,11 @@ all-stagefeedback-mpfr: configure-stagef
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2776,7 +2949,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-mpfr)
maybe-clean-stagefeedback-mpfr: clean-stagefeedback-mpfr
-@@ -17319,7 +17518,7 @@ clean-stagefeedback-mpfr:
+@@ -17318,7 +17533,7 @@ clean-stagefeedback-mpfr:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/mpfr && \
@@ -2785,7 +2958,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif mpfr-bootstrap
-@@ -17727,7 +17926,8 @@ all-gnuserv: configure-gnuserv
+@@ -17726,7 +17941,8 @@ all-gnuserv: configure-gnuserv
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gnuserv && \
@@ -2795,7 +2968,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gnuserv
-@@ -18151,7 +18351,8 @@ all-gprof: configure-gprof
+@@ -18150,7 +18366,8 @@ all-gprof: configure-gprof
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gprof && \
@@ -2805,7 +2978,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gprof
-@@ -18575,7 +18776,8 @@ all-gzip: configure-gzip
+@@ -18574,7 +18791,8 @@ all-gzip: configure-gzip
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gzip && \
@@ -2815,7 +2988,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gzip
-@@ -18999,7 +19201,8 @@ all-hello: configure-hello
+@@ -18998,7 +19216,8 @@ all-hello: configure-hello
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/hello && \
@@ -2825,7 +2998,7 @@ Index: gcc-4.3.1/Makefile.in
@endif hello
-@@ -19423,7 +19626,8 @@ all-indent: configure-indent
+@@ -19422,7 +19641,8 @@ all-indent: configure-indent
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/indent && \
@@ -2835,7 +3008,7 @@ Index: gcc-4.3.1/Makefile.in
@endif indent
-@@ -19840,9 +20044,9 @@ configure-stage1-intl:
+@@ -19839,9 +20059,9 @@ configure-stage1-intl:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
@@ -2847,7 +3020,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19871,9 +20075,9 @@ configure-stage2-intl:
+@@ -19870,9 +20090,9 @@ configure-stage2-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2859,7 +3032,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19902,9 +20106,9 @@ configure-stageb2g0-intl:
+@@ -19901,9 +20121,9 @@ configure-stageb2g0-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2871,7 +3044,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19933,9 +20137,9 @@ configure-stage3-intl:
+@@ -19932,9 +20152,9 @@ configure-stage3-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2883,7 +3056,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19964,9 +20168,9 @@ configure-stageb3g2-intl:
+@@ -19963,9 +20183,9 @@ configure-stageb3g2-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2895,7 +3068,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -19995,9 +20199,9 @@ configure-stage4-intl:
+@@ -19994,9 +20214,9 @@ configure-stage4-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2907,7 +3080,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20026,9 +20230,9 @@ configure-stageprofile-intl:
+@@ -20025,9 +20245,9 @@ configure-stageprofile-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2919,7 +3092,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20057,9 +20261,9 @@ configure-stagefeedback-intl:
+@@ -20056,9 +20276,9 @@ configure-stagefeedback-intl:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/intl/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -2931,7 +3104,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/intl ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \
cd $(HOST_SUBDIR)/intl || exit 1; \
-@@ -20094,7 +20298,8 @@ all-intl: configure-intl
+@@ -20093,7 +20313,8 @@ all-intl: configure-intl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/intl && \
@@ -2941,7 +3114,7 @@ Index: gcc-4.3.1/Makefile.in
@endif intl
-@@ -20113,8 +20318,11 @@ all-stage1-intl: configure-stage1-intl
+@@ -20112,8 +20333,11 @@ all-stage1-intl: configure-stage1-intl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -2955,7 +3128,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-intl)
maybe-clean-stage1-intl: clean-stage1-intl
-@@ -20127,7 +20335,7 @@ clean-stage1-intl:
+@@ -20126,7 +20350,7 @@ clean-stage1-intl:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -2964,7 +3137,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif intl-bootstrap
-@@ -20147,8 +20355,11 @@ all-stage2-intl: configure-stage2-intl
+@@ -20146,8 +20370,11 @@ all-stage2-intl: configure-stage2-intl
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -2978,7 +3151,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-intl)
maybe-clean-stage2-intl: clean-stage2-intl
-@@ -20161,7 +20372,7 @@ clean-stage2-intl:
+@@ -20160,7 +20387,7 @@ clean-stage2-intl:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -2987,7 +3160,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20182,8 +20393,11 @@ all-stageb2g0-intl: configure-stageb2g0-
+@@ -20181,8 +20408,11 @@ all-stageb2g0-intl: configure-stageb2g0-
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -3001,7 +3174,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-intl)
maybe-clean-stageb2g0-intl: clean-stageb2g0-intl
-@@ -20196,7 +20410,7 @@ clean-stageb2g0-intl:
+@@ -20195,7 +20425,7 @@ clean-stageb2g0-intl:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -3010,7 +3183,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20217,8 +20431,11 @@ all-stage3-intl: configure-stage3-intl
+@@ -20216,8 +20446,11 @@ all-stage3-intl: configure-stage3-intl
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -3024,7 +3197,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-intl)
maybe-clean-stage3-intl: clean-stage3-intl
-@@ -20231,7 +20448,7 @@ clean-stage3-intl:
+@@ -20230,7 +20463,7 @@ clean-stage3-intl:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -3033,7 +3206,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20252,8 +20469,11 @@ all-stageb3g2-intl: configure-stageb3g2-
+@@ -20251,8 +20484,11 @@ all-stageb3g2-intl: configure-stageb3g2-
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -3047,7 +3220,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-intl)
maybe-clean-stageb3g2-intl: clean-stageb3g2-intl
-@@ -20266,7 +20486,7 @@ clean-stageb3g2-intl:
+@@ -20265,7 +20501,7 @@ clean-stageb3g2-intl:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -3056,7 +3229,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20287,8 +20507,11 @@ all-stage4-intl: configure-stage4-intl
+@@ -20286,8 +20522,11 @@ all-stage4-intl: configure-stage4-intl
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -3070,7 +3243,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-intl)
maybe-clean-stage4-intl: clean-stage4-intl
-@@ -20301,7 +20524,7 @@ clean-stage4-intl:
+@@ -20300,7 +20539,7 @@ clean-stage4-intl:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -3079,7 +3252,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20322,8 +20545,11 @@ all-stageprofile-intl: configure-stagepr
+@@ -20321,8 +20560,11 @@ all-stageprofile-intl: configure-stagepr
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -3093,7 +3266,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-intl)
maybe-clean-stageprofile-intl: clean-stageprofile-intl
-@@ -20336,7 +20562,7 @@ clean-stageprofile-intl:
+@@ -20335,7 +20577,7 @@ clean-stageprofile-intl:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -3102,7 +3275,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20357,8 +20583,11 @@ all-stagefeedback-intl: configure-stagef
+@@ -20356,8 +20598,11 @@ all-stagefeedback-intl: configure-stagef
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/intl && \
@@ -3116,7 +3289,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-intl)
maybe-clean-stagefeedback-intl: clean-stagefeedback-intl
-@@ -20371,7 +20600,7 @@ clean-stagefeedback-intl:
+@@ -20370,7 +20615,7 @@ clean-stagefeedback-intl:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/intl && \
@@ -3125,7 +3298,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif intl-bootstrap
-@@ -20785,7 +21014,8 @@ all-tcl: configure-tcl
+@@ -20784,7 +21029,8 @@ all-tcl: configure-tcl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/tcl && \
@@ -3135,7 +3308,7 @@ Index: gcc-4.3.1/Makefile.in
@endif tcl
-@@ -21194,7 +21424,8 @@ all-itcl: configure-itcl
+@@ -21193,7 +21439,8 @@ all-itcl: configure-itcl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/itcl && \
@@ -3145,7 +3318,7 @@ Index: gcc-4.3.1/Makefile.in
@endif itcl
-@@ -21611,9 +21842,9 @@ configure-stage1-ld:
+@@ -21610,9 +21857,9 @@ configure-stage1-ld:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
@@ -3157,7 +3330,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21642,9 +21873,9 @@ configure-stage2-ld:
+@@ -21641,9 +21888,9 @@ configure-stage2-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3169,7 +3342,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21673,9 +21904,9 @@ configure-stageb2g0-ld:
+@@ -21672,9 +21919,9 @@ configure-stageb2g0-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3181,7 +3354,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21704,9 +21935,9 @@ configure-stage3-ld:
+@@ -21703,9 +21950,9 @@ configure-stage3-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3193,7 +3366,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21735,9 +21966,9 @@ configure-stageb3g2-ld:
+@@ -21734,9 +21981,9 @@ configure-stageb3g2-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3205,7 +3378,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21766,9 +21997,9 @@ configure-stage4-ld:
+@@ -21765,9 +22012,9 @@ configure-stage4-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3217,7 +3390,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21797,9 +22028,9 @@ configure-stageprofile-ld:
+@@ -21796,9 +22043,9 @@ configure-stageprofile-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3229,7 +3402,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21828,9 +22059,9 @@ configure-stagefeedback-ld:
+@@ -21827,9 +22074,9 @@ configure-stagefeedback-ld:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/ld/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3241,7 +3414,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/ld ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \
cd $(HOST_SUBDIR)/ld || exit 1; \
-@@ -21865,7 +22096,8 @@ all-ld: configure-ld
+@@ -21864,7 +22111,8 @@ all-ld: configure-ld
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/ld && \
@@ -3251,7 +3424,7 @@ Index: gcc-4.3.1/Makefile.in
@endif ld
-@@ -21884,8 +22116,11 @@ all-stage1-ld: configure-stage1-ld
+@@ -21883,8 +22131,11 @@ all-stage1-ld: configure-stage1-ld
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3265,7 +3438,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-ld)
maybe-clean-stage1-ld: clean-stage1-ld
-@@ -21898,7 +22133,7 @@ clean-stage1-ld:
+@@ -21897,7 +22148,7 @@ clean-stage1-ld:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3274,7 +3447,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif ld-bootstrap
-@@ -21918,8 +22153,11 @@ all-stage2-ld: configure-stage2-ld
+@@ -21917,8 +22168,11 @@ all-stage2-ld: configure-stage2-ld
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3288,7 +3461,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-ld)
maybe-clean-stage2-ld: clean-stage2-ld
-@@ -21932,7 +22170,7 @@ clean-stage2-ld:
+@@ -21931,7 +22185,7 @@ clean-stage2-ld:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3297,7 +3470,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -21953,8 +22191,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld
+@@ -21952,8 +22206,11 @@ all-stageb2g0-ld: configure-stageb2g0-ld
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3311,7 +3484,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-ld)
maybe-clean-stageb2g0-ld: clean-stageb2g0-ld
-@@ -21967,7 +22208,7 @@ clean-stageb2g0-ld:
+@@ -21966,7 +22223,7 @@ clean-stageb2g0-ld:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3320,7 +3493,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -21988,8 +22229,11 @@ all-stage3-ld: configure-stage3-ld
+@@ -21987,8 +22244,11 @@ all-stage3-ld: configure-stage3-ld
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3334,7 +3507,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-ld)
maybe-clean-stage3-ld: clean-stage3-ld
-@@ -22002,7 +22246,7 @@ clean-stage3-ld:
+@@ -22001,7 +22261,7 @@ clean-stage3-ld:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3343,7 +3516,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -22023,8 +22267,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld
+@@ -22022,8 +22282,11 @@ all-stageb3g2-ld: configure-stageb3g2-ld
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3357,7 +3530,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-ld)
maybe-clean-stageb3g2-ld: clean-stageb3g2-ld
-@@ -22037,7 +22284,7 @@ clean-stageb3g2-ld:
+@@ -22036,7 +22299,7 @@ clean-stageb3g2-ld:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3366,7 +3539,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -22058,8 +22305,11 @@ all-stage4-ld: configure-stage4-ld
+@@ -22057,8 +22320,11 @@ all-stage4-ld: configure-stage4-ld
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3380,7 +3553,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-ld)
maybe-clean-stage4-ld: clean-stage4-ld
-@@ -22072,7 +22322,7 @@ clean-stage4-ld:
+@@ -22071,7 +22337,7 @@ clean-stage4-ld:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3389,7 +3562,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -22093,8 +22343,11 @@ all-stageprofile-ld: configure-stageprof
+@@ -22092,8 +22358,11 @@ all-stageprofile-ld: configure-stageprof
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3403,7 +3576,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-ld)
maybe-clean-stageprofile-ld: clean-stageprofile-ld
-@@ -22107,7 +22360,7 @@ clean-stageprofile-ld:
+@@ -22106,7 +22375,7 @@ clean-stageprofile-ld:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3412,7 +3585,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -22128,8 +22381,11 @@ all-stagefeedback-ld: configure-stagefee
+@@ -22127,8 +22396,11 @@ all-stagefeedback-ld: configure-stagefee
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/ld && \
@@ -3426,7 +3599,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-ld)
maybe-clean-stagefeedback-ld: clean-stagefeedback-ld
-@@ -22142,7 +22398,7 @@ clean-stagefeedback-ld:
+@@ -22141,7 +22413,7 @@ clean-stagefeedback-ld:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/ld && \
@@ -3435,7 +3608,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif ld-bootstrap
-@@ -22549,9 +22805,9 @@ configure-stage1-libcpp:
+@@ -22548,9 +22820,9 @@ configure-stage1-libcpp:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
@@ -3447,7 +3620,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22580,9 +22836,9 @@ configure-stage2-libcpp:
+@@ -22579,9 +22851,9 @@ configure-stage2-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3459,7 +3632,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22611,9 +22867,9 @@ configure-stageb2g0-libcpp:
+@@ -22610,9 +22882,9 @@ configure-stageb2g0-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3471,7 +3644,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22642,9 +22898,9 @@ configure-stage3-libcpp:
+@@ -22641,9 +22913,9 @@ configure-stage3-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3483,7 +3656,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22673,9 +22929,9 @@ configure-stageb3g2-libcpp:
+@@ -22672,9 +22944,9 @@ configure-stageb3g2-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3495,7 +3668,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22704,9 +22960,9 @@ configure-stage4-libcpp:
+@@ -22703,9 +22975,9 @@ configure-stage4-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3507,7 +3680,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22735,9 +22991,9 @@ configure-stageprofile-libcpp:
+@@ -22734,9 +23006,9 @@ configure-stageprofile-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3519,7 +3692,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22766,9 +23022,9 @@ configure-stagefeedback-libcpp:
+@@ -22765,9 +23037,9 @@ configure-stagefeedback-libcpp:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libcpp/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3531,7 +3704,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/libcpp ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \
cd $(HOST_SUBDIR)/libcpp || exit 1; \
-@@ -22803,7 +23059,8 @@ all-libcpp: configure-libcpp
+@@ -22802,7 +23074,8 @@ all-libcpp: configure-libcpp
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libcpp && \
@@ -3541,7 +3714,7 @@ Index: gcc-4.3.1/Makefile.in
@endif libcpp
-@@ -22822,8 +23079,11 @@ all-stage1-libcpp: configure-stage1-libc
+@@ -22821,8 +23094,11 @@ all-stage1-libcpp: configure-stage1-libc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3555,7 +3728,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-libcpp)
maybe-clean-stage1-libcpp: clean-stage1-libcpp
-@@ -22836,7 +23096,7 @@ clean-stage1-libcpp:
+@@ -22835,7 +23111,7 @@ clean-stage1-libcpp:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3564,7 +3737,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif libcpp-bootstrap
-@@ -22856,8 +23116,11 @@ all-stage2-libcpp: configure-stage2-libc
+@@ -22855,8 +23131,11 @@ all-stage2-libcpp: configure-stage2-libc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3578,7 +3751,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-libcpp)
maybe-clean-stage2-libcpp: clean-stage2-libcpp
-@@ -22870,7 +23133,7 @@ clean-stage2-libcpp:
+@@ -22869,7 +23148,7 @@ clean-stage2-libcpp:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3587,7 +3760,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -22891,8 +23154,11 @@ all-stageb2g0-libcpp: configure-stageb2g
+@@ -22890,8 +23169,11 @@ all-stageb2g0-libcpp: configure-stageb2g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3601,7 +3774,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-libcpp)
maybe-clean-stageb2g0-libcpp: clean-stageb2g0-libcpp
-@@ -22905,7 +23171,7 @@ clean-stageb2g0-libcpp:
+@@ -22904,7 +23186,7 @@ clean-stageb2g0-libcpp:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3610,7 +3783,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -22926,8 +23192,11 @@ all-stage3-libcpp: configure-stage3-libc
+@@ -22925,8 +23207,11 @@ all-stage3-libcpp: configure-stage3-libc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3624,7 +3797,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-libcpp)
maybe-clean-stage3-libcpp: clean-stage3-libcpp
-@@ -22940,7 +23209,7 @@ clean-stage3-libcpp:
+@@ -22939,7 +23224,7 @@ clean-stage3-libcpp:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3633,7 +3806,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -22961,8 +23230,11 @@ all-stageb3g2-libcpp: configure-stageb3g
+@@ -22960,8 +23245,11 @@ all-stageb3g2-libcpp: configure-stageb3g
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3647,7 +3820,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-libcpp)
maybe-clean-stageb3g2-libcpp: clean-stageb3g2-libcpp
-@@ -22975,7 +23247,7 @@ clean-stageb3g2-libcpp:
+@@ -22974,7 +23262,7 @@ clean-stageb3g2-libcpp:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3656,7 +3829,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -22996,8 +23268,11 @@ all-stage4-libcpp: configure-stage4-libc
+@@ -22995,8 +23283,11 @@ all-stage4-libcpp: configure-stage4-libc
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3670,7 +3843,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-libcpp)
maybe-clean-stage4-libcpp: clean-stage4-libcpp
-@@ -23010,7 +23285,7 @@ clean-stage4-libcpp:
+@@ -23009,7 +23300,7 @@ clean-stage4-libcpp:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3679,7 +3852,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -23031,8 +23306,11 @@ all-stageprofile-libcpp: configure-stage
+@@ -23030,8 +23321,11 @@ all-stageprofile-libcpp: configure-stage
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3693,7 +3866,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-libcpp)
maybe-clean-stageprofile-libcpp: clean-stageprofile-libcpp
-@@ -23045,7 +23323,7 @@ clean-stageprofile-libcpp:
+@@ -23044,7 +23338,7 @@ clean-stageprofile-libcpp:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3702,7 +3875,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -23066,8 +23344,11 @@ all-stagefeedback-libcpp: configure-stag
+@@ -23065,8 +23359,11 @@ all-stagefeedback-libcpp: configure-stag
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3716,7 +3889,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-libcpp)
maybe-clean-stagefeedback-libcpp: clean-stagefeedback-libcpp
-@@ -23080,7 +23361,7 @@ clean-stagefeedback-libcpp:
+@@ -23079,7 +23376,7 @@ clean-stagefeedback-libcpp:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/libcpp && \
@@ -3725,7 +3898,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libcpp-bootstrap
-@@ -23487,9 +23768,9 @@ configure-stage1-libdecnumber:
+@@ -23486,9 +23783,9 @@ configure-stage1-libdecnumber:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
@@ -3737,7 +3910,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23518,9 +23799,9 @@ configure-stage2-libdecnumber:
+@@ -23517,9 +23814,9 @@ configure-stage2-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3749,7 +3922,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23549,9 +23830,9 @@ configure-stageb2g0-libdecnumber:
+@@ -23548,9 +23845,9 @@ configure-stageb2g0-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3761,7 +3934,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23580,9 +23861,9 @@ configure-stage3-libdecnumber:
+@@ -23579,9 +23876,9 @@ configure-stage3-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3773,7 +3946,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23611,9 +23892,9 @@ configure-stageb3g2-libdecnumber:
+@@ -23610,9 +23907,9 @@ configure-stageb3g2-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3785,7 +3958,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23642,9 +23923,9 @@ configure-stage4-libdecnumber:
+@@ -23641,9 +23938,9 @@ configure-stage4-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3797,7 +3970,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23673,9 +23954,9 @@ configure-stageprofile-libdecnumber:
+@@ -23672,9 +23969,9 @@ configure-stageprofile-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3809,7 +3982,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23704,9 +23985,9 @@ configure-stagefeedback-libdecnumber:
+@@ -23703,9 +24000,9 @@ configure-stagefeedback-libdecnumber:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libdecnumber/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -3821,7 +3994,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/libdecnumber ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \
cd $(HOST_SUBDIR)/libdecnumber || exit 1; \
-@@ -23741,7 +24022,8 @@ all-libdecnumber: configure-libdecnumber
+@@ -23740,7 +24037,8 @@ all-libdecnumber: configure-libdecnumber
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3831,7 +4004,7 @@ Index: gcc-4.3.1/Makefile.in
@endif libdecnumber
-@@ -23760,8 +24042,11 @@ all-stage1-libdecnumber: configure-stage
+@@ -23759,8 +24057,11 @@ all-stage1-libdecnumber: configure-stage
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3845,7 +4018,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-libdecnumber)
maybe-clean-stage1-libdecnumber: clean-stage1-libdecnumber
-@@ -23774,7 +24059,7 @@ clean-stage1-libdecnumber:
+@@ -23773,7 +24074,7 @@ clean-stage1-libdecnumber:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3854,7 +4027,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif libdecnumber-bootstrap
-@@ -23794,8 +24079,11 @@ all-stage2-libdecnumber: configure-stage
+@@ -23793,8 +24094,11 @@ all-stage2-libdecnumber: configure-stage
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3868,7 +4041,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-libdecnumber)
maybe-clean-stage2-libdecnumber: clean-stage2-libdecnumber
-@@ -23808,7 +24096,7 @@ clean-stage2-libdecnumber:
+@@ -23807,7 +24111,7 @@ clean-stage2-libdecnumber:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3877,7 +4050,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -23829,8 +24117,11 @@ all-stageb2g0-libdecnumber: configure-st
+@@ -23828,8 +24132,11 @@ all-stageb2g0-libdecnumber: configure-st
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3891,7 +4064,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-libdecnumber)
maybe-clean-stageb2g0-libdecnumber: clean-stageb2g0-libdecnumber
-@@ -23843,7 +24134,7 @@ clean-stageb2g0-libdecnumber:
+@@ -23842,7 +24149,7 @@ clean-stageb2g0-libdecnumber:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3900,7 +4073,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -23864,8 +24155,11 @@ all-stage3-libdecnumber: configure-stage
+@@ -23863,8 +24170,11 @@ all-stage3-libdecnumber: configure-stage
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3914,7 +4087,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-libdecnumber)
maybe-clean-stage3-libdecnumber: clean-stage3-libdecnumber
-@@ -23878,7 +24172,7 @@ clean-stage3-libdecnumber:
+@@ -23877,7 +24187,7 @@ clean-stage3-libdecnumber:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3923,7 +4096,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -23899,8 +24193,11 @@ all-stageb3g2-libdecnumber: configure-st
+@@ -23898,8 +24208,11 @@ all-stageb3g2-libdecnumber: configure-st
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3937,7 +4110,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-libdecnumber)
maybe-clean-stageb3g2-libdecnumber: clean-stageb3g2-libdecnumber
-@@ -23913,7 +24210,7 @@ clean-stageb3g2-libdecnumber:
+@@ -23912,7 +24225,7 @@ clean-stageb3g2-libdecnumber:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3946,7 +4119,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -23934,8 +24231,11 @@ all-stage4-libdecnumber: configure-stage
+@@ -23933,8 +24246,11 @@ all-stage4-libdecnumber: configure-stage
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3960,7 +4133,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-libdecnumber)
maybe-clean-stage4-libdecnumber: clean-stage4-libdecnumber
-@@ -23948,7 +24248,7 @@ clean-stage4-libdecnumber:
+@@ -23947,7 +24263,7 @@ clean-stage4-libdecnumber:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3969,7 +4142,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -23969,8 +24269,11 @@ all-stageprofile-libdecnumber: configure
+@@ -23968,8 +24284,11 @@ all-stageprofile-libdecnumber: configure
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3983,7 +4156,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-libdecnumber)
maybe-clean-stageprofile-libdecnumber: clean-stageprofile-libdecnumber
-@@ -23983,7 +24286,7 @@ clean-stageprofile-libdecnumber:
+@@ -23982,7 +24301,7 @@ clean-stageprofile-libdecnumber:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -3992,7 +4165,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -24004,8 +24307,11 @@ all-stagefeedback-libdecnumber: configur
+@@ -24003,8 +24322,11 @@ all-stagefeedback-libdecnumber: configur
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4006,7 +4179,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-libdecnumber)
maybe-clean-stagefeedback-libdecnumber: clean-stagefeedback-libdecnumber
-@@ -24018,7 +24324,7 @@ clean-stagefeedback-libdecnumber:
+@@ -24017,7 +24339,7 @@ clean-stagefeedback-libdecnumber:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/libdecnumber && \
@@ -4015,7 +4188,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libdecnumber-bootstrap
-@@ -24432,7 +24738,8 @@ all-libgui: configure-libgui
+@@ -24431,7 +24753,8 @@ all-libgui: configure-libgui
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libgui && \
@@ -4025,7 +4198,7 @@ Index: gcc-4.3.1/Makefile.in
@endif libgui
-@@ -24849,9 +25156,9 @@ configure-stage1-libiberty:
+@@ -24848,9 +25171,9 @@ configure-stage1-libiberty:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
@@ -4037,7 +4210,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24880,9 +25187,9 @@ configure-stage2-libiberty:
+@@ -24879,9 +25202,9 @@ configure-stage2-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4049,7 +4222,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24911,9 +25218,9 @@ configure-stageb2g0-libiberty:
+@@ -24910,9 +25233,9 @@ configure-stageb2g0-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4061,7 +4234,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24942,9 +25249,9 @@ configure-stage3-libiberty:
+@@ -24941,9 +25264,9 @@ configure-stage3-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4073,7 +4246,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -24973,9 +25280,9 @@ configure-stageb3g2-libiberty:
+@@ -24972,9 +25295,9 @@ configure-stageb3g2-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4085,7 +4258,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25004,9 +25311,9 @@ configure-stage4-libiberty:
+@@ -25003,9 +25326,9 @@ configure-stage4-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4097,7 +4270,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25035,9 +25342,9 @@ configure-stageprofile-libiberty:
+@@ -25034,9 +25357,9 @@ configure-stageprofile-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4109,7 +4282,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25066,9 +25373,9 @@ configure-stagefeedback-libiberty:
+@@ -25065,9 +25388,9 @@ configure-stagefeedback-libiberty:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/libiberty/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4121,7 +4294,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/libiberty ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \
cd $(HOST_SUBDIR)/libiberty || exit 1; \
-@@ -25103,7 +25410,8 @@ all-libiberty: configure-libiberty
+@@ -25102,7 +25425,8 @@ all-libiberty: configure-libiberty
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libiberty && \
@@ -4131,7 +4304,7 @@ Index: gcc-4.3.1/Makefile.in
@endif libiberty
-@@ -25122,8 +25430,11 @@ all-stage1-libiberty: configure-stage1-l
+@@ -25121,8 +25445,11 @@ all-stage1-libiberty: configure-stage1-l
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4145,7 +4318,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-libiberty)
maybe-clean-stage1-libiberty: clean-stage1-libiberty
-@@ -25136,7 +25447,7 @@ clean-stage1-libiberty:
+@@ -25135,7 +25462,7 @@ clean-stage1-libiberty:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4154,7 +4327,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif libiberty-bootstrap
-@@ -25156,8 +25467,11 @@ all-stage2-libiberty: configure-stage2-l
+@@ -25155,8 +25482,11 @@ all-stage2-libiberty: configure-stage2-l
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4168,7 +4341,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-libiberty)
maybe-clean-stage2-libiberty: clean-stage2-libiberty
-@@ -25170,7 +25484,7 @@ clean-stage2-libiberty:
+@@ -25169,7 +25499,7 @@ clean-stage2-libiberty:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4177,7 +4350,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25191,8 +25505,11 @@ all-stageb2g0-libiberty: configure-stage
+@@ -25190,8 +25520,11 @@ all-stageb2g0-libiberty: configure-stage
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4191,7 +4364,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-libiberty)
maybe-clean-stageb2g0-libiberty: clean-stageb2g0-libiberty
-@@ -25205,7 +25522,7 @@ clean-stageb2g0-libiberty:
+@@ -25204,7 +25537,7 @@ clean-stageb2g0-libiberty:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4200,7 +4373,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25226,8 +25543,11 @@ all-stage3-libiberty: configure-stage3-l
+@@ -25225,8 +25558,11 @@ all-stage3-libiberty: configure-stage3-l
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4214,7 +4387,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-libiberty)
maybe-clean-stage3-libiberty: clean-stage3-libiberty
-@@ -25240,7 +25560,7 @@ clean-stage3-libiberty:
+@@ -25239,7 +25575,7 @@ clean-stage3-libiberty:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4223,7 +4396,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25261,8 +25581,11 @@ all-stageb3g2-libiberty: configure-stage
+@@ -25260,8 +25596,11 @@ all-stageb3g2-libiberty: configure-stage
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4237,7 +4410,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-libiberty)
maybe-clean-stageb3g2-libiberty: clean-stageb3g2-libiberty
-@@ -25275,7 +25598,7 @@ clean-stageb3g2-libiberty:
+@@ -25274,7 +25613,7 @@ clean-stageb3g2-libiberty:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4246,7 +4419,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25296,8 +25619,11 @@ all-stage4-libiberty: configure-stage4-l
+@@ -25295,8 +25634,11 @@ all-stage4-libiberty: configure-stage4-l
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4260,7 +4433,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-libiberty)
maybe-clean-stage4-libiberty: clean-stage4-libiberty
-@@ -25310,7 +25636,7 @@ clean-stage4-libiberty:
+@@ -25309,7 +25651,7 @@ clean-stage4-libiberty:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4269,7 +4442,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25331,8 +25657,11 @@ all-stageprofile-libiberty: configure-st
+@@ -25330,8 +25672,11 @@ all-stageprofile-libiberty: configure-st
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4283,7 +4456,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-libiberty)
maybe-clean-stageprofile-libiberty: clean-stageprofile-libiberty
-@@ -25345,7 +25674,7 @@ clean-stageprofile-libiberty:
+@@ -25344,7 +25689,7 @@ clean-stageprofile-libiberty:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4292,7 +4465,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25366,8 +25695,11 @@ all-stagefeedback-libiberty: configure-s
+@@ -25365,8 +25710,11 @@ all-stagefeedback-libiberty: configure-s
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4306,7 +4479,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-libiberty)
maybe-clean-stagefeedback-libiberty: clean-stagefeedback-libiberty
-@@ -25380,7 +25712,7 @@ clean-stagefeedback-libiberty:
+@@ -25379,7 +25727,7 @@ clean-stagefeedback-libiberty:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/libiberty && \
@@ -4315,7 +4488,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif libiberty-bootstrap
-@@ -25794,7 +26126,8 @@ all-libtool: configure-libtool
+@@ -25793,7 +26141,8 @@ all-libtool: configure-libtool
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libtool && \
@@ -4325,7 +4498,7 @@ Index: gcc-4.3.1/Makefile.in
@endif libtool
-@@ -26218,7 +26551,8 @@ all-m4: configure-m4
+@@ -26217,7 +26566,8 @@ all-m4: configure-m4
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/m4 && \
@@ -4335,7 +4508,7 @@ Index: gcc-4.3.1/Makefile.in
@endif m4
-@@ -26642,7 +26976,8 @@ all-make: configure-make
+@@ -26641,7 +26991,8 @@ all-make: configure-make
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/make && \
@@ -4345,7 +4518,7 @@ Index: gcc-4.3.1/Makefile.in
@endif make
-@@ -27066,7 +27401,8 @@ all-mmalloc: configure-mmalloc
+@@ -27065,7 +27416,8 @@ all-mmalloc: configure-mmalloc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/mmalloc && \
@@ -4355,7 +4528,7 @@ Index: gcc-4.3.1/Makefile.in
@endif mmalloc
-@@ -27484,7 +27820,8 @@ all-patch: configure-patch
+@@ -27483,7 +27835,8 @@ all-patch: configure-patch
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/patch && \
@@ -4365,7 +4538,7 @@ Index: gcc-4.3.1/Makefile.in
@endif patch
-@@ -27908,7 +28245,8 @@ all-perl: configure-perl
+@@ -27907,7 +28260,8 @@ all-perl: configure-perl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/perl && \
@@ -4375,7 +4548,7 @@ Index: gcc-4.3.1/Makefile.in
@endif perl
-@@ -28332,7 +28670,8 @@ all-prms: configure-prms
+@@ -28331,7 +28685,8 @@ all-prms: configure-prms
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/prms && \
@@ -4385,7 +4558,7 @@ Index: gcc-4.3.1/Makefile.in
@endif prms
-@@ -28756,7 +29095,8 @@ all-rcs: configure-rcs
+@@ -28755,7 +29110,8 @@ all-rcs: configure-rcs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/rcs && \
@@ -4395,7 +4568,7 @@ Index: gcc-4.3.1/Makefile.in
@endif rcs
-@@ -29180,7 +29520,8 @@ all-readline: configure-readline
+@@ -29179,7 +29535,8 @@ all-readline: configure-readline
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/readline && \
@@ -4405,7 +4578,7 @@ Index: gcc-4.3.1/Makefile.in
@endif readline
-@@ -29604,7 +29945,8 @@ all-release: configure-release
+@@ -29603,7 +29960,8 @@ all-release: configure-release
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/release && \
@@ -4415,7 +4588,7 @@ Index: gcc-4.3.1/Makefile.in
@endif release
-@@ -30016,7 +30358,8 @@ all-recode: configure-recode
+@@ -30015,7 +30373,8 @@ all-recode: configure-recode
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/recode && \
@@ -4425,7 +4598,7 @@ Index: gcc-4.3.1/Makefile.in
@endif recode
-@@ -30440,7 +30783,8 @@ all-sed: configure-sed
+@@ -30439,7 +30798,8 @@ all-sed: configure-sed
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/sed && \
@@ -4435,7 +4608,7 @@ Index: gcc-4.3.1/Makefile.in
@endif sed
-@@ -30864,7 +31208,8 @@ all-send-pr: configure-send-pr
+@@ -30863,7 +31223,8 @@ all-send-pr: configure-send-pr
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/send-pr && \
@@ -4445,7 +4618,7 @@ Index: gcc-4.3.1/Makefile.in
@endif send-pr
-@@ -31288,7 +31633,8 @@ all-shellutils: configure-shellutils
+@@ -31287,7 +31648,8 @@ all-shellutils: configure-shellutils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/shellutils && \
@@ -4455,7 +4628,7 @@ Index: gcc-4.3.1/Makefile.in
@endif shellutils
-@@ -31712,7 +32058,8 @@ all-sid: configure-sid
+@@ -31711,7 +32073,8 @@ all-sid: configure-sid
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/sid && \
@@ -4465,7 +4638,7 @@ Index: gcc-4.3.1/Makefile.in
@endif sid
-@@ -32136,7 +32483,8 @@ all-sim: configure-sim
+@@ -32135,7 +32498,8 @@ all-sim: configure-sim
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/sim && \
@@ -4475,7 +4648,7 @@ Index: gcc-4.3.1/Makefile.in
@endif sim
-@@ -32560,7 +32908,8 @@ all-tar: configure-tar
+@@ -32559,7 +32923,8 @@ all-tar: configure-tar
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/tar && \
@@ -4485,7 +4658,7 @@ Index: gcc-4.3.1/Makefile.in
@endif tar
-@@ -32984,7 +33333,8 @@ all-texinfo: configure-texinfo
+@@ -32983,7 +33348,8 @@ all-texinfo: configure-texinfo
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/texinfo && \
@@ -4495,7 +4668,7 @@ Index: gcc-4.3.1/Makefile.in
@endif texinfo
-@@ -33402,7 +33752,8 @@ all-textutils: configure-textutils
+@@ -33401,7 +33767,8 @@ all-textutils: configure-textutils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/textutils && \
@@ -4505,7 +4678,7 @@ Index: gcc-4.3.1/Makefile.in
@endif textutils
-@@ -33826,7 +34177,8 @@ all-time: configure-time
+@@ -33825,7 +34192,8 @@ all-time: configure-time
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/time && \
@@ -4515,7 +4688,7 @@ Index: gcc-4.3.1/Makefile.in
@endif time
-@@ -34250,7 +34602,8 @@ all-uudecode: configure-uudecode
+@@ -34249,7 +34617,8 @@ all-uudecode: configure-uudecode
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/uudecode && \
@@ -4525,7 +4698,7 @@ Index: gcc-4.3.1/Makefile.in
@endif uudecode
-@@ -34674,7 +35027,8 @@ all-wdiff: configure-wdiff
+@@ -34673,7 +35042,8 @@ all-wdiff: configure-wdiff
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/wdiff && \
@@ -4535,7 +4708,7 @@ Index: gcc-4.3.1/Makefile.in
@endif wdiff
-@@ -35098,7 +35452,8 @@ all-zip: configure-zip
+@@ -35097,7 +35467,8 @@ all-zip: configure-zip
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/zip && \
@@ -4545,7 +4718,7 @@ Index: gcc-4.3.1/Makefile.in
@endif zip
-@@ -35518,9 +35873,9 @@ configure-stage1-zlib:
+@@ -35517,9 +35888,9 @@ configure-stage1-zlib:
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
@@ -4557,7 +4730,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35549,9 +35904,9 @@ configure-stage2-zlib:
+@@ -35548,9 +35919,9 @@ configure-stage2-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4569,7 +4742,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35580,9 +35935,9 @@ configure-stageb2g0-zlib:
+@@ -35579,9 +35950,9 @@ configure-stageb2g0-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4581,7 +4754,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35611,9 +35966,9 @@ configure-stage3-zlib:
+@@ -35610,9 +35981,9 @@ configure-stage3-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4593,7 +4766,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35642,9 +35997,9 @@ configure-stageb3g2-zlib:
+@@ -35641,9 +36012,9 @@ configure-stageb3g2-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4605,7 +4778,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35673,9 +36028,9 @@ configure-stage4-zlib:
+@@ -35672,9 +36043,9 @@ configure-stage4-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4617,7 +4790,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35704,9 +36059,9 @@ configure-stageprofile-zlib:
+@@ -35703,9 +36074,9 @@ configure-stageprofile-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4629,7 +4802,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35735,9 +36090,9 @@ configure-stagefeedback-zlib:
+@@ -35734,9 +36105,9 @@ configure-stagefeedback-zlib:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
test ! -f $(HOST_SUBDIR)/zlib/Makefile || exit 0; \
$(HOST_EXPORTS) \
@@ -4641,7 +4814,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(HOST_SUBDIR)/zlib ; \
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \
cd $(HOST_SUBDIR)/zlib || exit 1; \
-@@ -35772,7 +36127,8 @@ all-zlib: configure-zlib
+@@ -35771,7 +36142,8 @@ all-zlib: configure-zlib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/zlib && \
@@ -4651,7 +4824,7 @@ Index: gcc-4.3.1/Makefile.in
@endif zlib
-@@ -35791,8 +36147,11 @@ all-stage1-zlib: configure-stage1-zlib
+@@ -35790,8 +36162,11 @@ all-stage1-zlib: configure-stage1-zlib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4665,7 +4838,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-zlib)
maybe-clean-stage1-zlib: clean-stage1-zlib
-@@ -35805,7 +36164,7 @@ clean-stage1-zlib:
+@@ -35804,7 +36179,7 @@ clean-stage1-zlib:
$(MAKE) stage1-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4674,7 +4847,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif zlib-bootstrap
-@@ -35825,8 +36184,11 @@ all-stage2-zlib: configure-stage2-zlib
+@@ -35824,8 +36199,11 @@ all-stage2-zlib: configure-stage2-zlib
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4688,7 +4861,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-zlib)
maybe-clean-stage2-zlib: clean-stage2-zlib
-@@ -35839,7 +36201,7 @@ clean-stage2-zlib:
+@@ -35838,7 +36216,7 @@ clean-stage2-zlib:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4697,7 +4870,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -35860,8 +36222,11 @@ all-stageb2g0-zlib: configure-stageb2g0-
+@@ -35859,8 +36237,11 @@ all-stageb2g0-zlib: configure-stageb2g0-
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4711,7 +4884,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-zlib)
maybe-clean-stageb2g0-zlib: clean-stageb2g0-zlib
-@@ -35874,7 +36239,7 @@ clean-stageb2g0-zlib:
+@@ -35873,7 +36254,7 @@ clean-stageb2g0-zlib:
$(MAKE) stageb2g0-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4720,7 +4893,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -35895,8 +36260,11 @@ all-stage3-zlib: configure-stage3-zlib
+@@ -35894,8 +36275,11 @@ all-stage3-zlib: configure-stage3-zlib
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4734,7 +4907,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-zlib)
maybe-clean-stage3-zlib: clean-stage3-zlib
-@@ -35909,7 +36277,7 @@ clean-stage3-zlib:
+@@ -35908,7 +36292,7 @@ clean-stage3-zlib:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4743,7 +4916,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -35930,8 +36298,11 @@ all-stageb3g2-zlib: configure-stageb3g2-
+@@ -35929,8 +36313,11 @@ all-stageb3g2-zlib: configure-stageb3g2-
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4757,7 +4930,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-zlib)
maybe-clean-stageb3g2-zlib: clean-stageb3g2-zlib
-@@ -35944,7 +36315,7 @@ clean-stageb3g2-zlib:
+@@ -35943,7 +36330,7 @@ clean-stageb3g2-zlib:
$(MAKE) stageb3g2-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4766,7 +4939,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -35965,8 +36336,11 @@ all-stage4-zlib: configure-stage4-zlib
+@@ -35964,8 +36351,11 @@ all-stage4-zlib: configure-stage4-zlib
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4780,7 +4953,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-zlib)
maybe-clean-stage4-zlib: clean-stage4-zlib
-@@ -35979,7 +36353,7 @@ clean-stage4-zlib:
+@@ -35978,7 +36368,7 @@ clean-stage4-zlib:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4789,7 +4962,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -36000,8 +36374,11 @@ all-stageprofile-zlib: configure-stagepr
+@@ -35999,8 +36389,11 @@ all-stageprofile-zlib: configure-stagepr
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4803,7 +4976,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-zlib)
maybe-clean-stageprofile-zlib: clean-stageprofile-zlib
-@@ -36014,7 +36391,7 @@ clean-stageprofile-zlib:
+@@ -36013,7 +36406,7 @@ clean-stageprofile-zlib:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4812,7 +4985,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -36035,8 +36412,11 @@ all-stagefeedback-zlib: configure-stagef
+@@ -36034,8 +36427,11 @@ all-stagefeedback-zlib: configure-stagef
$(HOST_EXPORTS) \
$(POSTSTAGE1_HOST_EXPORTS) \
cd $(HOST_SUBDIR)/zlib && \
@@ -4826,7 +4999,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-zlib)
maybe-clean-stagefeedback-zlib: clean-stagefeedback-zlib
-@@ -36049,7 +36429,7 @@ clean-stagefeedback-zlib:
+@@ -36048,7 +36444,7 @@ clean-stagefeedback-zlib:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/zlib && \
@@ -4835,7 +5008,7 @@ Index: gcc-4.3.1/Makefile.in
$(POSTSTAGE1_FLAGS_TO_PASS) \
clean
@endif zlib-bootstrap
-@@ -36451,7 +36831,8 @@ all-gdb: configure-gdb
+@@ -36450,7 +36846,8 @@ all-gdb: configure-gdb
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gdb && \
@@ -4845,7 +5018,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gdb
-@@ -36875,7 +37256,8 @@ all-expect: configure-expect
+@@ -36874,7 +37271,8 @@ all-expect: configure-expect
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/expect && \
@@ -4855,7 +5028,7 @@ Index: gcc-4.3.1/Makefile.in
@endif expect
-@@ -37299,7 +37681,8 @@ all-guile: configure-guile
+@@ -37298,7 +37696,8 @@ all-guile: configure-guile
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/guile && \
@@ -4865,7 +5038,7 @@ Index: gcc-4.3.1/Makefile.in
@endif guile
-@@ -37723,7 +38106,8 @@ all-tk: configure-tk
+@@ -37722,7 +38121,8 @@ all-tk: configure-tk
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/tk && \
@@ -4875,7 +5048,7 @@ Index: gcc-4.3.1/Makefile.in
@endif tk
-@@ -38147,7 +38531,8 @@ all-libtermcap: configure-libtermcap
+@@ -38146,7 +38546,8 @@ all-libtermcap: configure-libtermcap
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/libtermcap && \
@@ -4885,7 +5058,7 @@ Index: gcc-4.3.1/Makefile.in
@endif libtermcap
-@@ -38505,7 +38890,8 @@ all-utils: configure-utils
+@@ -38504,7 +38905,8 @@ all-utils: configure-utils
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/utils && \
@@ -4895,7 +5068,7 @@ Index: gcc-4.3.1/Makefile.in
@endif utils
-@@ -38923,7 +39309,8 @@ all-gnattools: configure-gnattools
+@@ -38922,7 +39324,8 @@ all-gnattools: configure-gnattools
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gnattools && \
@@ -4905,7 +5078,7 @@ Index: gcc-4.3.1/Makefile.in
@endif gnattools
-@@ -39368,7 +39755,8 @@ all-target-libstdc++-v3: configure-targe
+@@ -39367,7 +39770,8 @@ all-target-libstdc++-v3: configure-targe
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(RAW_CXX_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libstdc++-v3 && \
@@ -4915,7 +5088,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libstdc++-v3
-@@ -39809,7 +40197,8 @@ all-target-libmudflap: configure-target-
+@@ -39808,7 +40212,8 @@ all-target-libmudflap: configure-target-
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libmudflap && \
@@ -4925,7 +5098,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libmudflap
-@@ -40250,7 +40639,8 @@ all-target-libssp: configure-target-libs
+@@ -40249,7 +40654,8 @@ all-target-libssp: configure-target-libs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libssp && \
@@ -4935,7 +5108,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libssp
-@@ -40691,7 +41081,8 @@ all-target-newlib: configure-target-newl
+@@ -40690,7 +41096,8 @@ all-target-newlib: configure-target-newl
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/newlib && \
@@ -4945,7 +5118,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-newlib
-@@ -41137,9 +41528,9 @@ configure-stage1-target-libgcc:
+@@ -41136,9 +41543,9 @@ configure-stage1-target-libgcc:
mv $(TARGET_SUBDIR)/libgcc/multilib.tmp $(TARGET_SUBDIR)/libgcc/multilib.out; \
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
@@ -4958,7 +5131,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 1 in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41180,9 +41571,9 @@ configure-stage2-target-libgcc:
+@@ -41179,9 +41586,9 @@ configure-stage2-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -4971,7 +5144,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 2 in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41223,9 +41614,9 @@ configure-stageb2g0-target-libgcc:
+@@ -41222,9 +41629,9 @@ configure-stageb2g0-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -4984,7 +5157,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b2g0 in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41266,9 +41657,9 @@ configure-stage3-target-libgcc:
+@@ -41265,9 +41672,9 @@ configure-stage3-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -4997,7 +5170,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 3 in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41309,9 +41700,9 @@ configure-stageb3g2-target-libgcc:
+@@ -41308,9 +41715,9 @@ configure-stageb3g2-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -5010,7 +5183,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage b3g2 in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41352,9 +41743,9 @@ configure-stage4-target-libgcc:
+@@ -41351,9 +41758,9 @@ configure-stage4-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -5023,7 +5196,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage 4 in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41395,9 +41786,9 @@ configure-stageprofile-target-libgcc:
+@@ -41394,9 +41801,9 @@ configure-stageprofile-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -5036,7 +5209,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage profile in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41438,9 +41829,9 @@ configure-stagefeedback-target-libgcc:
+@@ -41437,9 +41844,9 @@ configure-stagefeedback-target-libgcc:
fi; \
test ! -f $(TARGET_SUBDIR)/libgcc/Makefile || exit 0; \
$(NORMAL_TARGET_EXPORTS) \
@@ -5049,7 +5222,7 @@ Index: gcc-4.3.1/Makefile.in
echo Configuring stage feedback in $(TARGET_SUBDIR)/libgcc ; \
$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \
cd $(TARGET_SUBDIR)/libgcc || exit 1; \
-@@ -41475,7 +41866,8 @@ all-target-libgcc: configure-target-libg
+@@ -41474,7 +41881,8 @@ all-target-libgcc: configure-target-libg
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libgcc && \
@@ -5059,7 +5232,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libgcc
-@@ -41494,8 +41886,11 @@ all-stage1-target-libgcc: configure-stag
+@@ -41493,8 +41901,11 @@ all-stage1-target-libgcc: configure-stag
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5073,7 +5246,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage1-target-libgcc)
maybe-clean-stage1-target-libgcc: clean-stage1-target-libgcc
-@@ -41508,7 +41903,7 @@ clean-stage1-target-libgcc:
+@@ -41507,7 +41918,7 @@ clean-stage1-target-libgcc:
$(MAKE) stage1-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5082,7 +5255,7 @@ Index: gcc-4.3.1/Makefile.in
clean
@endif target-libgcc-bootstrap
-@@ -41528,8 +41923,11 @@ all-stage2-target-libgcc: configure-stag
+@@ -41527,8 +41938,11 @@ all-stage2-target-libgcc: configure-stag
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5096,7 +5269,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage2-target-libgcc)
maybe-clean-stage2-target-libgcc: clean-stage2-target-libgcc
-@@ -41542,7 +41940,7 @@ clean-stage2-target-libgcc:
+@@ -41541,7 +41955,7 @@ clean-stage2-target-libgcc:
$(MAKE) stage2-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5105,7 +5278,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -41563,8 +41961,11 @@ all-stageb2g0-target-libgcc: configure-s
+@@ -41562,8 +41976,11 @@ all-stageb2g0-target-libgcc: configure-s
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5119,7 +5292,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb2g0-target-libgcc)
maybe-clean-stageb2g0-target-libgcc: clean-stageb2g0-target-libgcc
-@@ -41577,7 +41978,7 @@ clean-stageb2g0-target-libgcc:
+@@ -41576,7 +41993,7 @@ clean-stageb2g0-target-libgcc:
$(MAKE) stageb2g0-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5128,7 +5301,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -41598,8 +41999,11 @@ all-stage3-target-libgcc: configure-stag
+@@ -41597,8 +42014,11 @@ all-stage3-target-libgcc: configure-stag
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5142,7 +5315,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage3-target-libgcc)
maybe-clean-stage3-target-libgcc: clean-stage3-target-libgcc
-@@ -41612,7 +42016,7 @@ clean-stage3-target-libgcc:
+@@ -41611,7 +42031,7 @@ clean-stage3-target-libgcc:
$(MAKE) stage3-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5151,7 +5324,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -41633,8 +42037,11 @@ all-stageb3g2-target-libgcc: configure-s
+@@ -41632,8 +42052,11 @@ all-stageb3g2-target-libgcc: configure-s
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5165,7 +5338,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageb3g2-target-libgcc)
maybe-clean-stageb3g2-target-libgcc: clean-stageb3g2-target-libgcc
-@@ -41647,7 +42054,7 @@ clean-stageb3g2-target-libgcc:
+@@ -41646,7 +42069,7 @@ clean-stageb3g2-target-libgcc:
$(MAKE) stageb3g2-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5174,7 +5347,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -41668,8 +42075,11 @@ all-stage4-target-libgcc: configure-stag
+@@ -41667,8 +42090,11 @@ all-stage4-target-libgcc: configure-stag
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5188,7 +5361,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stage4-target-libgcc)
maybe-clean-stage4-target-libgcc: clean-stage4-target-libgcc
-@@ -41682,7 +42092,7 @@ clean-stage4-target-libgcc:
+@@ -41681,7 +42107,7 @@ clean-stage4-target-libgcc:
$(MAKE) stage4-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5197,7 +5370,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -41703,8 +42113,11 @@ all-stageprofile-target-libgcc: configur
+@@ -41702,8 +42128,11 @@ all-stageprofile-target-libgcc: configur
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5211,7 +5384,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stageprofile-target-libgcc)
maybe-clean-stageprofile-target-libgcc: clean-stageprofile-target-libgcc
-@@ -41717,7 +42130,7 @@ clean-stageprofile-target-libgcc:
+@@ -41716,7 +42145,7 @@ clean-stageprofile-target-libgcc:
$(MAKE) stageprofile-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5220,7 +5393,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -41738,8 +42151,11 @@ all-stagefeedback-target-libgcc: configu
+@@ -41737,8 +42166,11 @@ all-stagefeedback-target-libgcc: configu
$(NORMAL_TARGET_EXPORTS) \
\
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5234,7 +5407,7 @@ Index: gcc-4.3.1/Makefile.in
$(TARGET-stagefeedback-target-libgcc)
maybe-clean-stagefeedback-target-libgcc: clean-stagefeedback-target-libgcc
-@@ -41752,7 +42168,7 @@ clean-stagefeedback-target-libgcc:
+@@ -41751,7 +42183,7 @@ clean-stagefeedback-target-libgcc:
$(MAKE) stagefeedback-start; \
fi; \
cd $(TARGET_SUBDIR)/libgcc && \
@@ -5243,7 +5416,7 @@ Index: gcc-4.3.1/Makefile.in
\
clean
@endif target-libgcc-bootstrap
-@@ -42191,7 +42607,8 @@ all-target-libgfortran: configure-target
+@@ -42190,7 +42622,8 @@ all-target-libgfortran: configure-target
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libgfortran && \
@@ -5253,7 +5426,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libgfortran
-@@ -42632,7 +43049,8 @@ all-target-libobjc: configure-target-lib
+@@ -42631,7 +43064,8 @@ all-target-libobjc: configure-target-lib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libobjc && \
@@ -5263,7 +5436,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libobjc
-@@ -43073,7 +43491,8 @@ all-target-libtermcap: configure-target-
+@@ -43072,7 +43506,8 @@ all-target-libtermcap: configure-target-
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libtermcap && \
@@ -5273,7 +5446,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libtermcap
-@@ -43449,7 +43868,8 @@ all-target-winsup: configure-target-wins
+@@ -43448,7 +43883,8 @@ all-target-winsup: configure-target-wins
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/winsup && \
@@ -5283,7 +5456,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-winsup
-@@ -43890,7 +44310,8 @@ all-target-libgloss: configure-target-li
+@@ -43889,7 +44325,8 @@ all-target-libgloss: configure-target-li
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libgloss && \
@@ -5293,7 +5466,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libgloss
-@@ -44326,7 +44747,8 @@ all-target-libiberty: configure-target-l
+@@ -44325,7 +44762,8 @@ all-target-libiberty: configure-target-l
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libiberty && \
@@ -5303,7 +5476,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libiberty
-@@ -44767,7 +45189,8 @@ all-target-gperf: configure-target-gperf
+@@ -44766,7 +45204,8 @@ all-target-gperf: configure-target-gperf
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/gperf && \
@@ -5313,7 +5486,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-gperf
-@@ -45208,7 +45631,8 @@ all-target-examples: configure-target-ex
+@@ -45207,7 +45646,8 @@ all-target-examples: configure-target-ex
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/examples && \
@@ -5323,7 +5496,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-examples
-@@ -45639,7 +46063,8 @@ all-target-libffi: configure-target-libf
+@@ -45638,7 +46078,8 @@ all-target-libffi: configure-target-libf
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libffi && \
@@ -5333,7 +5506,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libffi
-@@ -46080,7 +46505,8 @@ all-target-libjava: configure-target-lib
+@@ -46079,7 +46520,8 @@ all-target-libjava: configure-target-lib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(RAW_CXX_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libjava && \
@@ -5343,7 +5516,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libjava
-@@ -46521,7 +46947,8 @@ all-target-zlib: configure-target-zlib
+@@ -46520,7 +46962,8 @@ all-target-zlib: configure-target-zlib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/zlib && \
@@ -5353,7 +5526,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-zlib
-@@ -46962,7 +47389,8 @@ all-target-boehm-gc: configure-target-bo
+@@ -46961,7 +47404,8 @@ all-target-boehm-gc: configure-target-bo
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/boehm-gc && \
@@ -5363,7 +5536,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-boehm-gc
-@@ -47403,7 +47831,8 @@ all-target-qthreads: configure-target-qt
+@@ -47402,7 +47846,8 @@ all-target-qthreads: configure-target-qt
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/qthreads && \
@@ -5373,7 +5546,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-qthreads
-@@ -47844,7 +48273,8 @@ all-target-rda: configure-target-rda
+@@ -47843,7 +48288,8 @@ all-target-rda: configure-target-rda
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/rda && \
@@ -5383,7 +5556,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-rda
-@@ -48285,7 +48715,8 @@ all-target-libada: configure-target-liba
+@@ -48284,7 +48730,8 @@ all-target-libada: configure-target-liba
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libada && \
@@ -5393,7 +5566,7 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libada
-@@ -48726,7 +49157,8 @@ all-target-libgomp: configure-target-lib
+@@ -48725,7 +49172,8 @@ all-target-libgomp: configure-target-lib
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(NORMAL_TARGET_EXPORTS) \
(cd $(TARGET_SUBDIR)/libgomp && \
@@ -5403,10 +5576,105 @@ Index: gcc-4.3.1/Makefile.in
@endif target-libgomp
+@@ -49358,7 +49806,7 @@ stage1-end::
+
+ # Bubble a bug fix through all the stages up to stage 1. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage1-bubble
+ stage1-bubble::
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -49569,7 +50017,7 @@ stage2-end::
+
+ # Bubble a bug fix through all the stages up to stage 2. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage2-bubble
+ stage2-bubble:: stage1-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -49801,7 +50249,7 @@ stageb2g0-end::
+
+ # Bubble a bug fix through all the stages up to stage b2g0. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stageb2g0-bubble
+ stageb2g0-bubble:: stage1-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -50033,7 +50481,7 @@ stage3-end::
+
+ # Bubble a bug fix through all the stages up to stage 3. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage3-bubble
+ stage3-bubble:: stage2-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -50319,7 +50767,7 @@ stageb3g2-end::
+
+ # Bubble a bug fix through all the stages up to stage b3g2. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stageb3g2-bubble
+ stageb3g2-bubble:: stageb2g0-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -50605,7 +51053,7 @@ stage4-end::
+
+ # Bubble a bug fix through all the stages up to stage 4. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stage4-bubble
+ stage4-bubble:: stage3-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -50880,7 +51328,7 @@ stageprofile-end::
+
+ # Bubble a bug fix through all the stages up to stage profile. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stageprofile-bubble
+ stageprofile-bubble:: stage1-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -51091,7 +51539,7 @@ stagefeedback-end::
+
+ # Bubble a bug fix through all the stages up to stage feedback. They are
+ # remade, but not reconfigured. The next stage (if any) will not be
+-# reconfigured as well.
++# reconfigured either.
+ .PHONY: stagefeedback-bubble
+ stagefeedback-bubble:: stageprofile-bubble
+ @r=`${PWD_COMMAND}`; export r; \
+@@ -51174,10 +51622,10 @@ stage_current:
+ @if test -f stage_last; then $(unstage); else $(MAKE) stage1-start; fi
+
+ .PHONY: restrap
+-restrap:
++restrap::
+ @: $(MAKE); $(stage)
+ rm -rf stage1-$(TARGET_SUBDIR) stage2-* stageb2g0-* stage3-* stageb3g2-* stage4-* stageprofile-* stagefeedback-*
+- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all
++restrap:: all
+ @endif gcc-bootstrap
+
+ # --------------------------------------
+@@ -52003,7 +52451,8 @@ config.status: configure
+
+ # Rebuilding configure.
+ AUTOCONF = autoconf
+-$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4
++$(srcdir)/configure: @MAINT@ $(srcdir)/configure.ac $(srcdir)/config/acx.m4 \
++ $(srcdir)/config/override.m4 $(srcdir)/config/proginstall.m4
+ cd $(srcdir) && $(AUTOCONF)
+
+ # ------------------------------
Index: gcc-4.3.1/configure
===================================================================
--- gcc-4.3.1.orig/configure 2008-02-01 19:29:30.000000000 -0800
-+++ gcc-4.3.1/configure 2008-07-21 11:22:34.000000000 -0700
++++ gcc-4.3.1/configure 2008-08-20 00:47:50.000000000 -0700
@@ -272,7 +272,7 @@ PACKAGE_STRING=
PACKAGE_BUGREPORT=
@@ -5464,3 +5732,860 @@ Index: gcc-4.3.1/configure
s,@RPATH_ENVVAR@,$RPATH_ENVVAR,;t t
s,@tooldir@,$tooldir,;t t
s,@build_tooldir@,$build_tooldir,;t t
+Index: gcc-4.3.1/libiberty/Makefile.in
+===================================================================
+--- gcc-4.3.1.orig/libiberty/Makefile.in 2007-07-24 23:26:45.000000000 -0700
++++ gcc-4.3.1/libiberty/Makefile.in 2008-08-20 00:47:50.000000000 -0700
+@@ -60,7 +60,7 @@ RANLIB = @RANLIB@
+ MAKEINFO = @MAKEINFO@
+ PERL = @PERL@
+
+-PICFLAG =
++PICFLAG = @PICFLAG@
+
+ MAKEOVERRIDES =
+
+@@ -143,10 +143,11 @@ CFILES = alloca.c argv.c asprintf.c atex
+ pex-unix.c pex-win32.c \
+ physmem.c putenv.c \
+ random.c regex.c rename.c rindex.c \
+- safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c spaces.c \
+- splay-tree.c stpcpy.c stpncpy.c strcasecmp.c strchr.c strdup.c \
+- strerror.c strncasecmp.c strncmp.c strrchr.c strsignal.c \
+- strstr.c strtod.c strtol.c strtoul.c strndup.c strverscmp.c \
++ safe-ctype.c setenv.c sigsetmask.c snprintf.c sort.c \
++ spaces.c splay-tree.c stpcpy.c stpncpy.c strcasecmp.c \
++ strchr.c strdup.c strerror.c strncasecmp.c strncmp.c \
++ strrchr.c strsignal.c strstr.c strtod.c strtol.c strtoul.c \
++ strndup.c strverscmp.c \
+ tmpnam.c \
+ unlink-if-ordinary.c \
+ vasprintf.c vfork.c vfprintf.c vprintf.c vsnprintf.c vsprintf.c \
+@@ -156,7 +157,8 @@ CFILES = alloca.c argv.c asprintf.c atex
+
+ # These are always included in the library. The first four are listed
+ # first and by compile time to optimize parallel builds.
+-REQUIRED_OFILES = ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o \
++REQUIRED_OFILES = \
++ ./regex.o ./cplus-dem.o ./cp-demangle.o ./md5.o \
+ ./alloca.o ./argv.o \
+ ./choose-temp.o ./concat.o ./cp-demint.o \
+ ./dyn-string.o \
+@@ -473,13 +475,13 @@ stamp-h: $(srcdir)/config.in config.stat
+ config.status: $(srcdir)/configure
+ $(SHELL) ./config.status --recheck
+
+-# Depending on stamp-h makes sure that config.status has been re-run
++# Depending on config.h makes sure that config.status has been re-run
+ # if needed. This prevents problems with parallel builds, in case
+ # subdirectories need to run config.status also.
+ all-subdir check-subdir installcheck-subdir info-subdir \
+ install-info-subdir clean-info-subdir dvi-subdir pdf-subdir install-subdir \
+ etags-subdir mostlyclean-subdir clean-subdir distclean-subdir \
+-maintainer-clean-subdir: stamp-h
++maintainer-clean-subdir: config.h
+ @subdirs='$(SUBDIRS)'; \
+ target=`echo $@ | sed -e 's/-subdir//'`; \
+ for dir in $$subdirs ; do \
+@@ -496,40 +498,41 @@ $(CONFIGURED_OFILES): stamp-picdir
+ # The dependencies in the remainder of this file are automatically
+ # generated by "make maint-deps". Manual edits will be lost.
+
+-./_doprnt.o: $(srcdir)/_doprnt.c stamp-h $(INCDIR)/ansidecl.h \
++./_doprnt.o: $(srcdir)/_doprnt.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/_doprnt.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/_doprnt.c $(OUTPUT_OPTION)
+
+-./alloca.o: $(srcdir)/alloca.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./alloca.o: $(srcdir)/alloca.c config.h $(INCDIR)/ansidecl.h \
++ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/alloca.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/alloca.c $(OUTPUT_OPTION)
+
+-./argv.o: $(srcdir)/argv.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
++./argv.o: $(srcdir)/argv.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/argv.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/argv.c $(OUTPUT_OPTION)
+
+-./asprintf.o: $(srcdir)/asprintf.c stamp-h $(INCDIR)/ansidecl.h \
++./asprintf.o: $(srcdir)/asprintf.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/asprintf.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/asprintf.c $(OUTPUT_OPTION)
+
+-./atexit.o: $(srcdir)/atexit.c stamp-h
++./atexit.o: $(srcdir)/atexit.c config.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/atexit.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/atexit.c $(OUTPUT_OPTION)
+
+-./basename.o: $(srcdir)/basename.c stamp-h $(INCDIR)/ansidecl.h \
++./basename.o: $(srcdir)/basename.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/basename.c -o pic/$@; \
+@@ -548,7 +551,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/bcopy.c $(OUTPUT_OPTION)
+
+-./bsearch.o: $(srcdir)/bsearch.c stamp-h $(INCDIR)/ansidecl.h
++./bsearch.o: $(srcdir)/bsearch.c config.h $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/bsearch.c -o pic/$@; \
+ else true; fi
+@@ -566,20 +569,21 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/calloc.c $(OUTPUT_OPTION)
+
+-./choose-temp.o: $(srcdir)/choose-temp.c stamp-h $(INCDIR)/ansidecl.h \
++./choose-temp.o: $(srcdir)/choose-temp.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/choose-temp.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/choose-temp.c $(OUTPUT_OPTION)
+
+-./clock.o: $(srcdir)/clock.c stamp-h
++./clock.o: $(srcdir)/clock.c config.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/clock.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/clock.c $(OUTPUT_OPTION)
+
+-./concat.o: $(srcdir)/concat.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./concat.o: $(srcdir)/concat.c config.h $(INCDIR)/ansidecl.h \
++ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/concat.c -o pic/$@; \
+ else true; fi
+@@ -591,7 +595,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/copysign.c $(OUTPUT_OPTION)
+
+-./cp-demangle.o: $(srcdir)/cp-demangle.c stamp-h $(INCDIR)/ansidecl.h \
++./cp-demangle.o: $(srcdir)/cp-demangle.c config.h $(INCDIR)/ansidecl.h \
+ $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+ $(INCDIR)/dyn-string.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+@@ -599,7 +603,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/cp-demangle.c $(OUTPUT_OPTION)
+
+-./cp-demint.o: $(srcdir)/cp-demint.c stamp-h $(INCDIR)/ansidecl.h \
++./cp-demint.o: $(srcdir)/cp-demint.c config.h $(INCDIR)/ansidecl.h \
+ $(srcdir)/cp-demangle.h $(INCDIR)/demangle.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+@@ -607,7 +611,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/cp-demint.c $(OUTPUT_OPTION)
+
+-./cplus-dem.o: $(srcdir)/cplus-dem.c stamp-h $(INCDIR)/ansidecl.h \
++./cplus-dem.o: $(srcdir)/cplus-dem.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+@@ -615,14 +619,14 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/cplus-dem.c $(OUTPUT_OPTION)
+
+-./dyn-string.o: $(srcdir)/dyn-string.c stamp-h $(INCDIR)/ansidecl.h \
++./dyn-string.o: $(srcdir)/dyn-string.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/dyn-string.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/dyn-string.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/dyn-string.c $(OUTPUT_OPTION)
+
+-./fdmatch.o: $(srcdir)/fdmatch.c stamp-h $(INCDIR)/ansidecl.h \
++./fdmatch.o: $(srcdir)/fdmatch.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/fdmatch.c -o pic/$@; \
+@@ -635,93 +639,94 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/ffs.c $(OUTPUT_OPTION)
+
+-./fibheap.o: $(srcdir)/fibheap.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/fibheap.h \
+- $(INCDIR)/libiberty.h
++./fibheap.o: $(srcdir)/fibheap.c config.h $(INCDIR)/ansidecl.h \
++ $(INCDIR)/fibheap.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/fibheap.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/fibheap.c $(OUTPUT_OPTION)
+
+-./filename_cmp.o: $(srcdir)/filename_cmp.c stamp-h $(INCDIR)/filenames.h \
++./filename_cmp.o: $(srcdir)/filename_cmp.c config.h $(INCDIR)/filenames.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/filename_cmp.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/filename_cmp.c $(OUTPUT_OPTION)
+
+-./floatformat.o: $(srcdir)/floatformat.c stamp-h $(INCDIR)/ansidecl.h \
++./floatformat.o: $(srcdir)/floatformat.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/floatformat.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/floatformat.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/floatformat.c $(OUTPUT_OPTION)
+
+-./fnmatch.o: $(srcdir)/fnmatch.c stamp-h $(INCDIR)/fnmatch.h \
++./fnmatch.o: $(srcdir)/fnmatch.c config.h $(INCDIR)/fnmatch.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/fnmatch.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/fnmatch.c $(OUTPUT_OPTION)
+
+-./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c stamp-h $(INCDIR)/ansidecl.h \
++./fopen_unlocked.o: $(srcdir)/fopen_unlocked.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/fopen_unlocked.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/fopen_unlocked.c $(OUTPUT_OPTION)
+
+-./getcwd.o: $(srcdir)/getcwd.c stamp-h
++./getcwd.o: $(srcdir)/getcwd.c config.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/getcwd.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/getcwd.c $(OUTPUT_OPTION)
+
+-./getopt.o: $(srcdir)/getopt.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h
++./getopt.o: $(srcdir)/getopt.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/getopt.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/getopt.c $(OUTPUT_OPTION)
+
+-./getopt1.o: $(srcdir)/getopt1.c stamp-h $(INCDIR)/getopt.h
++./getopt1.o: $(srcdir)/getopt1.c config.h $(INCDIR)/getopt.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/getopt1.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/getopt1.c $(OUTPUT_OPTION)
+
+-./getpagesize.o: $(srcdir)/getpagesize.c stamp-h
++./getpagesize.o: $(srcdir)/getpagesize.c config.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/getpagesize.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/getpagesize.c $(OUTPUT_OPTION)
+
+-./getpwd.o: $(srcdir)/getpwd.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./getpwd.o: $(srcdir)/getpwd.c config.h $(INCDIR)/ansidecl.h \
++ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/getpwd.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/getpwd.c $(OUTPUT_OPTION)
+
+-./getruntime.o: $(srcdir)/getruntime.c stamp-h $(INCDIR)/ansidecl.h \
++./getruntime.o: $(srcdir)/getruntime.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/getruntime.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/getruntime.c $(OUTPUT_OPTION)
+
+-./gettimeofday.o: $(srcdir)/gettimeofday.c stamp-h $(INCDIR)/ansidecl.h \
++./gettimeofday.o: $(srcdir)/gettimeofday.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/gettimeofday.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/gettimeofday.c $(OUTPUT_OPTION)
+
+-./hashtab.o: $(srcdir)/hashtab.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/hashtab.h \
+- $(INCDIR)/libiberty.h
++./hashtab.o: $(srcdir)/hashtab.c config.h $(INCDIR)/ansidecl.h \
++ $(INCDIR)/hashtab.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/hashtab.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/hashtab.c $(OUTPUT_OPTION)
+
+-./hex.o: $(srcdir)/hex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
++./hex.o: $(srcdir)/hex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/hex.c -o pic/$@; \
+@@ -740,7 +745,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/insque.c $(OUTPUT_OPTION)
+
+-./lbasename.o: $(srcdir)/lbasename.c stamp-h $(INCDIR)/ansidecl.h \
++./lbasename.o: $(srcdir)/lbasename.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/filenames.h $(INCDIR)/libiberty.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+@@ -748,28 +753,28 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/lbasename.c $(OUTPUT_OPTION)
+
+-./lrealpath.o: $(srcdir)/lrealpath.c stamp-h $(INCDIR)/ansidecl.h \
++./lrealpath.o: $(srcdir)/lrealpath.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/lrealpath.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/lrealpath.c $(OUTPUT_OPTION)
+
+-./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c stamp-h \
++./make-relative-prefix.o: $(srcdir)/make-relative-prefix.c config.h \
+ $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/make-relative-prefix.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/make-relative-prefix.c $(OUTPUT_OPTION)
+
+-./make-temp-file.o: $(srcdir)/make-temp-file.c stamp-h $(INCDIR)/ansidecl.h \
++./make-temp-file.o: $(srcdir)/make-temp-file.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/make-temp-file.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/make-temp-file.c $(OUTPUT_OPTION)
+
+-./md5.o: $(srcdir)/md5.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
++./md5.o: $(srcdir)/md5.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/md5.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/md5.c -o pic/$@; \
+ else true; fi
+@@ -811,7 +816,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/memset.c $(OUTPUT_OPTION)
+
+-./mkstemps.o: $(srcdir)/mkstemps.c stamp-h $(INCDIR)/ansidecl.h
++./mkstemps.o: $(srcdir)/mkstemps.c config.h $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/mkstemps.c -o pic/$@; \
+ else true; fi
+@@ -823,41 +828,41 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/msdos.c $(OUTPUT_OPTION)
+
+-./objalloc.o: $(srcdir)/objalloc.c stamp-h $(INCDIR)/ansidecl.h \
++./objalloc.o: $(srcdir)/objalloc.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/objalloc.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/objalloc.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/objalloc.c $(OUTPUT_OPTION)
+
+-./obstack.o: $(srcdir)/obstack.c stamp-h $(INCDIR)/obstack.h
++./obstack.o: $(srcdir)/obstack.c config.h $(INCDIR)/obstack.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/obstack.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/obstack.c $(OUTPUT_OPTION)
+
+-./partition.o: $(srcdir)/partition.c stamp-h $(INCDIR)/ansidecl.h \
++./partition.o: $(srcdir)/partition.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(INCDIR)/partition.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/partition.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/partition.c $(OUTPUT_OPTION)
+
+-./pex-common.o: $(srcdir)/pex-common.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-common.o: $(srcdir)/pex-common.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-common.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pex-common.c $(OUTPUT_OPTION)
+
+-./pex-djgpp.o: $(srcdir)/pex-djgpp.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-djgpp.o: $(srcdir)/pex-djgpp.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-djgpp.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pex-djgpp.c $(OUTPUT_OPTION)
+
+-./pex-msdos.o: $(srcdir)/pex-msdos.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-msdos.o: $(srcdir)/pex-msdos.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+@@ -865,42 +870,42 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pex-msdos.c $(OUTPUT_OPTION)
+
+-./pex-one.o: $(srcdir)/pex-one.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-one.o: $(srcdir)/pex-one.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-one.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pex-one.c $(OUTPUT_OPTION)
+
+-./pex-unix.o: $(srcdir)/pex-unix.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-unix.o: $(srcdir)/pex-unix.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-unix.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pex-unix.c $(OUTPUT_OPTION)
+
+-./pex-win32.o: $(srcdir)/pex-win32.c stamp-h $(INCDIR)/ansidecl.h \
++./pex-win32.o: $(srcdir)/pex-win32.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(srcdir)/pex-common.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pex-win32.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pex-win32.c $(OUTPUT_OPTION)
+
+-./pexecute.o: $(srcdir)/pexecute.c stamp-h $(INCDIR)/ansidecl.h \
++./pexecute.o: $(srcdir)/pexecute.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/pexecute.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/pexecute.c $(OUTPUT_OPTION)
+
+-./physmem.o: $(srcdir)/physmem.c stamp-h $(INCDIR)/ansidecl.h \
++./physmem.o: $(srcdir)/physmem.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/physmem.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/physmem.c $(OUTPUT_OPTION)
+
+-./putenv.o: $(srcdir)/putenv.c stamp-h $(INCDIR)/ansidecl.h
++./putenv.o: $(srcdir)/putenv.c config.h $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/putenv.c -o pic/$@; \
+ else true; fi
+@@ -912,14 +917,14 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/random.c $(OUTPUT_OPTION)
+
+-./regex.o: $(srcdir)/regex.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
++./regex.o: $(srcdir)/regex.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/xregex.h \
+ $(INCDIR)/xregex2.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/regex.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/regex.c $(OUTPUT_OPTION)
+
+-./rename.o: $(srcdir)/rename.c stamp-h $(INCDIR)/ansidecl.h
++./rename.o: $(srcdir)/rename.c config.h $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/rename.c -o pic/$@; \
+ else true; fi
+@@ -938,7 +943,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/safe-ctype.c $(OUTPUT_OPTION)
+
+-./setenv.o: $(srcdir)/setenv.c stamp-h $(INCDIR)/ansidecl.h
++./setenv.o: $(srcdir)/setenv.c config.h $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/setenv.c -o pic/$@; \
+ else true; fi
+@@ -956,20 +961,21 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/snprintf.c $(OUTPUT_OPTION)
+
+-./sort.o: $(srcdir)/sort.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
++./sort.o: $(srcdir)/sort.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+ $(INCDIR)/sort.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/sort.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/sort.c $(OUTPUT_OPTION)
+
+-./spaces.o: $(srcdir)/spaces.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./spaces.o: $(srcdir)/spaces.c config.h $(INCDIR)/ansidecl.h \
++ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/spaces.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/spaces.c $(OUTPUT_OPTION)
+
+-./splay-tree.o: $(srcdir)/splay-tree.c stamp-h $(INCDIR)/ansidecl.h \
++./splay-tree.o: $(srcdir)/splay-tree.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h $(INCDIR)/splay-tree.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/splay-tree.c -o pic/$@; \
+@@ -1006,7 +1012,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/strdup.c $(OUTPUT_OPTION)
+
+-./strerror.o: $(srcdir)/strerror.c stamp-h $(INCDIR)/ansidecl.h \
++./strerror.o: $(srcdir)/strerror.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/strerror.c -o pic/$@; \
+@@ -1037,7 +1043,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/strrchr.c $(OUTPUT_OPTION)
+
+-./strsignal.o: $(srcdir)/strsignal.c stamp-h $(INCDIR)/ansidecl.h \
++./strsignal.o: $(srcdir)/strsignal.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/strsignal.c -o pic/$@; \
+@@ -1056,13 +1062,13 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/strtod.c $(OUTPUT_OPTION)
+
+-./strtol.o: $(srcdir)/strtol.c stamp-h $(INCDIR)/safe-ctype.h
++./strtol.o: $(srcdir)/strtol.c config.h $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/strtol.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/strtol.c $(OUTPUT_OPTION)
+
+-./strtoul.o: $(srcdir)/strtoul.c stamp-h $(INCDIR)/ansidecl.h \
++./strtoul.o: $(srcdir)/strtoul.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/safe-ctype.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/strtoul.c -o pic/$@; \
+@@ -1082,14 +1088,14 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/tmpnam.c $(OUTPUT_OPTION)
+
+-./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c stamp-h \
++./unlink-if-ordinary.o: $(srcdir)/unlink-if-ordinary.c config.h \
+ $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/unlink-if-ordinary.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/unlink-if-ordinary.c $(OUTPUT_OPTION)
+
+-./vasprintf.o: $(srcdir)/vasprintf.c stamp-h $(INCDIR)/ansidecl.h \
++./vasprintf.o: $(srcdir)/vasprintf.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/vasprintf.c -o pic/$@; \
+@@ -1114,7 +1120,7 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/vprintf.c $(OUTPUT_OPTION)
+
+-./vsnprintf.o: $(srcdir)/vsnprintf.c stamp-h $(INCDIR)/ansidecl.h \
++./vsnprintf.o: $(srcdir)/vsnprintf.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/vsnprintf.c -o pic/$@; \
+@@ -1127,54 +1133,54 @@ $(CONFIGURED_OFILES): stamp-picdir
+ else true; fi
+ $(COMPILE.c) $(srcdir)/vsprintf.c $(OUTPUT_OPTION)
+
+-./waitpid.o: $(srcdir)/waitpid.c stamp-h $(INCDIR)/ansidecl.h
++./waitpid.o: $(srcdir)/waitpid.c config.h $(INCDIR)/ansidecl.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/waitpid.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/waitpid.c $(OUTPUT_OPTION)
+
+-./xatexit.o: $(srcdir)/xatexit.c stamp-h $(INCDIR)/ansidecl.h \
++./xatexit.o: $(srcdir)/xatexit.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xatexit.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xatexit.c $(OUTPUT_OPTION)
+
+-./xexit.o: $(srcdir)/xexit.c stamp-h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
++./xexit.o: $(srcdir)/xexit.c config.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xexit.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xexit.c $(OUTPUT_OPTION)
+
+-./xmalloc.o: $(srcdir)/xmalloc.c stamp-h $(INCDIR)/ansidecl.h \
++./xmalloc.o: $(srcdir)/xmalloc.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xmalloc.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xmalloc.c $(OUTPUT_OPTION)
+
+-./xmemdup.o: $(srcdir)/xmemdup.c stamp-h $(INCDIR)/ansidecl.h \
++./xmemdup.o: $(srcdir)/xmemdup.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xmemdup.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xmemdup.c $(OUTPUT_OPTION)
+
+-./xstrdup.o: $(srcdir)/xstrdup.c stamp-h $(INCDIR)/ansidecl.h \
++./xstrdup.o: $(srcdir)/xstrdup.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrdup.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xstrdup.c $(OUTPUT_OPTION)
+
+-./xstrerror.o: $(srcdir)/xstrerror.c stamp-h $(INCDIR)/ansidecl.h \
++./xstrerror.o: $(srcdir)/xstrerror.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrerror.c -o pic/$@; \
+ else true; fi
+ $(COMPILE.c) $(srcdir)/xstrerror.c $(OUTPUT_OPTION)
+
+-./xstrndup.o: $(srcdir)/xstrndup.c stamp-h $(INCDIR)/ansidecl.h \
++./xstrndup.o: $(srcdir)/xstrndup.c config.h $(INCDIR)/ansidecl.h \
+ $(INCDIR)/libiberty.h
+ if [ x"$(PICFLAG)" != x ]; then \
+ $(COMPILE.c) $(PICFLAG) $(srcdir)/xstrndup.c -o pic/$@; \
+Index: gcc-4.3.1/libiberty/configure
+===================================================================
+--- gcc-4.3.1.orig/libiberty/configure 2007-07-17 10:52:28.000000000 -0700
++++ gcc-4.3.1/libiberty/configure 2008-08-20 00:47:50.000000000 -0700
+@@ -309,7 +309,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS libiberty_topdir MAINT NOTMAINT MAKEINFO BUILD_INFO PERL HAVE_PERL build build_cpu build_vendor build_os host host_cpu host_vendor host_os AR ac_ct_AR RANLIB ac_ct_RANLIB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP ac_libiberty_warn_cflags NO_MINUS_C_MINUS_O OUTPUT_OPTION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PICFLAG EGREP LIBOBJS CHECK target_header_dir pexecute INSTALL_DEST datarootdir docdir htmldir LTLIBOBJS'
+ ac_subst_files='host_makefile_frag'
+
+ # Initialize some variables set by options.
+@@ -3699,9 +3699,7 @@ case "${host}" in
+ esac
+
+ if [ -n "${frag}" ]; then
+- frags=${libiberty_topdir}/libiberty/config/$frag
+-else
+- frags=
++ frag=${libiberty_topdir}/libiberty/config/$frag
+ fi
+
+ # If they didn't specify --enable-shared, don't generate shared libs.
+@@ -3712,34 +3710,35 @@ case "${enable_shared}" in
+ *) shared=yes ;;
+ esac
+ if [ "${shared}" = "yes" ]; then
+- frag=
+ case "${host}" in
+ *-*-cygwin*) ;;
+- alpha*-*-linux*) frag=mh-elfalphapic ;;
+- arm*-*-*) frag=mh-armpic ;;
+- hppa*-*-*) frag=mh-papic ;;
++ alpha*-*-linux*) PICFLAG=-fPIC ;;
++ arm*-*-*) PICFLAG=-fPIC ;;
++ hppa*-*-*) PICFLAG=-fPIC ;;
++ i370-*-*) PICFLAG=-fPIC ;;
++ ia64-*-*) PICFLAG=-fpic ;;
+ i[34567]86-*-* | x86_64-*-*)
+- frag=mh-x86pic ;;
++ PICFLAG=-fpic ;;
++ m68k-*-*) PICFLAG=-fpic ;;
++ mips*-*-linux) PICFLAG=-fPIC ;;
+ powerpc*-*-aix*) ;;
+- powerpc*-*-*) frag=mh-ppcpic ;;
+- sparc*-*-*) frag=mh-sparcpic ;;
+- s390*-*-*) frag=mh-s390pic ;;
+- *) frag=mh-${host_cpu}pic ;;
++ powerpc*-*-*) PICFLAG=-fPIC ;;
++ sparc*-*-*) case "${CFLAGS}" in
++ *-fpic* ) PICFLAG=-fpic ;;
++ * ) PICFLAG=-fPIC ;;
++ esac ;;
++ s390*-*-*) PICFLAG=-fpic ;;
+ esac
+- if [ -n "${frag}" ]; then
+- frags="${frags} ${libiberty_topdir}/config/${frag}"
+- fi
+ fi
+
++
+ echo "# Warning: this fragment is automatically generated" > temp-frag
+
+-for frag in ${frags}; do
+- if [ -f ${frag} ]; then
+- echo "Appending ${frag} to xhost-mkfrag"
+- echo "# Following fragment copied from ${frag}" >> temp-frag
+- cat ${frag} >> temp-frag
+- fi
+-done
++if [ -n "${frag}" ] && [ -f "${frag}" ]; then
++ echo "Appending ${frag} to xhost-mkfrag"
++ echo "# Following fragment copied from ${frag}" >> temp-frag
++ cat ${frag} >> temp-frag
++fi
+
+ # record if we want to build shared libs.
+ if [ "${shared}" = "yes" ]; then
+@@ -9671,6 +9670,7 @@ s,@OUTPUT_OPTION@,$OUTPUT_OPTION,;t t
+ s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
+ s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
+ s,@INSTALL_DATA@,$INSTALL_DATA,;t t
++s,@PICFLAG@,$PICFLAG,;t t
+ s,@EGREP@,$EGREP,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@CHECK@,$CHECK,;t t
+Index: gcc-4.3.1/libiberty/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/libiberty/configure.ac 2007-07-17 10:52:28.000000000 -0700
++++ gcc-4.3.1/libiberty/configure.ac 2008-08-20 00:47:50.000000000 -0700
+@@ -187,9 +187,7 @@ case "${host}" in
+ esac
+
+ if [[ -n "${frag}" ]]; then
+- frags=${libiberty_topdir}/libiberty/config/$frag
+-else
+- frags=
++ frag=${libiberty_topdir}/libiberty/config/$frag
+ fi
+
+ # If they didn't specify --enable-shared, don't generate shared libs.
+@@ -200,34 +198,35 @@ case "${enable_shared}" in
+ *) shared=yes ;;
+ esac
+ if [[ "${shared}" = "yes" ]]; then
+- frag=
+ case "${host}" in
+ *-*-cygwin*) ;;
+- alpha*-*-linux*) frag=mh-elfalphapic ;;
+- arm*-*-*) frag=mh-armpic ;;
+- hppa*-*-*) frag=mh-papic ;;
++ alpha*-*-linux*) PICFLAG=-fPIC ;;
++ arm*-*-*) PICFLAG=-fPIC ;;
++ hppa*-*-*) PICFLAG=-fPIC ;;
++ i370-*-*) PICFLAG=-fPIC ;;
++ ia64-*-*) PICFLAG=-fpic ;;
+ i[[34567]]86-*-* | x86_64-*-*)
+- frag=mh-x86pic ;;
++ PICFLAG=-fpic ;;
++ m68k-*-*) PICFLAG=-fpic ;;
++ mips*-*-linux) PICFLAG=-fPIC ;;
+ powerpc*-*-aix*) ;;
+- powerpc*-*-*) frag=mh-ppcpic ;;
+- sparc*-*-*) frag=mh-sparcpic ;;
+- s390*-*-*) frag=mh-s390pic ;;
+- *) frag=mh-${host_cpu}pic ;;
++ powerpc*-*-*) PICFLAG=-fPIC ;;
++ sparc*-*-*) case "${CFLAGS}" in
++ *-fpic* ) PICFLAG=-fpic ;;
++ * ) PICFLAG=-fPIC ;;
++ esac ;;
++ s390*-*-*) PICFLAG=-fpic ;;
+ esac
+- if [[ -n "${frag}" ]]; then
+- frags="${frags} ${libiberty_topdir}/config/${frag}"
+- fi
+ fi
++AC_SUBST(PICFLAG)
+
+ echo "# Warning: this fragment is automatically generated" > temp-frag
+
+-for frag in ${frags}; do
+- if [[ -f ${frag} ]]; then
+- echo "Appending ${frag} to xhost-mkfrag"
+- echo "# Following fragment copied from ${frag}" >> temp-frag
+- cat ${frag} >> temp-frag
+- fi
+-done
++if [[ -n "${frag}" ]] && [[ -f "${frag}" ]]; then
++ echo "Appending ${frag} to xhost-mkfrag"
++ echo "# Following fragment copied from ${frag}" >> temp-frag
++ cat ${frag} >> temp-frag
++fi
+
+ # record if we want to build shared libs.
+ if [[ "${shared}" = "yes" ]]; then
+Index: gcc-4.3.1/gcc/Makefile.in
+===================================================================
+--- gcc-4.3.1.orig/gcc/Makefile.in 2008-08-20 00:46:44.000000000 -0700
++++ gcc-4.3.1/gcc/Makefile.in 2008-08-20 00:47:50.000000000 -0700
+@@ -673,7 +673,7 @@ CC_FOR_BUILD = @CC_FOR_BUILD@
+ BUILD_CFLAGS= @BUILD_CFLAGS@ -DGENERATOR_FILE
+
+ # Native linker and preprocessor flags. For x-fragment overrides.
+-BUILD_LDFLAGS=$(LDFLAGS)
++BUILD_LDFLAGS=@BUILD_LDFLAGS@
+ BUILD_CPPFLAGS=$(ALL_CPPFLAGS)
+
+ # Actual name to use when installing a native compiler.
+Index: gcc-4.3.1/gcc/configure
+===================================================================
+--- gcc-4.3.1.orig/gcc/configure 2008-08-20 00:46:50.000000000 -0700
++++ gcc-4.3.1/gcc/configure 2008-08-20 00:49:10.000000000 -0700
+@@ -309,7 +309,7 @@ ac_includes_default="\
+ # include <unistd.h>
+ #endif"
+
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical build_libsubdir build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP loose_warn cxx_compat_warn strict_warn warn_cflags nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float enable_fixed_point enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep PKGVERSION REPORT_BUGS_TO REPORT_BUGS_TEXI datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS BUILD_LDFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_compilers all_gtfiles all_lang_makefrags all_lang_makefiles all_languages all_selected_languages build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines build_file_translate check_languages cpp_install_dir xmake_file tmake_file extra_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir host_exeext host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
+ ac_subst_files='language_hooks'
+
+ # Initialize some variables set by options.
+@@ -12813,6 +12813,7 @@ else
+ esac
+ saved_CFLAGS="${CFLAGS}"
+ CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++ LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ --enable-languages=${enable_languages-all} \
+ --target=$target_alias --host=$build_alias --build=$build_alias
+@@ -13310,6 +13311,7 @@ fi
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)'
+ BUILD_CFLAGS='$(ALL_CFLAGS)'
++BUILD_LDFLAGS='$(LDFLAGS)'
+ STMP_FIXINC=stmp-fixinc
+
+ # Possibly disable fixproto, on a per-target basis.
+@@ -13327,6 +13329,7 @@ esac
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+ BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
++ BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+
+ if test "x$TARGET_SYSTEM_ROOT" = x; then
+ if test "x$STMP_FIXPROTO" != x; then
+@@ -17957,6 +17960,7 @@ s,@SYSTEM_HEADER_DIR@,$SYSTEM_HEADER_DIR
+ s,@inhibit_libc@,$inhibit_libc,;t t
+ s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t
+ s,@BUILD_CFLAGS@,$BUILD_CFLAGS,;t t
++s,@BUILD_LDFLAGS@,$BUILD_LDFLAGS,;t t
+ s,@STMP_FIXINC@,$STMP_FIXINC,;t t
+ s,@STMP_FIXPROTO@,$STMP_FIXPROTO,;t t
+ s,@collect2@,$collect2,;t t
+Index: gcc-4.3.1/gcc/configure.ac
+===================================================================
+--- gcc-4.3.1.orig/gcc/configure.ac 2008-08-20 00:46:50.000000000 -0700
++++ gcc-4.3.1/gcc/configure.ac 2008-08-20 00:48:50.000000000 -0700
+@@ -1480,6 +1480,7 @@ else
+ esac
+ saved_CFLAGS="${CFLAGS}"
+ CC="${CC_FOR_BUILD}" CFLAGS="${CFLAGS_FOR_BUILD}" \
++ LDFLAGS="${LDFLAGS_FOR_BUILD}" \
+ CONFIG_SITE= ${realsrcdir}/configure --cache-file=./other.cache \
+ --enable-languages=${enable_languages-all} \
+ --target=$target_alias --host=$build_alias --build=$build_alias
+@@ -1776,6 +1777,7 @@ AC_SUBST(inhibit_libc)
+ # These are the normal (build=host) settings:
+ CC_FOR_BUILD='$(CC)' AC_SUBST(CC_FOR_BUILD)
+ BUILD_CFLAGS='$(ALL_CFLAGS)' AC_SUBST(BUILD_CFLAGS)
++BUILD_LDFLAGS='$(LDFLAGS)' AC_SUBST(BUILD_LDFLAGS)
+ STMP_FIXINC=stmp-fixinc AC_SUBST(STMP_FIXINC)
+
+ # Possibly disable fixproto, on a per-target basis.
+@@ -1793,6 +1795,7 @@ AC_SUBST(STMP_FIXPROTO)
+ if test x$build != x$host || test "x$coverage_flags" != x
+ then
+ BUILD_CFLAGS='$(INTERNAL_CFLAGS) $(T_CFLAGS) $(CFLAGS_FOR_BUILD)'
++ BUILD_LDFLAGS='$(LDFLAGS_FOR_BUILD)'
+
+ if test "x$TARGET_SYSTEM_ROOT" = x; then
+ if test "x$STMP_FIXPROTO" != x; then
diff --git a/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch b/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch
index 3ccd124764..ec6e0af937 100644
--- a/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch
+++ b/packages/gcc/gcc-4.3.1/zecke-xgcc-cpp.patch
@@ -2,15 +2,15 @@ upstream: n/a
comment: Use the preprocessor we have just compiled instead the one of
the system. There might be incompabilities between us and them.
-Index: gcc-4.1.1/Makefile.in
+Index: gcc-4.3.1/Makefile.in
===================================================================
---- gcc-4.1.1.orig/Makefile.in 2006-08-06 13:32:44.000000000 +0200
-+++ gcc-4.1.1/Makefile.in 2006-08-06 13:32:46.000000000 +0200
-@@ -194,6 +194,7 @@
+--- gcc-4.3.1.orig/Makefile.in 2008-08-19 01:09:56.000000000 -0700
++++ gcc-4.3.1/Makefile.in 2008-08-19 01:13:27.000000000 -0700
+@@ -204,6 +204,7 @@
+ AR="$(AR_FOR_TARGET)"; export AR; \
AS="$(COMPILER_AS_FOR_TARGET)"; export AS; \
CC="$(CC_FOR_TARGET)"; export CC; \
- CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \
+ CPP="$(CC_FOR_TARGET) -E"; export CPP; \
+ CFLAGS="$(CFLAGS_FOR_TARGET) $(SYSROOT_CFLAGS_FOR_TARGET) $(DEBUG_PREFIX_CFLAGS_FOR_TARGET)"; export CFLAGS; \
CONFIG_SHELL="$(SHELL)"; export CONFIG_SHELL; \
CPPFLAGS="$(CPPFLAGS_FOR_TARGET)"; export CPPFLAGS; \
- CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \
diff --git a/packages/gcc/gcc-configure-common.inc b/packages/gcc/gcc-configure-common.inc
index 1b3f398789..795911db74 100644
--- a/packages/gcc/gcc-configure-common.inc
+++ b/packages/gcc/gcc-configure-common.inc
@@ -9,10 +9,14 @@ JAVA_arm ?= ""
JAVA_armeb ?= ""
JAVA_mipsel ?= ""
JAVA_sh3 ?= ""
+OBJC_linux-uclibcgnueabi ?= ""
+OBJC_linux-uclibc ?= ""
+OBJC_avr ?= ""
+OBJC ?= ",objc"
+
# gcc 3.x expects 'f77', 4.0 expects 'f95', 4.1 and 4.2 expect 'fortran'
FORTRAN ?= ",f77"
-LANGUAGES ?= "c,objc,c++${FORTRAN}${JAVA}"
-LANGUAGES_avr32 = "c,c++${FORTRAN}${JAVA}"
+LANGUAGES ?= "c,c++${OBJC}${FORTRAN}${JAVA}"
EXTRA_OECONF_BASE ?= ""
EXTRA_OECONF_PATHS ?= ""
diff --git a/packages/gcc/gcc-cross-sdk_4.2.4.bb b/packages/gcc/gcc-cross-sdk_4.2.4.bb
index 7f3e1466ce..482e9a63f6 100644
--- a/packages/gcc/gcc-cross-sdk_4.2.4.bb
+++ b/packages/gcc/gcc-cross-sdk_4.2.4.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
inherit sdk
@@ -9,6 +9,6 @@ require gcc-package-sdk.inc
DEPENDS += "gmp-native mpfr-native"
-EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
- --disable-libgomp --disable-libmudflap \
+EXTRA_OECONF += "--disable-libunwind-exceptions --enable-libssp \
+ --enable-libgomp --disable-libmudflap \
--with-mpfr=${STAGING_DIR_NATIVE}${layout_exec_prefix}"
diff --git a/packages/gcc/gcc-cross-sdk_4.3.1.bb b/packages/gcc/gcc-cross-sdk_4.3.1.bb
index ee4ce855af..297bd8ece8 100644
--- a/packages/gcc/gcc-cross-sdk_4.3.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r6"
+PR = "r7"
inherit sdk
diff --git a/packages/gcc/gcc-cross_4.3.1.bb b/packages/gcc/gcc-cross_4.3.1.bb
index 5383079904..eeac86baa1 100644
--- a/packages/gcc/gcc-cross_4.3.1.bb
+++ b/packages/gcc/gcc-cross_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r9"
+PR = "r10"
require gcc-${PV}.inc
require gcc-cross4.inc
diff --git a/packages/gcc/gcc_4.3.1.bb b/packages/gcc/gcc_4.3.1.bb
index c51d537d2d..e8d84eb811 100644
--- a/packages/gcc/gcc_4.3.1.bb
+++ b/packages/gcc/gcc_4.3.1.bb
@@ -1,4 +1,4 @@
-PR = "r5"
+PR = "r6"
require gcc-${PV}.inc
require gcc-configure-target.inc
@@ -7,4 +7,3 @@ require gcc-package-target.inc
SRC_URI_append = "file://fortran-cross-compile-hack.patch;patch=1"
ARCH_FLAGS_FOR_TARGET += "-isystem${STAGING_INCDIR}"
-
diff --git a/packages/gnome/gnome-games_2.23.6.bb b/packages/gnome/gnome-games_2.23.6.bb
index 61e145a549..b312382e81 100644
--- a/packages/gnome/gnome-games_2.23.6.bb
+++ b/packages/gnome/gnome-games_2.23.6.bb
@@ -1,5 +1,5 @@
LICENSE = "GPL"
-DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common"
+DEPENDS = "libggz ggz-client-libs python-pygtk gtk+ libgnome libgnomeui librsvg gnome-vfs gconf libglade gnome-common gnome-python-desktop"
PR = "r1"
@@ -10,6 +10,7 @@ EXTRA_OECONF = "--with-libggz-includes=${STAGING_INCDIR} \
--with-ggzmod-includes=${STAGING_INCDIR} \
--with-ggzmod-libraries=${STAGING_LIBDIR} \
--enable-scalable \
+ --enable-omitgames=aisleriot \
"
do_configure_prepend() {
diff --git a/packages/gnome/gnome-panel_2.18.1.bb b/packages/gnome/gnome-panel_2.18.1.bb
index 933be7f811..0192d863c5 100644
--- a/packages/gnome/gnome-panel_2.18.1.bb
+++ b/packages/gnome/gnome-panel_2.18.1.bb
@@ -1,5 +1,5 @@
LICENSE = "GPL"
-DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus"
+DEPENDS = "startup-notification libwnck orbit2 gtk+ libgnome libgnomeui gnome-desktop libglade gnome-menus orbit2-native"
PR = "r1"
@@ -16,6 +16,8 @@ FILES_libpanel-applet = "${libdir}/libpanel-applet-2.so.*"
FILES_${PN} =+ "${datadir}/gnome* \
${datadir}/icons"
+EXTRA_OEMAKE = "ORBIT_IDL=${STAGING_BINDIR_NATIVE}/orbit-idl-2"
+
do_stage() {
autotools_stage_all
}
diff --git a/packages/gnome/gnome-python-desktop/acinclude.m4 b/packages/gnome/gnome-python-desktop/acinclude.m4
new file mode 100644
index 0000000000..53518fb2eb
--- /dev/null
+++ b/packages/gnome/gnome-python-desktop/acinclude.m4
@@ -0,0 +1,90 @@
+## this one is commonly used with AM_PATH_PYTHONDIR ...
+dnl AM_CHECK_PYMOD(MODNAME [,SYMBOL [,ACTION-IF-FOUND [,ACTION-IF-NOT-FOUND]]])
+dnl Check if a module containing a given symbol is visible to python.
+AC_DEFUN(AM_CHECK_PYMOD,
+[AC_REQUIRE([AM_PATH_PYTHON])
+py_mod_var=`echo $1['_']$2 | sed 'y%./+-%__p_%'`
+AC_MSG_CHECKING(for ifelse([$2],[],,[$2 in ])python module $1)
+AC_CACHE_VAL(py_cv_mod_$py_mod_var, [
+ifelse([$2],[], [prog="
+import sys
+try:
+ import $1
+except ImportError:
+ sys.exit(1)
+except:
+ sys.exit(0)
+sys.exit(0)"], [prog="
+import $1
+$1.$2"])
+if $PYTHON -c "$prog" 1>&AC_FD_CC 2>&AC_FD_CC
+ then
+ eval "py_cv_mod_$py_mod_var=yes"
+ else
+ eval "py_cv_mod_$py_mod_var=no"
+ fi
+])
+py_val=`eval "echo \`echo '$py_cv_mod_'$py_mod_var\`"`
+if test "x$py_val" != xno; then
+ AC_MSG_RESULT(yes)
+ ifelse([$3], [],, [$3
+])dnl
+else
+ AC_MSG_RESULT(no)
+ ifelse([$4], [],, [$4
+])dnl
+fi
+])
+
+dnl a macro to check for ability to create python extensions
+dnl AM_CHECK_PYTHON_HEADERS([ACTION-IF-POSSIBLE], [ACTION-IF-NOT-POSSIBLE])
+dnl function also defines PYTHON_INCLUDES
+AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
+[AC_REQUIRE([AM_PATH_PYTHON])
+AC_MSG_CHECKING(for headers required to compile python extensions)
+dnl deduce PYTHON_INCLUDES
+AC_ARG_WITH(python-includes,
+ [ --with-python-includes=DIR path to Python includes], py_exec_prefix=$withval)
+if test x$py_exec_prefix != x; then
+PYTHON_INCLUDES="-I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+else
+py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
+py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
+PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
+if test "$py_prefix" != "$py_exec_prefix"; then
+ PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+fi
+fi
+AC_SUBST(PYTHON_INCLUDES)
+dnl check if the headers exist:
+save_CPPFLAGS="$CPPFLAGS"
+CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
+AC_TRY_CPP([#include <Python.h>],dnl
+[AC_MSG_RESULT(found)
+$1],dnl
+[AC_MSG_RESULT(not found)
+$2])
+CPPFLAGS="$save_CPPFLAGS"
+])
+
+dnl
+dnl JH_ADD_CFLAG(FLAG)
+dnl checks whether the C compiler supports the given flag, and if so, adds
+dnl it to $CFLAGS. If the flag is already present in the list, then the
+dnl check is not performed.
+AC_DEFUN([JH_ADD_CFLAG],
+[
+case " $CFLAGS " in
+*@<:@\ \ @:>@$1@<:@\ \ @:>@*)
+ ;;
+*)
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $1"
+ AC_MSG_CHECKING([whether [$]CC understands $1])
+ AC_TRY_COMPILE([], [], [jh_has_option=yes], [jh_has_option=no])
+ AC_MSG_RESULT($jh_has_option)
+ if test $jh_has_option = no; then
+ CFLAGS="$save_CFLAGS"
+ fi
+ ;;
+esac])
diff --git a/packages/gstreamer/gst-ffmpeg/autotools.patch b/packages/gstreamer/gst-ffmpeg/autotools.patch
new file mode 100644
index 0000000000..76e7ac6486
--- /dev/null
+++ b/packages/gstreamer/gst-ffmpeg/autotools.patch
@@ -0,0 +1,21 @@
+Index: gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac
+===================================================================
+--- gst-ffmpeg-0.10.2.orig/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:20:19.177850039 +0200
++++ gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac 2008-08-20 00:26:24.567809464 +0200
+@@ -27,13 +27,15 @@
+
+ AM_MAINTAINER_MODE
+ AC_GNU_SOURCE
++
++AC_PROG_LIBTOOL
+ AM_PROG_AS
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+ AC_STDC_HEADERS
+ AM_DISABLE_STATIC
+-AC_PROG_LIBTOOL
+
+ dnl Warning for anyone using these custom macros.
+ dnl before asking me questions on why it doesn't work and why you
diff --git a/packages/gstreamer/gst-ffmpeg_0.10.2.bb b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
index e4dfb0b701..2cad978a16 100644
--- a/packages/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/packages/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -4,12 +4,14 @@ PRIORITY = "optional"
LICENSE = "LGPL"
HOMEPAGE = "http://www.gstreamer.net/"
DEPENDS = "gstreamer zlib"
-PR = "r1"
+PR = "r2"
inherit autotools pkgconfig
SRC_URI = "http://gstreamer.freedesktop.org/src/${PN}/${PN}-${PV}.tar.bz2 \
- file://armv5.patch;patch=1"
+ file://armv5.patch;patch=1 \
+ file://autotools.patch;patch=1 \
+ "
FILES_${PN} += "${libdir}/gstreamer-0.10/*.so"
FILES_${PN}-dbg += "${libdir}/gstreamer-0.10/.debug"
diff --git a/packages/guile/guile-amd64.patch b/packages/guile/guile-amd64.patch
deleted file mode 100644
index dc9cea254f..0000000000
--- a/packages/guile/guile-amd64.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- guile-1.6.4/libguile/gc_os_dep.c 2003-04-16 20:16:21.000000000 +0000
-+++ guile-1.6.4-amd64/libguile/gc_os_dep.c 2003-10-20 01:52:11.543267320 +0000
-@@ -205,6 +205,10 @@
- # define I386
- # define mach_type_known
- # endif
-+# if defined(LINUX) && defined(__x86_64__)
-+# define IA64
-+# define mach_type_known
-+# endif
- # if defined(LINUX) && (defined(__ia64__) || defined(__ia64))
- # define IA64
- # define mach_type_known
diff --git a/packages/guile/guile_1.8.5.bb b/packages/guile/guile_1.8.5.bb
index fa6e696896..8cdd98c7d4 100644
--- a/packages/guile/guile_1.8.5.bb
+++ b/packages/guile/guile_1.8.5.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Guile is an interpreter for the Scheme programming language, \
packaged as a library which can be incorporated into your programs."
HOMEPAGE = "http://www.gnu.org/software/guile/guile.html"
SECTION = "devel/scheme"
-DEPENDS = "guile-native"
+DEPENDS = "guile-native gmp"
LICENSE = "GPL"
PR = "r1"
diff --git a/packages/jamvm/jamvm.inc b/packages/jamvm/jamvm.inc
index af6fd47ee6..b5655c6d35 100644
--- a/packages/jamvm/jamvm.inc
+++ b/packages/jamvm/jamvm.inc
@@ -7,6 +7,7 @@ RDEPENDS = "classpath"
SRC_URI = "${SOURCEFORGE_MIRROR}/jamvm/jamvm-${PV}.tar.gz"
+PROVIDES = "jamvm virtual/java"
RPROVIDES_jamvm = "java2-runtime"
# This uses 32 bit arm, so force the instruction set to arm, not thumb
diff --git a/packages/linux/linux-nokia800.inc b/packages/linux/linux-nokia800.inc
index 07b9766efc..0fc4740a94 100644
--- a/packages/linux/linux-nokia800.inc
+++ b/packages/linux/linux-nokia800.inc
@@ -2,8 +2,6 @@ SECTION = "kernel"
DESCRIPTION = "Linux kernel for Nokia 770/800"
LICENSE = "GPL"
-KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
-
inherit kernel
RPROVIDES_kernel-image = "hostap-modules"
diff --git a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
index 3f1c0e594f..1d79379863 100644
--- a/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
@@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qte"
inherit qt3x11
diff --git a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
index ba12796d28..f26ea4eac5 100644
--- a/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
@@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
inherit qt4x11
diff --git a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
index c812b34234..6d7cb9dba7 100644
--- a/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
+++ b/packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
@@ -6,7 +6,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/midpath/midpath-0.3rc1.tar.gz"
S = "${WORKDIR}/midpath-0.3rc1"
-DEPENDS = "classpath qt-mt"
+DEPENDS = "classpath qte-mt"
RCONFLICTS = "midpath-backend-qt3"
inherit qt3e
diff --git a/packages/mozilla/firefox-3.0.1/mozconfig b/packages/mozilla/firefox-3.0.1/mozconfig
index 5001e588e9..8032ea3a3b 100644
--- a/packages/mozilla/firefox-3.0.1/mozconfig
+++ b/packages/mozilla/firefox-3.0.1/mozconfig
@@ -32,12 +32,12 @@ ac_add_options --enable-necko-small-buffers
# disable debug logging and tests
#ac_add_options --disable-dtd-debug
ac_add_options --disable-logging
-ac_add_options --enable-debug=-ggdb
ac_add_options --disable-gtktest
ac_add_options --disable-tests
ac_add_options --disable-printing
ac_add_options --disable-gnomevfs
ac_add_options --disable-gnomeui
+ac_add_options --enable-debugger-info-modules
# build crypto module (PSM + NSS)
ac_add_options --enable-crypto
diff --git a/packages/mozilla/firefox.inc b/packages/mozilla/firefox.inc
index 182d65dc16..1fae3a759e 100644
--- a/packages/mozilla/firefox.inc
+++ b/packages/mozilla/firefox.inc
@@ -2,13 +2,21 @@ SRC_URI += "file://mozilla-firefox.png file://mozilla-firefox.desktop"
PACKAGES =+ "firefox-inspector"
+PACKAGES += "firefox-sdk"
+
FILES_firefox-inspector = " ${libdir}/firefox-${PV}/chrome/inspector* \
${libdir}/firefox-${PV}/components/*nspector* \
${libdir}/firefox-${PV}/extensions/inspector* \
${libdir}/firefox-${PV}/defaults/preferences/inspector* \
"
-FILES_${PN} = "${bindir}/firefox ${datadir}/applications/ ${datadir}/pixmaps/ ${libdir}/firefox-${PV}/* ${bindir}/defaults"
-FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config ${libdir}/firefox-devel-${PV}"
+FILES_${PN} = "${bindir}/firefox \
+ ${datadir}/applications/ \
+ ${datadir}/pixmaps/ \
+ ${libdir}/firefox-${PV}/* \
+ ${libdir}/firefox-${PV}/.autoreg \
+ ${bindir}/defaults"
+FILES_${PN}-dev += "${datadir}/idl ${bindir}/firefox-config"
+FILES_firefox-sdk += "${libdir}/firefox-devel-${PV}"
FILES_${PN}-dbg += " ${libdir}/firefox-*/.debug \
${libdir}/firefox-*/*/.debug \
${libdir}/firefox-*/*/*/.debug \
diff --git a/packages/mozilla/firefox_3.0.1.bb b/packages/mozilla/firefox_3.0.1.bb
index 3bf4f92e35..7a6ce119e1 100644
--- a/packages/mozilla/firefox_3.0.1.bb
+++ b/packages/mozilla/firefox_3.0.1.bb
@@ -1,5 +1,5 @@
DEPENDS += "cairo"
-PR = "r5"
+PR = "r6"
SRC_URI = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${PV}/source/firefox-${PV}-source.tar.bz2 \
file://jsautocfg.h \
diff --git a/packages/mythtv/gmyth-upnp_0.7.0.bb b/packages/mythtv/gmyth-upnp_0.7.0.bb
index 3f20b3dd83..84657de93e 100644
--- a/packages/mythtv/gmyth-upnp_0.7.0.bb
+++ b/packages/mythtv/gmyth-upnp_0.7.0.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "GMyth is a library to access MythTV backend services."
LICENSE = "LGPLv2""
HOMEPAGE = "http://gmyth.sourceforge.net/wiki/index.php/Main_Page"
-PR = "r2"
+PR = "r3"
DEPENDS = "glib-2.0 mysql gmyth libupnp"
@@ -21,6 +21,10 @@ do_compile_append() {
gmyth-upnp.pc
}
+do_install_append() {
+ mv ${D}/${bindir}/test ${D}/${bindir}/gmyth-upnp-test
+}
+
do_stage() {
autotools_stage_all
}
diff --git a/packages/openjade/openjade-native_1.3.2.bb b/packages/openjade/openjade-native_1.3.2.bb
index 11a3ca8525..822c47dd3b 100644
--- a/packages/openjade/openjade-native_1.3.2.bb
+++ b/packages/openjade/openjade-native_1.3.2.bb
@@ -15,8 +15,12 @@ EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR} \
--enable-default-catalog=${sysconfdir}/sgml/catalog \
--enable-default-search-path=${datadir}/sgml"
+
acpaths = "-I ${S}/config"
-CFLAGS_prepend = "-I${S}/include"
+
+# Trailing whitespace is important. Otherwise compiler arguments will be messed
+# up, resulting in a fail in do_configure.
+CFLAGS_prepend = "-I${S}/include "
do_configure () {
mv config/configure.in .
diff --git a/packages/openjade/openjade_1.3.2.bb b/packages/openjade/openjade_1.3.2.bb
index 7b1272ba4f..dcbfd886a0 100644
--- a/packages/openjade/openjade_1.3.2.bb
+++ b/packages/openjade/openjade_1.3.2.bb
@@ -12,8 +12,12 @@ inherit autotools
EXTRA_OECONF = "--enable-spincludedir=${STAGING_INCDIR}/OpenSP \
--enable-splibdir=${STAGING_LIBDIR}"
+
acpaths = "-I ${S}/config"
-CFLAGS_prepend = "-I${S}/include"
+
+# Trailing whitespace is important. Otherwise compiler arguments will be messed
+# up, resulting in a fail in do_configure.
+CFLAGS_prepend = "-I${S}/include "
do_configure_prepend () {
mv config/configure.in .
diff --git a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
index acbf3da7b9..e394547fd5 100644
--- a/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
+++ b/packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
@@ -4,6 +4,8 @@ DEPENDS = "imagemagick-native librsvg-native"
PV = "0.1.0+svnr${SRCREV}"
PR = "r2"
+EXCLUDE_FROM_WORLD = "1"
+
inherit openmoko2
SRC_URI = "svn://svn.openmoko.org/trunk/src/target/OM-2007.2/artwork/;module=icons;proto=http"
diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc
index 01d192c1dc..416874178c 100644
--- a/packages/phoneme/phoneme-advanced.inc
+++ b/packages/phoneme/phoneme-advanced.inc
@@ -65,7 +65,7 @@ do_configure() {
pmo JAVAME_LEGAL_DIR ${WORKDIR}/legal
pmo "# Java toolchain binaries"
- pmo JDK_HOME $JAVA_HOME
+ pmo JDK_HOME /dev/null
pmo CVM_TARGET_TOOLS_PREFIX ${CROSS_DIR}/bin/
pmo CVM_JAVA java
pmo CVM_JAVAC javac
diff --git a/packages/php/php-5.2.6/acinclude-xml2-config.patch b/packages/php/php-5.2.6/acinclude-xml2-config.patch
new file mode 100644
index 0000000000..bf519d2934
--- /dev/null
+++ b/packages/php/php-5.2.6/acinclude-xml2-config.patch
@@ -0,0 +1,18 @@
+--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
++++ /acinclude.m4 2007-02-20 15:03:24.000000000 +0200
+@@ -2359,12 +2359,9 @@
+ AC_DEFUN([PHP_SETUP_LIBXML], [
+ AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
+ [
+- for i in $PHP_LIBXML_DIR /usr/local /usr; do
+- if test -x "$i/bin/xml2-config"; then
+- ac_cv_php_xml2_config_path="$i/bin/xml2-config"
+- break
+- fi
+- done
++
++ ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
++
+ ])
+
+ if test -x "$ac_cv_php_xml2_config_path"; then
diff --git a/packages/php/php-5.2.6/pear-makefile.patch b/packages/php/php-5.2.6/pear-makefile.patch
new file mode 100644
index 0000000000..26de98a48f
--- /dev/null
+++ b/packages/php/php-5.2.6/pear-makefile.patch
@@ -0,0 +1,11 @@
+--- /pear/orig-Makefile.frag 2007-03-16 12:18:33.000000000 +0200
++++ /pear/Makefile.frag 2007-03-16 12:35:48.000000000 +0200
+@@ -6,7 +6,7 @@
+ PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
+
+ install-pear-installer: $(SAPI_CLI_PATH)
+- @$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
++ @$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
+
+ install-pear:
+ @echo "Installing PEAR environment: $(INSTALL_ROOT)$(peardir)/"
diff --git a/packages/portaudio/portaudio-v19_svn.bb b/packages/portaudio/portaudio-v19_svn.bb
index 8fe48f8efe..2dbef45d2d 100644
--- a/packages/portaudio/portaudio-v19_svn.bb
+++ b/packages/portaudio/portaudio-v19_svn.bb
@@ -5,7 +5,7 @@ LICENSE = "GPL"
PV = "v19+svnr${SRCREV}"
PR = "r0"
-SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=https"
+SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=http"
S = "${WORKDIR}/trunk"
inherit autotools
diff --git a/packages/python/python-numpy_1.1.1.bb b/packages/python/python-numpy_1.1.1.bb
new file mode 100644
index 0000000000..d688c93beb
--- /dev/null
+++ b/packages/python/python-numpy_1.1.1.bb
@@ -0,0 +1,16 @@
+DESCRIPTION = "A sophisticated Numeric Processing Package for Python"
+SECTION = "devel/python"
+PRIORITY = "optional"
+LICENSE = "PSF"
+PR = "ml0"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/numpy/numpy-${PV}.tar.gz \
+ "
+S = "${WORKDIR}/numpy-${PV}"
+
+inherit distutils
+
+do_stage() {
+ cp -pPR Include/Num* ${STAGING_INCDIR}
+}
+
diff --git a/packages/python/python-pygame_1.8.1.bb b/packages/python/python-pygame_1.8.1.bb
index 2debc950ea..dc3f431964 100644
--- a/packages/python/python-pygame_1.8.1.bb
+++ b/packages/python/python-pygame_1.8.1.bb
@@ -8,7 +8,7 @@ SRCNAME = "pygame"
PR = "ml0"
SRC_URI = "\
- ftp://ftp.pyganem.org/pygame/${SRCNAME}-${PV}release.tar.gz \
+ ftp://ftp.pygame.org/pub/pygame/${SRCNAME}-${PV}release.tar.gz \
file://Setup"
S = "${WORKDIR}/${SRCNAME}-${PV}release"
diff --git a/packages/sugar/sugar-base_0.82.0.bb b/packages/sugar/sugar-base_0.82.0.bb
new file mode 100644
index 0000000000..798a049a5a
--- /dev/null
+++ b/packages/sugar/sugar-base_0.82.0.bb
@@ -0,0 +1,25 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "LGPLv2"
+
+PR = "r3"
+
+DEPENDS = "python-pygtk sugar-toolkit"
+RDEPENDS = "python-pygtk sugar-toolkit python-logging python-dbus python-subprocess telepathy-python python-crypt python-numpy "
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+
+FILES_${PN} += "${datadir}/${PN} \
+ ${datadir}/dbus-1 \
+ ${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/sugar/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+ autotools_stage_all
+}
+
diff --git a/packages/sugar/sugar-toolkit_0.82.1.bb b/packages/sugar/sugar-toolkit_0.82.1.bb
index 8035d2ad80..cbc6b781de 100644
--- a/packages/sugar/sugar-toolkit_0.82.1.bb
+++ b/packages/sugar/sugar-toolkit_0.82.1.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Sugar toolkit"
LICENSE = "LGPLv2"
-DEPENDS = "libxml2 gtk+"
+DEPENDS = "python-pygtk libxml-parser-perl-native libxml2 gtk+"
SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-toolkit/sugar-toolkit-${PV}.tar.bz2"
diff --git a/packages/sugar/sugar_0.82.0.bb b/packages/sugar/sugar_0.82.0.bb
index 7ca93426e1..480ec5001f 100644
--- a/packages/sugar/sugar_0.82.0.bb
+++ b/packages/sugar/sugar_0.82.0.bb
@@ -1,7 +1,10 @@
DESCRIPTION = "Sugar base system"
LICENSE = "GPLv2"
+PR = "r3"
+
DEPENDS = "sugar-toolkit libxml2 gtk+"
+RDEPENDS = "sugar-toolkit sugar-base"
SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar/${PN}-${PV}.tar.bz2"
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index b68bb7ee6c..af2c85fb2c 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Openmoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r33"
+PR = "r35"
inherit task
@@ -84,9 +84,13 @@ RDEPENDS_task-openmoko-feed = "\
navit \
libnotify \
notification-daemon \
- u-boot-openmoko \
libxine \
# subversion \
task-openmoko-games \
xournal \
+ openvpn \
+ python-pygame \
+ irssi \
+ zsh \
+ fbreader \
"
diff --git a/packages/uclibc/files/arm_fix_alignment.patch b/packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch
index 3a059021a7..3a059021a7 100644
--- a/packages/uclibc/files/arm_fix_alignment.patch
+++ b/packages/uclibc/uclibc-0.9.29/arm_fix_alignment.patch
diff --git a/packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch b/packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch
new file mode 100644
index 0000000000..6f79c789d0
--- /dev/null
+++ b/packages/uclibc/uclibc-0.9.29/uclibc-use-fgnu89-inline.patch
@@ -0,0 +1,34 @@
+Source: http://www.nabble.com/-PATCH--uclibc-extern-inline-td14223616.html
+
+Description:
+
+Needed for uclibc-0.9.29 to compile with gcc 4.3.1
+
+You get this error without
+
+libc/libc_so.a(libc_pthread_init.oS): In function `testandset':
+libc_pthread_init.c:(.text+0x0): multiple definition of `testandset'
+libc/libc_so.a(forward.oS):forward.c:(.text+0x0): first defined here
+libc/libc_so.a(rpc_thread.oS): In function `testandset':
+rpc_thread.c:(.text+0x0): multiple definition of `testandset'
+libc/libc_so.a(forward.oS):forward.c:(.text+0x0): first defined here
+make[1]: *** [lib/libc.so] Error 1
+make: *** [lib/libc.so.0] Error 2
+
+
+---
+ Rules.mak | 1 +
+ 1 file changed, 1 insertion(+)
+
+Index: uClibc-0.9.29/Rules.mak
+===================================================================
+--- uClibc-0.9.29.orig/Rules.mak 2008-08-19 13:43:56.000000000 -0700
++++ uClibc-0.9.29/Rules.mak 2008-08-19 13:45:04.000000000 -0700
+@@ -402,6 +402,7 @@ CFLAGS += -DSTATIC
+ endif
+
+ CFLAGS += $(call check_gcc,-std=gnu99,)
++CFLAGS += $(call check_gcc,-fgnu89-inline,)
+
+ LDFLAGS_NOSTRIP:=$(CPU_LDFLAGS-y) -shared --warn-common --warn-once -z combreloc
+ # binutils-2.16.1 warns about ignored sections, 2.16.91.0.3 and newer are ok
diff --git a/packages/uclibc/uclibc-initial_nptl.bb b/packages/uclibc/uclibc-initial_nptl.bb
new file mode 100644
index 0000000000..3da8417e52
--- /dev/null
+++ b/packages/uclibc/uclibc-initial_nptl.bb
@@ -0,0 +1,35 @@
+SECTION = "base"
+require uclibc_nptl.bb
+
+DEPENDS = "linux-libc-headers ncurses-native virtual/${TARGET_PREFIX}gcc-initial"
+PROVIDES = "virtual/${TARGET_PREFIX}libc-initial"
+PACKAGES = ""
+
+do_stage() {
+ # Install initial headers into the cross dir
+ make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ install_headers V=1
+
+ ln -sf include ${CROSS_DIR}/${TARGET_SYS}/sys-include
+
+ # This conflicts with the c++ version of this header
+ make PREFIX= DEVEL_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ RUNTIME_PREFIX=${UCLIBC_STAGE_PREFIX}/ \
+ lib/crt1.o lib/crti.o lib/crtn.o V=1
+
+ rm -f ${UCLIBC_STAGE_PREFIX}/include/bits/atomicity.h
+
+ install -m 644 lib/crt[1in].o ${UCLIBC_STAGE_PREFIX}/lib
+
+ ${CC} -nostdlib -nostartfiles -shared -x c /dev/null \
+ -o ${UCLIBC_STAGE_PREFIX}/lib/libc.so
+}
+
+do_install() {
+ :
+}
+
+do_compile () {
+ :
+}
diff --git a/packages/uclibc/uclibc-cvs/.mtn2git_empty b/packages/uclibc/uclibc-nptl/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/.mtn2git_empty
+++ b/packages/uclibc/uclibc-nptl/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-nptl/arm_fix_alignment.patch b/packages/uclibc/uclibc-nptl/arm_fix_alignment.patch
new file mode 100644
index 0000000000..982afe9a6e
--- /dev/null
+++ b/packages/uclibc/uclibc-nptl/arm_fix_alignment.patch
@@ -0,0 +1,19 @@
+ARMV5 can use STRD and LDRD access instructions but these accesses need to be
+8 byte aligned. The dynamic linker's malloc needs to match this so structures
+become 8 byte aligned to void unaligned accesses.
+
+RP - 14/02/2008
+
+Index: uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
+===================================================================
+--- uClibc-nptl.orig/ldso/ldso/arm/dl-sysdep.h 2008-08-08 16:52:28.000000000 -0700
++++ uClibc-nptl/ldso/ldso/arm/dl-sysdep.h 2008-08-08 23:51:39.000000000 -0700
+@@ -18,6 +18,8 @@
+ GOT_BASE[1] = (unsigned long) MODULE; \
+ }
+
++#define DL_MALLOC_ALIGN 8 /* EABI needs 8 byte alignment for STRD LDRD*/
++
+ static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
+ {
+ unsigned long i,t,inc;
diff --git a/packages/uclibc/uclibc-nptl/uClibc.distro b/packages/uclibc/uclibc-nptl/uClibc.distro
new file mode 100644
index 0000000000..d51a29715a
--- /dev/null
+++ b/packages/uclibc/uclibc-nptl/uClibc.distro
@@ -0,0 +1,147 @@
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+# DOPIC is not set
+# HAVE_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+LDSO_CACHE_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+LDSO_BASE_FILENAME="ld.so"
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+UCLIBC_CTOR_DTOR=y
+# HAS_NO_THREADS is not set
+UCLIBC_HAS_THREADS=y
+UCLIBC_HAS_THREADS_NATIVE=y
+# PTHREADS_DEBUG_SUPPORT is not set
+# LINUXTHREADS_OLD is not set
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+COMPAT_ATEXIT=y
+UCLIBC_SUSV3_LEGACY=y
+UCLIBC_SUSV3_LEGACY_MACROS=y
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UNIX98PTY_ONLY=y
+ASSUME_DEVPTS=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Networking Support
+#
+UCLIBC_HAS_IPV6=y
+UCLIBC_HAS_RPC=y
+UCLIBC_HAS_FULL_RPC=y
+# UCLIBC_HAS_REENTRANT_RPC is not set
+# UCLIBC_USE_NETLINK is not set
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+
+#
+# String and Stdio Support
+#
+UCLIBC_HAS_STRING_GENERIC_OPT=y
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+UCLIBC_HAS_WCHAR=y
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+UCLIBC_HAS_STDIO_BUFSIZ_256=y
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+UCLIBC_HAS_STDIO_GETC_MACRO=y
+UCLIBC_HAS_STDIO_PUTC_MACRO=y
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+UCLIBC_HAS_GNU_GETSUBOPT=y
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+UCLIBC_HAS_WORDEXP=y
+UCLIBC_HAS_FTW=y
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+
+#
+# Library Installation Options
+#
+SHARED_LIB_LOADER_PREFIX="/lib"
+RUNTIME_PREFIX="/"
+DEVEL_PREFIX="//usr"
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+# UCLIBC_HAS_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
+
+# math stuff for perl
+DO_C99_MATH=y
diff --git a/packages/uclibc/uclibc-nptl/uClibc.machine.armv5te b/packages/uclibc/uclibc-nptl/uClibc.machine.armv5te
new file mode 100644
index 0000000000..ec0385bc0f
--- /dev/null
+++ b/packages/uclibc/uclibc-nptl/uClibc.machine.armv5te
@@ -0,0 +1,70 @@
+#
+# Automatically generated make config: don't edit
+# Sun May 13 11:16:02 2007
+#
+# TARGET_alpha is not set
+TARGET_arm=y
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="arm"
+FORCE_OPTIONS_FOR_ARCH=y
+# CONFIG_ARM_OABI is not set
+CONFIG_ARM_EABI=y
+USE_BX=y
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+CONFIG_ARM_XSCALE=y
+# CONFIG_ARM_IWMMXT is not set
+TARGET_SUBARCH=""
+
+#
+# Using ELF file format
+#
+ARCH_ANY_ENDIAN=y
+ARCH_LITTLE_ENDIAN=y
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_WANTS_LITTLE_ENDIAN=y
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+# UCLIBC_HAS_FPU is not set
+UCLIBC_HAS_SOFT_FLOAT=y
+DO_C99_MATH=y
+KERNEL_HEADERS="/data/build/koen/OE/build/tmp/angstrom/cross/arm-angstrom-linux-uclibcgnueabi/include"
+HAVE_DOT_CONFIG=y
+
diff --git a/packages/uclibc/uclibc-cvs/arm/.mtn2git_empty b/packages/uclibc/uclibc-svn/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/arm/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/armeb/.mtn2git_empty b/packages/uclibc/uclibc-svn/arm/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/armeb/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/arm/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/arm/uClibc.config b/packages/uclibc/uclibc-svn/arm/uClibc.config
index 9460573cdd..9460573cdd 100644
--- a/packages/uclibc/uclibc-cvs/arm/uClibc.config
+++ b/packages/uclibc/uclibc-svn/arm/uClibc.config
diff --git a/packages/uclibc/uclibc-svn/arm_fix_alignment.patch b/packages/uclibc/uclibc-svn/arm_fix_alignment.patch
new file mode 100644
index 0000000000..982afe9a6e
--- /dev/null
+++ b/packages/uclibc/uclibc-svn/arm_fix_alignment.patch
@@ -0,0 +1,19 @@
+ARMV5 can use STRD and LDRD access instructions but these accesses need to be
+8 byte aligned. The dynamic linker's malloc needs to match this so structures
+become 8 byte aligned to void unaligned accesses.
+
+RP - 14/02/2008
+
+Index: uClibc-nptl/ldso/ldso/arm/dl-sysdep.h
+===================================================================
+--- uClibc-nptl.orig/ldso/ldso/arm/dl-sysdep.h 2008-08-08 16:52:28.000000000 -0700
++++ uClibc-nptl/ldso/ldso/arm/dl-sysdep.h 2008-08-08 23:51:39.000000000 -0700
+@@ -18,6 +18,8 @@
+ GOT_BASE[1] = (unsigned long) MODULE; \
+ }
+
++#define DL_MALLOC_ALIGN 8 /* EABI needs 8 byte alignment for STRD LDRD*/
++
+ static __inline__ unsigned long arm_modulus(unsigned long m, unsigned long p)
+ {
+ unsigned long i,t,inc;
diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty b/packages/uclibc/uclibc-svn/armeb/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/dht-walnut/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/armeb/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/armeb/uClibc.config b/packages/uclibc/uclibc-svn/armeb/uClibc.config
index 5f9fe16afb..5f9fe16afb 100644
--- a/packages/uclibc/uclibc-cvs/armeb/uClibc.config
+++ b/packages/uclibc/uclibc-svn/armeb/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty b/packages/uclibc/uclibc-svn/dht-walnut/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/efika/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/dht-walnut/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config b/packages/uclibc/uclibc-svn/dht-walnut/uClibc.config
index 6e606f6be3..6e606f6be3 100644
--- a/packages/uclibc/uclibc-cvs/dht-walnut/uClibc.config
+++ b/packages/uclibc/uclibc-svn/dht-walnut/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/i386/.mtn2git_empty b/packages/uclibc/uclibc-svn/efika/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/i386/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/efika/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/efika/uClibc.config b/packages/uclibc/uclibc-svn/efika/uClibc.config
index 23b221d662..23b221d662 100644
--- a/packages/uclibc/uclibc-cvs/efika/uClibc.config
+++ b/packages/uclibc/uclibc-svn/efika/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/errno_values.h.patch b/packages/uclibc/uclibc-svn/errno_values.h.patch
index a1e39c181b..a1e39c181b 100644
--- a/packages/uclibc/uclibc-cvs/errno_values.h.patch
+++ b/packages/uclibc/uclibc-svn/errno_values.h.patch
diff --git a/packages/uclibc/uclibc-cvs/error_print_progname.patch b/packages/uclibc/uclibc-svn/error_print_progname.patch
index 6c10ec6b3c..6c10ec6b3c 100644
--- a/packages/uclibc/uclibc-cvs/error_print_progname.patch
+++ b/packages/uclibc/uclibc-svn/error_print_progname.patch
diff --git a/packages/uclibc/uclibc-cvs/i486/.mtn2git_empty b/packages/uclibc/uclibc-svn/i386/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/i486/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/i386/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/i386/uClibc.config b/packages/uclibc/uclibc-svn/i386/uClibc.config
index bc6e72debf..bc6e72debf 100644
--- a/packages/uclibc/uclibc-cvs/i386/uClibc.config
+++ b/packages/uclibc/uclibc-svn/i386/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/i586/.mtn2git_empty b/packages/uclibc/uclibc-svn/i486/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/i586/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/i486/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/i486/uClibc.config b/packages/uclibc/uclibc-svn/i486/uClibc.config
index 896d65ab20..896d65ab20 100644
--- a/packages/uclibc/uclibc-cvs/i486/uClibc.config
+++ b/packages/uclibc/uclibc-svn/i486/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/i686/.mtn2git_empty b/packages/uclibc/uclibc-svn/i586/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/i686/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/i586/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/i586/uClibc.config b/packages/uclibc/uclibc-svn/i586/uClibc.config
index d1bf538902..d1bf538902 100644
--- a/packages/uclibc/uclibc-cvs/i586/uClibc.config
+++ b/packages/uclibc/uclibc-svn/i586/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/ixp4xx/.mtn2git_empty b/packages/uclibc/uclibc-svn/i686/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/ixp4xx/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/i686/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/i686/uClibc.config b/packages/uclibc/uclibc-svn/i686/uClibc.config
index bc6e72debf..bc6e72debf 100644
--- a/packages/uclibc/uclibc-cvs/i686/uClibc.config
+++ b/packages/uclibc/uclibc-svn/i686/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/magicbox/.mtn2git_empty b/packages/uclibc/uclibc-svn/ixp4xx/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/magicbox/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/ixp4xx/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.distro b/packages/uclibc/uclibc-svn/ixp4xx/uClibc.distro
index 7d54119f39..7d54119f39 100644
--- a/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.distro
+++ b/packages/uclibc/uclibc-svn/ixp4xx/uClibc.distro
diff --git a/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.machine b/packages/uclibc/uclibc-svn/ixp4xx/uClibc.machine
index 77e53bc1a8..77e53bc1a8 100644
--- a/packages/uclibc/uclibc-cvs/ixp4xx/uClibc.machine
+++ b/packages/uclibc/uclibc-svn/ixp4xx/uClibc.machine
diff --git a/packages/uclibc/uclibc-cvs/mipsel/.mtn2git_empty b/packages/uclibc/uclibc-svn/magicbox/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/mipsel/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/magicbox/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/magicbox/uClibc.config b/packages/uclibc/uclibc-svn/magicbox/uClibc.config
index 6542d49fd0..6542d49fd0 100644
--- a/packages/uclibc/uclibc-cvs/magicbox/uClibc.config
+++ b/packages/uclibc/uclibc-svn/magicbox/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/powerpc/.mtn2git_empty b/packages/uclibc/uclibc-svn/mipsel/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/powerpc/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/mipsel/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/mipsel/uClibc.config b/packages/uclibc/uclibc-svn/mipsel/uClibc.config
index 4389c9b8c2..4389c9b8c2 100644
--- a/packages/uclibc/uclibc-cvs/mipsel/uClibc.config
+++ b/packages/uclibc/uclibc-svn/mipsel/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/sh3/.mtn2git_empty b/packages/uclibc/uclibc-svn/powerpc/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/sh3/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/powerpc/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/powerpc/uClibc.config b/packages/uclibc/uclibc-svn/powerpc/uClibc.config
index 8a12c10961..8a12c10961 100644
--- a/packages/uclibc/uclibc-cvs/powerpc/uClibc.config
+++ b/packages/uclibc/uclibc-svn/powerpc/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/sh4/.mtn2git_empty b/packages/uclibc/uclibc-svn/sh3/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/uclibc/uclibc-cvs/sh4/.mtn2git_empty
+++ b/packages/uclibc/uclibc-svn/sh3/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/sh3/uClibc.config b/packages/uclibc/uclibc-svn/sh3/uClibc.config
index 1e2710715f..1e2710715f 100644
--- a/packages/uclibc/uclibc-cvs/sh3/uClibc.config
+++ b/packages/uclibc/uclibc-svn/sh3/uClibc.config
diff --git a/packages/uclibc/uclibc-svn/sh4/.mtn2git_empty b/packages/uclibc/uclibc-svn/sh4/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/uclibc/uclibc-svn/sh4/.mtn2git_empty
diff --git a/packages/uclibc/uclibc-cvs/sh4/uClibc.config b/packages/uclibc/uclibc-svn/sh4/uClibc.config
index 0b9a3c48b2..0b9a3c48b2 100644
--- a/packages/uclibc/uclibc-cvs/sh4/uClibc.config
+++ b/packages/uclibc/uclibc-svn/sh4/uClibc.config
diff --git a/packages/uclibc/uclibc-cvs/thumb-asm-swi.patch b/packages/uclibc/uclibc-svn/thumb-asm-swi.patch
index d09e40b7a3..d09e40b7a3 100644
--- a/packages/uclibc/uclibc-cvs/thumb-asm-swi.patch
+++ b/packages/uclibc/uclibc-svn/thumb-asm-swi.patch
diff --git a/packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch b/packages/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch
index 6b73301bf7..6b73301bf7 100644
--- a/packages/uclibc/uclibc-cvs/thumb-defined-arm-or-thumb.patch
+++ b/packages/uclibc/uclibc-svn/thumb-defined-arm-or-thumb.patch
diff --git a/packages/uclibc/uclibc-cvs/thumb-mov-pc-bx.patch b/packages/uclibc/uclibc-svn/thumb-mov-pc-bx.patch
index 3d493514f8..3d493514f8 100644
--- a/packages/uclibc/uclibc-cvs/thumb-mov-pc-bx.patch
+++ b/packages/uclibc/uclibc-svn/thumb-mov-pc-bx.patch
diff --git a/packages/uclibc/uclibc_0.9.29.bb b/packages/uclibc/uclibc_0.9.29.bb
index fc06c28f67..9c716b6237 100644
--- a/packages/uclibc/uclibc_0.9.29.bb
+++ b/packages/uclibc/uclibc_0.9.29.bb
@@ -7,7 +7,7 @@
# on whether the base patches apply to the selected (SRCDATE) svn release.
#
UCLIBC_BASE ?= "0.9.29"
-PR = "r22"
+PR = "r24"
DEFAULT_PREFERENCE = "1"
require uclibc.inc
@@ -30,6 +30,7 @@ SRC_URI += "file://uClibc.machine file://uClibc.distro \
file://uClibc-0.9.29-nonposix_bashisms.patch;patch=1 \
file://arm_fix_alignment.patch;patch=1 \
file://uclibc-arm-ftruncate64.patch;patch=1 \
+ file://uclibc-use-fgnu89-inline.patch;patch=1 \
"
#recent versions uclibc require real kernel headers
diff --git a/packages/uclibc/uclibc_nptl.bb b/packages/uclibc/uclibc_nptl.bb
new file mode 100644
index 0000000000..6d6fc361c6
--- /dev/null
+++ b/packages/uclibc/uclibc_nptl.bb
@@ -0,0 +1,35 @@
+# UCLIBC_BASE should be the latest released revision of uclibc (that way
+# the config files will typically be correct!) uclibc-svn takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-svn is out of date
+# try removing it
+#
+# UCLIBC_BASE can be set in a distro file, but whether this works depends
+# on whether the base patches apply to the selected (SRCDATE) svn release.
+#
+UCLIBC_BASE ?= "0.9.29"
+PV = "${UCLIBC_BASE}+svnr${SRCREV}"
+PR = "r0"
+#DEFAULT_PREFERENCE = "2"
+#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
+# precedence.
+
+require uclibc.inc
+
+PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
+
+#recent versions uclibc require real kernel headers
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-nptl', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+
+#as stated above, uclibc needs real kernel-headers
+#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
+KERNEL_SOURCE = "${CROSS_DIR}/${TARGET_SYS}"
+
+SRC_URI += "svn://uclibc.org/branches/;module=uClibc-nptl \
+ file://uClibc.machine \
+ file://uClibc.distro \
+ file://uclibc-arm-ftruncate64.patch;patch=1 \
+ file://arm_fix_alignment.patch;patch=1 \
+ "
+
+S = "${WORKDIR}/uClibc-nptl"
diff --git a/packages/uclibc/uclibc_svn.bb b/packages/uclibc/uclibc_svn.bb
index b7b8960952..5dfa1b243c 100644
--- a/packages/uclibc/uclibc_svn.bb
+++ b/packages/uclibc/uclibc_svn.bb
@@ -1,6 +1,6 @@
# UCLIBC_BASE should be the latest released revision of uclibc (that way
-# the config files will typically be correct!) uclibc-cvs takes precedence
-# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-cvs is out of date
+# the config files will typically be correct!) uclibc-svn takes precedence
+# over uclibc-${UCLIBC_BASE}, if a config file in uclibc-snv is out of date
# try removing it
#
# UCLIBC_BASE can be set in a distro file, but whether this works depends
@@ -8,7 +8,7 @@
#
UCLIBC_BASE ?= "0.9.29"
PV = "${UCLIBC_BASE}+svnr${SRCREV}"
-PR = "r12"
+PR = "r13"
#DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take
# precedence.
@@ -18,7 +18,7 @@ PROVIDES += "virtual/${TARGET_PREFIX}libc-for-gcc"
#recent versions uclibc require real kernel headers
PACKAGE_ARCH = "${MACHINE_ARCH}"
-FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-cvs', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
+FILESPATH = "${@base_set_filespath([ '${FILE_DIRNAME}/uclibc-svn', '${FILE_DIRNAME}/uclibc-${UCLIBC_BASE}', '${FILE_DIRNAME}/files', '${FILE_DIRNAME}' ], d)}"
#as stated above, uclibc needs real kernel-headers
#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
diff --git a/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty b/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-5.07/.mtn2git_empty
diff --git a/packages/xscreensaver/xscreensaver-5.07/configure.in.patch b/packages/xscreensaver/xscreensaver-5.07/configure.in.patch
new file mode 100644
index 0000000000..384b134037
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver-5.07/configure.in.patch
@@ -0,0 +1,91 @@
+--- /tmp/configure.in 2008-08-21 12:56:59.000000000 +0200
++++ xscreensaver-5.07/configure.in 2008-08-21 13:06:16.293198000 +0200
+@@ -952,9 +952,6 @@
+ #
+ AC_DEFUN(AC_CHECK_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_CHECK_HEADER([$1],[$2],[$3],[$4])
+@@ -964,9 +961,6 @@
+ #
+ AC_DEFUN(AC_EGREP_X_HEADER, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_EGREP_HEADER([$1], [$2], [$3], [$4])
+@@ -976,9 +970,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_COMPILE, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_TRY_COMPILE([$1], [$2], [$3], [$4])
+@@ -993,9 +984,6 @@
+ ac_save_LDFLAGS="$LDFLAGS"
+ # ac_save_LIBS="$LIBS"
+
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ # note: $X_CFLAGS includes $x_includes
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+@@ -1018,9 +1006,6 @@
+ #
+ AC_DEFUN(AC_TRY_X_RUN, [
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+ CPPFLAGS=`eval eval eval eval eval eval eval eval eval echo $CPPFLAGS`
+ AC_TRY_RUN([$1], [$2], [$3], [$4])
+@@ -1099,11 +1084,8 @@
+
+ # random compiler setup
+ AC_CANONICAL_HOST
+-AC_PROG_CC_ANSI
+ AC_NO_LONG_STRING_WARNINGS
+ AC_NO_MISPLACED_DECLARATIONS
+-AC_NO_OBJECTIVE_C
+-AC_NO_CPLUSPLUS_COMMENTS_IN_C_CODE
+ AC_PROG_CPP
+ AC_C_CONST
+ AC_C_INLINE
+@@ -2831,9 +2813,6 @@
+ EOF
+
+ ac_save_CPPFLAGS="$CPPFLAGS"
+- if test \! -z "$includedir" ; then
+- CPPFLAGS="$CPPFLAGS -I$includedir"
+- fi
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+
+ mglv=`(eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC | grep configure:`
+@@ -3515,16 +3494,6 @@
+ DEPEND_FLAGS=
+ DEPEND_DEFINES=
+
+-
+-if test \! -z "$includedir" ; then
+- INCLUDES="$INCLUDES -I$includedir"
+-fi
+-
+-if test \! -z "$libdir" ; then
+- LDFLAGS="$LDFLAGS -L$libdir"
+-fi
+-
+-
+ PREFERRED_DEMO_PROGRAM=''
+ ALL_DEMO_PROGRAMS=
+ if test "$have_motif" = yes; then
diff --git a/packages/xscreensaver/xscreensaver_5.07.bb b/packages/xscreensaver/xscreensaver_5.07.bb
new file mode 100644
index 0000000000..8e288b872a
--- /dev/null
+++ b/packages/xscreensaver/xscreensaver_5.07.bb
@@ -0,0 +1,63 @@
+# xscreensaver OE build file
+# Copyright (C) 2004, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+DESCRIPTION = "*The* screensaver package for X11"
+HOMEPAGE = "http://www.jwz.org/xscreensaver/"
+SECTION = "x11-misc"
+LICENSE = "BSD"
+DEPENDS = "intltool virtual/libx11 gtk+ libxml2 libglade"
+
+
+SRC_URI = "http://www.jwz.org/xscreensaver/xscreensaver-${PV}.tar.gz \
+ file://configure.in.patch;patch=1 \
+ file://XScreenSaver"
+
+# xscreensaver-demo is a glade app
+LDFLAGS_append = " -Wl,--export-dynamic"
+
+inherit autotools
+
+export INTLTOOL_PERL="/usr/bin/env perl"
+
+EXTRA_OECONF="--with-xml --with-gtk --disable-locking --without-pixbuf \
+ --with-jpeg --with-xpm"
+
+PACKAGES =+ " xscreensaver-demo xscreensaver-extra"
+
+FILES_${PN}= "${bindir}/xscreensaver ${bindir}/xscreensaver-command \
+ /usr/X11R6/lib/X11/app-defaults"
+
+FILES_xscreensaver-demo="${bindir}/xscreensaver-demo ${datadir}/xscreensaver \
+ ${datadir}/pixmaps/"
+
+FILES_xscreensaver-extra="${bindir}/xscreensaver-getimage*"
+
+do_configure_prepend() {
+ sed -i 's:GTK_DATADIR="$GTK_DATADIR/share":GTK_DATADIR="${datadir}":' ${S}/configure.in
+
+ export includedir="/lib"
+}
+
+do_compile() {
+ oe_runmake GNOME_DATADIR=${datadir} all
+}
+
+do_install() {
+ unset KDEDIR
+ oe_runmake -C ${S}/driver GNOME_DATADIR=${datadir} \
+ install_prefix=${D} install
+
+ oe_runmake -C ${S}/hacks install_prefix=${D} install-program
+
+ # Install the defaults file
+ install -d ${D}/usr/X11R6/lib/X11/app-defaults
+ install -m 0644 ${WORKDIR}/XScreenSaver ${D}/usr/X11R6/lib/X11/app-defaults
+}
+
+PACKAGES_DYNAMIC = "xscreensaver-hack-*"
+
+python populate_packages_prepend () {
+ hackdir = bb.data.expand('${libexecdir}/xscreensaver', d)
+ do_split_packages(d, hackdir, '^(.*)', 'xscreensaver-hack-%s', 'XScreensaver hack %s')
+}