diff --git a/.cvsignore b/.cvsignore index f5ae873..b43967c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -binutils-2.17.50.0.17.tar.bz2 +binutils-2.17.50.0.18.tar.bz2 diff --git a/binutils-2.17.50.0.17-build-fixes.patch b/binutils-2.17.50.0.17-build-fixes.patch deleted file mode 100644 index 943ce2c..0000000 --- a/binutils-2.17.50.0.17-build-fixes.patch +++ /dev/null @@ -1,29 +0,0 @@ -2006-02-14 Jakub Jelinek - -ld/testsuite/ - * ld-shared/main.c (main): Prevent warnings about unused p. - * ld-elfcomm/common1b.c (dummy1): Add __attribute__((__used__)) for - GCC 3.3+. - ---- ld/testsuite/ld-shared/main.c.jj 2001-07-11 15:48:54.000000000 +0200 -+++ ld/testsuite/ld-shared/main.c 2006-02-14 10:07:08.000000000 +0100 -@@ -40,6 +40,8 @@ main () - { - int (*p) (); - -+ p = (void *) 0; -+ (void) p; - printf ("mainvar == %d\n", mainvar); - printf ("overriddenvar == %d\n", overriddenvar); - printf ("shlibvar1 == %d\n", shlibvar1); ---- ld/testsuite/ld-elfcomm/common1b.c.jj 2003-04-15 11:38:10.000000000 +0200 -+++ ld/testsuite/ld-elfcomm/common1b.c 2006-02-14 10:11:19.000000000 +0100 -@@ -1,3 +1,7 @@ --static char dummy1 = 'X'; -+static char dummy1 -+#if defined __GNUC__ && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) -+ __attribute__((__used__)) -+#endif -+ = 'X'; - char foo1 [] = "Aligned at odd byte."; - char foo2 [4]; diff --git a/binutils-2.17.50.0.17-build-id-script.patch b/binutils-2.17.50.0.17-build-id-script.patch deleted file mode 100644 index 35d10b4..0000000 --- a/binutils-2.17.50.0.17-build-id-script.patch +++ /dev/null @@ -1,14 +0,0 @@ -2007-07-24 Jakub Jelinek - - * scripttempl/elf.sc: Add .note.gnu.build-id. - ---- ld/scripttempl/elf.sc.jj 2007-07-24 10:07:02.000000000 +0200 -+++ ld/scripttempl/elf.sc 2007-07-24 21:44:35.000000000 +0200 -@@ -267,6 +267,7 @@ SECTIONS - ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}} - ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}} - ${INITIAL_READONLY_SECTIONS} -+ .note.gnu.build-id : { *(.note.gnu.build-id) } - ${TEXT_DYNAMIC+${DYNAMIC}} - .hash ${RELOCATING-0} : { *(.hash) } - .gnu.hash ${RELOCATING-0} : { *(.gnu.hash) } diff --git a/binutils-2.17.50.0.17-build-id.patch b/binutils-2.17.50.0.17-build-id.patch deleted file mode 100644 index 88cd5f4..0000000 --- a/binutils-2.17.50.0.17-build-id.patch +++ /dev/null @@ -1,1110 +0,0 @@ -bfd/ -2007-07-13 Roland McGrath - - * elf-bfd.h (struct elf_obj_tdata): Revert last change. - Add after_write_object_contents, after_write_object_contents_info. - * elf.c (_bfd_elf_write_object_contents): Revert last change. - Instead, call after_write_object_contents if set. - -2007-07-09 Roland McGrath - - * elf-bfd.h (struct elf_obj_tdata): Add members - emit_note_gnu_build_id and note_gnu_build_id_sec. - * elf.c (_bfd_id_note_section_size): New global function. - (read_hex, _bfd_elf_write_build_id_section): New static functions. - (_bfd_elf_write_object_contents): Call _bfd_elf_write_build_id_section - if emit_note_gnu_build_id is set. - * Makefile.am (elf.lo): Update dependencies. - - * elf-bfd.h (struct elf_size_info): Add checksum_contents hook. - (bfd_elf32_checksum_contents, bfd_elf64_checksum_contents): Declare. - * elfcode.h (elf_checksum_contents): New macro and function. - (NAME(_bfd_elf,size_info)): Initialize checksum_contents hook. -include/ -2007-07-09 Roland McGrath - - * bfdlink.h (struct bfd_link_info): Add member emit_note_gnu_build_id. -include/elf/ -2007-07-09 Roland McGrath - - * common.h (NT_GNU_HWCAP, NT_GNU_BUILD_ID): New macros. -binutils/ -2007-07-09 Roland McGrath - - * readelf.c (get_gnu_elf_note_type): New function. - (process_note): Use it for "GNU" name. -ld/ -2007-07-18 Roland McGrath - - * emultempl/elf32.em (gld${EMULATION_NAME}_write_build_id_section): - Use ASEC->contents for CONTENTS when missing, and allocate - ASEC->size if needed. - -2007-07-13 Roland McGrath - - * emultempl/elf32.em (struct build_id_info): New type. - (gld${EMULATION_NAME}_id_note_section_size): New function. - (gld${EMULATION_NAME}_write_build_id_section): New function. - (gld${EMULATION_NAME}_after_open): Use them. - (DEFAULT_BUILD_ID_STYLE): Change to "sha1". - * ld.texinfo (Options): Mention --build-id=sha1. - - * sha1.h: New file (from gnulib). - * sha1.c: New file (from gnulib). - * Makefile.am (CFILES, HFILES, OFILES, ld_new_SOURCES): Add them. - (sha1.o): New target. - * Makefile.in: Regenerated. - -2007-07-09 Roland McGrath - - * emultempl/elf32.em (gld${EMULATION_NAME}_add_option): Add --build-id. - (gld${EMULATION_NAME}_handle_option): Handle --build-id. - (gld${EMULATION_NAME}_list_options): List --build-id. - (gld${EMULATION_NAME}_after_open): If --build-id was given, - synthesize a ".note.gnu.build-id" section and cache it in elf_tdata. - * ld.texinfo (Options): Describe --build-id. - * NEWS: Mention --build-id. - ---- include/elf/common.h 29 Jun 2007 16:29:16 -0000 1.85 -+++ include/elf/common.h 9 Jul 2007 21:17:42 -0000 1.86 -@@ -413,9 +413,13 @@ - #define NT_VERSION 1 /* Contains a version string. */ - #define NT_ARCH 2 /* Contains an architecture string. */ - --/* Values for GNU .note.ABI-tag notes. Note name is "GNU". */ -+/* Values for notes in non-core files using name "GNU". */ - - #define NT_GNU_ABI_TAG 1 -+#define NT_GNU_HWCAP 2 /* Used by ld.so and kernel vDSO. */ -+#define NT_GNU_BUILD_ID 3 /* Generated by ld --build-id. */ -+ -+/* Values used in GNU .note.ABI-tag notes (NT_GNU_ABI_TAG). */ - #define GNU_ABI_TAG_LINUX 0 - #define GNU_ABI_TAG_HURD 1 - #define GNU_ABI_TAG_SOLARIS 2 ---- binutils/readelf.c 5 Jul 2007 16:54:45 -0000 1.369 -+++ binutils/readelf.c 9 Jul 2007 21:19:51 -0000 1.370 -@@ -9128,6 +9128,27 @@ - } - - static const char * -+get_gnu_elf_note_type (unsigned e_type) -+{ -+ static char buff[64]; -+ -+ switch (e_type) -+ { -+ case NT_GNU_ABI_TAG: -+ return _("NT_GNU_ABI_TAG (ABI version tag)"); -+ case NT_GNU_HWCAP: -+ return _("NT_GNU_HWCAP (DSO-supplied software HWCAP info)"); -+ case NT_GNU_BUILD_ID: -+ return _("NT_GNU_BUILD_ID (unique build ID bitstring)"); -+ default: -+ break; -+ } -+ -+ snprintf (buff, sizeof (buff), _("Unknown note type: (0x%08x)"), e_type); -+ return buff; -+} -+ -+static const char * - get_netbsd_elfcore_note_type (unsigned e_type) - { - static char buff[64]; -@@ -9204,6 +9225,10 @@ - note type strings. */ - nt = get_note_type (pnote->type); - -+ else if (const_strneq (pnote->namedata, "GNU")) -+ /* GNU-specific object file notes. */ -+ nt = get_gnu_elf_note_type (pnote->type); -+ - else if (const_strneq (pnote->namedata, "NetBSD-CORE")) - /* NetBSD-specific core file notes. */ - nt = get_netbsd_elfcore_note_type (pnote->type); ---- include/bfdlink.h 6 Jul 2007 11:13:56 -0000 1.69 -+++ include/bfdlink.h 9 Jul 2007 21:21:42 -0000 1.70 -@@ -348,6 +348,9 @@ - --dynamic-list command line options. */ - unsigned int dynamic: 1; - -+ /* Non-NULL if .note.gnu.build-id section should be created. */ -+ char *emit_note_gnu_build_id; -+ - /* What to do with unresolved symbols in an object file. - When producing executables the default is GENERATE_ERROR. - When producing shared libraries the default is IGNORE. The ---- bfd/elf-bfd.h 3 Jul 2007 14:26:40 -0000 1.235 -+++ bfd/elf-bfd.h 13 Jul 2007 10:44:12 -0000 1.237 -@@ -447,6 +447,8 @@ struct elf_size_info { - (bfd *, const Elf_Internal_Phdr *, unsigned int); - bfd_boolean - (*write_shdrs_and_ehdr) (bfd *); -+ bfd_boolean (*checksum_contents) -+ (bfd * , void (*) (const void *, size_t, void *), void *); - void (*write_relocs) - (bfd *, asection *, void *); - bfd_boolean (*swap_symbol_in) -@@ -1406,6 +1408,10 @@ struct elf_obj_tdata - - /* Symbol buffer. */ - void *symbuf; -+ -+ /* Called at the end of _bfd_elf_write_object_contents if not NULL. */ -+ bfd_boolean (*after_write_object_contents) (bfd *); -+ void *after_write_object_contents_info; - }; - - #define elf_tdata(bfd) ((bfd) -> tdata.elf_obj_data) -@@ -1803,6 +1809,8 @@ extern bfd_boolean bfd_elf32_write_shdrs - (bfd *); - extern int bfd_elf32_write_out_phdrs - (bfd *, const Elf_Internal_Phdr *, unsigned int); -+extern bfd_boolean bfd_elf32_checksum_contents -+ (bfd * , void (*) (const void *, size_t, void *), void *); - extern void bfd_elf32_write_relocs - (bfd *, asection *, void *); - extern bfd_boolean bfd_elf32_slurp_reloc_table -@@ -1845,6 +1853,8 @@ extern bfd_boolean bfd_elf64_write_shdrs - (bfd *); - extern int bfd_elf64_write_out_phdrs - (bfd *, const Elf_Internal_Phdr *, unsigned int); -+extern bfd_boolean bfd_elf64_checksum_contents -+ (bfd * , void (*) (const void *, size_t, void *), void *); - extern void bfd_elf64_write_relocs - (bfd *, asection *, void *); - extern bfd_boolean bfd_elf64_slurp_reloc_table ---- bfd/elf.c 3 Jul 2007 14:26:40 -0000 1.396 -+++ bfd/elf.c 13 Jul 2007 10:44:12 -0000 1.398 -@@ -5124,7 +5125,14 @@ - (*bed->elf_backend_final_write_processing) (abfd, - elf_tdata (abfd)->linker); - -- return bed->s->write_shdrs_and_ehdr (abfd); -+ if (!bed->s->write_shdrs_and_ehdr (abfd)) -+ return FALSE; -+ -+ /* This is last since write_shdrs_and_ehdr can touch i_shdrp[0]. */ -+ if (elf_tdata (abfd)->after_write_object_contents) -+ return (*elf_tdata (abfd)->after_write_object_contents) (abfd); -+ -+ return TRUE; - } - - bfd_boolean ---- bfd/elfcode.h 3 Jul 2007 14:26:42 -0000 1.83 -+++ bfd/elfcode.h 9 Jul 2007 21:23:37 -0000 1.84 -@@ -122,6 +122,7 @@ - #define elf_find_section NAME(bfd_elf,find_section) - #define elf_write_shdrs_and_ehdr NAME(bfd_elf,write_shdrs_and_ehdr) - #define elf_write_out_phdrs NAME(bfd_elf,write_out_phdrs) -+#define elf_checksum_contents NAME(bfd_elf,checksum_contents) - #define elf_write_relocs NAME(bfd_elf,write_relocs) - #define elf_slurp_reloc_table NAME(bfd_elf,slurp_reloc_table) - -@@ -1105,6 +1106,53 @@ - return TRUE; - } - -+bfd_boolean -+elf_checksum_contents (bfd *abfd, -+ void (*process) (const void *, size_t, void *), -+ void *arg) -+{ -+ Elf_Internal_Ehdr *i_ehdrp = elf_elfheader (abfd); -+ Elf_Internal_Shdr **i_shdrp = elf_elfsections (abfd); -+ Elf_Internal_Phdr *i_phdrp = elf_tdata (abfd)->phdr; -+ unsigned int count, num; -+ -+ { -+ Elf_External_Ehdr x_ehdr; -+ Elf_Internal_Ehdr i_ehdr; -+ -+ i_ehdr = *i_ehdrp; -+ i_ehdr.e_phoff = i_ehdr.e_shoff = 0; -+ elf_swap_ehdr_out (abfd, &i_ehdr, &x_ehdr); -+ (*process) (&x_ehdr, sizeof x_ehdr, arg); -+ } -+ -+ num = i_ehdrp->e_phnum; -+ for (count = 0; count < num; count++) -+ { -+ Elf_External_Phdr x_phdr; -+ elf_swap_phdr_out (abfd, &i_phdrp[count], &x_phdr); -+ (*process) (&x_phdr, sizeof x_phdr, arg); -+ } -+ -+ num = elf_numsections (abfd); -+ for (count = 0; count < num; count++) -+ { -+ Elf_Internal_Shdr i_shdr; -+ Elf_External_Shdr x_shdr; -+ -+ i_shdr = *i_shdrp[count]; -+ i_shdr.sh_offset = 0; -+ -+ elf_swap_shdr_out (abfd, &i_shdr, &x_shdr); -+ (*process) (&x_shdr, sizeof x_shdr, arg); -+ -+ if (i_shdr.contents) -+ (*process) (i_shdr.contents, i_shdr.sh_size, arg); -+ } -+ -+ return TRUE; -+} -+ - long - elf_slurp_symbol_table (bfd *abfd, asymbol **symptrs, bfd_boolean dynamic) - { -@@ -1803,6 +1851,7 @@ - ELFCLASS, EV_CURRENT, - elf_write_out_phdrs, - elf_write_shdrs_and_ehdr, -+ elf_checksum_contents, - elf_write_relocs, - elf_swap_symbol_in, - elf_swap_symbol_out, ---- ld/Makefile.in 2 Jul 2007 07:12:52 -0000 1.259 -+++ ld/Makefile.in 13 Jul 2007 10:44:28 -0000 1.260 -@@ -75,7 +75,7 @@ - ldlang.$(OBJEXT) mri.$(OBJEXT) ldctor.$(OBJEXT) \ - ldmain.$(OBJEXT) ldwrite.$(OBJEXT) ldexp.$(OBJEXT) \ - ldemul.$(OBJEXT) ldver.$(OBJEXT) ldmisc.$(OBJEXT) \ -- ldfile.$(OBJEXT) ldcref.$(OBJEXT) -+ ldfile.$(OBJEXT) ldcref.$(OBJEXT) sha1.$(OBJEXT) - ld_new_OBJECTS = $(am_ld_new_OBJECTS) - am__DEPENDENCIES_1 = - am__DEPENDENCIES_2 = ../bfd/libbfd.la -@@ -675,17 +675,17 @@ - - CFILES = ldctor.c ldemul.c ldexp.c ldfile.c ldlang.c \ - ldmain.c ldmisc.c ldver.c ldwrite.c lexsup.c \ -- mri.c ldcref.c pe-dll.c pep-dll.c -+ mri.c ldcref.c pe-dll.c pep-dll.c sha1.c - - HFILES = ld.h ldctor.h ldemul.h ldexp.h ldfile.h \ - ldlang.h ldlex.h ldmain.h ldmisc.h ldver.h \ -- ldwrite.h mri.h deffile.h pe-dll.h pep-dll.h elf-hints-local.h -+ ldwrite.h mri.h deffile.h pe-dll.h pep-dll.h elf-hints-local.h sha1.h - - GENERATED_CFILES = ldgram.c ldlex.c deffilep.c - GENERATED_HFILES = ldgram.h ldemul-list.h deffilep.h - OFILES = ldgram.o ldlex.o lexsup.o ldlang.o mri.o ldctor.o ldmain.o \ - ldwrite.o ldexp.o ldemul.o ldver.o ldmisc.o \ -- ldfile.o ldcref.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES} -+ ldfile.o ldcref.o sha1.o ${EMULATION_OFILES} ${EMUL_EXTRA_OFILES} - - STAGESTUFF = *.o ldscripts/* e*.c - -@@ -703,7 +703,7 @@ - # We need this for automake to use YLWRAP. - EXTRA_ld_new_SOURCES = deffilep.y - ld_new_SOURCES = ldgram.y ldlex.l lexsup.c ldlang.c mri.c ldctor.c ldmain.c \ -- ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c -+ ldwrite.c ldexp.c ldemul.c ldver.c ldmisc.c ldfile.c ldcref.c sha1.c - - ld_new_DEPENDENCIES = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL_DEP) - ld_new_LDADD = $(EMULATION_OFILES) $(EMUL_EXTRA_OFILES) $(BFDLIB) $(LIBIBERTY) $(LIBINTL) -@@ -2834,6 +2834,7 @@ - $(INCDIR)/libiberty.h $(INCDIR)/ansidecl.h $(INCDIR)/safe-ctype.h \ - ../bfd/bfd.h $(INCDIR)/ansidecl.h $(INCDIR)/symcat.h \ - ld.h ldmisc.h deffile.h -+sha1.o: sha1.c config.h sha1.h - # IF YOU PUT ANYTHING HERE IT WILL GO AWAY - # Tell versions [3.59,3.63) of GNU make to not export all variables. - # Otherwise a system limit (for SysV at least) may be exceeded. ---- ld/emultempl/elf32.em 6 Jul 2007 14:09:42 -0000 1.179 -+++ ld/emultempl/elf32.em 18 Jul 2007 09:46:05 -0000 1.182 -@@ -41,6 +41,9 @@ cat >e${EMULATION_NAME}.c < - - #include "bfdlink.h" - -@@ -859,6 +862,170 @@ EOF - if test x"$LDEMUL_AFTER_OPEN" != xgld"$EMULATION_NAME"_after_open; then - cat >>e${EMULATION_NAME}.c <emit_note_gnu_build_id; -+ bfd_size_type size; -+ -+ abfd = abfd; -+ -+ size = offsetof (Elf_External_Note, name[sizeof "GNU"]); -+ size = (size + 3) & -(bfd_size_type) 4; -+ -+ if (!strcmp (style, "md5") || !strcmp (style, "uuid")) -+ size += 128 / 8; -+ else if (!strcmp (style, "sha1")) -+ size += 160 / 8; -+ else if (!strncmp (style, "0x", 2)) -+ { -+ /* ID is in string form (hex). Convert to bits. */ -+ const char *id = style + 2; -+ do -+ { -+ if (ISXDIGIT (id[0]) && ISXDIGIT (id[1])) -+ { -+ ++size; -+ id += 2; -+ } -+ else if (*id == '-' || *id == ':') -+ ++id; -+ else -+ { -+ size = 0; -+ break; -+ } -+ } while (*id != '\0'); -+ } -+ else -+ size = 0; -+ -+ return size; -+} -+ -+static unsigned char -+read_hex (const char xdigit) -+{ -+ if (ISDIGIT (xdigit)) -+ return xdigit - '0'; -+ if (ISUPPER (xdigit)) -+ return xdigit - 'A' + 0xa; -+ if (ISLOWER (xdigit)) -+ return xdigit - 'a' + 0xa; -+ abort (); -+ return 0; -+} -+ -+struct build_id_info -+{ -+ const char *style; -+ asection *sec; -+}; -+ -+static bfd_boolean -+gld${EMULATION_NAME}_write_build_id_section (bfd *abfd) -+{ -+ const struct elf_backend_data *bed = get_elf_backend_data (abfd); -+ struct build_id_info *info = -+ elf_tdata (abfd)->after_write_object_contents_info; -+ asection *asec; -+ Elf_Internal_Shdr *i_shdr; -+ unsigned char *contents, *id_bits; -+ bfd_size_type size; -+ Elf_External_Note *e_note; -+ -+ asec = info->sec; -+ if (asec->output_section == NULL) -+ { -+ einfo (_("%P: .note.gnu.build-id section missing")); -+ return FALSE; -+ } -+ i_shdr = &elf_section_data (asec->output_section)->this_hdr; -+ -+ if (i_shdr->contents == NULL) -+ { -+ if (asec->contents == NULL) -+ asec->contents = xmalloc (asec->size); -+ contents = asec->contents; -+ } -+ else -+ contents = i_shdr->contents + asec->output_offset; -+ -+ e_note = (void *) contents; -+ size = offsetof (Elf_External_Note, name[sizeof "GNU"]); -+ size = (size + 3) & -(bfd_size_type) 4; -+ id_bits = contents + size; -+ size = asec->size - size; -+ -+ bfd_h_put_32 (abfd, sizeof "GNU", &e_note->namesz); -+ bfd_h_put_32 (abfd, size, &e_note->descsz); -+ bfd_h_put_32 (abfd, NT_GNU_BUILD_ID, &e_note->type); -+ memcpy (e_note->name, "GNU", sizeof "GNU"); -+ -+ if (!strcmp (info->style, "md5")) -+ { -+ struct md5_ctx ctx; -+ md5_init_ctx (&ctx); -+ if (bed->s->checksum_contents (abfd, -+ (void (*) (const void *, size_t, void *)) -+ &md5_process_bytes, -+ &ctx)) -+ md5_finish_ctx (&ctx, id_bits); -+ else -+ return FALSE; -+ } -+ else if (!strcmp (info->style, "sha1")) -+ { -+ struct sha1_ctx ctx; -+ sha1_init_ctx (&ctx); -+ if (bed->s->checksum_contents (abfd, -+ (void (*) (const void *, size_t, void *)) -+ &sha1_process_bytes, -+ &ctx)) -+ sha1_finish_ctx (&ctx, id_bits); -+ else -+ return FALSE; -+ } -+ else if (!strcmp (info->style, "uuid")) -+ { -+ int n; -+ int fd = open ("/dev/urandom", O_RDONLY); -+ if (fd < 0) -+ return FALSE; -+ n = read (fd, id_bits, size); -+ close (fd); -+ if (n < (int) size) -+ return FALSE; -+ } -+ else if (!strncmp (info->style, "0x", 2)) -+ { -+ /* ID is in string form (hex). Convert to bits. */ -+ const char *id = info->style + 2; -+ size_t n = 0; -+ do -+ { -+ if (ISXDIGIT (id[0]) && ISXDIGIT (id[1])) -+ { -+ id_bits[n] = read_hex (*id++) << 4; -+ id_bits[n++] |= read_hex (*id++); -+ } -+ else if (*id == '-' || *id == ':') -+ ++id; -+ else -+ abort (); /* Should have been validated earlier. */ -+ } while (*id != '\0'); -+ } -+ else -+ abort (); /* Should have been validated earlier. */ -+ -+ size = asec->size; -+ return (bfd_seek (abfd, -+ i_shdr->sh_offset + asec->output_offset, SEEK_SET) == 0 -+ && bfd_bwrite (contents, size, abfd) == size); -+} -+ -+ - /* This is called after all the input files have been opened. */ - - static void -@@ -866,6 +1033,49 @@ gld${EMULATION_NAME}_after_open (void) - { - struct bfd_link_needed_list *needed, *l; - -+ if (link_info.emit_note_gnu_build_id) -+ { -+ bfd *abfd; -+ asection *s; -+ bfd_size_type size; -+ -+ abfd = link_info.input_bfds; -+ -+ size = gld${EMULATION_NAME}_id_note_section_size (abfd, &link_info); -+ if (size == 0) -+ { -+ einfo ("%P: warning: unrecognized --build-id style ignored.\n"); -+ free (link_info.emit_note_gnu_build_id); -+ link_info.emit_note_gnu_build_id = NULL; -+ } -+ else -+ { -+ s = bfd_make_section_with_flags (abfd, ".note.gnu.build-id", -+ SEC_ALLOC | SEC_LOAD -+ | SEC_IN_MEMORY | SEC_LINKER_CREATED -+ | SEC_READONLY | SEC_DATA); -+ if (s != NULL && bfd_set_section_alignment (abfd, s, 2)) -+ { -+ struct elf_obj_tdata *t = elf_tdata (output_bfd); -+ struct build_id_info *b = xmalloc (sizeof *b); -+ b->style = link_info.emit_note_gnu_build_id; -+ b->sec = s; -+ elf_section_type (s) = SHT_NOTE; -+ s->size = size; -+ t->after_write_object_contents -+ = &gld${EMULATION_NAME}_write_build_id_section; -+ t->after_write_object_contents_info = b; -+ } -+ else -+ { -+ einfo ("%P: warning: Cannot create .note.gnu.build-id section," -+ " --build-id ignored.\n"); -+ free (link_info.emit_note_gnu_build_id); -+ link_info.emit_note_gnu_build_id = NULL; -+ } -+ } -+ } -+ - if (link_info.eh_frame_hdr - && ! link_info.traditional_format - && ! link_info.relocatable) -@@ -1760,6 +1970,7 @@ cat >>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c <>e${EMULATION_NAME}.c < -- Expansion function fix -+*/ -+ -+#include -+ -+#include "sha1.h" -+ -+#include -+#include -+ -+#if USE_UNLOCKED_IO -+# include "unlocked-io.h" -+#endif -+ -+#ifdef WORDS_BIGENDIAN -+# define SWAP(n) (n) -+#else -+# define SWAP(n) \ -+ (((n) << 24) | (((n) & 0xff00) << 8) | (((n) >> 8) & 0xff00) | ((n) >> 24)) -+#endif -+ -+#define BLOCKSIZE 4096 -+#if BLOCKSIZE % 64 != 0 -+# error "invalid BLOCKSIZE" -+#endif -+ -+/* This array contains the bytes used to pad the buffer to the next -+ 64-byte boundary. (RFC 1321, 3.1: Step 1) */ -+static const unsigned char fillbuf[64] = { 0x80, 0 /* , 0, 0, ... */ }; -+ -+ -+/* Take a pointer to a 160 bit block of data (five 32 bit ints) and -+ initialize it to the start constants of the SHA1 algorithm. This -+ must be called before using hash in the call to sha1_hash. */ -+void -+sha1_init_ctx (struct sha1_ctx *ctx) -+{ -+ ctx->A = 0x67452301; -+ ctx->B = 0xefcdab89; -+ ctx->C = 0x98badcfe; -+ ctx->D = 0x10325476; -+ ctx->E = 0xc3d2e1f0; -+ -+ ctx->total[0] = ctx->total[1] = 0; -+ ctx->buflen = 0; -+} -+ -+/* Put result from CTX in first 20 bytes following RESBUF. The result -+ must be in little endian byte order. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 32-bit value. */ -+void * -+sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf) -+{ -+ ((uint32_t *) resbuf)[0] = SWAP (ctx->A); -+ ((uint32_t *) resbuf)[1] = SWAP (ctx->B); -+ ((uint32_t *) resbuf)[2] = SWAP (ctx->C); -+ ((uint32_t *) resbuf)[3] = SWAP (ctx->D); -+ ((uint32_t *) resbuf)[4] = SWAP (ctx->E); -+ -+ return resbuf; -+} -+ -+/* Process the remaining bytes in the internal buffer and the usual -+ prolog according to the standard and write the result to RESBUF. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 32-bit value. */ -+void * -+sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf) -+{ -+ /* Take yet unprocessed bytes into account. */ -+ uint32_t bytes = ctx->buflen; -+ size_t size = (bytes < 56) ? 64 / 4 : 64 * 2 / 4; -+ -+ /* Now count remaining bytes. */ -+ ctx->total[0] += bytes; -+ if (ctx->total[0] < bytes) -+ ++ctx->total[1]; -+ -+ /* Put the 64-bit file length in *bits* at the end of the buffer. */ -+ ctx->buffer[size - 2] = SWAP ((ctx->total[1] << 3) | (ctx->total[0] >> 29)); -+ ctx->buffer[size - 1] = SWAP (ctx->total[0] << 3); -+ -+ memcpy (&((char *) ctx->buffer)[bytes], fillbuf, (size - 2) * 4 - bytes); -+ -+ /* Process last bytes. */ -+ sha1_process_block (ctx->buffer, size * 4, ctx); -+ -+ return sha1_read_ctx (ctx, resbuf); -+} -+ -+/* Compute SHA1 message digest for bytes read from STREAM. The -+ resulting message digest number will be written into the 16 bytes -+ beginning at RESBLOCK. */ -+int -+sha1_stream (FILE *stream, void *resblock) -+{ -+ struct sha1_ctx ctx; -+ char buffer[BLOCKSIZE + 72]; -+ size_t sum; -+ -+ /* Initialize the computation context. */ -+ sha1_init_ctx (&ctx); -+ -+ /* Iterate over full file contents. */ -+ while (1) -+ { -+ /* We read the file in blocks of BLOCKSIZE bytes. One call of the -+ computation function processes the whole buffer so that with the -+ next round of the loop another block can be read. */ -+ size_t n; -+ sum = 0; -+ -+ /* Read block. Take care for partial reads. */ -+ while (1) -+ { -+ n = fread (buffer + sum, 1, BLOCKSIZE - sum, stream); -+ -+ sum += n; -+ -+ if (sum == BLOCKSIZE) -+ break; -+ -+ if (n == 0) -+ { -+ /* Check for the error flag IFF N == 0, so that we don't -+ exit the loop after a partial read due to e.g., EAGAIN -+ or EWOULDBLOCK. */ -+ if (ferror (stream)) -+ return 1; -+ goto process_partial_block; -+ } -+ -+ /* We've read at least one byte, so ignore errors. But always -+ check for EOF, since feof may be true even though N > 0. -+ Otherwise, we could end up calling fread after EOF. */ -+ if (feof (stream)) -+ goto process_partial_block; -+ } -+ -+ /* Process buffer with BLOCKSIZE bytes. Note that -+ BLOCKSIZE % 64 == 0 -+ */ -+ sha1_process_block (buffer, BLOCKSIZE, &ctx); -+ } -+ -+ process_partial_block:; -+ -+ /* Process any remaining bytes. */ -+ if (sum > 0) -+ sha1_process_bytes (buffer, sum, &ctx); -+ -+ /* Construct result in desired memory. */ -+ sha1_finish_ctx (&ctx, resblock); -+ return 0; -+} -+ -+/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The -+ result is always in little endian byte order, so that a byte-wise -+ output yields to the wanted ASCII representation of the message -+ digest. */ -+void * -+sha1_buffer (const char *buffer, size_t len, void *resblock) -+{ -+ struct sha1_ctx ctx; -+ -+ /* Initialize the computation context. */ -+ sha1_init_ctx (&ctx); -+ -+ /* Process whole buffer but last len % 64 bytes. */ -+ sha1_process_bytes (buffer, len, &ctx); -+ -+ /* Put result in desired memory area. */ -+ return sha1_finish_ctx (&ctx, resblock); -+} -+ -+void -+sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) -+{ -+ /* When we already have some bits in our internal buffer concatenate -+ both inputs first. */ -+ if (ctx->buflen != 0) -+ { -+ size_t left_over = ctx->buflen; -+ size_t add = 128 - left_over > len ? len : 128 - left_over; -+ -+ memcpy (&((char *) ctx->buffer)[left_over], buffer, add); -+ ctx->buflen += add; -+ -+ if (ctx->buflen > 64) -+ { -+ sha1_process_block (ctx->buffer, ctx->buflen & ~63, ctx); -+ -+ ctx->buflen &= 63; -+ /* The regions in the following copy operation cannot overlap. */ -+ memcpy (ctx->buffer, -+ &((char *) ctx->buffer)[(left_over + add) & ~63], -+ ctx->buflen); -+ } -+ -+ buffer = (const char *) buffer + add; -+ len -= add; -+ } -+ -+ /* Process available complete blocks. */ -+ if (len >= 64) -+ { -+#if !_STRING_ARCH_unaligned -+# define alignof(type) offsetof (struct { char c; type x; }, x) -+# define UNALIGNED_P(p) (((size_t) p) % alignof (uint32_t) != 0) -+ if (UNALIGNED_P (buffer)) -+ while (len > 64) -+ { -+ sha1_process_block (memcpy (ctx->buffer, buffer, 64), 64, ctx); -+ buffer = (const char *) buffer + 64; -+ len -= 64; -+ } -+ else -+#endif -+ { -+ sha1_process_block (buffer, len & ~63, ctx); -+ buffer = (const char *) buffer + (len & ~63); -+ len &= 63; -+ } -+ } -+ -+ /* Move remaining bytes in internal buffer. */ -+ if (len > 0) -+ { -+ size_t left_over = ctx->buflen; -+ -+ memcpy (&((char *) ctx->buffer)[left_over], buffer, len); -+ left_over += len; -+ if (left_over >= 64) -+ { -+ sha1_process_block (ctx->buffer, 64, ctx); -+ left_over -= 64; -+ memcpy (ctx->buffer, &ctx->buffer[16], left_over); -+ } -+ ctx->buflen = left_over; -+ } -+} -+ -+/* --- Code below is the primary difference between md5.c and sha1.c --- */ -+ -+/* SHA1 round constants */ -+#define K1 0x5a827999 -+#define K2 0x6ed9eba1 -+#define K3 0x8f1bbcdc -+#define K4 0xca62c1d6 -+ -+/* Round functions. Note that F2 is the same as F4. */ -+#define F1(B,C,D) ( D ^ ( B & ( C ^ D ) ) ) -+#define F2(B,C,D) (B ^ C ^ D) -+#define F3(B,C,D) ( ( B & C ) | ( D & ( B | C ) ) ) -+#define F4(B,C,D) (B ^ C ^ D) -+ -+/* Process LEN bytes of BUFFER, accumulating context into CTX. -+ It is assumed that LEN % 64 == 0. -+ Most of this code comes from GnuPG's cipher/sha1.c. */ -+ -+void -+sha1_process_block (const void *buffer, size_t len, struct sha1_ctx *ctx) -+{ -+ const uint32_t *words = buffer; -+ size_t nwords = len / sizeof (uint32_t); -+ const uint32_t *endp = words + nwords; -+ uint32_t x[16]; -+ uint32_t a = ctx->A; -+ uint32_t b = ctx->B; -+ uint32_t c = ctx->C; -+ uint32_t d = ctx->D; -+ uint32_t e = ctx->E; -+ -+ /* First increment the byte count. RFC 1321 specifies the possible -+ length of the file up to 2^64 bits. Here we only compute the -+ number of bytes. Do a double word increment. */ -+ ctx->total[0] += len; -+ if (ctx->total[0] < len) -+ ++ctx->total[1]; -+ -+#define rol(x, n) (((x) << (n)) | ((uint32_t) (x) >> (32 - (n)))) -+ -+#define M(I) ( tm = x[I&0x0f] ^ x[(I-14)&0x0f] \ -+ ^ x[(I-8)&0x0f] ^ x[(I-3)&0x0f] \ -+ , (x[I&0x0f] = rol(tm, 1)) ) -+ -+#define R(A,B,C,D,E,F,K,M) do { E += rol( A, 5 ) \ -+ + F( B, C, D ) \ -+ + K \ -+ + M; \ -+ B = rol( B, 30 ); \ -+ } while(0) -+ -+ while (words < endp) -+ { -+ uint32_t tm; -+ int t; -+ for (t = 0; t < 16; t++) -+ { -+ x[t] = SWAP (*words); -+ words++; -+ } -+ -+ R( a, b, c, d, e, F1, K1, x[ 0] ); -+ R( e, a, b, c, d, F1, K1, x[ 1] ); -+ R( d, e, a, b, c, F1, K1, x[ 2] ); -+ R( c, d, e, a, b, F1, K1, x[ 3] ); -+ R( b, c, d, e, a, F1, K1, x[ 4] ); -+ R( a, b, c, d, e, F1, K1, x[ 5] ); -+ R( e, a, b, c, d, F1, K1, x[ 6] ); -+ R( d, e, a, b, c, F1, K1, x[ 7] ); -+ R( c, d, e, a, b, F1, K1, x[ 8] ); -+ R( b, c, d, e, a, F1, K1, x[ 9] ); -+ R( a, b, c, d, e, F1, K1, x[10] ); -+ R( e, a, b, c, d, F1, K1, x[11] ); -+ R( d, e, a, b, c, F1, K1, x[12] ); -+ R( c, d, e, a, b, F1, K1, x[13] ); -+ R( b, c, d, e, a, F1, K1, x[14] ); -+ R( a, b, c, d, e, F1, K1, x[15] ); -+ R( e, a, b, c, d, F1, K1, M(16) ); -+ R( d, e, a, b, c, F1, K1, M(17) ); -+ R( c, d, e, a, b, F1, K1, M(18) ); -+ R( b, c, d, e, a, F1, K1, M(19) ); -+ R( a, b, c, d, e, F2, K2, M(20) ); -+ R( e, a, b, c, d, F2, K2, M(21) ); -+ R( d, e, a, b, c, F2, K2, M(22) ); -+ R( c, d, e, a, b, F2, K2, M(23) ); -+ R( b, c, d, e, a, F2, K2, M(24) ); -+ R( a, b, c, d, e, F2, K2, M(25) ); -+ R( e, a, b, c, d, F2, K2, M(26) ); -+ R( d, e, a, b, c, F2, K2, M(27) ); -+ R( c, d, e, a, b, F2, K2, M(28) ); -+ R( b, c, d, e, a, F2, K2, M(29) ); -+ R( a, b, c, d, e, F2, K2, M(30) ); -+ R( e, a, b, c, d, F2, K2, M(31) ); -+ R( d, e, a, b, c, F2, K2, M(32) ); -+ R( c, d, e, a, b, F2, K2, M(33) ); -+ R( b, c, d, e, a, F2, K2, M(34) ); -+ R( a, b, c, d, e, F2, K2, M(35) ); -+ R( e, a, b, c, d, F2, K2, M(36) ); -+ R( d, e, a, b, c, F2, K2, M(37) ); -+ R( c, d, e, a, b, F2, K2, M(38) ); -+ R( b, c, d, e, a, F2, K2, M(39) ); -+ R( a, b, c, d, e, F3, K3, M(40) ); -+ R( e, a, b, c, d, F3, K3, M(41) ); -+ R( d, e, a, b, c, F3, K3, M(42) ); -+ R( c, d, e, a, b, F3, K3, M(43) ); -+ R( b, c, d, e, a, F3, K3, M(44) ); -+ R( a, b, c, d, e, F3, K3, M(45) ); -+ R( e, a, b, c, d, F3, K3, M(46) ); -+ R( d, e, a, b, c, F3, K3, M(47) ); -+ R( c, d, e, a, b, F3, K3, M(48) ); -+ R( b, c, d, e, a, F3, K3, M(49) ); -+ R( a, b, c, d, e, F3, K3, M(50) ); -+ R( e, a, b, c, d, F3, K3, M(51) ); -+ R( d, e, a, b, c, F3, K3, M(52) ); -+ R( c, d, e, a, b, F3, K3, M(53) ); -+ R( b, c, d, e, a, F3, K3, M(54) ); -+ R( a, b, c, d, e, F3, K3, M(55) ); -+ R( e, a, b, c, d, F3, K3, M(56) ); -+ R( d, e, a, b, c, F3, K3, M(57) ); -+ R( c, d, e, a, b, F3, K3, M(58) ); -+ R( b, c, d, e, a, F3, K3, M(59) ); -+ R( a, b, c, d, e, F4, K4, M(60) ); -+ R( e, a, b, c, d, F4, K4, M(61) ); -+ R( d, e, a, b, c, F4, K4, M(62) ); -+ R( c, d, e, a, b, F4, K4, M(63) ); -+ R( b, c, d, e, a, F4, K4, M(64) ); -+ R( a, b, c, d, e, F4, K4, M(65) ); -+ R( e, a, b, c, d, F4, K4, M(66) ); -+ R( d, e, a, b, c, F4, K4, M(67) ); -+ R( c, d, e, a, b, F4, K4, M(68) ); -+ R( b, c, d, e, a, F4, K4, M(69) ); -+ R( a, b, c, d, e, F4, K4, M(70) ); -+ R( e, a, b, c, d, F4, K4, M(71) ); -+ R( d, e, a, b, c, F4, K4, M(72) ); -+ R( c, d, e, a, b, F4, K4, M(73) ); -+ R( b, c, d, e, a, F4, K4, M(74) ); -+ R( a, b, c, d, e, F4, K4, M(75) ); -+ R( e, a, b, c, d, F4, K4, M(76) ); -+ R( d, e, a, b, c, F4, K4, M(77) ); -+ R( c, d, e, a, b, F4, K4, M(78) ); -+ R( b, c, d, e, a, F4, K4, M(79) ); -+ -+ a = ctx->A += a; -+ b = ctx->B += b; -+ c = ctx->C += c; -+ d = ctx->D += d; -+ e = ctx->E += e; -+ } -+} ---- ld/sha1.h 1 Jan 1970 00:00:00 -0000 -+++ ld/sha1.h 13 Jul 2007 10:44:28 -0000 1.1 -@@ -0,0 +1,87 @@ -+/* Declarations of functions and data types used for SHA1 sum -+ library functions. -+ Copyright (C) 2000, 2001, 2003, 2005, 2006 Free Software Foundation, Inc. -+ -+ This program is free software; you can redistribute it and/or modify it -+ under the terms of the GNU General Public License as published by the -+ Free Software Foundation; either version 2, or (at your option) any -+ later version. -+ -+ This program is distributed in the hope that it will be useful, -+ but WITHOUT ANY WARRANTY; without even the implied warranty of -+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ GNU General Public License for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with this program; if not, write to the Free Software Foundation, -+ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -+ -+#ifndef SHA1_H -+# define SHA1_H 1 -+ -+# include -+# include -+ -+/* Structure to save state of computation between the single steps. */ -+struct sha1_ctx -+{ -+ uint32_t A; -+ uint32_t B; -+ uint32_t C; -+ uint32_t D; -+ uint32_t E; -+ -+ uint32_t total[2]; -+ uint32_t buflen; -+ uint32_t buffer[32]; -+}; -+ -+ -+/* Initialize structure containing state of computation. */ -+extern void sha1_init_ctx (struct sha1_ctx *ctx); -+ -+/* Starting with the result of former calls of this function (or the -+ initialization function update the context for the next LEN bytes -+ starting at BUFFER. -+ It is necessary that LEN is a multiple of 64!!! */ -+extern void sha1_process_block (const void *buffer, size_t len, -+ struct sha1_ctx *ctx); -+ -+/* Starting with the result of former calls of this function (or the -+ initialization function update the context for the next LEN bytes -+ starting at BUFFER. -+ It is NOT required that LEN is a multiple of 64. */ -+extern void sha1_process_bytes (const void *buffer, size_t len, -+ struct sha1_ctx *ctx); -+ -+/* Process the remaining bytes in the buffer and put result from CTX -+ in first 20 bytes following RESBUF. The result is always in little -+ endian byte order, so that a byte-wise output yields to the wanted -+ ASCII representation of the message digest. -+ -+ IMPORTANT: On some systems it is required that RESBUF be correctly -+ aligned for a 32 bits value. */ -+extern void *sha1_finish_ctx (struct sha1_ctx *ctx, void *resbuf); -+ -+ -+/* Put result from CTX in first 20 bytes following RESBUF. The result is -+ always in little endian byte order, so that a byte-wise output yields -+ to the wanted ASCII representation of the message digest. -+ -+ IMPORTANT: On some systems it is required that RESBUF is correctly -+ aligned for a 32 bits value. */ -+extern void *sha1_read_ctx (const struct sha1_ctx *ctx, void *resbuf); -+ -+ -+/* Compute SHA1 message digest for bytes read from STREAM. The -+ resulting message digest number will be written into the 20 bytes -+ beginning at RESBLOCK. */ -+extern int sha1_stream (FILE *stream, void *resblock); -+ -+/* Compute SHA1 message digest for LEN bytes beginning at BUFFER. The -+ result is always in little endian byte order, so that a byte-wise -+ output yields to the wanted ASCII representation of the message -+ digest. */ -+extern void *sha1_buffer (const char *buffer, size_t len, void *resblock); -+ -+#endif diff --git a/binutils-2.17.50.0.17-ia64-lib64.patch b/binutils-2.17.50.0.17-ia64-lib64.patch deleted file mode 100644 index def9ea9..0000000 --- a/binutils-2.17.50.0.17-ia64-lib64.patch +++ /dev/null @@ -1,36 +0,0 @@ -2004-05-14 Jakub Jelinek - - * emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on - ia64-linux if /lib64 tree is present. - ---- ld/emulparams/elf64_ia64.sh.jj 2004-02-18 20:06:03.000000000 +0100 -+++ ld/emulparams/elf64_ia64.sh 2004-05-14 10:11:22.992278608 +0200 -@@ -37,3 +37,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL - # .dtors. They have to be next to .sbss/.sbss2/.sdata/.sdata2. - SMALL_DATA_CTOR=" " - SMALL_DATA_DTOR=" " -+ -+# Linux modify the default library search path to first include -+# a 64-bit specific directory. -+case "$target" in -+ ia64*-linux*) -+ case "$EMULATION_NAME" in -+ *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;; -+ esac -+ ;; -+esac ---- ltconfig 2003-02-03 16:56:49.000000000 +0900 -+++ ltconfig 2003-02-03 16:56:49.000000000 +0900 -@@ -1240,10 +1240,10 @@ - - # Find out which ABI we are using (multilib hack). - case "$host_cpu" in -- x86_64*|s390*|sparc*|ppc*|powerpc*) -+ x86_64*|s390*|sparc*|ppc*|powerpc*|ia64) - echo "$progname:@lineno@: checking multilib ABI type" 1>&5 - touch conftest.$ac_ext -- if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then -+ if test -d /lib64 && { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then - case `/usr/bin/file conftest.o` in - *64-bit*) - sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" diff --git a/binutils-2.17.50.0.17-ltconfig-multilib.patch b/binutils-2.17.50.0.17-ltconfig-multilib.patch deleted file mode 100644 index 2bf341a..0000000 --- a/binutils-2.17.50.0.17-ltconfig-multilib.patch +++ /dev/null @@ -1,718 +0,0 @@ ---- binutils/configure.jj 2007-06-18 13:29:28.000000000 -0400 -+++ binutils/configure 2007-06-27 13:55:07.000000000 -0400 -@@ -8990,10 +8990,34 @@ rm -f conftest.err conftest.$ac_objext \ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- binutils/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400 -+++ binutils/aclocal.m4 2007-06-27 13:55:07.000000000 -0400 -@@ -1206,16 +1206,49 @@ version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -1581,13 +1614,16 @@ linux*) - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ x86_64*|s390*|powerpc64*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - ;; - esac - fi ---- opcodes/configure.jj 2007-06-18 13:29:29.000000000 -0400 -+++ opcodes/configure 2007-06-27 13:55:08.000000000 -0400 -@@ -8420,10 +8420,34 @@ rm -f conftest.err conftest.$ac_objext \ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- opcodes/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400 -+++ opcodes/aclocal.m4 2007-06-27 13:55:08.000000000 -0400 -@@ -1206,16 +1206,49 @@ version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -1581,13 +1614,16 @@ linux*) - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ x86_64*|s390*|powerpc64*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - ;; - esac - fi ---- gprof/configure.jj 2007-06-18 13:29:29.000000000 -0400 -+++ gprof/configure 2007-06-27 13:55:08.000000000 -0400 -@@ -8250,10 +8250,34 @@ rm -f conftest.err conftest.$ac_objext \ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- gprof/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400 -+++ gprof/aclocal.m4 2007-06-27 13:55:08.000000000 -0400 -@@ -1206,16 +1206,49 @@ version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -1581,13 +1614,16 @@ linux*) - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ x86_64*|s390*|powerpc64*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - ;; - esac - fi ---- ld/configure.jj 2007-06-18 13:29:29.000000000 -0400 -+++ ld/configure 2007-06-27 13:55:08.000000000 -0400 -@@ -8253,10 +8253,34 @@ rm -f conftest.err conftest.$ac_objext \ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- ld/aclocal.m4.jj 2007-06-18 13:29:29.000000000 -0400 -+++ ld/aclocal.m4 2007-06-27 13:55:08.000000000 -0400 -@@ -1206,16 +1206,49 @@ version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -1581,13 +1614,16 @@ linux*) - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ x86_64*|s390*|powerpc64*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - ;; - esac - fi ---- gas/configure.jj 2007-06-18 13:29:28.000000000 -0400 -+++ gas/configure 2007-06-27 13:55:08.000000000 -0400 -@@ -8252,10 +8252,34 @@ rm -f conftest.err conftest.$ac_objext \ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- gas/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400 -+++ gas/aclocal.m4 2007-06-27 13:55:08.000000000 -0400 -@@ -1206,16 +1206,49 @@ version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -1581,13 +1614,16 @@ linux*) - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ x86_64*|s390*|powerpc64*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - ;; - esac - fi ---- bfd/configure.jj 2007-06-18 13:29:28.000000000 -0400 -+++ bfd/configure 2007-06-27 13:55:08.000000000 -0400 -@@ -9156,10 +9156,34 @@ rm -f conftest.err conftest.$ac_objext \ - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -+ (eval $ac_compile) 2>&5 -+ ac_status=$? -+ echo "$as_me:$LINENO: \$? = $ac_status" >&5 -+ (exit $ac_status); }; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on ---- bfd/aclocal.m4.jj 2007-06-18 13:29:28.000000000 -0400 -+++ bfd/aclocal.m4 2007-06-27 13:55:08.000000000 -0400 -@@ -1206,16 +1206,49 @@ version_type=none - dynamic_linker="$host_os ld.so" - sys_lib_dlsearch_path_spec="/lib /usr/lib" - if test "$GCC" = yes; then -- sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -- if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then -+ lt_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then - # if the path contains ";" then we assume it to be the separator - # otherwise default to the standard path separator (i.e. ":") - it is - # assumed that no part of a normal pathname contains ";" but that should - # okay in the real world where ";" in dirpaths is itself problematic. -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'` - else -- sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` - fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`echo $lt_search_path_spec` - else - sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" - fi -@@ -1581,13 +1614,16 @@ linux*) - # find out which ABI we are using - libsuff= - case "$host_cpu" in -- x86_64*|s390x*|powerpc64*) -- echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ x86_64*|s390*|powerpc64*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in - *64-bit*) - libsuff=64 -- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" - ;; - esac - fi ---- libtool.m4.jj 2007-06-18 13:29:28.000000000 -0400 -+++ libtool.m4 2007-06-27 13:55:08.000000000 -0400 -@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu) - # before this can be enabled. - hardcode_into_libs=yes - -+ # find out which ABI we are using -+ libsuff= -+ case "$host_cpu" in -+ x86_64*|s390*|powerpc*|ppc*|sparc*) -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *64-bit*) -+ libsuff=64 -+ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then -+ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" -+ fi -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ esac -+ - # Append ld.so.conf contents to the search path - if test -f /etc/ld.so.conf; then - lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" -+ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" - fi - - # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/binutils-2.17.50.0.17-place-orphan.patch b/binutils-2.17.50.0.17-place-orphan.patch deleted file mode 100644 index ae7c001..0000000 --- a/binutils-2.17.50.0.17-place-orphan.patch +++ /dev/null @@ -1,16 +0,0 @@ -2003-08-05 Jakub Jelinek - - * emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd. - ---- ld/emulparams/elf64ppc.sh.jj 2003-07-28 10:24:45.000000000 -0400 -+++ ld/emulparams/elf64ppc.sh 2003-08-05 08:35:58.000000000 -0400 -@@ -28,7 +28,8 @@ else - .toc 0 : { *(.toc) }" - fi - OTHER_GOT_RELOC_SECTIONS=" -- .rela.toc ${RELOCATING-0} : { *(.rela.toc) }" -+ .rela.toc ${RELOCATING-0} : { *(.rela.toc) } -+ .rela.opd ${RELOCATING-0} : { *(.rela.opd) }" - OTHER_READWRITE_SECTIONS=" - .toc1 ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.toc1) } - .opd ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { KEEP (*(.opd)) }" diff --git a/binutils-2.17.50.0.17-ppc64-pie.patch b/binutils-2.17.50.0.17-ppc64-pie.patch deleted file mode 100644 index 879ea91..0000000 --- a/binutils-2.17.50.0.17-ppc64-pie.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- bfd/elf64-ppc.c.jj 2004-09-27 16:46:06.000000000 -0400 -+++ bfd/elf64-ppc.c 2004-10-04 09:09:50.000000000 -0400 -@@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_ - else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf) - && !is_opd - && r_type != R_PPC64_TOC) -- outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); -+ { -+ outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); -+ if (h->elf.dynindx == -1 -+ && h->elf.root.type == bfd_link_hash_undefweak) -+ memset (&outrel, 0, sizeof outrel); -+ } - else - { - /* This symbol is local, or marked to become local, diff --git a/binutils-2.17.50.0.17-pt_note-coalescing.patch b/binutils-2.17.50.0.17-pt_note-coalescing.patch deleted file mode 100644 index d500560..0000000 --- a/binutils-2.17.50.0.17-pt_note-coalescing.patch +++ /dev/null @@ -1,81 +0,0 @@ -2007-07-24 Jakub Jelinek - - * elf.c (get_program_header_size): Adjacent loadable .note* - sections need just one PT_NOTE segment. - (_bfd_elf_map_sections_to_segments): Likewise. - ---- bfd/elf.c 18 Jul 2007 11:23:37 -0000 1.399 -+++ bfd/elf.c 24 Jul 2007 08:24:11 -0000 -@@ -3696,6 +3696,19 @@ get_program_header_size (bfd *abfd, stru - { - /* We need a PT_NOTE segment. */ - ++segs; -+ /* Try to create just one PT_NOTE segment -+ for all adjacent loadable .note* sections. -+ gABI requires that within a PT_NOTE segment -+ (and also inside of each SHT_NOTE section) -+ each note is padded to a multiple of 4 size, -+ so we check whether the sections are correctly -+ aligned. */ -+ if (s->alignment_power == 2) -+ while (s->next != NULL -+ && s->next->alignment_power == 2 -+ && (s->next->flags & SEC_LOAD) != 0 -+ && CONST_STRNEQ (s->next->name, ".note")) -+ s = s->next; - } - } - -@@ -4070,25 +4083,44 @@ _bfd_elf_map_sections_to_segments (bfd * - pm = &m->next; - } - -- /* For each loadable .note section, add a PT_NOTE segment. We don't -- use bfd_get_section_by_name, because if we link together -- nonloadable .note sections and loadable .note sections, we will -- generate two .note sections in the output file. FIXME: Using -- names for section types is bogus anyhow. */ -+ /* For each batch of consecutive loadable .note sections, -+ add a PT_NOTE segment. We don't use bfd_get_section_by_name, -+ because if we link together nonloadable .note sections and -+ loadable .note sections, we will generate two .note sections -+ in the output file. FIXME: Using names for section types is -+ bogus anyhow. */ - for (s = abfd->sections; s != NULL; s = s->next) - { - if ((s->flags & SEC_LOAD) != 0 - && CONST_STRNEQ (s->name, ".note")) - { -+ asection *s2; -+ unsigned count = 1; - amt = sizeof (struct elf_segment_map); -+ if (s->alignment_power == 2) -+ for (s2 = s; s2->next != NULL; s2 = s2->next) -+ if (s2->next->alignment_power == 2 -+ && (s2->next->flags & SEC_LOAD) != 0 -+ && CONST_STRNEQ (s2->next->name, ".note") -+ && align_power (s2->vma + s2->size, 2) == s2->next->vma) -+ count++; -+ else -+ break; -+ amt += (count - 1) * sizeof (asection *); - m = bfd_zalloc (abfd, amt); - if (m == NULL) - goto error_return; - m->next = NULL; - m->p_type = PT_NOTE; -- m->count = 1; -- m->sections[0] = s; -- -+ m->count = count; -+ while (count > 1) -+ { -+ m->sections[m->count - count--] = s; -+ BFD_ASSERT ((s->flags & SEC_THREAD_LOCAL) == 0); -+ s = s->next; -+ } -+ m->sections[m->count - 1] = s; -+ BFD_ASSERT ((s->flags & SEC_THREAD_LOCAL) == 0); - *pm = m; - pm = &m->next; - } diff --git a/binutils-2.17.50.0.17-secure-plt.patch b/binutils-2.17.50.0.17-secure-plt.patch deleted file mode 100644 index 89a373a..0000000 --- a/binutils-2.17.50.0.17-secure-plt.patch +++ /dev/null @@ -1,16 +0,0 @@ -2007-06-27 Alan Modra - - * elf32-ppc.c (ppc_elf_select_plt_layout): Properly iterate over - input bfds. - ---- bfd/elf32-ppc.c.jj 2007-06-18 13:31:40.000000000 -0400 -+++ bfd/elf32-ppc.c 2007-07-31 03:48:37.000000000 -0400 -@@ -3703,7 +3703,7 @@ ppc_elf_select_plt_layout (bfd *output_b - --secure-plt and we never see REL16 relocs. */ - if (plt_type == PLT_UNSET) - plt_type = PLT_OLD; -- for (ibfd = info->input_bfds; ibfd; ibfd = ibfd->next) -+ for (ibfd = info->input_bfds; ibfd; ibfd = ibfd->link_next) - if (is_ppc_elf_target (ibfd->xvec)) - { - if (ppc_elf_tdata (ibfd)->has_rel16) diff --git a/binutils-2.17.50.0.17-standards.patch b/binutils-2.17.50.0.17-standards.patch deleted file mode 100644 index 8e82614..0000000 --- a/binutils-2.17.50.0.17-standards.patch +++ /dev/null @@ -1,878 +0,0 @@ ---- etc/standards.texi.jj 2002-02-27 11:32:17.000000000 +0100 -+++ etc/standards.texi 2005-08-18 19:05:42.000000000 +0200 -@@ -3,16 +3,13 @@ - @setfilename standards.info - @settitle GNU Coding Standards - @c This date is automagically updated when you save this file: --@set lastupdate February 14, 2002 -+@set lastupdate June 8, 2005 - @c %**end of header - --@ifnottex --@format --START-INFO-DIR-ENTRY -+@dircategory GNU organization -+@direntry - * Standards: (standards). GNU coding standards. --END-INFO-DIR-ENTRY --@end format --@end ifnottex -+@end direntry - - @c @setchapternewpage odd - @setchapternewpage off -@@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY - @set CHAPTER node - @end ifnottex - --@ifnottex --GNU Coding Standards --Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. -+@copying -+The GNU coding standards, last updated @value{lastupdate}. -+ -+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -+2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. - - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 -@@ -43,32 +42,25 @@ with no Invariant Sections, with no - Front-Cover Texts, and with no Back-Cover Texts. - A copy of the license is included in the section entitled ``GNU - Free Documentation License''. --@end ifnottex -+@end copying - - @titlepage - @title GNU Coding Standards - @author Richard Stallman, et al. - @author last updated @value{lastupdate} - @page -- - @vskip 0pt plus 1filll --Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. -- --Permission is granted to copy, distribute and/or modify this document --under the terms of the GNU Free Documentation License, Version 1.1 --or any later version published by the Free Software Foundation; --with no Invariant Sections, with no --Front-Cover Texts, and with no Back-Cover Texts. --A copy of the license is included in the section entitled ``GNU --Free Documentation License''. -+@insertcopying - @end titlepage - --@ifnottex -+@contents -+ -+@ifnottex - @node Top, Preface, (dir), (dir) - @top Version - --Last updated @value{lastupdate}. --@end ifnottex -+@insertcopying -+@end ifnottex - - @menu - * Preface:: About the GNU Coding Standards -@@ -101,15 +93,10 @@ This release of the GNU Coding Standards - @cindex where to obtain @code{standards.texi} - @cindex downloading this manual - If you did not obtain this file directly from the GNU project and --recently, please check for a newer version. You can ftp the GNU --Coding Standards from any GNU FTP host in the directory --@file{/pub/gnu/standards/}. The GNU Coding Standards are available --there in several different formats: @file{standards.text}, --@file{standards.info}, and @file{standards.dvi}, as well as the --Texinfo ``source'' which is divided in two files: --@file{standards.texi} and @file{make-stds.texi}. The GNU Coding --Standards are also available on the GNU World Wide Web server: --@uref{http://www.gnu.org/prep/standards_toc.html}. -+recently, please check for a newer version. You can get the GNU -+Coding Standards from the GNU web server in many -+different formats, including the Texinfo source, PDF, HTML, DVI, plain -+text, and more, at: @uref{http://www.gnu.org/prep/standards/}. - - Corrections or suggestions for this document should be sent to - @email{bug-standards@@gnu.org}. If you make a suggestion, please include a -@@ -129,11 +116,15 @@ be self-consistent---try to stick to the - to document them as much as possible. That way, your program will be - more maintainable by others. - -+The GNU Hello program serves as an example of how to follow the GNU -+coding standards for a trivial program which prints @samp{Hello, -+world!}. @uref{http://www.gnu.org/software/hello/hello.html}. -+ - @node Legal Issues - @chapter Keeping Free Software Free - @cindex legal aspects - --This @value{CHAPTER} discusses how you can make sure that GNU software -+This chapter discusses how you can make sure that GNU software - avoids legal difficulties, and other related issues. - - @menu -@@ -211,7 +202,7 @@ You might have to take that code out aga - You don't need papers for changes of a few lines here or there, since - they are not significant for copyright purposes. Also, you don't need - papers if all you get from the suggestion is some ideas, not actual code --which you use. For example, if someone send you one implementation, but -+which you use. For example, if someone sent you one implementation, but - you write a different implementation of the same idea, you don't need to - get papers. - -@@ -221,7 +212,8 @@ result. - - We have more detailed advice for maintainers of programs; if you have - reached the stage of actually maintaining a program for GNU (whether --released or not), please ask us for a copy. -+released or not), please ask us for a copy. It is also available -+online for your perusal: @uref{http://www.gnu.org/prep/maintain/}. - - @node Trademarks - @section Trademarks -@@ -232,24 +224,33 @@ packages or documentation. - - Trademark acknowledgements are the statements that such-and-such is a - trademark of so-and-so. The GNU Project has no objection to the basic --idea of trademarks, but these acknowledgements feel like kowtowing, so --we don't use them. There is no legal requirement for them. -+idea of trademarks, but these acknowledgements feel like kowtowing, -+and there is no legal requirement for them, so we don't use them. - - What is legally required, as regards other people's trademarks, is to --avoid using them in ways which a reader might read as naming or labeling --our own programs or activities. For example, since ``Objective C'' is --(or at least was) a trademark, we made sure to say that we provide a --``compiler for the Objective C language'' rather than an ``Objective C --compiler''. The latter is meant to be short for the former, but it does --not explicitly state the relationship, so it could be misinterpreted as --using ``Objective C'' as a label for the compiler rather than for the --language. -+avoid using them in ways which a reader might reasonably understand as -+naming or labeling our own programs or activities. For example, since -+``Objective C'' is (or at least was) a trademark, we made sure to say -+that we provide a ``compiler for the Objective C language'' rather -+than an ``Objective C compiler''. The latter would have been meant as -+a shorter way of saying the former, but it does not explicitly state -+the relationship, so it could be misinterpreted as using ``Objective -+C'' as a label for the compiler rather than for the language. -+ -+Please don't use ``win'' as an abbreviation for Microsoft Windows in -+GNU software or documentation. In hacker terminology, calling -+something a ``win'' is a form of praise. If you wish to praise -+Microsoft Windows when speaking on your own, by all means do so, but -+not in GNU software. Usually we write the name ``Windows'' in full, -+but when brevity is very important (as in file names and sometimes -+symbol names), we abbreviate it to ``w''. For instance, the files and -+functions in Emacs that deal with Windows start with @samp{w32}. - - @node Design Advice - @chapter General Program Design - @cindex program design - --This @value{CHAPTER} discusses some of the issues you should take into -+This chapter discusses some of the issues you should take into - account when designing your program. - - @c Standard or ANSI C -@@ -263,7 +264,7 @@ account when designing your program. - @c A major revision of the C Standard appeared in 1999. - - @menu --* Source Language:: Which languges to use. -+* Source Language:: Which languages to use. - * Compatibility:: Compatibility with other implementations - * Using Extensions:: Using non-standard features - * Standard C:: Using Standard C features -@@ -272,7 +273,7 @@ account when designing your program. - - @node Source Language - @section Which Languages to Use --@cindex programming languges -+@cindex programming languages - - When you want to use a language that gets compiled and runs at high - speed, the best language to use is C. Using another language is like -@@ -476,6 +477,7 @@ For example, please write - ... - @end smallexample - -+@noindent - instead of: - - @smallexample -@@ -488,11 +490,12 @@ instead of: - - A modern compiler such as GCC will generate exactly the same code in - both cases, and we have been using similar techniques with good success --in several projects. -+in several projects. Of course, the former method assumes that -+@code{HAS_FOO} is defined as either 0 or 1. - - While this is not a silver bullet solving all portability problems, --following this policy would have saved the GCC project alone many person --hours if not days per year. -+and is not always appropriate, following this policy would have saved -+GCC developers many hours, or even days, per year. - - In the case of function-like macros like @code{REVERSIBLE_CC_MODE} in - GCC which cannot be simply used in @code{if( ...)} statements, there is -@@ -510,7 +513,7 @@ an easy workaround. Simply introduce an - @node Program Behavior - @chapter Program Behavior for All Programs - --This @value{CHAPTER} describes conventions for writing robust -+This chapter describes conventions for writing robust - software. It also describes general standards for error messages, the - command line interface, and how libraries should behave. - -@@ -679,10 +682,12 @@ Error messages from compilers should loo - @end example - - @noindent --If you want to mention the column number, use this format: -+If you want to mention the column number, use one of these formats: - - @example - @var{source-file-name}:@var{lineno}:@var{column}: @var{message} -+@var{source-file-name}:@var{lineno}.@var{column}: @var{message} -+ - @end example - - @noindent -@@ -692,6 +697,24 @@ of these conventions are chosen for comp - numbers assuming that space and all ASCII printing characters have - equal width, and assuming tab stops every 8 columns. - -+The error message can also give both the starting and ending positions -+of the erroneous text. There are several formats so that you can -+avoid redundant information such as a duplicate line number. -+Here are the possible formats: -+ -+@example -+@var{source-file-name}:@var{lineno-1}.@var{column-1}-@var{lineno-2}.@var{column-2}: @var{message} -+@var{source-file-name}:@var{lineno-1}.@var{column-1}-@var{column-2}: @var{message} -+@var{source-file-name}:@var{lineno-1}-@var{lineno-2}: @var{message} -+@end example -+ -+@noindent -+When an error is spread over several files, you can use this format: -+ -+@example -+@var{file-1}:@var{lineno-1}.@var{column-1}-@var{file-2}:@var{lineno-2}.@var{column-2}: @var{message} -+@end example -+ - Error messages from other noninteractive programs should look like this: - - @example -@@ -722,8 +745,9 @@ input from a source other than a termina - would do best to print error messages using the noninteractive style.) - - The string @var{message} should not begin with a capital letter when --it follows a program name and/or file name. Also, it should not end --with a period. -+it follows a program name and/or file name, because that isn't the -+beginning of a sentence. (The sentence conceptually starts at the -+beginning of the line.) Also, it should not end with a period. - - Error messages from interactive programs, and other messages such as - usage messages, should start with a capital letter. But they should not -@@ -767,9 +791,9 @@ multi-column format. - @section Standards for Graphical Interfaces - @cindex graphical user interface - --@cindex gtk -+@cindex gtk+ - When you write a program that provides a graphical user interface, --please make it work with X Windows and the GTK toolkit unless the -+please make it work with X Windows and the GTK+ toolkit unless the - functionality specifically requires some alternative (for example, - ``displaying jpeg images while in console mode''). - -@@ -819,8 +843,15 @@ option as another way to specify it. Th - among GNU utilities, and fewer idiosyncracies for users to remember. - - @cindex standard command-line options -+@cindex options, standard command-line -+@cindex CGI programs, standard options for -+@cindex PATH_INFO, specifying standard options as - All programs should support two standard options: @samp{--version} --and @samp{--help}. -+and @samp{--help}. CGI programs should accept these as command-line -+options, and also if given as the @env{PATH_INFO}; for instance, -+visiting @url{http://example.org/p.cgi/--help} in a browser should -+output the same information as invoking @samp{p.cgi --help} from the -+command line. - - @table @code - @cindex @samp{--version} option -@@ -1461,9 +1492,7 @@ Used in @code{gawk}. - Used in @code{su}. - - @item machine --No listing of which programs already use this; --someone should check to --see if any actually do, and tell @email{gnu@@gnu.org}. -+Used in @code{uname}. - - @item macro-name - @samp{-M} in @code{ptx}. -@@ -1573,6 +1602,9 @@ Used in GDB. - @item no-sort - @samp{-p} in @code{nm}. - -+@item no-splash -+Don't print a startup splash screen. -+ - @item no-split - Used in @code{makeinfo}. - -@@ -1740,7 +1772,7 @@ Specify an HTTP proxy. - @samp{-q} in Make. - - @item quiet --Used in many programs to inhibit the usual output. @strong{Note:} every -+Used in many programs to inhibit the usual output. Every - program accepting @samp{--quiet} should accept @samp{--silent} as a - synonym. - -@@ -1855,7 +1887,7 @@ Used by @code{recode} to chose files or - - @item silent - Used in many programs to inhibit the usual output. --@strong{Note:} every program accepting -+Every program accepting - @samp{--silent} should accept @samp{--quiet} as a synonym. - - @item size -@@ -2098,7 +2130,7 @@ directory. - @node Writing C - @chapter Making The Best Use of C - --This @value{CHAPTER} provides advice on how best to use the C language -+This chapter provides advice on how best to use the C language - when writing GNU software. - - @menu -@@ -2128,13 +2160,12 @@ These tools will not work on code not fo - It is also important for function definitions to start the name of the - function in column zero. This helps people to search for function - definitions, and may also help certain tools recognize them. Thus, --the proper format is this: -+using Standard C syntax, the format is this: - - @example - static char * --concat (s1, s2) /* Name starts in column zero here */ -- char *s1, *s2; --@{ /* Open brace in column zero here */ -+concat (char *s1, char *s2) -+@{ - @dots{} - @} - @end example -@@ -2145,8 +2176,9 @@ this: - - @example - static char * --concat (char *s1, char *s2) --@{ -+concat (s1, s2) /* Name starts in column zero here */ -+ char *s1, *s2; -+@{ /* Open brace in column zero here */ - @dots{} - @} - @end example -@@ -2383,7 +2415,7 @@ functions. - @cindex temporary variables - It used to be common practice to use the same local variables (with - names like @code{tem}) over and over for different values within one --function. Instead of doing this, it is better declare a separate local -+function. Instead of doing this, it is better to declare a separate local - variable for each distinct purpose, and give it a name which is - meaningful. This not only makes programs easier to understand, it also - facilitates optimization by good compilers. You can also move the -@@ -2584,11 +2616,20 @@ Avoid using the format of semi-internal - when there is a higher-level alternative (@code{readdir}). - - @cindex non-@sc{posix} systems, and portability --As for systems that are not like Unix, such as MSDOS, Windows, the --Macintosh, VMS, and MVS, supporting them is often a lot of work. When --that is the case, it is better to spend your time adding features that --will be useful on GNU and GNU/Linux, rather than on supporting other --incompatible systems. -+As for systems that are not like Unix, such as MSDOS, Windows, VMS, -+MVS, and older Macintosh systems, supporting them is often a lot of -+work. When that is the case, it is better to spend your time adding -+features that will be useful on GNU and GNU/Linux, rather than on -+supporting other incompatible systems. -+ -+If you do support Windows, please do not abbreviate it as ``win''. In -+hacker terminology, calling something a ``win'' is a form of praise. -+You're free to praise Microsoft Windows on your own if you want, but -+please don't do this in GNU packages. Instead of abbreviating -+``Windows'' to ``un'', you can write it in full or abbreviate it to -+``woe'' or ``w''. In GNU Emacs, for instance, we use @samp{w32} in -+file names of Windows-specific files, but the macro for Windows -+conditionals is called @code{WINDOWSNT}. - - It is a good idea to define the ``feature test macro'' - @code{_GNU_SOURCE} when compiling your C files. When you compile on GNU -@@ -2644,37 +2685,50 @@ while ((c = getchar()) != EOF) - write(file_descriptor, &c, 1); - @end example - --When calling functions, you need not worry about the difference between --pointers of various types, or between pointers and integers. On most --machines, there's no difference anyway. As for the few machines where --there is a difference, all of them support Standard C prototypes, so you can --use prototypes (perhaps conditionalized to be active only in Standard C) --to make the code work on those systems. -- --In certain cases, it is ok to pass integer and pointer arguments --indiscriminately to the same function, and use no prototype on any --system. For example, many GNU programs have error-reporting functions --that pass their arguments along to @code{printf} and friends: -- --@example --error (s, a1, a2, a3) -- char *s; -- char *a1, *a2, *a3; --@{ -- fprintf (stderr, "error: "); -- fprintf (stderr, s, a1, a2, a3); --@} -+It used to be ok to not worry about the difference between pointers -+and integers when passing arguments to functions. However, on most -+modern 64-bit machines pointers are wider than @code{int}. -+Conversely, integer types like @code{long long int} and @code{off_t} -+are wider than pointers on most modern 32-bit machines. Hence it's -+often better nowadays to use prototypes to define functions whose -+argument types are not trivial. -+ -+In particular, if functions accept varying argument counts or types -+they should be declared using prototypes containing @samp{...} and -+defined using @file{stdarg.h}. For an example of this, please see the -+@uref{http://www.gnu.org/software/gnulib/, Gnulib} error module, which -+declares and defines the following function: -+ -+@example -+/* Print a message with `fprintf (stderr, FORMAT, ...)'; -+ if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). -+ If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ -+ -+void error (int status, int errnum, const char *format, ...); - @end example - --@noindent --In practice, this works on all machines, since a pointer is generally --the widest possible kind of argument; it is much simpler than any --``correct'' alternative. Be sure @emph{not} to use a prototype for such --functions. -+A simple way to use the Gnulib error module is to obtain the two -+source files @file{error.c} and @file{error.h} from the Gnulib library -+source code repository at -+@uref{http://savannah.gnu.org/cgi-bin/viewcvs/gnulib/gnulib/lib/}. -+Here's a sample use: - --If you have decided to use Standard C, then you can instead define --@code{error} using @file{stdarg.h}, and pass the arguments along to --@code{vfprintf}. -+@example -+#include "error.h" -+#include -+#include -+ -+char *program_name = "myprogram"; -+ -+FILE * -+xfopen (char const *name) -+@{ -+ FILE *fp = fopen (name, "r"); -+ if (! fp) -+ error (1, errno, "cannot read %s", name); -+ return fp; -+@} -+@end example - - @cindex casting pointers to integers - Avoid casting pointers to integers if you can. Such casts greatly -@@ -3000,10 +3054,13 @@ together, we can make the whole subject - - The manual which discusses a program should certainly document all of - the program's command-line options and all of its commands. It should --give examples of their use. But don't organize the manual as a list of --features. Instead, organize it logically, by subtopics. Address the --questions that a user will ask when thinking about the job that the --program does. -+give examples of their use. But don't organize the manual as a list -+of features. Instead, organize it logically, by subtopics. Address -+the questions that a user will ask when thinking about the job that -+the program does. Don't just tell the reader what each feature can -+do---say what jobs it is good for, and show how to use it for those -+jobs. Explain what is recommended usage, and what kinds of usage -+users should avoid. - - In general, a GNU manual should serve both as tutorial and reference. - It should be set up for convenient access to each topic through Info, -@@ -3030,9 +3087,9 @@ functions, variables, options, and impor - the program. One combined Index should do for a short manual, but - sometimes for a complex package it is better to use multiple indices. - The Texinfo manual includes advice on preparing good index entries, see --@ref{Index Entries, , Making Index Entries, texinfo, The GNU Texinfo --Manual}, and see @ref{Indexing Commands, , Defining the Entries of an --Index, texinfo, The GNU Texinfo manual}. -+@ref{Index Entries, , Making Index Entries, texinfo, GNU Texinfo}, and -+see @ref{Indexing Commands, , Defining the Entries of an -+Index, texinfo, GNU Texinfo}. - - Don't use Unix man pages as a model for how to write GNU documentation; - most of them are terse, badly structured, and give inadequate -@@ -3041,15 +3098,15 @@ exceptions.) Also, Unix man pages use a - different from what we use in GNU manuals. - - Please include an email address in the manual for where to report --bugs @emph{in the manual}. -+bugs @emph{in the text of the manual}. - - Please do not use the term ``pathname'' that is used in Unix - documentation; use ``file name'' (two words) instead. We use the term - ``path'' only for search paths, which are lists of directory names. - --Please do not use the term ``illegal'' to refer to erroneous input to a --computer program. Please use ``invalid'' for this, and reserve the term --``illegal'' for activities punishable by law. -+Please do not use the term ``illegal'' to refer to erroneous input to -+a computer program. Please use ``invalid'' for this, and reserve the -+term ``illegal'' for activities prohibited by law. - - @node Doc Strings and Manuals - @section Doc Strings and Manuals -@@ -3092,7 +3149,7 @@ Each program documented in the manual sh - @samp{@var{program} Invocation} or @samp{Invoking @var{program}}. This - node (together with its subnodes, if any) should describe the program's - command line arguments and how to run it (the sort of information people --would look in a man page for). Start with an @samp{@@example} -+would look for in a man page). Start with an @samp{@@example} - containing a template for all the options and arguments that the program - uses. - -@@ -3210,6 +3267,11 @@ code. For example, ``New function'' is - you add a function, because there should be a comment before the - function definition to explain what it does. - -+In the past, we recommended not mentioning changes in non-software -+files (manuals, help files, etc.) in change logs. However, we've been -+advised that it is a good idea to include them, for the sake of -+copyright records. -+ - However, sometimes it is useful to write one line to describe the - overall purpose of a batch of changes. - -@@ -3224,9 +3286,9 @@ Then describe the changes you made to th - @cindex change logs, style - - Here are some simple examples of change log entries, starting with the --header line that says who made the change and when, followed by --descriptions of specific changes. (These examples are drawn from Emacs --and GCC.) -+header line that says who made the change and when it was installed, -+followed by descriptions of specific changes. (These examples are -+drawn from Emacs and GCC.) - - @example - 1998-08-17 Richard Stallman -@@ -3270,6 +3332,27 @@ Break long lists of function names by cl - (Fexecute_extended_command): Deal with `keymap' property. - @end example - -+When you install someone else's changes, put the contributor's name in -+the change log entry rather than in the text of the entry. In other -+words, write this: -+ -+@example -+2002-07-14 John Doe -+ -+ * sewing.c: Make it sew. -+@end example -+ -+@noindent -+rather than this: -+ -+@example -+2002-07-14 Usual Maintainer -+ -+ * sewing.c: Make it sew. Patch by jdoe@@gnu.org. -+@end example -+ -+As for the date, that should be the date you applied the change. -+ - @node Simple Changes - @subsection Simple Changes - -@@ -3291,12 +3374,17 @@ When you change just comments or doc str - entry for the file, without mentioning the functions. Just ``Doc - fixes'' is enough for the change log. - --There's no need to make change log entries for documentation files. --This is because documentation is not susceptible to bugs that are hard --to fix. Documentation does not consist of parts that must interact in a --precisely engineered fashion. To correct an error, you need not know --the history of the erroneous passage; it is enough to compare what the --documentation says with the way the program actually works. -+There's no technical need to make change log entries for documentation -+files. This is because documentation is not susceptible to bugs that -+are hard to fix. Documentation does not consist of parts that must -+interact in a precisely engineered fashion. To correct an error, you -+need not know the history of the erroneous passage; it is enough to -+compare what the documentation says with the way the program actually -+works. -+ -+However, you should keep change logs for documentation files when the -+project gets copyright assignments from its contributors, so as to -+make the records of authorship more accurate. - - @node Conditional Changes - @subsection Conditional Changes -@@ -3387,6 +3475,25 @@ page explaining that you don't maintain - is more authoritative. The note should say how to access the Texinfo - documentation. - -+Be sure that man pages include a copyright statement and free -+license. The simple all-permissive license is appropriate for simple -+man pages: -+ -+@example -+Copying and distribution of this file, with or without modification, -+are permitted in any medium without royalty provided the copyright -+notice and this notice are preserved. -+@end example -+ -+For long man pages, with enough explanation and documentation that -+they can be considered true manuals, use the GFDL (@pxref{License for -+Manuals}). -+ -+Finally, the GNU help2man program -+(@uref{http://www.gnu.org/software/help2man/}) is one way to automate -+generation of a man page, in this case from @option{--help} output. -+This is sufficient in many cases. -+ - @node Reading other Manuals - @section Reading other Manuals - -@@ -3486,19 +3593,26 @@ this: - @var{cpu}-@var{company}-@var{system} - @end example - --For example, a Sun 3 might be @samp{m68k-sun-sunos4.1}. -+For example, an Athlon-based GNU/Linux system might be -+@samp{i686-pc-linux-gnu}. - - The @code{configure} script needs to be able to decode all plausible --alternatives for how to describe a machine. Thus, @samp{sun3-sunos4.1} --would be a valid alias. For many programs, @samp{vax-dec-ultrix} would --be an alias for @samp{vax-dec-bsd}, simply because the differences --between Ultrix and @sc{bsd} are rarely noticeable, but a few programs --might need to distinguish them. --@c Real 4.4BSD now runs on some Suns. -- --There is a shell script called @file{config.sub} that you can use -+alternatives for how to describe a machine. Thus, -+@samp{athlon-pc-gnu/linux} would be a valid alias. -+There is a shell script called -+@uref{ftp://ftp.gnu.org/gnu/config/config.sub, @file{config.sub}} -+that you can use - as a subroutine to validate system types and canonicalize aliases. - -+The @code{configure} script should also take the option -+@option{--build=@var{buildtype}}, which should be equivalent to a -+plain @var{buildtype} argument. For example, @samp{configure -+--build=i686-pc-linux-gnu} is equivalent to @samp{configure -+i686-pc-linux-gnu}. When the build type is not specified by an option -+or argument, the @code{configure} script should normally guess it -+using the shell script -+@uref{ftp://ftp.gnu.org/gnu/config/config.guess, @file{config.guess}}. -+ - @cindex optional features, configure-time - Other options are permitted to specify in more detail the software - or hardware present on the machine, and include or exclude optional -@@ -3558,6 +3672,11 @@ The @code{configure} script should norma - system as both the host and the target, thus producing a program which - works for the same type of machine that it runs on. - -+To compile a program to run on a host type that differs from the build -+type, use the configure option @option{--host=@var{hosttype}}, where -+@var{hosttype} uses the same syntax as @var{buildtype}. The host type -+normally defaults to the build type. -+ - To configure a cross-compiler, cross-assembler, or what have you, you - should specify a target different from the host, using the configure - option @samp{--target=@var{targettype}}. The syntax for -@@ -3565,22 +3684,14 @@ option @samp{--target=@var{targettype}}. - look like this: - - @example --./configure @var{hosttype} --target=@var{targettype} -+./configure --host=@var{hosttype} --target=@var{targettype} - @end example - -+The target type normally defaults to the host type. - Programs for which cross-operation is not meaningful need not accept the - @samp{--target} option, because configuring an entire operating system for - cross-operation is not a meaningful operation. - --Bootstrapping a cross-compiler requires compiling it on a machine other --than the host it will run on. Compilation packages accept a --configuration option @samp{--build=@var{buildtype}} for specifying the --configuration on which you will compile them, but the configure script --should normally guess the build machine type (using --@file{config.guess}), so this option is probably not necessary. The --host and target types normally default from the build type, so in --bootstrapping a cross-compiler you must specify them both explicitly. -- - Some programs have ways of configuring themselves automatically. If - your program is set up to do this, your @code{configure} script can simply - ignore most of its arguments. -@@ -3596,6 +3707,10 @@ ignore most of its arguments. - @section Making Releases - @cindex packaging - -+You should identify each release with a pair of version numbers, a -+major version and a minor. We have no objection to using more than -+two numbers, but it is very unlikely that you really need them. -+ - Package the distribution of @code{Foo version 69.96} up in a gzipped tar - file with the name @file{foo-69.96.tar.gz}. It should unpack into a - subdirectory named @file{foo-69.96}. -@@ -3644,13 +3759,6 @@ able to extract all the files even if th - - Make sure that all the files in the distribution are world-readable. - --Make sure that no file name in the distribution is more than 14 --characters long. Likewise, no file created by building the program --should have a name longer than 14 characters. The reason for this is --that some systems adhere to a foolish interpretation of the @sc{posix} --standard, and refuse to open a longer name, rather than truncating as --they did in the past. -- - Don't include any symbolic links in the distribution itself. If the tar - file contains symbolic links, then people cannot even unpack it on - systems that don't support symbolic links. Also, don't use multiple -@@ -3682,16 +3790,27 @@ other files to get. - - A GNU program should not recommend use of any non-free program. We - can't stop some people from writing proprietary programs, or stop --other people from using them, but we can and should avoid helping to -+other people from using them, but we can and should refuse to - advertise them to new potential customers. Proprietary software is a - social and ethical problem, and the point of GNU is to solve that - problem. - -+The GNU definition of free software is found on the GNU web site at -+@url{http://www.gnu.org/philosophy/free-sw.html}. A list of -+important licenses and whether they qualify as free is in -+@url{http://www.gnu.org/licenses/license-list.html}. The terms -+``free'' and ``non-free'', used in this document, refer to that -+definition. If it is not clear whether a license qualifies as free -+under this definition, please ask the GNU Project by writing to -+@email{licensing@@gnu.org}. We will answer, and if the license is an -+important one, we will add it to the list. -+ - When a non-free program or system is well known, you can mention it in - passing---that is harmless, since users who might want to use it - probably already know about it. For instance, it is fine to explain --how to build your package on top of some non-free operating system, or --how to use it together with some widely used non-free program. -+how to build your package on top of some widely used non-free -+operating system, or how to use it together with some widely used -+non-free program. - - However, you should give only the necessary information to help those - who already use the non-free program to use your program with -@@ -3700,8 +3819,8 @@ proprietary program, and don't imply tha - enhances your program, or that its existence is in any way a good - thing. The goal should be that people already using the proprietary - program will get the advice they need about how to use your free --program, while people who don't already use the proprietary program --will not see anything to lead them to take an interest in it. -+program with it, while people who don't already use the proprietary -+program will not see anything to lead them to take an interest in it. - - If a non-free program or system is obscure in your program's domain, - your program should not mention or support it at all, since doing so -@@ -3709,13 +3828,46 @@ would tend to popularize the non-free pr - your program. (You cannot hope to find many additional users among - the users of Foobar if the users of Foobar are few.) - -+Sometimes a program is free software in itself but depends on a -+non-free platform in order to run. For instance, many Java programs -+depend on Sun's Java implementation, and won't run on the GNU Java -+Compiler (which does not yet have all the features) or won't run with -+the GNU Java libraries. To recommend that program is inherently to -+recommend the non-free platform as well; if you should not do the -+latter, then don't do the former. -+ - A GNU package should not refer the user to any non-free documentation - for free software. Free documentation that can be included in free --operating systems is essential for completing the GNU system, so it is --a major focus of the GNU Project; to recommend use of documentation --that we are not allowed to use in GNU would undermine the efforts to --get documentation that we can include. So GNU packages should never --recommend non-free documentation. -+operating systems is essential for completing the GNU system, or any -+free operating system, so it is a major focus of the GNU Project; to -+recommend use of documentation that we are not allowed to use in GNU -+would weaken the impetus for the community to produce documentation -+that we can include. So GNU packages should never recommend non-free -+documentation. -+ -+By contrast, it is ok to refer to journal articles and textbooks in -+the comments of a program for explanation of how it functions, even -+though they be non-free. This is because we don't include such things -+in the GNU system even if we are allowed to--they are outside the -+scope of an operating system project. -+ -+Referring to a web site that describes or recommends a non-free -+program is in effect promoting that software, so please do not make -+links (or mention by name) web sites that contain such material. This -+policy is relevant particularly for the web pages for a GNU package. -+ -+Following links from nearly any web site can lead to non-free -+software; this is an inescapable aspect of the nature of the web, and -+in itself is no objection to linking to a site. As long as the site -+does not itself recommend a non-free program, there is no need be -+concerned about the sites it links to for other reasons. -+ -+Thus, for example, you should not make a link to AT&T's web site, -+because that recommends AT&T's non-free software packages; you should -+not make a link to a site that links to AT&T's site saying it is a -+place to get a non-free program; but if a site you want to link to -+refers to AT&T's web site in some other context (such as long-distance -+telephone service), that is not a problem. - - @node Copying This Manual - @appendix Copying This Manual -@@ -3730,13 +3882,12 @@ recommend non-free documentation. - @unnumbered Index - @printindex cp - --@contents -- - @bye --@c Local variables: --@c eval: (add-hook 'write-file-hooks 'time-stamp) --@c time-stamp-start: "@set lastupdate " --@c time-stamp-end: "$" --@c time-stamp-format: "%:b %:d, %:y" --@c compile-command: "make just-standards" --@c End: -+ -+Local variables: -+eval: (add-hook 'write-file-hooks 'time-stamp) -+time-stamp-start: "@set lastupdate " -+time-stamp-end: "$" -+time-stamp-format: "%:b %:d, %:y" -+compile-command: "make just-standards" -+End: diff --git a/binutils-2.17.50.0.17-symbolic-envvar-revert.patch b/binutils-2.17.50.0.17-symbolic-envvar-revert.patch deleted file mode 100644 index 7d1d834..0000000 --- a/binutils-2.17.50.0.17-symbolic-envvar-revert.patch +++ /dev/null @@ -1,50 +0,0 @@ ---- ld/NEWS.jj 2007-05-11 11:24:08.000000000 -0400 -+++ ld/NEWS 2007-06-12 05:04:49.000000000 -0400 -@@ -1,7 +1,4 @@ - -*- text -*- --* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and -- LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions. -- - * -l:foo now searches the library path for a filename called foo, - without converting it to libfoo.a or libfoo.so. - ---- ld/ld.texinfo.jj 2007-05-11 11:24:08.000000000 -0400 -+++ ld/ld.texinfo 2007-06-12 05:04:33.000000000 -0400 -@@ -1147,21 +1147,14 @@ When creating a shared library, bind ref - definition within the shared library, if any. Normally, it is possible - for a program linked against a shared library to override the definition - within the shared library. This option is only meaningful on ELF --platforms which support shared libraries. If @option{-Bsymbolic} is not --used when linking a shared library, the linker will also turn on this --option if the environment variable @code{LD_SYMBOLIC} is set. -+platforms which support shared libraries. - - @kindex -Bsymbolic-functions - @item -Bsymbolic-functions - When creating a shared library, bind references to global function - symbols to the definition within the shared library, if any. - This option is only meaningful on ELF platforms which support shared --libraries. If @option{-Bsymbolic-functions} is not used when linking a --shared library, the linker will also turn on this option if the --environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set. When --both environment variables @code{LD_SYMBOLIC} and --@code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take --precedent. -+libraries. - - @kindex --dynamic-list=@var{dynamic-list-file} - @item --dynamic-list=@var{dynamic-list-file} ---- ld/ldmain.c.jj 2007-05-11 11:24:08.000000000 -0400 -+++ ld/ldmain.c 2007-06-12 05:05:48.000000000 -0400 -@@ -254,11 +254,6 @@ main (int argc, char **argv) - command_line.warn_search_mismatch = TRUE; - command_line.check_section_addresses = TRUE; - -- if (getenv ("LD_SYMBOLIC") != NULL) -- command_line.symbolic = symbolic; -- else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL) -- command_line.symbolic = symbolic_functions; -- - /* We initialize DEMANGLING based on the environment variable - COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the - output of the linker, unless COLLECT_NO_DEMANGLE is set in the diff --git a/binutils-2.17.50.0.17-version.patch b/binutils-2.17.50.0.17-version.patch deleted file mode 100644 index bec1e57..0000000 --- a/binutils-2.17.50.0.17-version.patch +++ /dev/null @@ -1,36 +0,0 @@ ---- bfd/Makefile.in.jj 2007-05-11 17:23:18.000000000 +0200 -+++ bfd/Makefile.in 2007-06-12 12:28:10.000000000 +0200 -@@ -1540,12 +1540,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ - report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ - if test "x$(RELEASE)" = x ; then \ - bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ -- bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ -- bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ -+ bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\ -+ bfd_soversion="$(VERSION)-%{release}" ;\ - fi ;\ - sed -e "s,@bfd_version@,$$bfd_version," \ - -e "s,@bfd_version_string@,$$bfd_version_string," \ -- -e "s,@bfd_version_package@,$$bfd_version_package," \ -+ -e "s,@bfd_version_package@,\"version \"," \ - -e "s,@report_bugs_to@,$$report_bugs_to," \ - < $(srcdir)/version.h > $@; \ - echo "$${bfd_soversion}" > libtool-soversion ---- bfd/Makefile.am.jj 2007-05-11 17:23:18.000000000 +0200 -+++ bfd/Makefile.am 2007-06-12 12:28:10.000000000 +0200 -@@ -973,12 +973,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ - report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ - if test "x$(RELEASE)" = x ; then \ - bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ -- bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ -- bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ -+ bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\ -+ bfd_soversion="$(VERSION)-%{release}" ;\ - fi ;\ - sed -e "s,@bfd_version@,$$bfd_version," \ - -e "s,@bfd_version_string@,$$bfd_version_string," \ -- -e "s,@bfd_version_package@,$$bfd_version_package," \ -+ -e "s,@bfd_version_package@,\"version \"," \ - -e "s,@report_bugs_to@,$$report_bugs_to," \ - < $(srcdir)/version.h > $@; \ - echo "$${bfd_soversion}" > libtool-soversion diff --git a/binutils-2.17.50.0.18-build-fixes.patch b/binutils-2.17.50.0.18-build-fixes.patch new file mode 100644 index 0000000..943ce2c --- /dev/null +++ b/binutils-2.17.50.0.18-build-fixes.patch @@ -0,0 +1,29 @@ +2006-02-14 Jakub Jelinek + +ld/testsuite/ + * ld-shared/main.c (main): Prevent warnings about unused p. + * ld-elfcomm/common1b.c (dummy1): Add __attribute__((__used__)) for + GCC 3.3+. + +--- ld/testsuite/ld-shared/main.c.jj 2001-07-11 15:48:54.000000000 +0200 ++++ ld/testsuite/ld-shared/main.c 2006-02-14 10:07:08.000000000 +0100 +@@ -40,6 +40,8 @@ main () + { + int (*p) (); + ++ p = (void *) 0; ++ (void) p; + printf ("mainvar == %d\n", mainvar); + printf ("overriddenvar == %d\n", overriddenvar); + printf ("shlibvar1 == %d\n", shlibvar1); +--- ld/testsuite/ld-elfcomm/common1b.c.jj 2003-04-15 11:38:10.000000000 +0200 ++++ ld/testsuite/ld-elfcomm/common1b.c 2006-02-14 10:11:19.000000000 +0100 +@@ -1,3 +1,7 @@ +-static char dummy1 = 'X'; ++static char dummy1 ++#if defined __GNUC__ && (__GNUC__ >= 4 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 3)) ++ __attribute__((__used__)) ++#endif ++ = 'X'; + char foo1 [] = "Aligned at odd byte."; + char foo2 [4]; diff --git a/binutils-2.17.50.0.18-bz4923.patch b/binutils-2.17.50.0.18-bz4923.patch new file mode 100644 index 0000000..c3c8a54 --- /dev/null +++ b/binutils-2.17.50.0.18-bz4923.patch @@ -0,0 +1,100 @@ +2007-08-15 Alan Modra + + PR 4923 + * emultempl/elf32.em (after_open): Return immediately when + non-ELF output. + +--- ld/emultempl/elf32.em 29 Jul 2007 12:33:38 -0000 1.184 ++++ ld/emultempl/elf32.em 15 Aug 2007 06:03:11 -0000 1.185 +@@ -1032,6 +1032,11 @@ static void + gld${EMULATION_NAME}_after_open (void) + { + struct bfd_link_needed_list *needed, *l; ++ struct elf_link_hash_table *htab; ++ ++ htab = elf_hash_table (&link_info); ++ if (!is_elf_hash_table (htab)) ++ return; + + if (link_info.emit_note_gnu_build_id) + { +@@ -1076,46 +1081,38 @@ gld${EMULATION_NAME}_after_open (void) + } + } + ++ if (link_info.relocatable) ++ return; ++ + if (link_info.eh_frame_hdr +- && ! link_info.traditional_format +- && ! link_info.relocatable) ++ && !link_info.traditional_format) + { +- struct elf_link_hash_table *htab; ++ bfd *abfd; ++ asection *s; + +- htab = elf_hash_table (&link_info); +- if (is_elf_hash_table (htab)) ++ for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) + { +- bfd *abfd; +- asection *s; +- +- for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next) +- { +- s = bfd_get_section_by_name (abfd, ".eh_frame"); +- if (s && s->size > 8 && !bfd_is_abs_section (s->output_section)) +- break; +- } +- if (abfd) +- { +- const struct elf_backend_data *bed; ++ s = bfd_get_section_by_name (abfd, ".eh_frame"); ++ if (s && s->size > 8 && !bfd_is_abs_section (s->output_section)) ++ break; ++ } ++ if (abfd) ++ { ++ const struct elf_backend_data *bed; + +- bed = get_elf_backend_data (abfd); +- s = bfd_make_section_with_flags (abfd, ".eh_frame_hdr", +- bed->dynamic_sec_flags +- | SEC_READONLY); +- if (s != NULL +- && bfd_set_section_alignment (abfd, s, 2)) +- htab->eh_info.hdr_sec = s; +- else +- einfo ("%P: warning: Cannot create .eh_frame_hdr section," +- " --eh-frame-hdr ignored.\n"); +- } ++ bed = get_elf_backend_data (abfd); ++ s = bfd_make_section_with_flags (abfd, ".eh_frame_hdr", ++ bed->dynamic_sec_flags ++ | SEC_READONLY); ++ if (s != NULL ++ && bfd_set_section_alignment (abfd, s, 2)) ++ htab->eh_info.hdr_sec = s; ++ else ++ einfo ("%P: warning: Cannot create .eh_frame_hdr section," ++ " --eh-frame-hdr ignored.\n"); + } + } + +- /* We only need to worry about this when doing a final link. */ +- if (link_info.relocatable || !link_info.executable) +- return; +- + /* Get the list of files which appear in DT_NEEDED entries in + dynamic objects included in the link (often there will be none). + For each such file, we want to track down the corresponding +@@ -1125,6 +1122,8 @@ gld${EMULATION_NAME}_after_open (void) + special action by the person doing the link. Note that the + needed list can actually grow while we are stepping through this + loop. */ ++ if (!link_info.executable) ++ return; + needed = bfd_elf_get_needed_list (output_bfd, &link_info); + for (l = needed; l != NULL; l = l->next) + { diff --git a/binutils-2.17.50.0.18-ia64-lib64.patch b/binutils-2.17.50.0.18-ia64-lib64.patch new file mode 100644 index 0000000..def9ea9 --- /dev/null +++ b/binutils-2.17.50.0.18-ia64-lib64.patch @@ -0,0 +1,36 @@ +2004-05-14 Jakub Jelinek + + * emulparams/elf64_ia64.sh (LIBPATH_SUFFIX): Use */lib64 paths on + ia64-linux if /lib64 tree is present. + +--- ld/emulparams/elf64_ia64.sh.jj 2004-02-18 20:06:03.000000000 +0100 ++++ ld/emulparams/elf64_ia64.sh 2004-05-14 10:11:22.992278608 +0200 +@@ -37,3 +37,13 @@ OTHER_READONLY_SECTIONS="${OTHER_READONL + # .dtors. They have to be next to .sbss/.sbss2/.sdata/.sdata2. + SMALL_DATA_CTOR=" " + SMALL_DATA_DTOR=" " ++ ++# Linux modify the default library search path to first include ++# a 64-bit specific directory. ++case "$target" in ++ ia64*-linux*) ++ case "$EMULATION_NAME" in ++ *64*) test -d /lib64 && LIBPATH_SUFFIX=64 ;; ++ esac ++ ;; ++esac +--- ltconfig 2003-02-03 16:56:49.000000000 +0900 ++++ ltconfig 2003-02-03 16:56:49.000000000 +0900 +@@ -1240,10 +1240,10 @@ + + # Find out which ABI we are using (multilib hack). + case "$host_cpu" in +- x86_64*|s390*|sparc*|ppc*|powerpc*) ++ x86_64*|s390*|sparc*|ppc*|powerpc*|ia64) + echo "$progname:@lineno@: checking multilib ABI type" 1>&5 + touch conftest.$ac_ext +- if { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then ++ if test -d /lib64 && { (eval echo $progname: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>conftest.err; } && test -s conftest.$objext; then + case `/usr/bin/file conftest.o` in + *64-bit*) + sys_lib_dlsearch_path_spec="/lib64 /usr/lib64" diff --git a/binutils-2.17.50.0.18-ltconfig-multilib.patch b/binutils-2.17.50.0.18-ltconfig-multilib.patch new file mode 100644 index 0000000..5b302c3 --- /dev/null +++ b/binutils-2.17.50.0.18-ltconfig-multilib.patch @@ -0,0 +1,262 @@ +--- binutils/configure.jj 2007-06-18 13:29:28.000000000 -0400 ++++ binutils/configure 2007-06-27 13:55:07.000000000 -0400 +@@ -8990,10 +8990,34 @@ rm -f conftest.err conftest.$ac_objext \ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +--- opcodes/configure.jj 2007-06-18 13:29:29.000000000 -0400 ++++ opcodes/configure 2007-06-27 13:55:08.000000000 -0400 +@@ -8420,10 +8420,34 @@ rm -f conftest.err conftest.$ac_objext \ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +--- gprof/configure.jj 2007-06-18 13:29:29.000000000 -0400 ++++ gprof/configure 2007-06-27 13:55:08.000000000 -0400 +@@ -8250,10 +8250,34 @@ rm -f conftest.err conftest.$ac_objext \ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +--- ld/configure.jj 2007-06-18 13:29:29.000000000 -0400 ++++ ld/configure 2007-06-27 13:55:08.000000000 -0400 +@@ -8253,10 +8253,34 @@ rm -f conftest.err conftest.$ac_objext \ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +--- gas/configure.jj 2007-06-18 13:29:28.000000000 -0400 ++++ gas/configure 2007-06-27 13:55:08.000000000 -0400 +@@ -8252,10 +8252,34 @@ rm -f conftest.err conftest.$ac_objext \ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +--- bfd/configure.jj 2007-06-18 13:29:28.000000000 -0400 ++++ bfd/configure 2007-06-27 13:55:08.000000000 -0400 +@@ -9156,10 +9156,34 @@ rm -f conftest.err conftest.$ac_objext \ + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 ++ (eval $ac_compile) 2>&5 ++ ac_status=$? ++ echo "$as_me:$LINENO: \$? = $ac_status" >&5 ++ (exit $ac_status); }; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on +--- libtool.m4.jj 2007-06-18 13:29:28.000000000 -0400 ++++ libtool.m4 2007-06-27 13:55:08.000000000 -0400 +@@ -2337,10 +2337,30 @@ linux* | k*bsd*-gnu) + # before this can be enabled. + hardcode_into_libs=yes + ++ # find out which ABI we are using ++ libsuff= ++ case "$host_cpu" in ++ x86_64*|s390*|powerpc*|ppc*|sparc*) ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *64-bit*) ++ libsuff=64 ++ if test x"$sys_lib_search_path_spec" = x"/lib /usr/lib /usr/local/lib"; then ++ sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}" ++ fi ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ esac ++ + # Append ld.so.conf contents to the search path + if test -f /etc/ld.so.conf; then + lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` +- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra" ++ sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff} $lt_ld_extra" + fi + + # We used to test for /lib/ld.so.1 and disable shared libraries on diff --git a/binutils-2.17.50.0.18-place-orphan.patch b/binutils-2.17.50.0.18-place-orphan.patch new file mode 100644 index 0000000..ae7c001 --- /dev/null +++ b/binutils-2.17.50.0.18-place-orphan.patch @@ -0,0 +1,16 @@ +2003-08-05 Jakub Jelinek + + * emulparams/elf64ppc.sh (OTHER_GOT_RELOC_SECTIONS): Add .rela.opd. + +--- ld/emulparams/elf64ppc.sh.jj 2003-07-28 10:24:45.000000000 -0400 ++++ ld/emulparams/elf64ppc.sh 2003-08-05 08:35:58.000000000 -0400 +@@ -28,7 +28,8 @@ else + .toc 0 : { *(.toc) }" + fi + OTHER_GOT_RELOC_SECTIONS=" +- .rela.toc ${RELOCATING-0} : { *(.rela.toc) }" ++ .rela.toc ${RELOCATING-0} : { *(.rela.toc) } ++ .rela.opd ${RELOCATING-0} : { *(.rela.opd) }" + OTHER_READWRITE_SECTIONS=" + .toc1 ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { *(.toc1) } + .opd ${RELOCATING-0}${RELOCATING+ALIGN(8)} : { KEEP (*(.opd)) }" diff --git a/binutils-2.17.50.0.18-ppc64-pie.patch b/binutils-2.17.50.0.18-ppc64-pie.patch new file mode 100644 index 0000000..879ea91 --- /dev/null +++ b/binutils-2.17.50.0.18-ppc64-pie.patch @@ -0,0 +1,16 @@ +--- bfd/elf64-ppc.c.jj 2004-09-27 16:46:06.000000000 -0400 ++++ bfd/elf64-ppc.c 2004-10-04 09:09:50.000000000 -0400 +@@ -9681,7 +9681,12 @@ ppc64_elf_relocate_section (bfd *output_ + else if (!SYMBOL_REFERENCES_LOCAL (info, &h->elf) + && !is_opd + && r_type != R_PPC64_TOC) +- outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); ++ { ++ outrel.r_info = ELF64_R_INFO (h->elf.dynindx, r_type); ++ if (h->elf.dynindx == -1 ++ && h->elf.root.type == bfd_link_hash_undefweak) ++ memset (&outrel, 0, sizeof outrel); ++ } + else + { + /* This symbol is local, or marked to become local, diff --git a/binutils-2.17.50.0.18-readelf-D-gnu-hash.patch b/binutils-2.17.50.0.18-readelf-D-gnu-hash.patch index df0a2af..2d59e70 100644 --- a/binutils-2.17.50.0.18-readelf-D-gnu-hash.patch +++ b/binutils-2.17.50.0.18-readelf-D-gnu-hash.patch @@ -13,8 +13,8 @@ ld/testsuite/ PR binutils/4476 * ld-elf/hash.d: Check "-s -D" for readelf. ---- binutils/binutils/readelf.c.hash 2007-05-09 10:54:22.000000000 -0700 -+++ binutils/binutils/readelf.c 2007-05-09 17:24:46.000000000 -0700 +--- binutils/readelf.c.hash 2007-05-09 10:54:22.000000000 -0700 ++++ binutils/readelf.c 2007-05-09 17:24:46.000000000 -0700 @@ -7033,6 +7033,39 @@ get_dynamic_data (FILE *file, unsigned i return i_data; } @@ -383,8 +383,8 @@ ld/testsuite/ (gnuchains[off] & 1) == 0; ++off) ++length; lengths[hn] = length; ---- binutils/ld/testsuite/ld-elf/hash.d.hash 2006-09-15 07:55:42.000000000 -0700 -+++ binutils/ld/testsuite/ld-elf/hash.d 2007-05-09 15:46:56.000000000 -0700 +--- ld/testsuite/ld-elf/hash.d.hash 2006-09-15 07:55:42.000000000 -0700 ++++ ld/testsuite/ld-elf/hash.d 2007-05-09 15:46:56.000000000 -0700 @@ -1,5 +1,5 @@ #source: start.s -#readelf: -d diff --git a/binutils-2.17.50.0.18-standards.patch b/binutils-2.17.50.0.18-standards.patch new file mode 100644 index 0000000..8e82614 --- /dev/null +++ b/binutils-2.17.50.0.18-standards.patch @@ -0,0 +1,878 @@ +--- etc/standards.texi.jj 2002-02-27 11:32:17.000000000 +0100 ++++ etc/standards.texi 2005-08-18 19:05:42.000000000 +0200 +@@ -3,16 +3,13 @@ + @setfilename standards.info + @settitle GNU Coding Standards + @c This date is automagically updated when you save this file: +-@set lastupdate February 14, 2002 ++@set lastupdate June 8, 2005 + @c %**end of header + +-@ifnottex +-@format +-START-INFO-DIR-ENTRY ++@dircategory GNU organization ++@direntry + * Standards: (standards). GNU coding standards. +-END-INFO-DIR-ENTRY +-@end format +-@end ifnottex ++@end direntry + + @c @setchapternewpage odd + @setchapternewpage off +@@ -32,9 +29,11 @@ END-INFO-DIR-ENTRY + @set CHAPTER node + @end ifnottex + +-@ifnottex +-GNU Coding Standards +-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. ++@copying ++The GNU coding standards, last updated @value{lastupdate}. ++ ++Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, ++2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. + + Permission is granted to copy, distribute and/or modify this document + under the terms of the GNU Free Documentation License, Version 1.1 +@@ -43,32 +42,25 @@ with no Invariant Sections, with no + Front-Cover Texts, and with no Back-Cover Texts. + A copy of the license is included in the section entitled ``GNU + Free Documentation License''. +-@end ifnottex ++@end copying + + @titlepage + @title GNU Coding Standards + @author Richard Stallman, et al. + @author last updated @value{lastupdate} + @page +- + @vskip 0pt plus 1filll +-Copyright @copyright{} 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc. +- +-Permission is granted to copy, distribute and/or modify this document +-under the terms of the GNU Free Documentation License, Version 1.1 +-or any later version published by the Free Software Foundation; +-with no Invariant Sections, with no +-Front-Cover Texts, and with no Back-Cover Texts. +-A copy of the license is included in the section entitled ``GNU +-Free Documentation License''. ++@insertcopying + @end titlepage + +-@ifnottex ++@contents ++ ++@ifnottex + @node Top, Preface, (dir), (dir) + @top Version + +-Last updated @value{lastupdate}. +-@end ifnottex ++@insertcopying ++@end ifnottex + + @menu + * Preface:: About the GNU Coding Standards +@@ -101,15 +93,10 @@ This release of the GNU Coding Standards + @cindex where to obtain @code{standards.texi} + @cindex downloading this manual + If you did not obtain this file directly from the GNU project and +-recently, please check for a newer version. You can ftp the GNU +-Coding Standards from any GNU FTP host in the directory +-@file{/pub/gnu/standards/}. The GNU Coding Standards are available +-there in several different formats: @file{standards.text}, +-@file{standards.info}, and @file{standards.dvi}, as well as the +-Texinfo ``source'' which is divided in two files: +-@file{standards.texi} and @file{make-stds.texi}. The GNU Coding +-Standards are also available on the GNU World Wide Web server: +-@uref{http://www.gnu.org/prep/standards_toc.html}. ++recently, please check for a newer version. You can get the GNU ++Coding Standards from the GNU web server in many ++different formats, including the Texinfo source, PDF, HTML, DVI, plain ++text, and more, at: @uref{http://www.gnu.org/prep/standards/}. + + Corrections or suggestions for this document should be sent to + @email{bug-standards@@gnu.org}. If you make a suggestion, please include a +@@ -129,11 +116,15 @@ be self-consistent---try to stick to the + to document them as much as possible. That way, your program will be + more maintainable by others. + ++The GNU Hello program serves as an example of how to follow the GNU ++coding standards for a trivial program which prints @samp{Hello, ++world!}. @uref{http://www.gnu.org/software/hello/hello.html}. ++ + @node Legal Issues + @chapter Keeping Free Software Free + @cindex legal aspects + +-This @value{CHAPTER} discusses how you can make sure that GNU software ++This chapter discusses how you can make sure that GNU software + avoids legal difficulties, and other related issues. + + @menu +@@ -211,7 +202,7 @@ You might have to take that code out aga + You don't need papers for changes of a few lines here or there, since + they are not significant for copyright purposes. Also, you don't need + papers if all you get from the suggestion is some ideas, not actual code +-which you use. For example, if someone send you one implementation, but ++which you use. For example, if someone sent you one implementation, but + you write a different implementation of the same idea, you don't need to + get papers. + +@@ -221,7 +212,8 @@ result. + + We have more detailed advice for maintainers of programs; if you have + reached the stage of actually maintaining a program for GNU (whether +-released or not), please ask us for a copy. ++released or not), please ask us for a copy. It is also available ++online for your perusal: @uref{http://www.gnu.org/prep/maintain/}. + + @node Trademarks + @section Trademarks +@@ -232,24 +224,33 @@ packages or documentation. + + Trademark acknowledgements are the statements that such-and-such is a + trademark of so-and-so. The GNU Project has no objection to the basic +-idea of trademarks, but these acknowledgements feel like kowtowing, so +-we don't use them. There is no legal requirement for them. ++idea of trademarks, but these acknowledgements feel like kowtowing, ++and there is no legal requirement for them, so we don't use them. + + What is legally required, as regards other people's trademarks, is to +-avoid using them in ways which a reader might read as naming or labeling +-our own programs or activities. For example, since ``Objective C'' is +-(or at least was) a trademark, we made sure to say that we provide a +-``compiler for the Objective C language'' rather than an ``Objective C +-compiler''. The latter is meant to be short for the former, but it does +-not explicitly state the relationship, so it could be misinterpreted as +-using ``Objective C'' as a label for the compiler rather than for the +-language. ++avoid using them in ways which a reader might reasonably understand as ++naming or labeling our own programs or activities. For example, since ++``Objective C'' is (or at least was) a trademark, we made sure to say ++that we provide a ``compiler for the Objective C language'' rather ++than an ``Objective C compiler''. The latter would have been meant as ++a shorter way of saying the former, but it does not explicitly state ++the relationship, so it could be misinterpreted as using ``Objective ++C'' as a label for the compiler rather than for the language. ++ ++Please don't use ``win'' as an abbreviation for Microsoft Windows in ++GNU software or documentation. In hacker terminology, calling ++something a ``win'' is a form of praise. If you wish to praise ++Microsoft Windows when speaking on your own, by all means do so, but ++not in GNU software. Usually we write the name ``Windows'' in full, ++but when brevity is very important (as in file names and sometimes ++symbol names), we abbreviate it to ``w''. For instance, the files and ++functions in Emacs that deal with Windows start with @samp{w32}. + + @node Design Advice + @chapter General Program Design + @cindex program design + +-This @value{CHAPTER} discusses some of the issues you should take into ++This chapter discusses some of the issues you should take into + account when designing your program. + + @c Standard or ANSI C +@@ -263,7 +264,7 @@ account when designing your program. + @c A major revision of the C Standard appeared in 1999. + + @menu +-* Source Language:: Which languges to use. ++* Source Language:: Which languages to use. + * Compatibility:: Compatibility with other implementations + * Using Extensions:: Using non-standard features + * Standard C:: Using Standard C features +@@ -272,7 +273,7 @@ account when designing your program. + + @node Source Language + @section Which Languages to Use +-@cindex programming languges ++@cindex programming languages + + When you want to use a language that gets compiled and runs at high + speed, the best language to use is C. Using another language is like +@@ -476,6 +477,7 @@ For example, please write + ... + @end smallexample + ++@noindent + instead of: + + @smallexample +@@ -488,11 +490,12 @@ instead of: + + A modern compiler such as GCC will generate exactly the same code in + both cases, and we have been using similar techniques with good success +-in several projects. ++in several projects. Of course, the former method assumes that ++@code{HAS_FOO} is defined as either 0 or 1. + + While this is not a silver bullet solving all portability problems, +-following this policy would have saved the GCC project alone many person +-hours if not days per year. ++and is not always appropriate, following this policy would have saved ++GCC developers many hours, or even days, per year. + + In the case of function-like macros like @code{REVERSIBLE_CC_MODE} in + GCC which cannot be simply used in @code{if( ...)} statements, there is +@@ -510,7 +513,7 @@ an easy workaround. Simply introduce an + @node Program Behavior + @chapter Program Behavior for All Programs + +-This @value{CHAPTER} describes conventions for writing robust ++This chapter describes conventions for writing robust + software. It also describes general standards for error messages, the + command line interface, and how libraries should behave. + +@@ -679,10 +682,12 @@ Error messages from compilers should loo + @end example + + @noindent +-If you want to mention the column number, use this format: ++If you want to mention the column number, use one of these formats: + + @example + @var{source-file-name}:@var{lineno}:@var{column}: @var{message} ++@var{source-file-name}:@var{lineno}.@var{column}: @var{message} ++ + @end example + + @noindent +@@ -692,6 +697,24 @@ of these conventions are chosen for comp + numbers assuming that space and all ASCII printing characters have + equal width, and assuming tab stops every 8 columns. + ++The error message can also give both the starting and ending positions ++of the erroneous text. There are several formats so that you can ++avoid redundant information such as a duplicate line number. ++Here are the possible formats: ++ ++@example ++@var{source-file-name}:@var{lineno-1}.@var{column-1}-@var{lineno-2}.@var{column-2}: @var{message} ++@var{source-file-name}:@var{lineno-1}.@var{column-1}-@var{column-2}: @var{message} ++@var{source-file-name}:@var{lineno-1}-@var{lineno-2}: @var{message} ++@end example ++ ++@noindent ++When an error is spread over several files, you can use this format: ++ ++@example ++@var{file-1}:@var{lineno-1}.@var{column-1}-@var{file-2}:@var{lineno-2}.@var{column-2}: @var{message} ++@end example ++ + Error messages from other noninteractive programs should look like this: + + @example +@@ -722,8 +745,9 @@ input from a source other than a termina + would do best to print error messages using the noninteractive style.) + + The string @var{message} should not begin with a capital letter when +-it follows a program name and/or file name. Also, it should not end +-with a period. ++it follows a program name and/or file name, because that isn't the ++beginning of a sentence. (The sentence conceptually starts at the ++beginning of the line.) Also, it should not end with a period. + + Error messages from interactive programs, and other messages such as + usage messages, should start with a capital letter. But they should not +@@ -767,9 +791,9 @@ multi-column format. + @section Standards for Graphical Interfaces + @cindex graphical user interface + +-@cindex gtk ++@cindex gtk+ + When you write a program that provides a graphical user interface, +-please make it work with X Windows and the GTK toolkit unless the ++please make it work with X Windows and the GTK+ toolkit unless the + functionality specifically requires some alternative (for example, + ``displaying jpeg images while in console mode''). + +@@ -819,8 +843,15 @@ option as another way to specify it. Th + among GNU utilities, and fewer idiosyncracies for users to remember. + + @cindex standard command-line options ++@cindex options, standard command-line ++@cindex CGI programs, standard options for ++@cindex PATH_INFO, specifying standard options as + All programs should support two standard options: @samp{--version} +-and @samp{--help}. ++and @samp{--help}. CGI programs should accept these as command-line ++options, and also if given as the @env{PATH_INFO}; for instance, ++visiting @url{http://example.org/p.cgi/--help} in a browser should ++output the same information as invoking @samp{p.cgi --help} from the ++command line. + + @table @code + @cindex @samp{--version} option +@@ -1461,9 +1492,7 @@ Used in @code{gawk}. + Used in @code{su}. + + @item machine +-No listing of which programs already use this; +-someone should check to +-see if any actually do, and tell @email{gnu@@gnu.org}. ++Used in @code{uname}. + + @item macro-name + @samp{-M} in @code{ptx}. +@@ -1573,6 +1602,9 @@ Used in GDB. + @item no-sort + @samp{-p} in @code{nm}. + ++@item no-splash ++Don't print a startup splash screen. ++ + @item no-split + Used in @code{makeinfo}. + +@@ -1740,7 +1772,7 @@ Specify an HTTP proxy. + @samp{-q} in Make. + + @item quiet +-Used in many programs to inhibit the usual output. @strong{Note:} every ++Used in many programs to inhibit the usual output. Every + program accepting @samp{--quiet} should accept @samp{--silent} as a + synonym. + +@@ -1855,7 +1887,7 @@ Used by @code{recode} to chose files or + + @item silent + Used in many programs to inhibit the usual output. +-@strong{Note:} every program accepting ++Every program accepting + @samp{--silent} should accept @samp{--quiet} as a synonym. + + @item size +@@ -2098,7 +2130,7 @@ directory. + @node Writing C + @chapter Making The Best Use of C + +-This @value{CHAPTER} provides advice on how best to use the C language ++This chapter provides advice on how best to use the C language + when writing GNU software. + + @menu +@@ -2128,13 +2160,12 @@ These tools will not work on code not fo + It is also important for function definitions to start the name of the + function in column zero. This helps people to search for function + definitions, and may also help certain tools recognize them. Thus, +-the proper format is this: ++using Standard C syntax, the format is this: + + @example + static char * +-concat (s1, s2) /* Name starts in column zero here */ +- char *s1, *s2; +-@{ /* Open brace in column zero here */ ++concat (char *s1, char *s2) ++@{ + @dots{} + @} + @end example +@@ -2145,8 +2176,9 @@ this: + + @example + static char * +-concat (char *s1, char *s2) +-@{ ++concat (s1, s2) /* Name starts in column zero here */ ++ char *s1, *s2; ++@{ /* Open brace in column zero here */ + @dots{} + @} + @end example +@@ -2383,7 +2415,7 @@ functions. + @cindex temporary variables + It used to be common practice to use the same local variables (with + names like @code{tem}) over and over for different values within one +-function. Instead of doing this, it is better declare a separate local ++function. Instead of doing this, it is better to declare a separate local + variable for each distinct purpose, and give it a name which is + meaningful. This not only makes programs easier to understand, it also + facilitates optimization by good compilers. You can also move the +@@ -2584,11 +2616,20 @@ Avoid using the format of semi-internal + when there is a higher-level alternative (@code{readdir}). + + @cindex non-@sc{posix} systems, and portability +-As for systems that are not like Unix, such as MSDOS, Windows, the +-Macintosh, VMS, and MVS, supporting them is often a lot of work. When +-that is the case, it is better to spend your time adding features that +-will be useful on GNU and GNU/Linux, rather than on supporting other +-incompatible systems. ++As for systems that are not like Unix, such as MSDOS, Windows, VMS, ++MVS, and older Macintosh systems, supporting them is often a lot of ++work. When that is the case, it is better to spend your time adding ++features that will be useful on GNU and GNU/Linux, rather than on ++supporting other incompatible systems. ++ ++If you do support Windows, please do not abbreviate it as ``win''. In ++hacker terminology, calling something a ``win'' is a form of praise. ++You're free to praise Microsoft Windows on your own if you want, but ++please don't do this in GNU packages. Instead of abbreviating ++``Windows'' to ``un'', you can write it in full or abbreviate it to ++``woe'' or ``w''. In GNU Emacs, for instance, we use @samp{w32} in ++file names of Windows-specific files, but the macro for Windows ++conditionals is called @code{WINDOWSNT}. + + It is a good idea to define the ``feature test macro'' + @code{_GNU_SOURCE} when compiling your C files. When you compile on GNU +@@ -2644,37 +2685,50 @@ while ((c = getchar()) != EOF) + write(file_descriptor, &c, 1); + @end example + +-When calling functions, you need not worry about the difference between +-pointers of various types, or between pointers and integers. On most +-machines, there's no difference anyway. As for the few machines where +-there is a difference, all of them support Standard C prototypes, so you can +-use prototypes (perhaps conditionalized to be active only in Standard C) +-to make the code work on those systems. +- +-In certain cases, it is ok to pass integer and pointer arguments +-indiscriminately to the same function, and use no prototype on any +-system. For example, many GNU programs have error-reporting functions +-that pass their arguments along to @code{printf} and friends: +- +-@example +-error (s, a1, a2, a3) +- char *s; +- char *a1, *a2, *a3; +-@{ +- fprintf (stderr, "error: "); +- fprintf (stderr, s, a1, a2, a3); +-@} ++It used to be ok to not worry about the difference between pointers ++and integers when passing arguments to functions. However, on most ++modern 64-bit machines pointers are wider than @code{int}. ++Conversely, integer types like @code{long long int} and @code{off_t} ++are wider than pointers on most modern 32-bit machines. Hence it's ++often better nowadays to use prototypes to define functions whose ++argument types are not trivial. ++ ++In particular, if functions accept varying argument counts or types ++they should be declared using prototypes containing @samp{...} and ++defined using @file{stdarg.h}. For an example of this, please see the ++@uref{http://www.gnu.org/software/gnulib/, Gnulib} error module, which ++declares and defines the following function: ++ ++@example ++/* Print a message with `fprintf (stderr, FORMAT, ...)'; ++ if ERRNUM is nonzero, follow it with ": " and strerror (ERRNUM). ++ If STATUS is nonzero, terminate the program with `exit (STATUS)'. */ ++ ++void error (int status, int errnum, const char *format, ...); + @end example + +-@noindent +-In practice, this works on all machines, since a pointer is generally +-the widest possible kind of argument; it is much simpler than any +-``correct'' alternative. Be sure @emph{not} to use a prototype for such +-functions. ++A simple way to use the Gnulib error module is to obtain the two ++source files @file{error.c} and @file{error.h} from the Gnulib library ++source code repository at ++@uref{http://savannah.gnu.org/cgi-bin/viewcvs/gnulib/gnulib/lib/}. ++Here's a sample use: + +-If you have decided to use Standard C, then you can instead define +-@code{error} using @file{stdarg.h}, and pass the arguments along to +-@code{vfprintf}. ++@example ++#include "error.h" ++#include ++#include ++ ++char *program_name = "myprogram"; ++ ++FILE * ++xfopen (char const *name) ++@{ ++ FILE *fp = fopen (name, "r"); ++ if (! fp) ++ error (1, errno, "cannot read %s", name); ++ return fp; ++@} ++@end example + + @cindex casting pointers to integers + Avoid casting pointers to integers if you can. Such casts greatly +@@ -3000,10 +3054,13 @@ together, we can make the whole subject + + The manual which discusses a program should certainly document all of + the program's command-line options and all of its commands. It should +-give examples of their use. But don't organize the manual as a list of +-features. Instead, organize it logically, by subtopics. Address the +-questions that a user will ask when thinking about the job that the +-program does. ++give examples of their use. But don't organize the manual as a list ++of features. Instead, organize it logically, by subtopics. Address ++the questions that a user will ask when thinking about the job that ++the program does. Don't just tell the reader what each feature can ++do---say what jobs it is good for, and show how to use it for those ++jobs. Explain what is recommended usage, and what kinds of usage ++users should avoid. + + In general, a GNU manual should serve both as tutorial and reference. + It should be set up for convenient access to each topic through Info, +@@ -3030,9 +3087,9 @@ functions, variables, options, and impor + the program. One combined Index should do for a short manual, but + sometimes for a complex package it is better to use multiple indices. + The Texinfo manual includes advice on preparing good index entries, see +-@ref{Index Entries, , Making Index Entries, texinfo, The GNU Texinfo +-Manual}, and see @ref{Indexing Commands, , Defining the Entries of an +-Index, texinfo, The GNU Texinfo manual}. ++@ref{Index Entries, , Making Index Entries, texinfo, GNU Texinfo}, and ++see @ref{Indexing Commands, , Defining the Entries of an ++Index, texinfo, GNU Texinfo}. + + Don't use Unix man pages as a model for how to write GNU documentation; + most of them are terse, badly structured, and give inadequate +@@ -3041,15 +3098,15 @@ exceptions.) Also, Unix man pages use a + different from what we use in GNU manuals. + + Please include an email address in the manual for where to report +-bugs @emph{in the manual}. ++bugs @emph{in the text of the manual}. + + Please do not use the term ``pathname'' that is used in Unix + documentation; use ``file name'' (two words) instead. We use the term + ``path'' only for search paths, which are lists of directory names. + +-Please do not use the term ``illegal'' to refer to erroneous input to a +-computer program. Please use ``invalid'' for this, and reserve the term +-``illegal'' for activities punishable by law. ++Please do not use the term ``illegal'' to refer to erroneous input to ++a computer program. Please use ``invalid'' for this, and reserve the ++term ``illegal'' for activities prohibited by law. + + @node Doc Strings and Manuals + @section Doc Strings and Manuals +@@ -3092,7 +3149,7 @@ Each program documented in the manual sh + @samp{@var{program} Invocation} or @samp{Invoking @var{program}}. This + node (together with its subnodes, if any) should describe the program's + command line arguments and how to run it (the sort of information people +-would look in a man page for). Start with an @samp{@@example} ++would look for in a man page). Start with an @samp{@@example} + containing a template for all the options and arguments that the program + uses. + +@@ -3210,6 +3267,11 @@ code. For example, ``New function'' is + you add a function, because there should be a comment before the + function definition to explain what it does. + ++In the past, we recommended not mentioning changes in non-software ++files (manuals, help files, etc.) in change logs. However, we've been ++advised that it is a good idea to include them, for the sake of ++copyright records. ++ + However, sometimes it is useful to write one line to describe the + overall purpose of a batch of changes. + +@@ -3224,9 +3286,9 @@ Then describe the changes you made to th + @cindex change logs, style + + Here are some simple examples of change log entries, starting with the +-header line that says who made the change and when, followed by +-descriptions of specific changes. (These examples are drawn from Emacs +-and GCC.) ++header line that says who made the change and when it was installed, ++followed by descriptions of specific changes. (These examples are ++drawn from Emacs and GCC.) + + @example + 1998-08-17 Richard Stallman +@@ -3270,6 +3332,27 @@ Break long lists of function names by cl + (Fexecute_extended_command): Deal with `keymap' property. + @end example + ++When you install someone else's changes, put the contributor's name in ++the change log entry rather than in the text of the entry. In other ++words, write this: ++ ++@example ++2002-07-14 John Doe ++ ++ * sewing.c: Make it sew. ++@end example ++ ++@noindent ++rather than this: ++ ++@example ++2002-07-14 Usual Maintainer ++ ++ * sewing.c: Make it sew. Patch by jdoe@@gnu.org. ++@end example ++ ++As for the date, that should be the date you applied the change. ++ + @node Simple Changes + @subsection Simple Changes + +@@ -3291,12 +3374,17 @@ When you change just comments or doc str + entry for the file, without mentioning the functions. Just ``Doc + fixes'' is enough for the change log. + +-There's no need to make change log entries for documentation files. +-This is because documentation is not susceptible to bugs that are hard +-to fix. Documentation does not consist of parts that must interact in a +-precisely engineered fashion. To correct an error, you need not know +-the history of the erroneous passage; it is enough to compare what the +-documentation says with the way the program actually works. ++There's no technical need to make change log entries for documentation ++files. This is because documentation is not susceptible to bugs that ++are hard to fix. Documentation does not consist of parts that must ++interact in a precisely engineered fashion. To correct an error, you ++need not know the history of the erroneous passage; it is enough to ++compare what the documentation says with the way the program actually ++works. ++ ++However, you should keep change logs for documentation files when the ++project gets copyright assignments from its contributors, so as to ++make the records of authorship more accurate. + + @node Conditional Changes + @subsection Conditional Changes +@@ -3387,6 +3475,25 @@ page explaining that you don't maintain + is more authoritative. The note should say how to access the Texinfo + documentation. + ++Be sure that man pages include a copyright statement and free ++license. The simple all-permissive license is appropriate for simple ++man pages: ++ ++@example ++Copying and distribution of this file, with or without modification, ++are permitted in any medium without royalty provided the copyright ++notice and this notice are preserved. ++@end example ++ ++For long man pages, with enough explanation and documentation that ++they can be considered true manuals, use the GFDL (@pxref{License for ++Manuals}). ++ ++Finally, the GNU help2man program ++(@uref{http://www.gnu.org/software/help2man/}) is one way to automate ++generation of a man page, in this case from @option{--help} output. ++This is sufficient in many cases. ++ + @node Reading other Manuals + @section Reading other Manuals + +@@ -3486,19 +3593,26 @@ this: + @var{cpu}-@var{company}-@var{system} + @end example + +-For example, a Sun 3 might be @samp{m68k-sun-sunos4.1}. ++For example, an Athlon-based GNU/Linux system might be ++@samp{i686-pc-linux-gnu}. + + The @code{configure} script needs to be able to decode all plausible +-alternatives for how to describe a machine. Thus, @samp{sun3-sunos4.1} +-would be a valid alias. For many programs, @samp{vax-dec-ultrix} would +-be an alias for @samp{vax-dec-bsd}, simply because the differences +-between Ultrix and @sc{bsd} are rarely noticeable, but a few programs +-might need to distinguish them. +-@c Real 4.4BSD now runs on some Suns. +- +-There is a shell script called @file{config.sub} that you can use ++alternatives for how to describe a machine. Thus, ++@samp{athlon-pc-gnu/linux} would be a valid alias. ++There is a shell script called ++@uref{ftp://ftp.gnu.org/gnu/config/config.sub, @file{config.sub}} ++that you can use + as a subroutine to validate system types and canonicalize aliases. + ++The @code{configure} script should also take the option ++@option{--build=@var{buildtype}}, which should be equivalent to a ++plain @var{buildtype} argument. For example, @samp{configure ++--build=i686-pc-linux-gnu} is equivalent to @samp{configure ++i686-pc-linux-gnu}. When the build type is not specified by an option ++or argument, the @code{configure} script should normally guess it ++using the shell script ++@uref{ftp://ftp.gnu.org/gnu/config/config.guess, @file{config.guess}}. ++ + @cindex optional features, configure-time + Other options are permitted to specify in more detail the software + or hardware present on the machine, and include or exclude optional +@@ -3558,6 +3672,11 @@ The @code{configure} script should norma + system as both the host and the target, thus producing a program which + works for the same type of machine that it runs on. + ++To compile a program to run on a host type that differs from the build ++type, use the configure option @option{--host=@var{hosttype}}, where ++@var{hosttype} uses the same syntax as @var{buildtype}. The host type ++normally defaults to the build type. ++ + To configure a cross-compiler, cross-assembler, or what have you, you + should specify a target different from the host, using the configure + option @samp{--target=@var{targettype}}. The syntax for +@@ -3565,22 +3684,14 @@ option @samp{--target=@var{targettype}}. + look like this: + + @example +-./configure @var{hosttype} --target=@var{targettype} ++./configure --host=@var{hosttype} --target=@var{targettype} + @end example + ++The target type normally defaults to the host type. + Programs for which cross-operation is not meaningful need not accept the + @samp{--target} option, because configuring an entire operating system for + cross-operation is not a meaningful operation. + +-Bootstrapping a cross-compiler requires compiling it on a machine other +-than the host it will run on. Compilation packages accept a +-configuration option @samp{--build=@var{buildtype}} for specifying the +-configuration on which you will compile them, but the configure script +-should normally guess the build machine type (using +-@file{config.guess}), so this option is probably not necessary. The +-host and target types normally default from the build type, so in +-bootstrapping a cross-compiler you must specify them both explicitly. +- + Some programs have ways of configuring themselves automatically. If + your program is set up to do this, your @code{configure} script can simply + ignore most of its arguments. +@@ -3596,6 +3707,10 @@ ignore most of its arguments. + @section Making Releases + @cindex packaging + ++You should identify each release with a pair of version numbers, a ++major version and a minor. We have no objection to using more than ++two numbers, but it is very unlikely that you really need them. ++ + Package the distribution of @code{Foo version 69.96} up in a gzipped tar + file with the name @file{foo-69.96.tar.gz}. It should unpack into a + subdirectory named @file{foo-69.96}. +@@ -3644,13 +3759,6 @@ able to extract all the files even if th + + Make sure that all the files in the distribution are world-readable. + +-Make sure that no file name in the distribution is more than 14 +-characters long. Likewise, no file created by building the program +-should have a name longer than 14 characters. The reason for this is +-that some systems adhere to a foolish interpretation of the @sc{posix} +-standard, and refuse to open a longer name, rather than truncating as +-they did in the past. +- + Don't include any symbolic links in the distribution itself. If the tar + file contains symbolic links, then people cannot even unpack it on + systems that don't support symbolic links. Also, don't use multiple +@@ -3682,16 +3790,27 @@ other files to get. + + A GNU program should not recommend use of any non-free program. We + can't stop some people from writing proprietary programs, or stop +-other people from using them, but we can and should avoid helping to ++other people from using them, but we can and should refuse to + advertise them to new potential customers. Proprietary software is a + social and ethical problem, and the point of GNU is to solve that + problem. + ++The GNU definition of free software is found on the GNU web site at ++@url{http://www.gnu.org/philosophy/free-sw.html}. A list of ++important licenses and whether they qualify as free is in ++@url{http://www.gnu.org/licenses/license-list.html}. The terms ++``free'' and ``non-free'', used in this document, refer to that ++definition. If it is not clear whether a license qualifies as free ++under this definition, please ask the GNU Project by writing to ++@email{licensing@@gnu.org}. We will answer, and if the license is an ++important one, we will add it to the list. ++ + When a non-free program or system is well known, you can mention it in + passing---that is harmless, since users who might want to use it + probably already know about it. For instance, it is fine to explain +-how to build your package on top of some non-free operating system, or +-how to use it together with some widely used non-free program. ++how to build your package on top of some widely used non-free ++operating system, or how to use it together with some widely used ++non-free program. + + However, you should give only the necessary information to help those + who already use the non-free program to use your program with +@@ -3700,8 +3819,8 @@ proprietary program, and don't imply tha + enhances your program, or that its existence is in any way a good + thing. The goal should be that people already using the proprietary + program will get the advice they need about how to use your free +-program, while people who don't already use the proprietary program +-will not see anything to lead them to take an interest in it. ++program with it, while people who don't already use the proprietary ++program will not see anything to lead them to take an interest in it. + + If a non-free program or system is obscure in your program's domain, + your program should not mention or support it at all, since doing so +@@ -3709,13 +3828,46 @@ would tend to popularize the non-free pr + your program. (You cannot hope to find many additional users among + the users of Foobar if the users of Foobar are few.) + ++Sometimes a program is free software in itself but depends on a ++non-free platform in order to run. For instance, many Java programs ++depend on Sun's Java implementation, and won't run on the GNU Java ++Compiler (which does not yet have all the features) or won't run with ++the GNU Java libraries. To recommend that program is inherently to ++recommend the non-free platform as well; if you should not do the ++latter, then don't do the former. ++ + A GNU package should not refer the user to any non-free documentation + for free software. Free documentation that can be included in free +-operating systems is essential for completing the GNU system, so it is +-a major focus of the GNU Project; to recommend use of documentation +-that we are not allowed to use in GNU would undermine the efforts to +-get documentation that we can include. So GNU packages should never +-recommend non-free documentation. ++operating systems is essential for completing the GNU system, or any ++free operating system, so it is a major focus of the GNU Project; to ++recommend use of documentation that we are not allowed to use in GNU ++would weaken the impetus for the community to produce documentation ++that we can include. So GNU packages should never recommend non-free ++documentation. ++ ++By contrast, it is ok to refer to journal articles and textbooks in ++the comments of a program for explanation of how it functions, even ++though they be non-free. This is because we don't include such things ++in the GNU system even if we are allowed to--they are outside the ++scope of an operating system project. ++ ++Referring to a web site that describes or recommends a non-free ++program is in effect promoting that software, so please do not make ++links (or mention by name) web sites that contain such material. This ++policy is relevant particularly for the web pages for a GNU package. ++ ++Following links from nearly any web site can lead to non-free ++software; this is an inescapable aspect of the nature of the web, and ++in itself is no objection to linking to a site. As long as the site ++does not itself recommend a non-free program, there is no need be ++concerned about the sites it links to for other reasons. ++ ++Thus, for example, you should not make a link to AT&T's web site, ++because that recommends AT&T's non-free software packages; you should ++not make a link to a site that links to AT&T's site saying it is a ++place to get a non-free program; but if a site you want to link to ++refers to AT&T's web site in some other context (such as long-distance ++telephone service), that is not a problem. + + @node Copying This Manual + @appendix Copying This Manual +@@ -3730,13 +3882,12 @@ recommend non-free documentation. + @unnumbered Index + @printindex cp + +-@contents +- + @bye +-@c Local variables: +-@c eval: (add-hook 'write-file-hooks 'time-stamp) +-@c time-stamp-start: "@set lastupdate " +-@c time-stamp-end: "$" +-@c time-stamp-format: "%:b %:d, %:y" +-@c compile-command: "make just-standards" +-@c End: ++ ++Local variables: ++eval: (add-hook 'write-file-hooks 'time-stamp) ++time-stamp-start: "@set lastupdate " ++time-stamp-end: "$" ++time-stamp-format: "%:b %:d, %:y" ++compile-command: "make just-standards" ++End: diff --git a/binutils-2.17.50.0.18-symbolic-envvar-revert.patch b/binutils-2.17.50.0.18-symbolic-envvar-revert.patch new file mode 100644 index 0000000..1de1f92 --- /dev/null +++ b/binutils-2.17.50.0.18-symbolic-envvar-revert.patch @@ -0,0 +1,50 @@ +--- ld/NEWS.jj 2007-05-11 11:24:08.000000000 -0400 ++++ ld/NEWS 2007-06-12 05:04:49.000000000 -0400 +@@ -1,7 +1,4 @@ + -*- text -*- +-* ELF: Support environment variables, LD_SYMBOLIC for -Bsymbolic and +- LD_SYMBOLIC_FUNCTIONS for -Bsymbolic-functions. +- + * Linker sources now released under version 3 of the GNU General Public + License. + +--- ld/ld.texinfo.jj 2007-05-11 11:24:08.000000000 -0400 ++++ ld/ld.texinfo 2007-06-12 05:04:33.000000000 -0400 +@@ -1142,21 +1142,14 @@ When creating a shared library, bind ref + definition within the shared library, if any. Normally, it is possible + for a program linked against a shared library to override the definition + within the shared library. This option is only meaningful on ELF +-platforms which support shared libraries. If @option{-Bsymbolic} is not +-used when linking a shared library, the linker will also turn on this +-option if the environment variable @code{LD_SYMBOLIC} is set. ++platforms which support shared libraries. + + @kindex -Bsymbolic-functions + @item -Bsymbolic-functions + When creating a shared library, bind references to global function + symbols to the definition within the shared library, if any. + This option is only meaningful on ELF platforms which support shared +-libraries. If @option{-Bsymbolic-functions} is not used when linking a +-shared library, the linker will also turn on this option if the +-environment variable @code{LD_SYMBOLIC_FUNCTIONS} is set. When +-both environment variables @code{LD_SYMBOLIC} and +-@code{LD_SYMBOLIC_FUNCTIONS} are set, @code{LD_SYMBOLIC} will take +-precedent. ++libraries. + + @kindex --dynamic-list=@var{dynamic-list-file} + @item --dynamic-list=@var{dynamic-list-file} +--- ld/ldmain.c.jj 2007-05-11 11:24:08.000000000 -0400 ++++ ld/ldmain.c 2007-06-12 05:05:48.000000000 -0400 +@@ -254,11 +254,6 @@ main (int argc, char **argv) + command_line.warn_search_mismatch = TRUE; + command_line.check_section_addresses = TRUE; + +- if (getenv ("LD_SYMBOLIC") != NULL) +- command_line.symbolic = symbolic; +- else if (getenv ("LD_SYMBOLIC_FUNCTIONS") != NULL) +- command_line.symbolic = symbolic_functions; +- + /* We initialize DEMANGLING based on the environment variable + COLLECT_NO_DEMANGLE. The gcc collect2 program will demangle the + output of the linker, unless COLLECT_NO_DEMANGLE is set in the diff --git a/binutils-2.17.50.0.18-version.patch b/binutils-2.17.50.0.18-version.patch new file mode 100644 index 0000000..bec1e57 --- /dev/null +++ b/binutils-2.17.50.0.18-version.patch @@ -0,0 +1,36 @@ +--- bfd/Makefile.in.jj 2007-05-11 17:23:18.000000000 +0200 ++++ bfd/Makefile.in 2007-06-12 12:28:10.000000000 +0200 +@@ -1540,12 +1540,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ + report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ + if test "x$(RELEASE)" = x ; then \ + bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ +- bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ +- bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ ++ bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\ ++ bfd_soversion="$(VERSION)-%{release}" ;\ + fi ;\ + sed -e "s,@bfd_version@,$$bfd_version," \ + -e "s,@bfd_version_string@,$$bfd_version_string," \ +- -e "s,@bfd_version_package@,$$bfd_version_package," \ ++ -e "s,@bfd_version_package@,\"version \"," \ + -e "s,@report_bugs_to@,$$report_bugs_to," \ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion +--- bfd/Makefile.am.jj 2007-05-11 17:23:18.000000000 +0200 ++++ bfd/Makefile.am 2007-06-12 12:28:10.000000000 +0200 +@@ -973,12 +973,12 @@ bfdver.h: $(srcdir)/version.h $(srcdir)/ + report_bugs_to="\"$(REPORT_BUGS_TO)\"" ;\ + if test "x$(RELEASE)" = x ; then \ + bfd_version_date=`sed -n -e 's/.*DATE //p' < $(srcdir)/version.h` ;\ +- bfd_version_string="\"$(VERSION).$${bfd_version_date}\"" ;\ +- bfd_soversion="$(VERSION).$${bfd_version_date}" ;\ ++ bfd_version_string="\"$(VERSION)-%{release} $${bfd_version_date}\"" ;\ ++ bfd_soversion="$(VERSION)-%{release}" ;\ + fi ;\ + sed -e "s,@bfd_version@,$$bfd_version," \ + -e "s,@bfd_version_string@,$$bfd_version_string," \ +- -e "s,@bfd_version_package@,$$bfd_version_package," \ ++ -e "s,@bfd_version_package@,\"version \"," \ + -e "s,@report_bugs_to@,$$report_bugs_to," \ + < $(srcdir)/version.h > $@; \ + echo "$${bfd_soversion}" > libtool-soversion diff --git a/binutils.spec b/binutils.spec index 0d50f9e..d36668f 100644 --- a/binutils.spec +++ b/binutils.spec @@ -15,7 +15,6 @@ Patch6: binutils-2.17.50.0.18-build-fixes.patch Patch7: binutils-2.17.50.0.18-symbolic-envvar-revert.patch Patch8: binutils-2.17.50.0.18-version.patch Patch9: binutils-2.17.50.0.18-bz4923.patch -Patch10: binutils-2.17.50.0.18-readelf-D-gnu-hash.patch Buildroot: %{_tmppath}/binutils-root BuildRequires: texinfo >= 4.0, dejagnu, gettext, flex, bison @@ -70,7 +69,6 @@ to consider using libelf instead of BFD. %patch7 -p0 -b .symbolic-envvar-revert~ %patch8 -p0 -b .version~ %patch9 -p0 -b .bz4923~ -%patch10 -p0 -b .readelf-D-gnu-hash~ # On ppc64 we might use 64K pages sed -i -e '/#define.*ELF_COMMONPAGESIZE/s/0x1000$/0x10000/' bfd/elf*ppc.c @@ -228,7 +226,6 @@ fi - fix sparc64/alpha broken by --build-id patch (#252936) - update License tag - fix ld crash with --build-id and non-ELF output format (Alan Modra, BZ#4923) -- support .gnu.hash section for readelf -D -s (H.J. Lu) * Tue Jul 31 2007 Jakub Jelinek 2.17.50.0.17-7 - fix ppc32 secure PLT detection (Alan Modra) diff --git a/sources b/sources index 26231b2..a6c8676 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f1852ef43d7539480c77f813224ef81c binutils-2.17.50.0.17.tar.bz2 +98e21a7c0d82b318fe29f2e04d273344 binutils-2.17.50.0.18.tar.bz2