binutils/

author Nathan Sidwell <nathan@codesourcery.com>

Mon, 16 Oct 2006 20:21:25 +0000 (20:21 +0000)

committer Nathan Sidwell <nathan@codesourcery.com>

Mon, 16 Oct 2006 20:21:25 +0000 (20:21 +0000)
author Nathan Sidwell <nathan@codesourcery.com>
Mon, 16 Oct 2006 20:21:25 +0000 (20:21 +0000)
committer Nathan Sidwell <nathan@codesourcery.com>
Mon, 16 Oct 2006 20:21:25 +0000 (20:21 +0000)
diff --git a/ChangeLog.csl b/ChangeLog.csl

index 2781bd4bff9a319b10a6a8ad8ca5fca4d35b8901..6986b135ecc8027b49b5049a197593418cf37697 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,61 @@
+2006-10-16  Nathan Sidwell  <nathan@codesourcery.com>
+
+       binutils/
+       * Makefile.am: Rebuild dependencies.
+       (REPORT_BUGS_TO): Always defined.
+       (INCLUDES): Adjust.
+       * Makefile.in: Rebuilt.
+       * configure.in (REPORT_BUGS_TO): Provide default value.
+       * configure: Rebuilt.
+       * bucomm.h: Remove bin-bugs.h.
+       * addr2line.c (usage): Don't print empty REPORT_BUGS_TO.
+       * coffdump.c (show_usage): Likewise.
+       * cxxfilt.c (usage): Likewise.
+       * nlmconv.c (show_usage): Likewise.
+       * nm.c (usage): Likewise.
+       * objcopy.c (copy_usage, strip_usage): Likewise.
+       * objdump.c (usage): Likewise.
+       * size.c (usage): Likewise.
+       * srconv.c (show_usage): Likewise.
+       * string.c (usage): Likewise.
+       * sysdymp.c (show_usage): Likewise.
+       * windres.c (usage): Likewise.
+       * readelf (usage): Likewise. Add STREAM argument.  Adjust callers.
+
+       gas/
+       * Makefile.am: Rebuild dependencies.
+       (REPORT_BUGS_TO): Always defined.
+       (INCLUDES): Adjust.
+       * Makefile.in: Rebuilt.
+       * configure.in (REPORT_BUGS_TO): Provide default value.
+       * configure: Rebuilt.
+       * as.c (show_usage): Don't print empty REPORT_BUGS_TO.
+       * as.h: Remove bin-bugs.h.
+
+       ld/
+       * Makefile.am: Rebuild dependencies.
+       (REPORT_BUGS_TO): Always defined.
+       (INCLUDES): Adjust.
+       * Makefile.in: Rebuilt.
+       * configure.in (REPORT_BUGS_TO): Provide default value.
+       * configure: Rebuilt.
+       * ld.h: Remove bin-bugs.h
+       * lexsup.c (help):  Don't print empty REPORT_BUGS_TO.
+
+       gprof/
+       * Makefile.am: Rebuild dependencies.
+       (REPORT_BUGS_TO): Always defined.
+       (PKGVERSION): Define.
+       (INCLUDES): Adjust.
+       * Makefile.in: Rebuilt.
+       * configure.in (REPORT_BUGS_TO): Provide default value.
+       * configure: Rebuilt.
+       * gprof.c (usage): Don't print empty REPORT_BUGS_TO.
+       * gprof.h: Remove bin-bugs.h
+
+       include/
+       * bin-bugs.h: Remove.
+
  2006-10-16  Mark Shinwell  <shinwell@codesourcery.com>
  
         bfd/
diff --git a/binutils/Makefile.am b/binutils/Makefile.am

index f4e1745db655508f6acaa843674332ccc4874f8b..a8499894bbe7a7780a649cc449addfadacd58583 100644 (file)
--- a/binutils/Makefile.am
+++ b/binutils/Makefile.am
@@ -72,14 +72,14 @@ INCDIR      = $(BASEDIR)/include
  
  MKDEP = gcc -MM
  
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  
  INCLUDES = -D_GNU_SOURCE \
          -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
          @HDEFINES@ \
          -I$(srcdir)/../intl -I../intl \
          -DLOCALEDIR="\"$(datadir)/locale\"" \
-        $(REPORT_BUGS_TO) \
+        -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
          -Dbin_dummy_emulation=$(EMULATION_VECTOR)
  
  HFILES = \
@@ -409,63 +409,63 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
  # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
  addr2line.o: addr2line.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/demangle.h bucomm.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/demangle.h bucomm.h \
    $(INCDIR)/fopen-same.h budemang.h
  ar.o: ar.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
    $(INCDIR)/libiberty.h $(INCDIR)/progress.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/aout/ar.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h \
    arsup.h $(INCDIR)/filenames.h binemul.h
  arsup.o: arsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h arsup.h $(INCDIR)/libiberty.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h
  binemul.o: binemul.c binemul.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h
  bucomm.o: bucomm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h $(INCDIR)/libiberty.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h
  budemang.o: budemang.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
    budemang.h
  coffdump.o: coffdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h coffgrok.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  bucomm.h config.h $(INCDIR)/fopen-same.h
  coffgrok.o: coffgrok.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/coff/internal.h \
    $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h coffgrok.h
  cxxfilt.o: cxxfilt.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/safe-ctype.h
  dwarf.o: dwarf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/elf/dwarf2.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h
  debug.o: debug.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h
  dlltool.o: dlltool.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/demangle.h \
    $(INCDIR)/dyn-string.h dlltool.h $(INCDIR)/safe-ctype.h
  dllwrap.o: dllwrap.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/dyn-string.h
+  $(INCDIR)/fopen-same.h $(INCDIR)/dyn-string.h
  emul_aix.o: emul_aix.c binemul.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
    $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(BFDDIR)/libxcoff.h
  emul_vanilla.o: emul_vanilla.c binemul.h ../bfd/bfd.h \
    $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  $(INCDIR)/fopen-same.h
  filemode.o: filemode.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h
  ieee.o: ieee.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/ieee.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/ieee.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h \
    budbg.h $(INCDIR)/filenames.h
  is-ranlib.o: is-ranlib.c
@@ -474,11 +474,11 @@ maybe-ranlib.o: maybe-ranlib.c
  maybe-strip.o: maybe-strip.c
  nlmconv.o: nlmconv.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \
    $(BFDDIR)/libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
    $(INCDIR)/nlm/external.h nlmconv.h
  nm.o: nm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/progress.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/progress.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h budemang.h $(INCDIR)/aout/stab_gnu.h \
    $(INCDIR)/aout/stab.def $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h \
    $(INCDIR)/libiberty.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \
@@ -487,27 +487,27 @@ not-ranlib.o: not-ranlib.c
  not-strip.o: not-strip.c
  objcopy.o: objcopy.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/progress.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
    budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
    $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h 
  objdump.o: objdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h $(INCDIR)/progress.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    dwarf.h $(INCDIR)/elf/dwarf2.h budemang.h $(INCDIR)/safe-ctype.h \
    $(INCDIR)/dis-asm.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
    debug.h budbg.h $(INCDIR)/aout/aout64.h
  prdbg.o: prdbg.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h \
    budbg.h
  rdcoff.o: rdcoff.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h debug.h budbg.h $(BFDDIR)/libcoff.h \
    $(INCDIR)/bfdlink.h
  rddbg.o: rddbg.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h \
    budbg.h
  readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
