From 425cb26a526d32b6c9fed5b65b8892c5e5cc24f2 Mon Sep 17 00:00:00 2001 From: Ralf Corsepius Date: Sun, 11 Nov 2007 16:58:15 +0000 Subject: More makeinfo hacks. --- .../patches/gcc-core-4.2.1-rtems4.8-20071111.diff | 58 +++++++++++++++++++--- 1 file changed, 52 insertions(+), 6 deletions(-) (limited to 'contrib') diff --git a/contrib/crossrpms/patches/gcc-core-4.2.1-rtems4.8-20071111.diff b/contrib/crossrpms/patches/gcc-core-4.2.1-rtems4.8-20071111.diff index 71601d3496..31b853f16e 100644 --- a/contrib/crossrpms/patches/gcc-core-4.2.1-rtems4.8-20071111.diff +++ b/contrib/crossrpms/patches/gcc-core-4.2.1-rtems4.8-20071111.diff @@ -1,6 +1,6 @@ diff -uNr gcc-4.2.1.orig/configure gcc-4.2.1/configure --- gcc-4.2.1.orig/configure 2007-06-21 01:07:21.000000000 +0200 -+++ gcc-4.2.1/configure 2007-11-11 14:01:06.000000000 +0100 ++++ gcc-4.2.1/configure 2007-11-11 16:35:26.000000000 +0100 @@ -3743,7 +3743,7 @@ # For an installed makeinfo, we require it to be from texinfo 4.4 or # higher, else we use the "missing" dummy. @@ -12,7 +12,7 @@ diff -uNr gcc-4.2.1.orig/configure gcc-4.2.1/configure MAKEINFO="$MISSING makeinfo" diff -uNr gcc-4.2.1.orig/configure.in gcc-4.2.1/configure.in --- gcc-4.2.1.orig/configure.in 2007-05-30 15:48:07.000000000 +0200 -+++ gcc-4.2.1/configure.in 2007-11-11 14:01:14.000000000 +0100 ++++ gcc-4.2.1/configure.in 2007-11-11 16:35:26.000000000 +0100 @@ -2246,7 +2246,7 @@ # For an installed makeinfo, we require it to be from texinfo 4.4 or # higher, else we use the "missing" dummy. @@ -24,7 +24,7 @@ diff -uNr gcc-4.2.1.orig/configure.in gcc-4.2.1/configure.in MAKEINFO="$MISSING makeinfo" diff -uNr gcc-4.2.1.orig/gcc/config/arm/rtems-elf.h gcc-4.2.1/gcc/config/arm/rtems-elf.h --- gcc-4.2.1.orig/gcc/config/arm/rtems-elf.h 2005-11-21 23:56:34.000000000 +0100 -+++ gcc-4.2.1/gcc/config/arm/rtems-elf.h 2007-11-11 14:01:52.000000000 +0100 ++++ gcc-4.2.1/gcc/config/arm/rtems-elf.h 2007-11-11 16:35:26.000000000 +0100 @@ -27,6 +27,7 @@ #define TARGET_OS_CPP_BUILTINS() \ do { \ @@ -35,7 +35,7 @@ diff -uNr gcc-4.2.1.orig/gcc/config/arm/rtems-elf.h gcc-4.2.1/gcc/config/arm/rte diff -uNr gcc-4.2.1.orig/gcc/config/c4x/rtems.h gcc-4.2.1/gcc/config/c4x/rtems.h --- gcc-4.2.1.orig/gcc/config/c4x/rtems.h 2005-06-25 03:22:41.000000000 +0200 -+++ gcc-4.2.1/gcc/config/c4x/rtems.h 2007-11-11 14:01:52.000000000 +0100 ++++ gcc-4.2.1/gcc/config/c4x/rtems.h 2007-11-11 16:35:26.000000000 +0100 @@ -24,6 +24,5 @@ #define TARGET_OS_CPP_BUILTINS() \ do { \ @@ -45,7 +45,7 @@ diff -uNr gcc-4.2.1.orig/gcc/config/c4x/rtems.h gcc-4.2.1/gcc/config/c4x/rtems.h } while (0) diff -uNr gcc-4.2.1.orig/gcc/config/m68k/t-rtems gcc-4.2.1/gcc/config/m68k/t-rtems --- gcc-4.2.1.orig/gcc/config/m68k/t-rtems 2005-02-07 06:13:25.000000000 +0100 -+++ gcc-4.2.1/gcc/config/m68k/t-rtems 2007-11-11 14:01:52.000000000 +0100 ++++ gcc-4.2.1/gcc/config/m68k/t-rtems 2007-11-11 16:35:26.000000000 +0100 @@ -1,7 +1,11 @@ # Custom multilibs for RTEMS @@ -63,7 +63,7 @@ diff -uNr gcc-4.2.1.orig/gcc/config/m68k/t-rtems gcc-4.2.1/gcc/config/m68k/t-rte +MULTILIB_EXCEPTIONS += m528x/m68881 m528x/msoft-float diff -uNr gcc-4.2.1.orig/gcc/config/mips/elf.h gcc-4.2.1/gcc/config/mips/elf.h --- gcc-4.2.1.orig/gcc/config/mips/elf.h 2006-10-08 09:35:47.000000000 +0200 -+++ gcc-4.2.1/gcc/config/mips/elf.h 2007-11-11 14:01:52.000000000 +0100 ++++ gcc-4.2.1/gcc/config/mips/elf.h 2007-11-11 16:35:26.000000000 +0100 @@ -49,6 +49,4 @@ #undef ENDFILE_SPEC #define ENDFILE_SPEC "crtend%O%s crtn%O%s" @@ -71,3 +71,49 @@ diff -uNr gcc-4.2.1.orig/gcc/config/mips/elf.h gcc-4.2.1/gcc/config/mips/elf.h -#define NO_IMPLICIT_EXTERN_C 1 - #define HANDLE_PRAGMA_PACK_PUSH_POP 1 +diff -uNr gcc-4.2.1.orig/gcc/configure gcc-4.2.1/gcc/configure +--- gcc-4.2.1.orig/gcc/configure 2007-01-02 04:44:31.000000000 +0100 ++++ gcc-4.2.1/gcc/configure 2007-11-11 17:19:41.000000000 +0100 +@@ -7654,7 +7654,7 @@ + echo "configure:7654: version of makeinfo is $ac_prog_version" >&5 + case $ac_prog_version in + '') gcc_cv_prog_makeinfo_modern=no;; +- 4.[4-9]*) ++ 4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*) + gcc_cv_prog_makeinfo_modern=yes;; + *) gcc_cv_prog_makeinfo_modern=no;; + esac +@@ -13937,9 +13937,7 @@ + ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q` + if echo "$ld_ver" | grep GNU > /dev/null; then + ld_vers=`echo $ld_ver | sed -n \ +- -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ +- -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ +- -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ ++ -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ +diff -uNr gcc-4.2.1.orig/gcc/configure.ac gcc-4.2.1/gcc/configure.ac +--- gcc-4.2.1.orig/gcc/configure.ac 2007-01-02 04:44:31.000000000 +0100 ++++ gcc-4.2.1/gcc/configure.ac 2007-11-11 17:19:41.000000000 +0100 +@@ -878,7 +878,7 @@ + # that we can use it. + gcc_AC_CHECK_PROG_VER(MAKEINFO, makeinfo, --version, + [GNU texinfo.* \([0-9][0-9.]*\)], +- [4.[4-9]*]) ++ [4.[4-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*]) + if test $gcc_cv_prog_makeinfo_modern = no; then + MAKEINFO="$MISSING makeinfo" + AC_MSG_WARN([ +@@ -2094,9 +2094,7 @@ + if echo "$ld_ver" | grep GNU > /dev/null; then + changequote(,)dnl + ld_vers=`echo $ld_ver | sed -n \ +- -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ +- -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ +- -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \ ++ -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*.*\)$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ + -e 's,^.*[ ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[ ].*$,\1,p' \ -- cgit v1.2.3