diff options
| -rw-r--r-- | bfd/ChangeLog | 8 | ||||
| -rw-r--r-- | bfd/archive.c | 25 | ||||
| -rw-r--r-- | bfd/archive64.c | 2 | ||||
| -rw-r--r-- | bfd/bfd-in2.h | 2 | ||||
| -rw-r--r-- | bfd/bfd.c | 2 | ||||
| -rw-r--r-- | bfd/coff-rs6000.c | 29 | ||||
| -rw-r--r-- | bfd/ecoff.c | 2 | ||||
| -rw-r--r-- | bfd/som.c | 10 | ||||
| -rw-r--r-- | binutils/ChangeLog | 8 | ||||
| -rw-r--r-- | binutils/ar.c | 42 | ||||
| -rw-r--r-- | binutils/arsup.c | 30 | ||||
| -rw-r--r-- | binutils/binemul.c | 4 | ||||
| -rw-r--r-- | binutils/dlltool.c | 10 | ||||
| -rw-r--r-- | binutils/objcopy.c | 2 | ||||
| -rw-r--r-- | ld/ChangeLog | 4 | ||||
| -rw-r--r-- | ld/pe-dll.c | 8 |
16 files changed, 109 insertions, 79 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index a35e408..cdb4784 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,5 +1,13 @@ 2007-06-27 Alan Modra <amodra@bigpond.net.au> + * bfd.c (struct bfd): Rename "next" to "archive_next". + * archive.c: Rename uses throughout file. + * archive64.c: Likewise. + * coff-rs6000.c: Likewise. + * ecoff.c: Likewise. + * som.c: Likewise. + * bfd-in2.h: Regenerate. + * elf32-ppc.c (ppc_elf_select_plt_layout): Properly iterate over input bfds. * elf32-spu.c (spu_elf_create_sections): Likewise. diff --git a/bfd/archive.c b/bfd/archive.c index f209c40..053ad47 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -1234,7 +1234,9 @@ _bfd_construct_extended_name_table (bfd *abfd, *tablen = 0; /* Figure out how long the table should be. */ - for (current = abfd->archive_head; current != NULL; current = current->next) + for (current = abfd->archive_head; + current != NULL; + current = current->archive_next) { const char *normal; unsigned int thislen; @@ -1286,8 +1288,9 @@ _bfd_construct_extended_name_table (bfd *abfd, *tablen = total_namelen; strptr = *tabloc; - for (current = abfd->archive_head; current != NULL; current = - current->next) + for (current = abfd->archive_head; + current != NULL; + current = current->archive_next) { const char *normal; unsigned int thislen; @@ -1637,7 +1640,9 @@ _bfd_write_archive_contents (bfd *arch) /* Verify the viability of all entries; if any of them live in the filesystem (as opposed to living in an archive open for input) then construct a fresh ar_hdr for them. */ - for (current = arch->archive_head; current; current = current->next) + for (current = arch->archive_head; + current != NULL; + current = current->archive_next) { /* This check is checking the bfds for the objects we're reading from (which are usually either an object file or archive on @@ -1705,7 +1710,9 @@ _bfd_write_archive_contents (bfd *arch) } } - for (current = arch->archive_head; current; current = current->next) + for (current = arch->archive_head; + current != NULL; + current = current->archive_next) { char buffer[DEFAULT_BUFFERSIZE]; unsigned int remaining = arelt_size (current); @@ -1802,12 +1809,12 @@ _bfd_compute_and_write_armap (bfd *arch, unsigned int elength) /* Drop all the files called __.SYMDEF, we're going to make our own. */ while (arch->archive_head && strcmp (arch->archive_head->filename, "__.SYMDEF") == 0) - arch->archive_head = arch->archive_head->next; + arch->archive_head = arch->archive_head->archive_next; /* Map over each element. */ for (current = arch->archive_head; current != NULL; - current = current->next, elt_no++) + current = current->archive_next, elt_no++) { if (bfd_check_format (current, bfd_object) && (bfd_get_file_flags (current) & HAS_SYMS) != 0) @@ -1964,7 +1971,7 @@ bsd_write_armap (bfd *arch, { firstreal += arelt_size (current) + sizeof (struct ar_hdr); firstreal += firstreal % 2; - current = current->next; + current = current->archive_next; } while (current != map[count].u.abfd); } @@ -2134,7 +2141,7 @@ coff_write_armap (bfd *arch, archive_member_file_ptr += arelt_size (current) + sizeof (struct ar_hdr); /* Remember aboout the even alignment. */ archive_member_file_ptr += archive_member_file_ptr % 2; - current = current->next; + current = current->archive_next; } /* Now write the strings themselves. */ diff --git a/bfd/archive64.c b/bfd/archive64.c index d02b749..5e2bf11 100644 --- a/bfd/archive64.c +++ b/bfd/archive64.c @@ -215,7 +215,7 @@ bfd_elf64_archive_write_armap (bfd *arch, + sizeof (struct ar_hdr)); /* remember about the even alignment */ archive_member_file_ptr += archive_member_file_ptr % 2; - current = current->next; + current = current->archive_next; } /* now write the strings themselves */ diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index e08dddf..e09d836 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -4646,7 +4646,7 @@ struct bfd /* Stuff only useful for archives. */ void *arelt_data; struct bfd *my_archive; /* The containing archive BFD. */ - struct bfd *next; /* The next BFD in the archive. */ + struct bfd *archive_next; /* The next BFD in the archive. */ struct bfd *archive_head; /* The first BFD in the archive. */ bfd_boolean has_armap; @@ -139,7 +139,7 @@ CODE_FRAGMENT . {* Stuff only useful for archives. *} . void *arelt_data; . struct bfd *my_archive; {* The containing archive BFD. *} -. struct bfd *next; {* The next BFD in the archive. *} +. struct bfd *archive_next; {* The next BFD in the archive. *} . struct bfd *archive_head; {* The first BFD in the archive. *} . bfd_boolean has_armap; . diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index ae75f65..f446f49 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -1649,7 +1649,7 @@ xcoff_write_armap_old (abfd, elength, map, orl_count, stridx) + SXCOFFARFMAG + arelt_size (sub)); fileoff = (fileoff + 1) &~ 1; - sub = sub->next; + sub = sub->archive_next; } for (i = 0; i < orl_count; i++) @@ -1820,7 +1820,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->next; + current_bfd = current_bfd->archive_next; if (current_bfd != NULL) arch_info = bfd_get_arch_info (current_bfd); } @@ -1924,7 +1924,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) + SXCOFFARFMAG + arelt_size (current_bfd)); fileoff += fileoff & 1; - current_bfd = current_bfd->next; + current_bfd = current_bfd->archive_next; if (current_bfd != NULL) arch_info = bfd_get_arch_info (current_bfd); } @@ -1945,7 +1945,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->next; + current_bfd = current_bfd->archive_next; if (current_bfd != NULL) arch_info = bfd_get_arch_info (current_bfd); } @@ -2020,7 +2020,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) + SXCOFFARFMAG + arelt_size (current_bfd)); fileoff += fileoff & 1; - current_bfd = current_bfd->next; + current_bfd = current_bfd->archive_next; if (current_bfd != NULL) arch_info = bfd_get_arch_info (current_bfd); } @@ -2041,7 +2041,7 @@ xcoff_write_armap_big (abfd, elength, map, orl_count, stridx) } i++; } - current_bfd = current_bfd->next; + current_bfd = current_bfd->archive_next; if (current_bfd != NULL) arch_info = bfd_get_arch_info (current_bfd); } @@ -2100,7 +2100,7 @@ xcoff_write_archive_contents_old (abfd) count = 0; total_namlen = 0; - for (sub = abfd->archive_head; sub != NULL; sub = sub->next) + for (sub = abfd->archive_head; sub != NULL; sub = sub->archive_next) { ++count; total_namlen += strlen (normalize_filename (sub)) + 1; @@ -2116,7 +2116,9 @@ xcoff_write_archive_contents_old (abfd) hasobjects = FALSE; prevoff = 0; nextoff = SIZEOF_AR_FILE_HDR; - for (sub = abfd->archive_head, i = 0; sub != NULL; sub = sub->next, i++) + for (sub = abfd->archive_head, i = 0; + sub != NULL; + sub = sub->archive_next, i++) { const char *name; bfd_size_type namlen; @@ -2264,7 +2266,7 @@ xcoff_write_archive_contents_old (abfd) abfd) != XCOFFARMAG_ELEMENT_SIZE) return FALSE; } - for (sub = abfd->archive_head; sub != NULL; sub = sub->next) + for (sub = abfd->archive_head; sub != NULL; sub = sub->archive_next) { const char *name; bfd_size_type namlen; @@ -2334,7 +2336,7 @@ xcoff_write_archive_contents_big (abfd) hasobjects = FALSE; for (current_bfd = abfd->archive_head, count = 0, total_namlen = 0; current_bfd != NULL; - current_bfd = current_bfd->next, count++) + current_bfd = current_bfd->archive_next, count++) { total_namlen += strlen (normalize_filename (current_bfd)) + 1; @@ -2356,7 +2358,7 @@ xcoff_write_archive_contents_big (abfd) nextoff = SIZEOF_AR_FILE_HDR_BIG; for (current_bfd = abfd->archive_head, i = 0; current_bfd != NULL; - current_bfd = current_bfd->next, i++) + current_bfd = current_bfd->archive_next, i++) { const char *name; bfd_size_type namlen; @@ -2523,8 +2525,9 @@ xcoff_write_archive_contents_big (abfd) offsets = NULL; } - for (current_bfd = abfd->archive_head; current_bfd != NULL; - current_bfd = current_bfd->next) + for (current_bfd = abfd->archive_head; + current_bfd != NULL; + current_bfd = current_bfd->archive_next) { const char *name; size_t namlen; diff --git a/bfd/ecoff.c b/bfd/ecoff.c index 55a9596..45cdb1d 100644 --- a/bfd/ecoff.c +++ b/bfd/ecoff.c @@ -3097,7 +3097,7 @@ _bfd_ecoff_write_armap (bfd *abfd, { firstreal += arelt_size (current) + sizeof (struct ar_hdr); firstreal += firstreal % 2; - current = current->next; + current = current->archive_next; } while (current != map[i].u.abfd); } @@ -5768,7 +5768,7 @@ som_bfd_prep_for_ar_write (bfd *abfd, if (curr_bfd->format != bfd_object || curr_bfd->xvec->flavour != bfd_target_som_flavour) { - curr_bfd = curr_bfd->next; + curr_bfd = curr_bfd->archive_next; continue; } @@ -5813,7 +5813,7 @@ som_bfd_prep_for_ar_write (bfd *abfd, (*stringsize)++; } - curr_bfd = curr_bfd->next; + curr_bfd = curr_bfd->archive_next; } return TRUE; } @@ -5922,7 +5922,7 @@ som_bfd_ar_write_symbol_stuff (bfd *abfd, if (curr_bfd->format != bfd_object || curr_bfd->xvec->flavour != bfd_target_som_flavour) { - curr_bfd = curr_bfd->next; + curr_bfd = curr_bfd->archive_next; continue; } @@ -6038,7 +6038,7 @@ som_bfd_ar_write_symbol_stuff (bfd *abfd, linker requires objects begin on an even boundary. So round up the current offset as necessary. */ curr_som_offset = (curr_som_offset + 0x1) &~ (unsigned) 1; - curr_bfd = curr_bfd->next; + curr_bfd = curr_bfd->archive_next; som_index++; } @@ -6144,7 +6144,7 @@ som_write_armap (bfd *abfd, if (curr_bfd->format == bfd_object && curr_bfd->xvec->flavour == bfd_target_som_flavour) lst.module_count++; - curr_bfd = curr_bfd->next; + curr_bfd = curr_bfd->archive_next; } lst.module_limit = lst.module_count; lst.dir_loc = lst_size; diff --git a/binutils/ChangeLog b/binutils/ChangeLog index d5a6c5c..050b416 100644 --- a/binutils/ChangeLog +++ b/binutils/ChangeLog @@ -1,3 +1,11 @@ +2007-06-27 Alan Modra <amodra@bigpond.net.au> + + * ar.c: Rename uses of bfd.next to bfd.archive_next throughout. + * arsup.c: Likewise. + * binemul.c: Likewise. + * objcopy.c: Likewise. + * dlltool.c: Likewise. + 2007-06-26 Shantonu Sen <ssen@apple.com> PR binutils/4693 diff --git a/binutils/ar.c b/binutils/ar.c index 720ced7..8313df5 100644 --- a/binutils/ar.c +++ b/binutils/ar.c @@ -154,7 +154,7 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count) if (count == 0) { - for (head = arch->next; head; head = head->next) + for (head = arch->archive_next; head; head = head->archive_next) { PROGRESS (1); function (head); @@ -173,7 +173,7 @@ map_over_members (bfd *arch, void (*function)(bfd *), char **files, int count) bfd_boolean found = FALSE; match_count = 0; - for (head = arch->next; head; head = head->next) + for (head = arch->archive_next; head; head = head->archive_next) { PROGRESS (1); if (head->filename == NULL) @@ -759,7 +759,7 @@ open_inarch (const char *archive_filename, const char *file) xexit (1); } - last_one = &(arch->next); + last_one = &(arch->archive_next); /* Read all the contents right away, regardless. */ for (next_one = bfd_openr_next_archived_file (arch, NULL); next_one; @@ -767,7 +767,7 @@ open_inarch (const char *archive_filename, const char *file) { PROGRESS (1); *last_one = next_one; - last_one = &next_one->next; + last_one = &next_one->archive_next; } *last_one = (bfd *) NULL; if (bfd_get_error () != bfd_error_no_more_archived_files) @@ -923,7 +923,7 @@ write_archive (bfd *iarch) { bfd *obfd; char *old_name, *new_name; - bfd *contents_head = iarch->next; + bfd *contents_head = iarch->archive_next; old_name = xmalloc (strlen (bfd_get_filename (iarch)) + 1); strcpy (old_name, bfd_get_filename (iarch)); @@ -995,15 +995,15 @@ get_pos_bfd (bfd **contents, enum pos default_pos, const char *default_posname) if (realpos == pos_end) { while (*after_bfd) - after_bfd = &((*after_bfd)->next); + after_bfd = &((*after_bfd)->archive_next); } else { - for (; *after_bfd; after_bfd = &(*after_bfd)->next) + for (; *after_bfd; after_bfd = &(*after_bfd)->archive_next) if (FILENAME_CMP ((*after_bfd)->filename, realposname) == 0) { if (realpos == pos_after) - after_bfd = &(*after_bfd)->next; + after_bfd = &(*after_bfd)->archive_next; break; } } @@ -1035,7 +1035,7 @@ delete_members (bfd *arch, char **files_to_delete) found = FALSE; match_count = 0; - current_ptr_ptr = &(arch->next); + current_ptr_ptr = &(arch->archive_next); while (*current_ptr_ptr) { if (FILENAME_CMP (normalize (*files_to_delete, arch), @@ -1055,12 +1055,12 @@ delete_members (bfd *arch, char **files_to_delete) if (verbose) printf ("d - %s\n", *files_to_delete); - *current_ptr_ptr = ((*current_ptr_ptr)->next); + *current_ptr_ptr = ((*current_ptr_ptr)->archive_next); goto next_file; } } - current_ptr_ptr = &((*current_ptr_ptr)->next); + current_ptr_ptr = &((*current_ptr_ptr)->archive_next); } if (verbose && !found) @@ -1089,7 +1089,7 @@ move_members (bfd *arch, char **files_to_move) for (; *files_to_move; ++files_to_move) { - current_ptr_ptr = &(arch->next); + current_ptr_ptr = &(arch->archive_next); while (*current_ptr_ptr) { bfd *current_ptr = *current_ptr_ptr; @@ -1099,13 +1099,13 @@ move_members (bfd *arch, char **files_to_move) /* Move this file to the end of the list - first cut from where it is. */ bfd *link; - *current_ptr_ptr = current_ptr->next; + *current_ptr_ptr = current_ptr->archive_next; /* Now glue to end */ - after_bfd = get_pos_bfd (&arch->next, pos_end, NULL); + after_bfd = get_pos_bfd (&arch->archive_next, pos_end, NULL); link = *after_bfd; *after_bfd = current_ptr; - current_ptr->next = link; + current_ptr->archive_next = link; if (verbose) printf ("m - %s\n", *files_to_move); @@ -1113,7 +1113,7 @@ move_members (bfd *arch, char **files_to_move) goto next_file; } - current_ptr_ptr = &((*current_ptr_ptr)->next); + current_ptr_ptr = &((*current_ptr_ptr)->archive_next); } /* xgettext:c-format */ fatal (_("no entry %s in archive %s!"), *files_to_move, arch->filename); @@ -1138,7 +1138,7 @@ replace_members (bfd *arch, char **files_to_move, bfd_boolean quick) { if (! quick) { - current_ptr = &arch->next; + current_ptr = &arch->archive_next; while (*current_ptr) { current = *current_ptr; @@ -1168,24 +1168,24 @@ replace_members (bfd *arch, char **files_to_move, bfd_boolean quick) goto next_file; } - after_bfd = get_pos_bfd (&arch->next, pos_after, + after_bfd = get_pos_bfd (&arch->archive_next, pos_after, current->filename); if (ar_emul_replace (after_bfd, *files_to_move, verbose)) { /* Snip out this entry from the chain. */ - *current_ptr = (*current_ptr)->next; + *current_ptr = (*current_ptr)->archive_next; changed = TRUE; } goto next_file; } - current_ptr = &(current->next); + current_ptr = &(current->archive_next); } } /* Add to the end of the archive. */ - after_bfd = get_pos_bfd (&arch->next, pos_end, NULL); + after_bfd = get_pos_bfd (&arch->archive_next, pos_end, NULL); if (ar_emul_append (after_bfd, *files_to_move, verbose)) changed = TRUE; diff --git a/binutils/arsup.c b/binutils/arsup.c index 0d2b2a5..98f93a6 100644 --- a/binutils/arsup.c +++ b/binutils/arsup.c @@ -52,10 +52,10 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list) { bfd *next; - head = arch->next; + head = arch->archive_next; while (head != NULL) { - next = head->next; + next = head->archive_next; function (head, (bfd *) NULL); head = next; } @@ -74,7 +74,7 @@ map_over_list (bfd *arch, void (*function) (bfd *, bfd *), struct list *list) bfd_boolean found = FALSE; bfd *prev = arch; - for (head = arch->next; head; head = head->next) + for (head = arch->archive_next; head; head = head->archive_next) { if (head->filename != NULL && FILENAME_CMP (ptr->name, head->filename) == 0) @@ -198,7 +198,7 @@ ar_open (char *name, int t) while (element) { *ptr = element; - ptr = &element->next; + ptr = &element->archive_next; element = bfd_openr_next_archived_file (ibfd, element); } } @@ -214,9 +214,9 @@ ar_addlib_doer (bfd *abfd, bfd *prev) { /* Add this module to the output bfd. */ if (prev != NULL) - prev->next = abfd->next; + prev->archive_next = abfd->archive_next; - abfd->next = obfd->archive_head; + abfd->archive_next = obfd->archive_head; obfd->archive_head = abfd; } @@ -262,7 +262,7 @@ ar_addmod (struct list *list) } else { - abfd->next = obfd->archive_head; + abfd->archive_next = obfd->archive_head; obfd->archive_head = abfd; } list = list->next; @@ -299,13 +299,13 @@ ar_delete (struct list *list) { if (FILENAME_CMP(member->filename, list->name) == 0) { - *prev = member->next; + *prev = member->archive_next; found = 1; } else - prev = &(member->next); + prev = &(member->archive_next); - member = member->next; + member = member->archive_next; } if (!found) @@ -373,15 +373,15 @@ ar_replace (struct list *list) else { *prev = abfd; - abfd->next = member->next; + abfd->archive_next = member->archive_next; found = 1; } } else { - prev = &(member->next); + prev = &(member->archive_next); } - member = member->next; + member = member->archive_next; } if (!found) @@ -424,7 +424,7 @@ ar_list (void) for (abfd = obfd->archive_head; abfd != (bfd *)NULL; - abfd = abfd->next) + abfd = abfd->archive_next) ar_directory_doer (abfd, (bfd *) NULL); } } @@ -463,7 +463,7 @@ ar_extract (struct list *list) found = 1; } - member = member->next; + member = member->archive_next; } if (!found) diff --git a/binutils/binemul.c b/binutils/binemul.c index 7dac32d..83740d0 100644 --- a/binutils/binemul.c +++ b/binutils/binemul.c @@ -58,7 +58,7 @@ ar_emul_default_append (bfd **after_bfd, char *file_name, AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name); AR_EMUL_APPEND_PRINT_VERBOSE (verbose, file_name); - (*after_bfd)->next = temp; + (*after_bfd)->archive_next = temp; return TRUE; } @@ -84,7 +84,7 @@ ar_emul_default_replace (bfd **after_bfd, char *file_name, AR_EMUL_ELEMENT_CHECK (*after_bfd, file_name); AR_EMUL_REPLACE_PRINT_VERBOSE (verbose, file_name); - (*after_bfd)->next = temp; + (*after_bfd)->archive_next = temp; return TRUE; } diff --git a/binutils/dlltool.c b/binutils/dlltool.c index 70b5041..568ad68 100644 --- a/binutils/dlltool.c +++ b/binutils/dlltool.c @@ -2828,7 +2828,7 @@ gen_lib_file (void) if (exp->private) continue; n = make_one_lib_file (exp, i); - n->next = head; + n->archive_next = head; head = n; if (ext_prefix_alias) { @@ -2847,14 +2847,14 @@ gen_lib_file (void) alias_exp.forward = exp->forward; alias_exp.next = exp->next; n = make_one_lib_file (&alias_exp, i + PREFIX_ALIAS_BASE); - n->next = head; + n->archive_next = head; head = n; } } /* Now stick them all into the archive. */ - ar_head->next = head; - ar_tail->next = ar_head; + ar_head->archive_next = head; + ar_tail->archive_next = ar_head; head = ar_tail; if (! bfd_set_archive_head (outarch, head)) @@ -2865,7 +2865,7 @@ gen_lib_file (void) while (head != NULL) { - bfd *n = head->next; + bfd *n = head->archive_next; bfd_close (head); head = n; } diff --git a/binutils/objcopy.c b/binutils/objcopy.c index 3cfb831..ce751b5 100644 --- a/binutils/objcopy.c +++ b/binutils/objcopy.c @@ -1935,7 +1935,7 @@ copy_unknown_element: l->obfd = output_bfd; *ptr = output_bfd; - ptr = &output_bfd->next; + ptr = &output_bfd->archive_next; last_element = this_element; diff --git a/ld/ChangeLog b/ld/ChangeLog index 75f2329..617a55e 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2007-06-27 Alan Modra <amodra@bigpond.net.au> + + * pe-dll.c: Rename uses of bfd.next to bfd.archive_next throughout. + 2007-06-20 Alan Modra <amodra@bigpond.net.au> * emulparams/elf32_spu.sh (OTHER_SECTIONS): KEEP .note.spu_name. diff --git a/ld/pe-dll.c b/ld/pe-dll.c index b431c22..ab743ee 100644 --- a/ld/pe-dll.c +++ b/ld/pe-dll.c @@ -2416,7 +2416,7 @@ pe_dll_generate_implib (def_file *def, const char *impfilename) def->exports[i].internal_name = def->exports[i].name; n = make_one (def->exports + i, outarch, ! (def->exports + i)->flag_data); - n->next = head; + n->archive_next = head; head = n; def->exports[i].internal_name = internal; } @@ -2427,8 +2427,8 @@ pe_dll_generate_implib (def_file *def, const char *impfilename) return; /* Now stick them all into the archive. */ - ar_head->next = head; - ar_tail->next = ar_head; + ar_head->archive_next = head; + ar_tail->archive_next = ar_head; head = ar_tail; if (! bfd_set_archive_head (outarch, head)) @@ -2439,7 +2439,7 @@ pe_dll_generate_implib (def_file *def, const char *impfilename) while (head != NULL) { - bfd *n = head->next; + bfd *n = head->archive_next; bfd_close (head); head = n; } |