@@ -528,66 +528,66 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/elf/sparc.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/vax.h \
    $(INCDIR)/elf/x86-64.h $(INCDIR)/elf/xstormy16.h $(INCDIR)/elf/crx.h \
    $(INCDIR)/elf/iq2000.h $(INCDIR)/elf/xtensa.h $(INCDIR)/aout/ar.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h unwind-ia64.h
  rename.o: rename.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h
  resbin.o: resbin.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h
  rescoff.o: rescoff.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
    $(INCDIR)/bfdlink.h
  resrc.o: resrc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    windres.h winduni.h
  resres.o: resres.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h
  size.o: size.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h
  srconv.o: srconv.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h sysroff.h coffgrok.h $(INCDIR)/libiberty.h \
    $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
    sysroff.c
  stabs.o: stabs.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    $(INCDIR)/demangle.h debug.h budbg.h $(INCDIR)/filenames.h \
    $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
  strings.o: strings.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/getopt.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
    $(INCDIR)/safe-ctype.h
  sysdump.o: sysdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h \
    sysroff.h sysroff.c
  version.o: version.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  $(INCDIR)/fopen-same.h
  windres.o: windres.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
    windres.h winduni.h
  winduni.o: winduni.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h winduni.h $(INCDIR)/safe-ctype.h
  wrstabs.o: wrstabs.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    debug.h budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
    $(INCDIR)/aout/stab.def
  arparse.o: arparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h arsup.h
  arlex.o: arlex.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
    arparse.h
@@ -595,20 +595,20 @@ sysroff.o: sysroff.c
  sysinfo.o: sysinfo.c
  syslex.o: syslex.c config.h sysinfo.h
  defparse.o: defparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h dlltool.h
  deflex.o: deflex.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    defparse.h dlltool.h
  nlmheader.o: nlmheader.c $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
    nlmconv.h
  rcparse.o: rcparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h $(INCDIR)/safe-ctype.h
  rclex.o: rclex.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    windres.h winduni.h rcparse.h
  # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/binutils/Makefile.in b/binutils/Makefile.in

index f17fc3b3d579638139167955ffd44eaad397d4c7..3faf112029df1d6f95da1cebfaabb47f51b4a817 100644 (file)
--- a/binutils/Makefile.in
+++ b/binutils/Makefile.in
@@ -307,7 +307,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
  POFILES = @POFILES@
  POSUB = @POSUB@
  RANLIB = @RANLIB@
-REPORT_BUGS_TO = @REPORT_BUGS_TO@
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
@@ -401,13 +401,12 @@ BASEDIR = $(srcdir)/..
  BFDDIR = $(BASEDIR)/bfd
  INCDIR = $(BASEDIR)/include
  MKDEP = gcc -MM
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
  INCLUDES = -D_GNU_SOURCE \
          -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
          @HDEFINES@ \
          -I$(srcdir)/../intl -I../intl \
          -DLOCALEDIR="\"$(datadir)/locale\"" \
-        $(REPORT_BUGS_TO) \
+        -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
          -Dbin_dummy_emulation=$(EMULATION_VECTOR)
  
  HFILES = \
@@ -1162,63 +1161,63 @@ install-exec-local: install-binPROGRAMS $(bin_PROGRAMS) $(noinst_PROGRAMS)
  # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
  addr2line.o: addr2line.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/getopt.h $(INCDIR)/libiberty.h \
-  $(INCDIR)/demangle.h bucomm.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/demangle.h bucomm.h \
    $(INCDIR)/fopen-same.h budemang.h
  ar.o: ar.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
    $(INCDIR)/libiberty.h $(INCDIR)/progress.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/aout/ar.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h \
    arsup.h $(INCDIR)/filenames.h binemul.h
  arsup.o: arsup.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h arsup.h $(INCDIR)/libiberty.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h
  binemul.o: binemul.c binemul.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h
  bucomm.o: bucomm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h $(INCDIR)/libiberty.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h $(BFDDIR)/libbfd.h $(INCDIR)/hashtab.h
  budemang.o: budemang.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
    budemang.h
  coffdump.o: coffdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h coffgrok.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  bucomm.h config.h $(INCDIR)/fopen-same.h
  coffgrok.o: coffgrok.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/coff/internal.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/coff/internal.h \
    $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h coffgrok.h
  cxxfilt.o: cxxfilt.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/demangle.h $(INCDIR)/safe-ctype.h
  dwarf.o: dwarf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/elf/dwarf2.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h
  debug.o: debug.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h
  dlltool.o: dlltool.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/demangle.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/demangle.h \
    $(INCDIR)/dyn-string.h dlltool.h $(INCDIR)/safe-ctype.h
  dllwrap.o: dllwrap.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/dyn-string.h
+  $(INCDIR)/fopen-same.h $(INCDIR)/dyn-string.h
  emul_aix.o: emul_aix.c binemul.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/bfdlink.h $(INCDIR)/coff/internal.h \
    $(INCDIR)/coff/xcoff.h $(BFDDIR)/libcoff.h $(BFDDIR)/libxcoff.h
  emul_vanilla.o: emul_vanilla.c binemul.h ../bfd/bfd.h \
    $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  $(INCDIR)/fopen-same.h
  filemode.o: filemode.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h
  ieee.o: ieee.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/ieee.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/ieee.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h \
    budbg.h $(INCDIR)/filenames.h
  is-ranlib.o: is-ranlib.c
@@ -1227,11 +1226,11 @@ maybe-ranlib.o: maybe-ranlib.c
  maybe-strip.o: maybe-strip.c
  nlmconv.o: nlmconv.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/libiberty.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h \
    $(BFDDIR)/libnlm.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
    $(INCDIR)/nlm/external.h nlmconv.h
  nm.o: nm.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  $(INCDIR)/progress.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/progress.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h budemang.h $(INCDIR)/aout/stab_gnu.h \
    $(INCDIR)/aout/stab.def $(INCDIR)/aout/ranlib.h $(INCDIR)/demangle.h \
    $(INCDIR)/libiberty.h $(BFDDIR)/elf-bfd.h $(INCDIR)/elf/common.h \
@@ -1240,27 +1239,27 @@ not-ranlib.o: not-ranlib.c
  not-strip.o: not-strip.c
  objcopy.o: objcopy.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/progress.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
    budbg.h $(INCDIR)/filenames.h $(INCDIR)/fnmatch.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h \
    $(INCDIR)/bfdlink.h $(BFDDIR)/libbfd.h 
  objdump.o: objdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h $(INCDIR)/progress.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    dwarf.h $(INCDIR)/elf/dwarf2.h budemang.h $(INCDIR)/safe-ctype.h \
    $(INCDIR)/dis-asm.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
    debug.h budbg.h $(INCDIR)/aout/aout64.h
  prdbg.o: prdbg.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h \
    budbg.h
  rdcoff.o: rdcoff.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/coff/internal.h bucomm.h \
-  config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h debug.h budbg.h $(BFDDIR)/libcoff.h \
    $(INCDIR)/bfdlink.h
  rddbg.o: rddbg.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h debug.h \
    budbg.h
  readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
