# HG changeset patch
# User "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
# Date 1252747209 -7200
# Node ID 24dac8b8a9b4125c14ee53c23166adde106767a1
# Parent  b849649bc89d146aa3f701db47bc76f5f94d2a54# Parent  4647e6fb994a8a3cd116cfb85bebdb32491de508
Merge.

diff -r b849649bc89d -r 24dac8b8a9b4 kconfig/conf.c
--- a/kconfig/conf.c	Sat Sep 12 11:19:30 2009 +0200
+++ b/kconfig/conf.c	Sat Sep 12 11:20:09 2009 +0200
@@ -67,10 +67,10 @@
 static void check_stdin(void)
 {
 	if (!valid_stdin) {
-		printf(_("aborted!\n\n"));
-		printf(_("Console input/output is redirected. "));
-		printf(_("Run 'make oldconfig' to update configuration.\n\n"));
-		exit(1);
+		/* For crosstool-NG, we don't care if stdin/stdout got redirected.
+		 * In this case, just printf a cariage return, for pretty output.
+		 */
+		printf("\n");
 	}
 }
 
diff -r b849649bc89d -r 24dac8b8a9b4 patches/gcc/4.3.0/380-unbreak-armv4t.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc/4.3.0/380-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
@@ -0,0 +1,11 @@
+--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff -r b849649bc89d -r 24dac8b8a9b4 patches/gcc/4.3.1/360-unbreak-armv4t.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc/4.3.1/360-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
@@ -0,0 +1,11 @@
+--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff -r b849649bc89d -r 24dac8b8a9b4 patches/gcc/4.3.2/390-unbreak-armv4t.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc/4.3.2/390-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
@@ -0,0 +1,11 @@
+--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff -r b849649bc89d -r 24dac8b8a9b4 patches/gcc/4.3.3/390-unbreak-armv4t.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc/4.3.3/390-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
@@ -0,0 +1,11 @@
+--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */
diff -r b849649bc89d -r 24dac8b8a9b4 patches/gcc/4.3.4/390-unbreak-armv4t.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gcc/4.3.4/390-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
@@ -0,0 +1,11 @@
+--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
+@@ -44,7 +44,7 @@
+    The ARM10TDMI core is the default for armv5t, so set
+    SUBTARGET_CPU_DEFAULT to achieve this.  */
+ #undef  SUBTARGET_CPU_DEFAULT
+-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
+ 
+ /* TARGET_BIG_ENDIAN_DEFAULT is set in
+    config.gcc for big endian configurations.  */