patches/gcc/2.95.3/170-pr3106.patch
author "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Wed May 20 20:13:13 2009 +0000 (2009-05-20)
changeset 1345 27fec561af53
parent 402 197e1b49586e
permissions -rw-r--r--
Merge the uClinux/noMMU stuff back to /trunk:
- merge Linux and uClinux back to a single kernel
- add ARCH_USE_MMU and acquainted config options that
architectures can auto-select
- make binutils and elf2flt two "Binary utilities" that
go in a single common sub-{menu,directory} structure

-------- diffstat follows --------
/trunk/scripts/build/kernel/uclinux.sh | 2 0 2 0 -
/trunk/scripts/build/kernel/linux.sh | 206 204 2 0 +++++++++++++++++++++++++++++
/trunk/scripts/build/kernel/linux-common.sh | 198 0 198 0 ----------------------------
/trunk/scripts/build/binutils.sh | 232 0 232 0 --------------------------------
/trunk/scripts/build/elf2flt.sh | 150 0 150 0 ---------------------
/trunk/scripts/crosstool-NG.sh.in | 6 4 2 0 +
/trunk/config/kernel/linux.in | 249 249 0 0 +++++++++++++++++++++++++++++++++++
/trunk/config/kernel/linux.in-common | 252 0 252 0 -----------------------------------
/trunk/config/kernel/uclinux.in | 21 0 21 0 ---
/trunk/config/target.in | 23 22 1 0 +++
/trunk/config/elf2flt.in | 49 0 49 0 -------
/trunk/config/libc/glibc.in | 2 1 1 0
/trunk/config/libc/eglibc.in | 2 1 1 0
/trunk/config/config.in | 1 0 1 0 -
/trunk/config/arch/sh.in | 1 1 0 0 +
/trunk/config/arch/arm.in | 2 1 1 0
/trunk/config/arch/powerpc.in | 1 1 0 0 +
/trunk/config/arch/ia64.in | 1 1 0 0 +
/trunk/config/arch/alpha.in | 1 1 0 0 +
/trunk/config/arch/x86.in | 1 1 0 0 +
/trunk/config/arch/mips.in | 1 1 0 0 +
/trunk/config/arch/powerpc64.in | 1 1 0 0 +
22 files changed, 489 insertions(+), 913 deletions(-)
yann@402
     1
See http://gcc.gnu.org/PR3106
yann@402
     2
Backported from gcc-3.0.x
yann@402
     3
yann@402
     4
Fixes error
yann@402
     5
  .../binutils-2.11.2/libiberty/strerror.c:468: error: conflicting types for `sys_nerr'
yann@402
     6
  /usr/include/stdio.h:258: error: previous declaration of `sys_nerr'
yann@402
     7
  make[1]: *** [strerror.o] Error 1
yann@402
     8
  make: *** [all-libiberty] Error 2
yann@402
     9
on Mac OS X.
yann@402
    10
yann@402
    11
--- gcc-2.95.3/libiberty/strerror.c.old	2004-03-24 16:23:19.000000000 -0800
yann@402
    12
+++ gcc-2.95.3/libiberty/strerror.c	2004-03-24 16:23:48.000000000 -0800
yann@402
    13
@@ -13,6 +13,7 @@
yann@402
    14
    incompatible with our later declaration, perhaps by using const
yann@402
    15
    attributes.  So we hide the declaration in errno.h (if any) using a
yann@402
    16
    macro. */
yann@402
    17
+#define sys_nerr sys_nerr__
yann@402
    18
 #define sys_errlist sys_errlist__
yann@402
    19
 #endif
yann@402
    20
 
yann@402
    21
@@ -20,6 +21,7 @@
yann@402
    22
 #include <errno.h>
yann@402
    23
 
yann@402
    24
 #ifdef HAVE_SYS_ERRLIST
yann@402
    25
+#undef sys_nerr
yann@402
    26
 #undef sys_errlist
yann@402
    27
 #endif
yann@402
    28