@@ -1281,66 +1280,66 @@ readelf.o: readelf.c dwarf.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/elf/sparc.h $(INCDIR)/elf/v850.h $(INCDIR)/elf/vax.h \
    $(INCDIR)/elf/x86-64.h $(INCDIR)/elf/xstormy16.h $(INCDIR)/elf/crx.h \
    $(INCDIR)/elf/iq2000.h $(INCDIR)/elf/xtensa.h $(INCDIR)/aout/ar.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h unwind-ia64.h
  rename.o: rename.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h
  resbin.o: resbin.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h
  rescoff.o: rescoff.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h \
    $(INCDIR)/bfdlink.h
  resrc.o: resrc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    windres.h winduni.h
  resres.o: resres.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h
  size.o: size.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  bucomm.h config.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  bucomm.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h
  srconv.o: srconv.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h sysroff.h coffgrok.h $(INCDIR)/libiberty.h \
    $(INCDIR)/coff/internal.h $(BFDDIR)/libcoff.h $(INCDIR)/bfdlink.h \
    sysroff.c
  stabs.o: stabs.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    $(INCDIR)/demangle.h debug.h budbg.h $(INCDIR)/filenames.h \
    $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h $(INCDIR)/aout/stab.def
  strings.o: strings.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/getopt.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
+  $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h \
    $(INCDIR)/safe-ctype.h
  sysdump.o: sysdump.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h \
    sysroff.h sysroff.c
  version.o: version.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h bucomm.h config.h \
-  $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h
+  $(INCDIR)/fopen-same.h
  windres.o: windres.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/bin-bugs.h $(INCDIR)/fopen-same.h \
+  $(INCDIR)/symcat.h bucomm.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
    windres.h winduni.h
  winduni.o: winduni.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h winduni.h $(INCDIR)/safe-ctype.h
  wrstabs.o: wrstabs.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    debug.h budbg.h $(INCDIR)/aout/aout64.h $(INCDIR)/aout/stab_gnu.h \
    $(INCDIR)/aout/stab.def
  arparse.o: arparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h arsup.h
  arlex.o: arlex.c $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
    arparse.h
@@ -1348,20 +1347,20 @@ sysroff.o: sysroff.c
  sysinfo.o: sysinfo.c
  syslex.o: syslex.c config.h sysinfo.h
  defparse.o: defparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h dlltool.h
  deflex.o: deflex.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    defparse.h dlltool.h
  nlmheader.o: nlmheader.c $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/nlm/common.h $(INCDIR)/nlm/internal.h \
    nlmconv.h
  rcparse.o: rcparse.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h windres.h \
    winduni.h $(INCDIR)/safe-ctype.h
  rclex.o: rclex.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
-  $(INCDIR)/symcat.h bucomm.h config.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/symcat.h bucomm.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
    windres.h winduni.h rcparse.h
  # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/binutils/addr2line.c b/binutils/addr2line.c

index 7cd67bc0a1b08e1b742537d4bf80c3f09f4849c0..54353c3390d5b16aa550dd63be390d833fdb8a90 100644 (file)
--- a/binutils/addr2line.c
+++ b/binutils/addr2line.c
@@ -92,7 +92,7 @@ usage (FILE *stream, int status)
  \n"));
  
    list_supported_targets (program_name, stream);
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/ar.c b/binutils/ar.c

index 3b5123d9ab3bc2d315f83ac963e8b810aaa35b3a..31c283542081ac5ccdee3e51e383f0b361f85df1 100644 (file)
--- a/binutils/ar.c
+++ b/binutils/ar.c
@@ -259,7 +259,7 @@ usage (int help)
  
    list_supported_targets (program_name, s);
  
-  if (help)
+  if (REPORT_BUGS_TO[0] && help)
      fprintf (s, _("Report bugs to %s\n"), REPORT_BUGS_TO);
  
    xexit (help ? 0 : 1);
diff --git a/binutils/bucomm.h b/binutils/bucomm.h

index 9f914adeb58c2ec2e2076ecd90fe1622c8d371e7..2937583a0954b70fb9f275290a9f99240b6e6c11 100644 (file)
--- a/binutils/bucomm.h
+++ b/binutils/bucomm.h
@@ -26,7 +26,6 @@
  #include <sys/types.h>
  
  #include "config.h"
-#include "bin-bugs.h"
  
  #include <stdarg.h>
  
diff --git a/binutils/coffdump.c b/binutils/coffdump.c

index 5ec23b43f62d4eda93b360a60956fd6299121cea..297688834104808a0a9334705651d06b1667c2f4 100644 (file)
--- a/binutils/coffdump.c
+++ b/binutils/coffdump.c
@@ -462,7 +462,7 @@ show_usage (FILE *file, int status)
    -v --version           Display the program's version\n\
  \n"));
  
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (file, _("Report bugs to %s\n"), REPORT_BUGS_TO);
  
    exit (status);
diff --git a/binutils/configure b/binutils/configure

index d9ee045dc20d29825313c0f05112a5c8df3b98bd..82db791cb6a4050b02ab9be06c85dc9f55b3e114 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -4190,7 +4190,7 @@ echo "$as_me: error: bug URL not specified" >&2;}
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac
  else
-  REPORT_BUGS_TO=""
+  REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  
  fi;
  
diff --git a/binutils/configure.in b/binutils/configure.in

index 3bd05364813e9c9c866274be0651916338e9b254..036b5932b969c074ec577f5e1ce9dd9e1bbd8b0c 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -38,7 +38,7 @@ AC_ARG_WITH(bugurl,
      no)  REPORT_BUGS_TO="" ;;
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac],
-   REPORT_BUGS_TO=""
+   REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  )
  AC_SUBST(REPORT_BUGS_TO)
  
diff --git a/binutils/cxxfilt.c b/binutils/cxxfilt.c

index ee5d8e44db080d8f9c411b68775c860a0f55cdd9..2ba7d809af1eb7ed27f0aba22729204db6a8f52b 100644 (file)
--- a/binutils/cxxfilt.c
+++ b/binutils/cxxfilt.c
@@ -115,7 +115,7 @@ Options are:\n\
  Demangled names are displayed to stdout.\n\
  If a name cannot be demangled it is just echoed to stdout.\n\
  If no names are provided on the command line, stdin is read.\n");
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/nlmconv.c b/binutils/nlmconv.c

index 551e7e59e430bbbfacef4d2f3f502937734625dd..904d3895c732ce5cb5b4ef595368fa242d744c97 100644 (file)
--- a/binutils/nlmconv.c
+++ b/binutils/nlmconv.c
@@ -1109,7 +1109,7 @@ show_usage (FILE *file, int status)
    -h --help                     Display this information\n\
    -v --version                  Display the program's version\n\
  "));
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (file, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/nm.c b/binutils/nm.c

index c1fb4d803e845e1f3de510f813dd99b393d31130..70a1706fa4c5a33d6e92e666c8a7c36205dd888f 100644 (file)
--- a/binutils/nm.c
+++ b/binutils/nm.c
@@ -259,7 +259,7 @@ usage (FILE *stream, int status)
    -V, --version          Display this program's version number\n\
  \n"));
    list_supported_targets (program_name, stream);
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/objcopy.c b/binutils/objcopy.c

index 06e500d4754a7303ae788e03b4acd1b1d5c5c5ba..4f8479482490ad5447be2d143088ec9be8eae416 100644 (file)
--- a/binutils/objcopy.c
+++ b/binutils/objcopy.c
@@ -496,7 +496,7 @@ copy_usage (FILE *stream, int exit_status)
       --info                        List object formats & architectures supported\n\
  "));
    list_supported_targets (program_name, stream);
-  if (exit_status == 0)
+  if (REPORT_BUGS_TO[0] && exit_status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (exit_status);
  }
@@ -531,7 +531,7 @@ strip_usage (FILE *stream, int exit_status)
  "));
  
    list_supported_targets (program_name, stream);
-  if (exit_status == 0)
+  if (REPORT_BUGS_TO[0] && exit_status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (exit_status);
  }
diff --git a/binutils/objdump.c b/binutils/objdump.c

index 6e5eab56da24f9f67d70a74bd8bdf5bb2aaf549f..38622d7c4bf8e81aef68269933fc4ff215912f17 100644 (file)
--- a/binutils/objdump.c
+++ b/binutils/objdump.c
@@ -225,7 +225,7 @@ usage (FILE *stream, int status)
  
        disassembler_usage (stream);
      }
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s.\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/readelf.c b/binutils/readelf.c

