From 8122c539f5902256d8eb154d1641a4d6797e42e7 Mon Sep 17 00:00:00 2001 From: Pavel Pisa Date: Mon, 31 Oct 2005 13:23:16 +0100 Subject: [PATCH] Binutils 2.16.1 to 2.16.1.0 patches. darcs-hash:20051031122316-ff715-fe800fcd15229d147a6ca1b1d00bccb51a42d016.gz --- .../2.16.1.0/binutils-2.15-psignal.patch | 40 ++++++++ .../2.16.1.0/binutils-bfd-soname-mod.patch | 26 +++++ .../binutils-redefinition-mname.patch | 13 +++ .../2.16.1.0/binutils-skip-comments.patch | 95 +++++++++++++++++++ binutils-patches/2.16.1.0/cross-gprof.patch | 22 +++++ binutils-patches/2.16.1.0/series | 5 + 6 files changed, 201 insertions(+) create mode 100644 binutils-patches/2.16.1.0/binutils-2.15-psignal.patch create mode 100644 binutils-patches/2.16.1.0/binutils-bfd-soname-mod.patch create mode 100644 binutils-patches/2.16.1.0/binutils-redefinition-mname.patch create mode 100644 binutils-patches/2.16.1.0/binutils-skip-comments.patch create mode 100644 binutils-patches/2.16.1.0/cross-gprof.patch create mode 100644 binutils-patches/2.16.1.0/series diff --git a/binutils-patches/2.16.1.0/binutils-2.15-psignal.patch b/binutils-patches/2.16.1.0/binutils-2.15-psignal.patch new file mode 100644 index 0000000..98fa600 --- /dev/null +++ b/binutils-patches/2.16.1.0/binutils-2.15-psignal.patch @@ -0,0 +1,40 @@ +Make psignal prototype in libiberty match that in glibc. + +Fixes: + +gcc-2.95.3-glibc-2.1.3/binutils-2.15/libiberty/strsignal.c: In function `psignal': +gcc-2.95.3-glibc-2.1.3/binutils-2.15/libiberty/strsignal.c:563: argument `signo' doesn't match prototype +/usr/include/signal.h:131: prototype declaration +gcc-2.95.3-glibc-2.1.3/binutils-2.15/libiberty/strsignal.c:563: argument `message' doesn't match prototype +/usr/include/signal.h:131: prototype declaration +gcc-2.95.3-glibc-2.1.3/binutils-2.15/libiberty/strsignal.c:568: warning: comparison between signed and unsigned +mprotect... make[1]: *** [strsignal.o] Error 1 +make[1]: Leaving directory `/export/hda3/dkegel/queue/jobdir.produser_cpsm17/crosstool-0.32/build/i686-unknown-linux-gnu/gcc-2.95.3-glibc-2.1.3/build-binutils/libiberty' +make: *** [all-libiberty] Error 2 + +when building on red hat 7.1 +though it's a bit of a mystery why libiberty's psignal is being compiled at +all, since red hat 7.1's glibc supports psignal (hence the error message) + +--- binutils-2.15/libiberty/strsignal.c.old 2005-04-18 13:57:40.000000000 -0700 ++++ binutils-2.15/libiberty/strsignal.c 2005-04-18 13:59:09.000000000 -0700 +@@ -544,7 +544,7 @@ + + /* + +-@deftypefn Supplemental void psignal (unsigned @var{signo}, char *@var{message}) ++@deftypefn Supplemental void psignal (int @var{signo}, const char *@var{message}) + + Print @var{message} to the standard error, followed by a colon, + followed by the description of the signal specified by @var{signo}, +@@ -557,9 +557,7 @@ + #ifndef HAVE_PSIGNAL + + void +-psignal (signo, message) +- unsigned signo; +- char *message; ++psignal (int signo, const char *message) + { + if (signal_names == NULL) + { diff --git a/binutils-patches/2.16.1.0/binutils-bfd-soname-mod.patch b/binutils-patches/2.16.1.0/binutils-bfd-soname-mod.patch new file mode 100644 index 0000000..d3b3e5a --- /dev/null +++ b/binutils-patches/2.16.1.0/binutils-bfd-soname-mod.patch @@ -0,0 +1,26 @@ +Index: binutils-2.16.1/bfd/configure +=================================================================== +--- binutils-2.16.1.orig/bfd/configure ++++ binutils-2.16.1/bfd/configure +@@ -2834,7 +2834,7 @@ fi + + # Define the identity of the package. + PACKAGE=bfd +- VERSION=2.16.1 ++ VERSION=2.16.1.0 + + + cat >>confdefs.h <<_ACEOF +Index: binutils-2.16.1/bfd/configure.in +=================================================================== +--- binutils-2.16.1.orig/bfd/configure.in ++++ binutils-2.16.1/bfd/configure.in +@@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([libbfd.c]) + AC_CANONICAL_TARGET + AC_ISC_POSIX + +-AM_INIT_AUTOMAKE(bfd, 2.16.1) ++AM_INIT_AUTOMAKE(bfd, 2.16.1.0) + + dnl These must be called before AM_PROG_LIBTOOL, because it may want + dnl to call AC_CHECK_PROG. diff --git a/binutils-patches/2.16.1.0/binutils-redefinition-mname.patch b/binutils-patches/2.16.1.0/binutils-redefinition-mname.patch new file mode 100644 index 0000000..ddef4e6 --- /dev/null +++ b/binutils-patches/2.16.1.0/binutils-redefinition-mname.patch @@ -0,0 +1,13 @@ +Index: binutils-2.16.1/binutils/dlltool.c +=================================================================== +--- binutils-2.16.1.orig/binutils/dlltool.c ++++ binutils-2.16.1/binutils/dlltool.c +@@ -389,7 +389,7 @@ static int verbose; + static FILE *output_def; + static FILE *base_file; + +-#ifdef DLLTOOL_ARM ++#if defined(DLLTOOL_ARM) && !defined(DLLTOOL_I386) + #ifdef DLLTOOL_ARM_EPOC + static const char *mname = "arm-epoc"; + #else diff --git a/binutils-patches/2.16.1.0/binutils-skip-comments.patch b/binutils-patches/2.16.1.0/binutils-skip-comments.patch new file mode 100644 index 0000000..0ca9a47 --- /dev/null +++ b/binutils-patches/2.16.1.0/binutils-skip-comments.patch @@ -0,0 +1,95 @@ +[removed first hunk so it would apply to 2.16.1 - copyright date already updated - dank] + +Retrieved from http://sources.redhat.com/ml/binutils/2004-04/msg00646.html +Fixes +localealias.s:544: Error: junk at end of line, first unrecognized character is `,' +when building glibc-2.3.2 with gcc-3.4.0 and binutils-2.15.90.0.3 + +Paths adjusted to match crosstool's patcher. + +Message-Id: m3n052qw2g.fsf@whitebox.m5r.de +From: Andreas Schwab +To: Nathan Sidwell +Cc: Ian Lance Taylor , binutils at sources dot redhat dot com +Date: Fri, 23 Apr 2004 22:27:19 +0200 +Subject: Re: demand_empty_rest_of_line and ignore_rest_of_line + +Nathan Sidwell writes: + +> Index: read.c +> =================================================================== +> RCS file: /cvs/src/src/gas/read.c,v +> retrieving revision 1.76 +> diff -c -3 -p -r1.76 read.c +> *** read.c 12 Mar 2004 17:48:12 -0000 1.76 +> --- read.c 18 Mar 2004 09:56:05 -0000 +> *************** read_a_source_file (char *name) +> *** 1053,1059 **** +> #endif +> input_line_pointer--; +> /* Report unknown char as ignored. */ +> ! ignore_rest_of_line (); +> } +> +> #ifdef md_after_pass_hook +> --- 1053,1059 ---- +> #endif +> input_line_pointer--; +> /* Report unknown char as ignored. */ +> ! demand_empty_rest_of_line (); +> } +> +> #ifdef md_after_pass_hook + +This means that the unknown character is no longer ignored, despite the +comment. As a side effect a line starting with a line comment character +not followed by APP in NO_APP mode now triggers an error instead of just a +warning, breaking builds of glibc on m68k-linux. Earlier in +read_a_source_file where #APP is handled there is another comment that +claims that unknown comments are ignored, when in fact they aren't (only +the initial line comment character is skipped). + +Note that the presence of #APP will mess up the line counters, but +that appears to be difficult to fix. + +Andreas. + +2004-04-23 Andreas Schwab + + * read.c (read_a_source_file): Ignore unknown text after line + comment character. Fix misleading comment. + +--- binutils/gas/read.c.~1.78.~ 2004-04-23 08:58:23.000000000 +0200 ++++ binutils/gas/read.c 2004-04-23 21:49:01.000000000 +0200 +@@ -950,10 +950,14 @@ read_a_source_file (char *name) + unsigned int new_length; + char *tmp_buf = 0; + +- bump_line_counters (); + s = input_line_pointer; + if (strncmp (s, "APP\n", 4)) +- continue; /* We ignore it */ ++ { ++ /* We ignore it */ ++ ignore_rest_of_line (); ++ continue; ++ } ++ bump_line_counters (); + s += 4; + + sb_new (&sbuf); +@@ -1052,7 +1056,7 @@ read_a_source_file (char *name) + continue; + #endif + input_line_pointer--; +- /* Report unknown char as ignored. */ ++ /* Report unknown char as error. */ + demand_empty_rest_of_line (); + } + + +-- +Andreas Schwab, SuSE Labs, schwab@suse.de +SuSE Linux AG, MaxfeldstraÃe 5, 90409 NÃrnberg, Germany +Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 +"And now for something completely different." diff --git a/binutils-patches/2.16.1.0/cross-gprof.patch b/binutils-patches/2.16.1.0/cross-gprof.patch new file mode 100644 index 0000000..ea6c18f --- /dev/null +++ b/binutils-patches/2.16.1.0/cross-gprof.patch @@ -0,0 +1,22 @@ +--- binutils-2.15/configure.old 2004-07-21 21:36:47.000000000 -0700 ++++ binutils-2.15/configure 2004-07-21 21:37:08.000000000 -0700 +@@ -999,7 +999,7 @@ + + # Some tools are only suitable for building in a "native" situation. + # Remove these if host!=target. +-native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" ++native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" + + # Similarly, some are only suitable for cross toolchains. + # Remove these if host=target. +--- binutils-2.15/configure.in.old 2004-07-21 21:37:19.000000000 -0700 ++++ binutils-2.15/configure.in 2004-07-21 21:37:34.000000000 -0700 +@@ -236,7 +236,7 @@ + + # Some tools are only suitable for building in a "native" situation. + # Remove these if host!=target. +-native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff gprof target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" ++native_only="autoconf automake libtool fileutils find gawk gettext gzip hello indent m4 rcs recode sed shellutils tar textutils uudecode wdiff target-groff guile perl time ash bash bzip2 prms gnuserv target-gperf" + + # Similarly, some are only suitable for cross toolchains. + # Remove these if host=target. diff --git a/binutils-patches/2.16.1.0/series b/binutils-patches/2.16.1.0/series new file mode 100644 index 0000000..33a573f --- /dev/null +++ b/binutils-patches/2.16.1.0/series @@ -0,0 +1,5 @@ +binutils-2.15-psignal.patch +binutils-skip-comments.patch +cross-gprof.patch +binutils-redefinition-mname.patch +binutils-bfd-soname-mod.patch -- 2.39.2