Merge.
author"Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Sat Sep 12 11:20:09 2009 +0200 (2009-09-12)
changeset 152724dac8b8a9b4
parent 1526 b849649bc89d
parent 1525 4647e6fb994a
child 1533 c26952040832
Merge.
     1.1 --- a/kconfig/conf.c	Sat Sep 12 11:19:30 2009 +0200
     1.2 +++ b/kconfig/conf.c	Sat Sep 12 11:20:09 2009 +0200
     1.3 @@ -67,10 +67,10 @@
     1.4  static void check_stdin(void)
     1.5  {
     1.6  	if (!valid_stdin) {
     1.7 -		printf(_("aborted!\n\n"));
     1.8 -		printf(_("Console input/output is redirected. "));
     1.9 -		printf(_("Run 'make oldconfig' to update configuration.\n\n"));
    1.10 -		exit(1);
    1.11 +		/* For crosstool-NG, we don't care if stdin/stdout got redirected.
    1.12 +		 * In this case, just printf a cariage return, for pretty output.
    1.13 +		 */
    1.14 +		printf("\n");
    1.15  	}
    1.16  }
    1.17  
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/patches/gcc/4.3.0/380-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
     2.3 @@ -0,0 +1,11 @@
     2.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     2.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     2.6 +@@ -44,7 +44,7 @@
     2.7 +    The ARM10TDMI core is the default for armv5t, so set
     2.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     2.9 + #undef  SUBTARGET_CPU_DEFAULT
    2.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    2.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    2.12 + 
    2.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    2.14 +    config.gcc for big endian configurations.  */
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/patches/gcc/4.3.1/360-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
     3.3 @@ -0,0 +1,11 @@
     3.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     3.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     3.6 +@@ -44,7 +44,7 @@
     3.7 +    The ARM10TDMI core is the default for armv5t, so set
     3.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     3.9 + #undef  SUBTARGET_CPU_DEFAULT
    3.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    3.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    3.12 + 
    3.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    3.14 +    config.gcc for big endian configurations.  */
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/patches/gcc/4.3.2/390-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
     4.3 @@ -0,0 +1,11 @@
     4.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     4.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     4.6 +@@ -44,7 +44,7 @@
     4.7 +    The ARM10TDMI core is the default for armv5t, so set
     4.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     4.9 + #undef  SUBTARGET_CPU_DEFAULT
    4.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    4.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    4.12 + 
    4.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    4.14 +    config.gcc for big endian configurations.  */
     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/patches/gcc/4.3.3/390-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
     5.3 @@ -0,0 +1,11 @@
     5.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     5.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     5.6 +@@ -44,7 +44,7 @@
     5.7 +    The ARM10TDMI core is the default for armv5t, so set
     5.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     5.9 + #undef  SUBTARGET_CPU_DEFAULT
    5.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    5.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    5.12 + 
    5.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    5.14 +    config.gcc for big endian configurations.  */
     6.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     6.2 +++ b/patches/gcc/4.3.4/390-unbreak-armv4t.patch	Sat Sep 12 11:20:09 2009 +0200
     6.3 @@ -0,0 +1,11 @@
     6.4 +--- gcc-4.3.2.orig/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:44.000000000 +0200
     6.5 ++++ gcc-4.3.2/gcc/config/arm/linux-eabi.h	2009-09-08 23:46:51.000000000 +0200
     6.6 +@@ -44,7 +44,7 @@
     6.7 +    The ARM10TDMI core is the default for armv5t, so set
     6.8 +    SUBTARGET_CPU_DEFAULT to achieve this.  */
     6.9 + #undef  SUBTARGET_CPU_DEFAULT
    6.10 +-#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
    6.11 ++#define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm9tdmi
    6.12 + 
    6.13 + /* TARGET_BIG_ENDIAN_DEFAULT is set in
    6.14 +    config.gcc for big endian configurations.  */