index 4a9bd1a87e0a3d55fde4a6347904e9c6e1ea51f1..7c7f1c3d1486164e41b1887b0bc70cfff0e96d1f 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -2661,11 +2661,11 @@ static struct option options[] =
  };
  
  static void
-usage (void)
+usage (FILE *stream)
  {
-  fprintf (stdout, _("Usage: readelf <option(s)> elf-file(s)\n"));
-  fprintf (stdout, _(" Display information about the contents of ELF format files\n"));
-  fprintf (stdout, _(" Options are:\n\
+  fprintf (stream, _("Usage: readelf <option(s)> elf-file(s)\n"));
+  fprintf (stream, _(" Display information about the contents of ELF format files\n"));
+  fprintf (stream, _(" Options are:\n\
    -a --all               Equivalent to: -h -l -S -s -r -d -V -A -I\n\
    -h --file-header       Display the ELF file header\n\
    -l --program-headers   Display the program headers\n\
@@ -2689,19 +2689,21 @@ usage (void)
    --debug-dump[=line,=info,=abbrev,=pubnames,=aranges,=macro,=frames,=str,=loc,=Ranges]\n\
                           Display the contents of DWARF2 debug sections\n"));
  #ifdef SUPPORT_DISASSEMBLY
-  fprintf (stdout, _("\
+  fprintf (stream, _("\
    -i --instruction-dump=<number>\n\
                           Disassemble the contents of section <number>\n"));
  #endif
-  fprintf (stdout, _("\
+  fprintf (stream, _("\
    -I --histogram         Display histogram of bucket list lengths\n\
    -W --wide              Allow output width to exceed 80 characters\n\
    @<file>                Read options from <file>\n\
    -H --help              Display this information\n\
    -v --version           Display the version number of readelf\n"));
-  fprintf (stdout, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+  
+  if (REPORT_BUGS_TO[0] && stream == stdout)
+    fprintf (stdout, _("Report bugs to %s\n"), REPORT_BUGS_TO);
  
-  exit (0);
+  exit (stream == stdout ? 0 : 1);
  }
  
  /* Record the fact that the user wants the contents of section number
@@ -2765,7 +2767,7 @@ parse_args (int argc, char **argv)
    int c;
  
    if (argc < 2)
-    usage ();
+    usage (stderr);
  
    while ((c = getopt_long
           (argc, argv, "ersuahnldSDAINtgw::x:i:vVWH", options, NULL)) != EOF)
@@ -2779,7 +2781,7 @@ parse_args (int argc, char **argv)
           /* Long options.  */
           break;
         case 'H':
-         usage ();
+         usage (stdout);
           break;
  
         case 'a':
@@ -3020,7 +3022,7 @@ parse_args (int argc, char **argv)
           error (_("Invalid option '-%c'\n"), c);
           /* Drop through.  */
         case '?':
-         usage ();
+         usage (stderr);
         }
      }
  
@@ -3028,11 +3030,11 @@ parse_args (int argc, char **argv)
        && !do_segments && !do_header && !do_dump && !do_version
        && !do_histogram && !do_debugging && !do_arch && !do_notes
        && !do_section_groups)
-    usage ();
+    usage (stderr);
    else if (argc < 3)
      {
        warn (_("Nothing to do.\n"));
-      usage ();
+      usage (stderr);
      }
  }
  
diff --git a/binutils/size.c b/binutils/size.c

index b78cba02ba04c6d873e964265506176cdc14bab3..73f012520679da16247aad6113bfa7adb6c35251 100644 (file)
--- a/binutils/size.c
+++ b/binutils/size.c
@@ -98,7 +98,7 @@ usage (FILE *stream, int status)
  #endif
  );
    list_supported_targets (program_name, stream);
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/srconv.c b/binutils/srconv.c

index d1f3efdb9e016a2d9fcf710243254d0688e87ced..420b9e9cab33dbf256fe14cd755a5ba2658f1a8c 100644 (file)
--- a/binutils/srconv.c
+++ b/binutils/srconv.c
@@ -1728,7 +1728,7 @@ show_usage (FILE *file, int status)
    -h --help        Display this information\n\
    -v --version     Print the program's version number\n"));
  
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (file, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/strings.c b/binutils/strings.c

index a04cb581eaeafc556471064f82b87240bf154828..03fb75bba3788ebdee3760237253aa5fc95b9dfb 100644 (file)
--- a/binutils/strings.c
+++ b/binutils/strings.c
@@ -721,7 +721,7 @@ usage (FILE *stream, int status)
    -h --help                 Display this information\n\
    -v --version              Print the program's version number\n"));
    list_supported_targets (program_name, stream);
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/sysdump.c b/binutils/sysdump.c

index ec19472558fdde818352187d0b809143d499164f..e2812c7b2ca2ca1aa94ee8c4e8fe31dbed22322c 100644 (file)
--- a/binutils/sysdump.c
+++ b/binutils/sysdump.c
@@ -644,7 +644,7 @@ show_usage (FILE *file, int status)
    -h --help        Display this information\n\
    -v --version     Print the program's version number\n"));
  
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (file, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    exit (status);
  }
diff --git a/binutils/windres.c b/binutils/windres.c

index 50af427d0f3cf929bce5ce9d8cb226568709a1bf..b12529edcc0aef80048b535a87868ac8f7adc1e4 100644 (file)
--- a/binutils/windres.c
+++ b/binutils/windres.c
@@ -669,7 +669,7 @@ No input-file is stdin, default rc.  No output-file is stdout, default rc.\n"));
  
    list_supported_targets (program_name, stream);
  
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
  
    exit (status);
diff --git a/gas/Makefile.am b/gas/Makefile.am

index f52854a092ec1b141ab762da45cbe6ffc399ac2b..7df4efd0d7f9aaf739acf41256cf5cf5c112ac3e 100644 (file)
--- a/gas/Makefile.am
+++ b/gas/Makefile.am
@@ -459,7 +459,7 @@ BASEDIR = $(srcdir)/..
  BFDDIR = $(BASEDIR)/bfd
  INCDIR = $(BASEDIR)/include
  
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  
  # This is the variable actually used when we compile.
  # Specify the directories to be searched for header files.
@@ -468,7 +468,7 @@ REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT
  # subdirectory rather than in the source directory.
  INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
         -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl \
-       $(REPORT_BUGS_TO) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  # This should be parallel to INCLUDES, but should replace $(srcdir)
@@ -477,7 +477,7 @@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
  # in a subdirectory.
  DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config \
         -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl  \
-       $(REPORT_BUGS_TO) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  DEP_FLAGS = -DOBJ_MAYBE_ELF \
@@ -503,7 +503,7 @@ as_new_DEPENDENCIES = $(TARG_CPU_O) $(OBJ_FORMAT_O) $(ATOF_TARG_O) \
  
  # Stuff that every object file depends upon.  If anything is removed
  # from this list, remove it from dep-in.sed as well.
-$(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+$(OBJS): $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
         $(INCDIR)/progress.h $(INCDIR)/fopen-same.h \
         $(OBJ_FORMAT_H) $(TARG_CPU_H) $(TARG_ENV_H) \
         as.h asintl.h bignum.h bit_fix.h config.h emul.h expr.h flonum.h \
diff --git a/gas/Makefile.in b/gas/Makefile.in

index 729d923e9ced885e71a9211c01dca81d1808497a..62a0088854dd30e26319cf4fad9279d0e71781f3 100644 (file)
--- a/gas/Makefile.in
+++ b/gas/Makefile.in
@@ -183,7 +183,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
  POFILES = @POFILES@
  POSUB = @POSUB@
  RANLIB = @RANLIB@
-REPORT_BUGS_TO = @REPORT_BUGS_TO@
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
@@ -676,7 +676,6 @@ DISTCLEANFILES = targ-cpu.h obj-format.h targ-env.h itbl-cpu.h cgen-desc.h
  BASEDIR = $(srcdir)/..
  BFDDIR = $(BASEDIR)/bfd
  INCDIR = $(BASEDIR)/include
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
  
  # This is the variable actually used when we compile.
  # Specify the directories to be searched for header files.
@@ -685,7 +684,7 @@ REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT
  # subdirectory rather than in the source directory.
  INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
         -I$(INCDIR) -I$(srcdir)/.. -I$(BFDDIR) -I$(srcdir)/../intl -I../intl \
-       $(REPORT_BUGS_TO) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  
@@ -695,7 +694,7 @@ INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(srcdir)/config \
  # in a subdirectory.
  DEP_INCLUDES = -D_GNU_SOURCE -I.. -I$${srcdir} -I../../bfd -I$${srcdir}/config \
         -I$${srcdir}/../include -I$${srcdir}/.. -I$${srcdir}/../bfd -I$${srcdir}/../intl -I../../intl  \
-       $(REPORT_BUGS_TO) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  DEP_FLAGS = -DOBJ_MAYBE_ELF \
@@ -2870,7 +2869,7 @@ $(OBJS): @ALL_OBJ_DEPS@
  
  # Stuff that every object file depends upon.  If anything is removed
  # from this list, remove it from dep-in.sed as well.
-$(OBJS): $(INCDIR)/bin-bugs.h $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
+$(OBJS): $(INCDIR)/ansidecl.h $(INCDIR)/libiberty.h \
         $(INCDIR)/progress.h $(INCDIR)/fopen-same.h \
         $(OBJ_FORMAT_H) $(TARG_CPU_H) $(TARG_ENV_H) \
         as.h asintl.h bignum.h bit_fix.h config.h emul.h expr.h flonum.h \
diff --git a/gas/as.c b/gas/as.c

index 727a1dd40ee58e5ac1c11a4e24185bfa324a286f..932748ba5cf40da3ffa1202d19761d630a55e234 100644 (file)
--- a/gas/as.c
+++ b/gas/as.c
@@ -352,7 +352,9 @@ Options:\n\
    md_show_usage (stream);
  
    fputc ('\n', stream);
-  fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
+
+  if (REPORT_BUGS_TO[0] && stream == stdout)
+    fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
  }
  
  /* Since it is easy to do here we interpret the special arg "-"
diff --git a/gas/as.h b/gas/as.h

index 2f92c2ed7748509850dee48840876c77cef9259f..a4402269d16e7b815a566d46f01ce165a9ce64d9 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -37,7 +37,6 @@
     If TEST is #defined, then we are testing a module: #define COMMON as "".  */
  
  #include "config.h"
-#include "bin-bugs.h"
  
  /* This is the code recommended in the autoconf documentation, almost
     verbatim.  If it doesn't work for you, let me know, and notify
diff --git a/gas/configure b/gas/configure

index 539f7545a48d1208968b6907984bafe78d2aceeb..bc18d5f79fcab97009842f2e05e6fd5b6a147ec5 100755 (executable)
--- a/gas/configure
+++ b/gas/configure
@@ -4192,7 +4192,7 @@ echo "$as_me: error: bug URL not specified" >&2;}
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac
  else
-  REPORT_BUGS_TO=""
+  REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  
  fi;
  
diff --git a/gas/configure.in b/gas/configure.in

index 43c9ef9b083c61865b1935b91e04c830cf14dfe6..8c9325581620ca8343316196024fef7b3f3a7250 100644 (file)
--- a/gas/configure.in
+++ b/gas/configure.in
@@ -49,7 +49,7 @@ AC_ARG_WITH(bugurl,
      no)  REPORT_BUGS_TO="" ;;
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac],
-   REPORT_BUGS_TO=""
+   REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  )
  AC_SUBST(REPORT_BUGS_TO)
  
diff --git a/gprof/Makefile.am b/gprof/Makefile.am

index e0083f3c590cfd76fdefde770dbaad245ca3107a..b82d59a0a5b7fc687a454710eee69e210ae9b171 100644 (file)
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -16,12 +16,13 @@ AM_CFLAGS = $(WARN_CFLAGS)
  
  MKDEP = gcc -MM
  
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO"" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
+PKGVERSION = "\"@PKGVERSION@\""
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  
  INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
         -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I.  \
-       -DVERSUFFIX=$(VERSUFFIX_s) \
-       $(REPORT_BUGS_TO) \
+       -DPKGVERSION=$(PKGVERSION) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  bin_PROGRAMS = gprof
@@ -185,108 +186,108 @@ CLEANFILES = dep.sed DEP DEPA DEP1 DEP2
  basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \
    $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h basic_blocks.h \
+  $(INCDIR)/symcat.h gconfig.h basic_blocks.h \
    corefile.h gmon_io.h gmon_out.h search_list.h source.h \
    symtab.h sym_ids.h
  call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
    $(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
    gmon_out.h sym_ids.h
  cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
    utils.h sym_ids.h
  cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h cg_arcs.h cg_dfn.h utils.h
  cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h cg_arcs.h cg_print.h hist.h utils.h corefile.h
  corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h corefile.h
  gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \
    corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \
    hertz.h hist.h $(INCDIR)/libiberty.h
  gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h basic_blocks.h call_graph.h cg_arcs.h cg_print.h \
    corefile.h gmon_io.h hertz.h hist.h sym_ids.h $(INCDIR)/demangle.h
  hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    hertz.h
  hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h \
    utils.h
  source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    $(INCDIR)/libiberty.h search_list.h source.h
  search_list.o: search_list.c $(INCDIR)/libiberty.h \
    $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h
+  $(INCDIR)/symcat.h gconfig.h search_list.h
  symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h
  sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h \
+  $(INCDIR)/symcat.h gconfig.h search_list.h \
    source.h symtab.h cg_arcs.h sym_ids.h
  utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
    $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h \
+  $(INCDIR)/symcat.h gconfig.h search_list.h \
    source.h symtab.h cg_arcs.h utils.h
  i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
diff --git a/gprof/Makefile.in b/gprof/Makefile.in

index e1608307972b2b4232251930590d526234f30efa..ca1bb5401643775ca38c5e897b9795885b192e03 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -175,17 +175,17 @@ PACKAGE_STRING = @PACKAGE_STRING@
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
  PACKAGE_VERSION = @PACKAGE_VERSION@
  PATH_SEPARATOR = @PATH_SEPARATOR@
+PKGVERSION = "\"@PKGVERSION@\""
  POFILES = @POFILES@
  POSUB = @POSUB@
  RANLIB = @RANLIB@
-REPORT_BUGS_TO = @REPORT_BUGS_TO@
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRIP = @STRIP@
  USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@
  USE_NLS = @USE_NLS@
  VERSION = @VERSION@
-VERSUFFIX = @VERSUFFIX@
  WARN_CFLAGS = @WARN_CFLAGS@
  XGETTEXT = @XGETTEXT@
  ac_ct_CC = @ac_ct_CC@
@@ -242,11 +242,10 @@ BFDDIR = $(BASEDIR)/bfd
  INCDIR = $(BASEDIR)/include
  AM_CFLAGS = $(WARN_CFLAGS)
  MKDEP = gcc -MM
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
  INCLUDES = -D_GNU_SOURCE -DDEBUG -I../bfd -I$(srcdir)/../include \
         -I$(srcdir)/../bfd -I$(srcdir)/../intl -I../intl -I.  \
-       -DPKGVERSION="\"$(PKGVERSION)\"" \
-       $(REPORT_BUGS_TO) \
+       -DPKGVERSION=$(PKGVERSION) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  sources = basic_blocks.c call_graph.c cg_arcs.c cg_dfn.c \
@@ -932,108 +931,108 @@ dep-am: DEP
  basic_blocks.o: basic_blocks.c $(INCDIR)/libiberty.h \
    $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h basic_blocks.h \
+  $(INCDIR)/symcat.h gconfig.h basic_blocks.h \
    corefile.h gmon_io.h gmon_out.h search_list.h source.h \
    symtab.h sym_ids.h
  call_graph.o: call_graph.c gprof.h $(BFDDIR)/sysdep.h \
    $(INCDIR)/ansidecl.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h cg_arcs.h call_graph.h corefile.h gmon_io.h \
    gmon_out.h sym_ids.h
  cg_arcs.o: cg_arcs.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h call_graph.h cg_arcs.h cg_dfn.h cg_print.h \
    utils.h sym_ids.h
  cg_dfn.o: cg_dfn.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h cg_arcs.h cg_dfn.h utils.h
  cg_print.o: cg_print.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h cg_arcs.h cg_print.h hist.h utils.h corefile.h
  corefile.o: corefile.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h corefile.h
  gmon_io.o: gmon_io.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h basic_blocks.h \
    corefile.h call_graph.h gmon_io.h gmon_out.h gmon.h \
    hertz.h hist.h $(INCDIR)/libiberty.h
  gprof.o: gprof.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h basic_blocks.h call_graph.h cg_arcs.h cg_print.h \
    corefile.h gmon_io.h hertz.h hist.h sym_ids.h $(INCDIR)/demangle.h
  hertz.o: hertz.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    hertz.h
  hist.o: hist.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/filenames.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  gconfig.h $(INCDIR)/bin-bugs.h search_list.h source.h \
+  gconfig.h search_list.h source.h \
    symtab.h corefile.h gmon_io.h gmon_out.h hist.h sym_ids.h \
    utils.h
  source.o: source.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    $(INCDIR)/libiberty.h search_list.h source.h
  search_list.o: search_list.c $(INCDIR)/libiberty.h \
    $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h
+  $(INCDIR)/symcat.h gconfig.h search_list.h
  symtab.o: symtab.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h
  sym_ids.o: sym_ids.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/safe-ctype.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h \
+  $(INCDIR)/symcat.h gconfig.h search_list.h \
    source.h symtab.h cg_arcs.h sym_ids.h
  utils.o: utils.c $(INCDIR)/demangle.h $(INCDIR)/libiberty.h \
    $(INCDIR)/ansidecl.h gprof.h $(BFDDIR)/sysdep.h ../bfd/config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h ../bfd/bfd.h \
-  $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h search_list.h \
+  $(INCDIR)/symcat.h gconfig.h search_list.h \
    source.h symtab.h cg_arcs.h utils.h
  i386.o: i386.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  alpha.o: alpha.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  vax.o: vax.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  tahoe.o: tahoe.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  sparc.o: sparc.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  mips.o: mips.c gprof.h $(BFDDIR)/sysdep.h $(INCDIR)/ansidecl.h \
    ../bfd/config.h $(INCDIR)/fopen-same.h $(INCDIR)/filenames.h \
-  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h $(INCDIR)/bin-bugs.h \
+  ../bfd/bfd.h $(INCDIR)/symcat.h gconfig.h \
    search_list.h source.h symtab.h cg_arcs.h corefile.h \
    hist.h
  flat_bl.o: flat_bl.c $(INCDIR)/ansidecl.h
diff --git a/gprof/configure b/gprof/configure

index 00fbb637a519ffc25bfcbed1ddaebc0bad9dcadc..fee5d8a0001ec7443550daecb50419a002e5ed62 100755 (executable)
--- a/gprof/configure
+++ b/gprof/configure
@@ -4186,7 +4186,7 @@ echo "$as_me: error: bug URL not specified" >&2;}
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac
  else
-  REPORT_BUGS_TO=""
+  REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  
  fi;
  
diff --git a/gprof/configure.in b/gprof/configure.in

index dbed06c00f9458cfc2bc2fd9117f2dc3fec814aa..0aed56d9a4cea7299685a3db80b3ff57b66155ce 100644 (file)
--- a/gprof/configure.in
+++ b/gprof/configure.in
@@ -35,7 +35,7 @@ AC_ARG_WITH(bugurl,
      no)  REPORT_BUGS_TO="" ;;
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac],
-   REPORT_BUGS_TO=""
+   REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  )
  AC_SUBST(REPORT_BUGS_TO)
  
diff --git a/gprof/gprof.c b/gprof/gprof.c

index 2e09ab380deee8584dadbcfdf4fe178a2a7ccb87..90be2fe9591808f0dcde747efa07d6582401c539 100644 (file)
--- a/gprof/gprof.c
+++ b/gprof/gprof.c
@@ -170,7 +170,7 @@ Usage: %s [-[abcDhilLsTvwxyz]] [-[ACeEfFJnNOpPqQZ][name]] [-I dirs]\n\
         [--demangle[=STYLE]] [--no-demangle] [@FILE]\n\
         [image-file] [profile-file...]\n"),
            whoami);
-  if (status == 0)
+  if (REPORT_BUGS_TO[0] && status == 0)
      fprintf (stream, _("Report bugs to %s\n"), REPORT_BUGS_TO);
    done (status);
  }
diff --git a/gprof/gprof.h b/gprof/gprof.h

index a651699f238de72fdffb348f4b505dff6ad06d09..aa873f309f002cc1e3bcd2a9fd981927bb0af206 100644 (file)
--- a/gprof/gprof.h
+++ b/gprof/gprof.h
@@ -68,8 +68,6 @@
  #define _(String) gettext (String)
  #endif
  
-#include "bin-bugs.h"
-
  #define STYLE_FLAT_PROFILE     (1<<0)
  #define STYLE_CALL_GRAPH       (1<<1)
  #define STYLE_SUMMARY_FILE     (1<<2)
diff --git a/include/bin-bugs.h b/include/bin-bugs.h

deleted file mode 100644 (file)

index 63901b0..0000000
--- a/include/bin-bugs.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#ifndef REPORT_BUGS_TO
-#define REPORT_BUGS_TO "<URL:http://www.sourceware.org/bugzilla/>"
-#endif
diff --git a/ld/Makefile.am b/ld/Makefile.am

index 16efcfe5a62f72d53b084ca208cae7ecf660f4a9..2a78b241e5449d6810f2fa2edb605f1e5a390e90 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -100,11 +100,11 @@ man_MANS = ld.1
  AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
  TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
  
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  
  INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
         -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) \
-       $(REPORT_BUGS_TO) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  BFDLIB = ../bfd/libbfd.la
@@ -1883,81 +1883,81 @@ dep-am: DEP
  # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
  ldctor.o: ldctor.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h \
    ldexp.h ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h
  ldemul.o: ldemul.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \
+  $(INCDIR)/bfdlink.h ld.h ldmisc.h \
    ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h ldemul-list.h
  ldexp.o: ldexp.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \
+  $(INCDIR)/bfdlink.h ld.h ldmain.h \
    ldmisc.h ldexp.h ldgram.h ldlang.h $(INCDIR)/libiberty.h \
    $(INCDIR)/safe-ctype.h
  ldfile.o: ldfile.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h \
    ldmisc.h ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h \
    ldlex.h ldemul.h $(INCDIR)/libiberty.h $(INCDIR)/filenames.h
  ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \
+  $(INCDIR)/bfdlink.h ld.h ldmain.h \
    ldexp.h ldlang.h ldgram.h ldlex.h ldmisc.h ldctor.h \
    ldfile.h ldemul.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h \
    $(INCDIR)/hashtab.h
  ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h \
    ldmain.h ldmisc.h ldwrite.h ldexp.h ldlang.h ldgram.h \
    ldlex.h ldfile.h ldemul.h ldctor.h
  ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h sysdep.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
-  ld.h $(INCDIR)/bin-bugs.h ldmisc.h ldexp.h ldlang.h \
+  ld.h ldmisc.h ldexp.h ldlang.h \
    ldgram.h ldlex.h ldmain.h ldfile.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
  ldver.o: ldver.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h sysdep.h config.h \
-  $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h ldver.h \
+  $(INCDIR)/fopen-same.h ld.h ldver.h \
    ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h
  ldwrite.o: ldwrite.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h $(INCDIR)/bin-bugs.h ldexp.h ldlang.h ldwrite.h \
+  ld.h ldexp.h ldlang.h ldwrite.h \
    ldmisc.h ldgram.h ldmain.h
  lexsup.o: lexsup.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h \
-  ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldexp.h \
+  ld.h ldmain.h ldmisc.h ldexp.h \
    ldlang.h ldgram.h ldlex.h ldfile.h ldver.h ldemul.h \
    $(INCDIR)/demangle.h
  mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \
+  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h \
    ldexp.h ldlang.h ldmisc.h mri.h ldgram.h $(INCDIR)/libiberty.h
  ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h \
    ldmain.h ldmisc.h ldexp.h ldlang.h
  pe-dll.o: pe-dll.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h $(INCDIR)/bin-bugs.h ldexp.h ldlang.h ldwrite.h \
+  ld.h ldexp.h ldlang.h ldwrite.h \
    ldmisc.h ldgram.h ldmain.h ldfile.h ldemul.h $(INCDIR)/coff/internal.h \
    $(BFDDIR)/libcoff.h deffile.h pe-dll.h
  ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \
+  $(INCDIR)/bfdlink.h ld.h ldexp.h \
    ldver.h ldlang.h ldfile.h ldemul.h ldmisc.h ldmain.h \
    mri.h ldctor.h ldlex.h
  ldlex.o: ldlex.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h \
    ldmisc.h ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h \
    ldmain.h $(INCDIR)/libiberty.h
  deffilep.o: deffilep.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \
+  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h \
    ldmisc.h deffile.h
  # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
diff --git a/ld/Makefile.in b/ld/Makefile.in

index 1c3fabc2b01030cefd24a7a64e6931e2a1c55a2c..be3c132d925a6260f2e35635c6648ace8ce29cbe 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -200,7 +200,7 @@ PATH_SEPARATOR = @PATH_SEPARATOR@
  POFILES = @POFILES@
  POSUB = @POSUB@
  RANLIB = @RANLIB@
-REPORT_BUGS_TO = `test -z "@REPORT_BUGS_TO@" || echo "-DREPORT_BUGS_TO=\"@REPORT_BUGS_TO@\""`
+REPORT_BUGS_TO = "\"@REPORT_BUGS_TO@\""
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  STRINGIFY = @STRINGIFY@
@@ -331,7 +331,7 @@ AM_MAKEINFOFLAGS = -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
  TEXI2DVI = texi2dvi -I $(srcdir) -I $(BFDDIR)/doc -I $(top_srcdir)/../libiberty
  INCLUDES = -D_GNU_SOURCE -I. -I$(srcdir) -I../bfd -I$(BFDDIR) -I$(INCDIR) \
         -I$(top_srcdir)/../intl -I../intl $(HDEFINES) $(CFLAGS) \
-       $(REPORT_BUGS_TO) \
+       -DREPORT_BUGS_TO=$(REPORT_BUGS_TO) \
         -DLOCALEDIR="\"$(datadir)/locale\""
  
  BFDLIB = ../bfd/libbfd.la
@@ -2663,82 +2663,82 @@ dep-am: DEP
  # DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.
  ldctor.o: ldctor.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h \
    ldexp.h ldlang.h ldmisc.h ldgram.h ldmain.h ldctor.h
  ldemul.o: ldemul.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmisc.h \
+  $(INCDIR)/bfdlink.h ld.h ldmisc.h \
    ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h ldemul-list.h
  ldexp.o: ldexp.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \
+  $(INCDIR)/bfdlink.h ld.h ldmain.h \
    ldmisc.h ldexp.h ldgram.h ldlang.h $(INCDIR)/libiberty.h \
    $(INCDIR)/safe-ctype.h
  ldfile.o: ldfile.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/safe-ctype.h ld.h \
    ldmisc.h ldexp.h ldlang.h ldfile.h ldmain.h ldgram.h \
    ldlex.h ldemul.h $(INCDIR)/libiberty.h $(INCDIR)/filenames.h
  ldlang.o: ldlang.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/obstack.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldmain.h \
+  $(INCDIR)/bfdlink.h ld.h ldmain.h \
    ldexp.h ldlang.h ldgram.h ldlex.h ldmisc.h ldctor.h \
    ldfile.h ldemul.h $(INCDIR)/fnmatch.h $(INCDIR)/demangle.h \
    $(INCDIR)/hashtab.h
  ldmain.o: ldmain.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/safe-ctype.h $(INCDIR)/libiberty.h $(INCDIR)/progress.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/filenames.h ld.h \
    ldmain.h ldmisc.h ldwrite.h ldexp.h ldlang.h ldgram.h \
    ldlex.h ldfile.h ldemul.h ldctor.h
  ldmisc.o: ldmisc.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h $(INCDIR)/bfdlink.h sysdep.h config.h \
    $(INCDIR)/fopen-same.h $(INCDIR)/libiberty.h $(INCDIR)/demangle.h \
-  ld.h $(INCDIR)/bin-bugs.h ldmisc.h ldexp.h ldlang.h \
+  ld.h ldmisc.h ldexp.h ldlang.h \
    ldgram.h ldlex.h ldmain.h ldfile.h $(BFDDIR)/elf-bfd.h \
    $(INCDIR)/elf/common.h $(INCDIR)/elf/internal.h $(INCDIR)/elf/external.h
  ldver.o: ldver.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h ../bfd/bfdver.h sysdep.h config.h \
-  $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h ldver.h \
+  $(INCDIR)/fopen-same.h ld.h ldver.h \
    ldexp.h ldlang.h ldfile.h ldemul.h ldmain.h
  ldwrite.o: ldwrite.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h $(INCDIR)/bin-bugs.h ldexp.h ldlang.h ldwrite.h \
+  ld.h ldexp.h ldlang.h ldwrite.h \
    ldmisc.h ldgram.h ldmain.h
  lexsup.o: lexsup.c config.h ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h \
-  ld.h $(INCDIR)/bin-bugs.h ldmain.h ldmisc.h ldexp.h \
+  ld.h ldmain.h ldmisc.h ldexp.h \
    ldlang.h ldgram.h ldlex.h ldfile.h ldver.h ldemul.h \
    $(INCDIR)/demangle.h
  mri.o: mri.c ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \
-  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \
+  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h \
    ldexp.h ldlang.h ldmisc.h mri.h ldgram.h $(INCDIR)/libiberty.h
  ldcref.o: ldcref.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h ld.h \
    ldmain.h ldmisc.h ldexp.h ldlang.h
  pe-dll.o: pe-dll.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
    $(INCDIR)/bfdlink.h $(INCDIR)/libiberty.h $(INCDIR)/safe-ctype.h \
-  ld.h $(INCDIR)/bin-bugs.h ldexp.h ldlang.h ldwrite.h \
+  ld.h ldexp.h ldlang.h ldwrite.h \
    ldmisc.h ldgram.h ldmain.h ldfile.h ldemul.h $(INCDIR)/coff/internal.h \
    $(BFDDIR)/libcoff.h deffile.h pe-dll.h
  ldgram.o: ldgram.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h ldexp.h \
+  $(INCDIR)/bfdlink.h ld.h ldexp.h \
    ldver.h ldlang.h ldfile.h ldemul.h ldmisc.h ldmain.h \
    mri.h ldctor.h ldlex.h
  ldlex.o: ldlex.c ../bfd/bfd.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/symcat.h sysdep.h config.h $(INCDIR)/fopen-same.h \
-  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h $(INCDIR)/bin-bugs.h \
+  $(INCDIR)/safe-ctype.h $(INCDIR)/bfdlink.h ld.h \
    ldmisc.h ldexp.h ldlang.h ldgram.h ldfile.h ldlex.h \
    ldmain.h $(INCDIR)/libiberty.h
  deffilep.o: deffilep.c $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h \
    $(INCDIR)/safe-ctype.h ../bfd/bfd.h $(INCDIR)/symcat.h \
-  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h $(INCDIR)/bin-bugs.h \
+  sysdep.h config.h $(INCDIR)/fopen-same.h ld.h \
    ldmisc.h deffile.h
  # IF YOU PUT ANYTHING HERE IT WILL GO AWAY
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
diff --git a/ld/configure b/ld/configure

index 9f10ff6cfae4befe92acae26dfa9f7febaa58dd1..44ddd7c1b0153365bf157784ce566a50c79f8213 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -4241,7 +4241,7 @@ echo "$as_me: error: bug URL not specified" >&2;}
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac
  else
-  REPORT_BUGS_TO=""
+  REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  
  fi;
  
diff --git a/ld/configure.in b/ld/configure.in

index 18245e13979f3930d487ccc701aca532a3d92779..b1a3e35ffaaea41d9cfd7fb6079d71680cb659c5 100644 (file)
--- a/ld/configure.in
+++ b/ld/configure.in
@@ -75,7 +75,7 @@ AC_ARG_WITH(bugurl,
      no)  REPORT_BUGS_TO="" ;;
      *)   REPORT_BUGS_TO="<URL:$withval>" ;;
     esac],
-   REPORT_BUGS_TO=""
+   REPORT_BUGS_TO="<URL:http://www.sourceware.org/bugzilla/>"
  )
  AC_SUBST(REPORT_BUGS_TO)
  
diff --git a/ld/ld.h b/ld/ld.h

index e1aa62cc6cfc794cfd7439908c5538f41d3933a4..a976ffcc96bc541f042be40dfed703252add2b70 100644 (file)
--- a/ld/ld.h
+++ b/ld/ld.h
@@ -81,8 +81,6 @@ void *alloca ();
  # define N_(String) (String)
  #endif
  
-#include "bin-bugs.h"
-
  /* Look in this environment name for the linker to pretend to be */
  #define EMULATION_ENVIRON "LDEMULATION"
  /* If in there look for the strings: */
diff --git a/ld/lexsup.c b/ld/lexsup.c

index c2bef1dd4829b381c148ffda12f40206e4fe0c94..9eae38ab77236bc43066a3744e62b8f5e3661ce1 100644 (file)
--- a/ld/lexsup.c
+++ b/ld/lexsup.c
@@ -1549,5 +1549,6 @@ help (void)
    ldemul_list_emulation_options (stdout);
    printf ("\n");
  
-  printf (_("Report bugs to %s\n"), REPORT_BUGS_TO);
+  if (REPORT_BUGS_TO[0])
+    printf (_("Report bugs to %s\n"), REPORT_BUGS_TO);
  }
author	Nathan Sidwell <nathan@codesourcery.com>
	Mon, 16 Oct 2006 20:21:25 +0000 (20:21 +0000)
committer	Nathan Sidwell <nathan@codesourcery.com>
	Mon, 16 Oct 2006 20:21:25 +0000 (20:21 +0000)
ChangeLog.csl		patch \| blob \| blame \| history
binutils/Makefile.am		patch \| blob \| blame \| history
binutils/Makefile.in		patch \| blob \| blame \| history
binutils/addr2line.c		patch \| blob \| blame \| history
binutils/ar.c		patch \| blob \| blame \| history
binutils/bucomm.h		patch \| blob \| blame \| history
binutils/coffdump.c		patch \| blob \| blame \| history
binutils/configure		patch \| blob \| blame \| history
binutils/configure.in		patch \| blob \| blame \| history
binutils/cxxfilt.c		patch \| blob \| blame \| history
binutils/nlmconv.c		patch \| blob \| blame \| history
binutils/nm.c		patch \| blob \| blame \| history
binutils/objcopy.c		patch \| blob \| blame \| history
binutils/objdump.c		patch \| blob \| blame \| history
binutils/readelf.c		patch \| blob \| blame \| history
binutils/size.c		patch \| blob \| blame \| history
binutils/srconv.c		patch \| blob \| blame \| history
binutils/strings.c		patch \| blob \| blame \| history
binutils/sysdump.c		patch \| blob \| blame \| history
binutils/windres.c		patch \| blob \| blame \| history
gas/Makefile.am		patch \| blob \| blame \| history
gas/Makefile.in		patch \| blob \| blame \| history
gas/as.c		patch \| blob \| blame \| history
gas/as.h		patch \| blob \| blame \| history
gas/configure		patch \| blob \| blame \| history
gas/configure.in		patch \| blob \| blame \| history
gprof/Makefile.am		patch \| blob \| blame \| history
gprof/Makefile.in		patch \| blob \| blame \| history
gprof/configure		patch \| blob \| blame \| history
gprof/configure.in		patch \| blob \| blame \| history
gprof/gprof.c		patch \| blob \| blame \| history
gprof/gprof.h		patch \| blob \| blame \| history
include/bin-bugs.h	[deleted file]	patch \| blob \| blame \| history
ld/Makefile.am		patch \| blob \| blame \| history
ld/Makefile.in		patch \| blob \| blame \| history
ld/configure		patch \| blob \| blame \| history
ld/configure.in		patch \| blob \| blame \| history
ld/ld.h		patch \| blob \| blame \| history
ld/lexsup.c		patch \| blob \| blame \| history