* secure-plt layout not selected
@ 2007-06-27 6:41 Alan Modra
2007-06-27 7:13 ` Alan Modra
0 siblings, 1 reply; 4+ messages in thread
From: Alan Modra @ 2007-06-27 6:41 UTC (permalink / raw)
To: binutils
Found during a glibc build.
* elf32-ppc.c (ppc_elf_select_plt_layout): Properly iterate over
input bfds.
Index: bfd/elf32-ppc.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-ppc.c,v
retrieving revision 1.215
diff -u -p -r1.215 elf32-ppc.c
--- bfd/elf32-ppc.c 15 May 2007 13:55:53 -0000 1.215
+++ bfd/elf32-ppc.c 27 Jun 2007 06:41:21 -0000
@@ -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)
--
Alan Modra
IBM OzLabs - Linux Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: secure-plt layout not selected
2007-06-27 6:41 secure-plt layout not selected Alan Modra
@ 2007-06-27 7:13 ` Alan Modra
2007-06-27 11:50 ` Alan Modra
0 siblings, 1 reply; 4+ messages in thread
From: Alan Modra @ 2007-06-27 7:13 UTC (permalink / raw)
To: binutils
On Wed, Jun 27, 2007 at 04:11:41PM +0930, Alan Modra wrote:
> * elf32-ppc.c (ppc_elf_select_plt_layout): Properly iterate over
> input bfds.
Ho hum, there's another one here.
* elf32-spu.c (spu_elf_create_sections): Properly iterate over
input bfds.
Index: bfd/elf32-spu.c
===================================================================
RCS file: /cvs/src/src/bfd/elf32-spu.c,v
retrieving revision 1.17
diff -u -p -r1.17 elf32-spu.c
--- bfd/elf32-spu.c 12 May 2007 06:45:33 -0000 1.17
+++ bfd/elf32-spu.c 27 Jun 2007 07:00:44 -0000
@@ -533,7 +533,7 @@ spu_elf_create_sections (bfd *output_bfd
htab->stack_analysis = stack_analysis;
htab->emit_stack_syms = emit_stack_syms;
- for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->next)
+ for (ibfd = info->input_bfds; ibfd != NULL; ibfd = ibfd->link_next)
if (bfd_get_section_by_name (ibfd, SPU_PTNOTE_SPUNAME) != NULL)
break;
--
Alan Modra
IBM OzLabs - Linux Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: secure-plt layout not selected
2007-06-27 7:13 ` Alan Modra
@ 2007-06-27 11:50 ` Alan Modra
2007-07-05 0:19 ` Alan Modra
0 siblings, 1 reply; 4+ messages in thread
From: Alan Modra @ 2007-06-27 11:50 UTC (permalink / raw)
To: binutils
This should ensure that I don't repeat my silly mistake in using the
wrong "next" field.
bfd/
* 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.
binutils/
* ar.c: Rename uses of bfd.next to bfd.archive_next throughout.
* arsup.c: Likewise.
* binemul.c: Likewise.
* objcopy.c: Likewise.
* dlltool.c: Likewise.
ld/
* pe-dll.c: Rename uses of bfd.next to bfd.archive_next throughout.
Index: bfd/bfd.c
===================================================================
RCS file: /cvs/src/src/bfd/bfd.c,v
retrieving revision 1.93
diff -u -p -r1.93 bfd.c
--- bfd/bfd.c 26 Apr 2007 14:46:55 -0000 1.93
+++ bfd/bfd.c 27 Jun 2007 07:30:54 -0000
@@ -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;
.
Index: bfd/archive.c
===================================================================
RCS file: /cvs/src/src/bfd/archive.c,v
retrieving revision 1.48
diff -u -p -r1.48 archive.c
--- bfd/archive.c 26 Apr 2007 14:46:55 -0000 1.48
+++ bfd/archive.c 27 Jun 2007 07:30:47 -0000
@@ -1234,7 +1234,9 @@ _bfd_construct_extended_name_table (bfd
*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
*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,
/* 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. */
Index: bfd/archive64.c
===================================================================
RCS file: /cvs/src/src/bfd/archive64.c,v
retrieving revision 1.8
diff -u -p -r1.8 archive64.c
--- bfd/archive64.c 26 Apr 2007 14:46:55 -0000 1.8
+++ bfd/archive64.c 27 Jun 2007 07:30:47 -0000
@@ -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 */
Index: bfd/coff-rs6000.c
===================================================================
RCS file: /cvs/src/src/bfd/coff-rs6000.c,v
retrieving revision 1.80
diff -u -p -r1.80 coff-rs6000.c
--- bfd/coff-rs6000.c 27 Apr 2007 03:37:42 -0000 1.80
+++ bfd/coff-rs6000.c 27 Jun 2007 07:30:54 -0000
@@ -1649,7 +1649,7 @@ xcoff_write_armap_old (abfd, elength, ma
+ 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, ma
}
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, ma
+ 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, ma
}
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, ma
+ 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, ma
}
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;
Index: bfd/ecoff.c
===================================================================
RCS file: /cvs/src/src/bfd/ecoff.c,v
retrieving revision 1.55
diff -u -p -r1.55 ecoff.c
--- bfd/ecoff.c 26 Apr 2007 14:46:56 -0000 1.55
+++ bfd/ecoff.c 27 Jun 2007 07:30:56 -0000
@@ -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);
}
Index: bfd/som.c
===================================================================
RCS file: /cvs/src/src/bfd/som.c,v
retrieving revision 1.64
diff -u -p -r1.64 som.c
--- bfd/som.c 26 Apr 2007 14:46:58 -0000 1.64
+++ bfd/som.c 27 Jun 2007 07:31:11 -0000
@@ -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;
Index: binutils/ar.c
===================================================================
RCS file: /cvs/src/src/binutils/ar.c,v
retrieving revision 1.51
diff -u -p -r1.51 ar.c
--- binutils/ar.c 26 Apr 2007 14:46:59 -0000 1.51
+++ binutils/ar.c 27 Jun 2007 07:31:16 -0000
@@ -154,7 +154,7 @@ map_over_members (bfd *arch, void (*func
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 (*func
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_filenam
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_filenam
{
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 de
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_
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_
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
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 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
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
{
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
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;
Index: binutils/arsup.c
===================================================================
RCS file: /cvs/src/src/binutils/arsup.c,v
retrieving revision 1.17
diff -u -p -r1.17 arsup.c
--- binutils/arsup.c 26 Apr 2007 14:46:59 -0000 1.17
+++ binutils/arsup.c 27 Jun 2007 07:31:16 -0000
@@ -52,10 +52,10 @@ map_over_list (bfd *arch, void (*functio
{
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 (*functio
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)
Index: binutils/binemul.c
===================================================================
RCS file: /cvs/src/src/binutils/binemul.c,v
retrieving revision 1.8
diff -u -p -r1.8 binemul.c
--- binutils/binemul.c 18 Jul 2005 14:16:51 -0000 1.8
+++ binutils/binemul.c 27 Jun 2007 07:31:16 -0000
@@ -58,7 +58,7 @@ ar_emul_default_append (bfd **after_bfd,
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
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;
}
Index: binutils/objcopy.c
===================================================================
RCS file: /cvs/src/src/binutils/objcopy.c,v
retrieving revision 1.113
diff -u -p -r1.113 objcopy.c
--- binutils/objcopy.c 30 May 2007 14:29:27 -0000 1.113
+++ binutils/objcopy.c 27 Jun 2007 07:31:21 -0000
@@ -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;
Index: binutils/dlltool.c
===================================================================
RCS file: /cvs/src/src/binutils/dlltool.c,v
retrieving revision 1.76
diff -u -p -r1.76 dlltool.c
--- binutils/dlltool.c 26 Apr 2007 14:46:59 -0000 1.76
+++ binutils/dlltool.c 27 Jun 2007 08:07:59 -0000
@@ -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;
}
Index: ld/pe-dll.c
===================================================================
RCS file: /cvs/src/src/ld/pe-dll.c,v
retrieving revision 1.97
diff -u -p -r1.97 pe-dll.c
--- ld/pe-dll.c 26 Apr 2007 14:46:59 -0000 1.97
+++ ld/pe-dll.c 27 Jun 2007 07:31:37 -0000
@@ -2416,7 +2416,7 @@ pe_dll_generate_implib (def_file *def, c
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, c
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, c
while (head != NULL)
{
- bfd *n = head->next;
+ bfd *n = head->archive_next;
bfd_close (head);
head = n;
}
--
Alan Modra
IBM OzLabs - Linux Technology Centre
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: secure-plt layout not selected
2007-06-27 11:50 ` Alan Modra
@ 2007-07-05 0:19 ` Alan Modra
0 siblings, 0 replies; 4+ messages in thread
From: Alan Modra @ 2007-07-05 0:19 UTC (permalink / raw)
To: binutils
I missed renaming one place.
* emul_aix.c (ar_emul_aix_internal): Rename "next" to "archive_next".
Index: binutils/emul_aix.c
===================================================================
RCS file: /cvs/src/src/binutils/emul_aix.c,v
retrieving revision 1.9
diff -u -p -r1.9 emul_aix.c
--- binutils/emul_aix.c 16 Sep 2006 18:12:17 -0000 1.9
+++ binutils/emul_aix.c 4 Jul 2007 22:22:55 -0000
@@ -1,5 +1,5 @@
/* Binutils emulation layer.
- Copyright 2002, 2003, 2006 Free Software Foundation, Inc.
+ Copyright 2002, 2003, 2006, 2007 Free Software Foundation, Inc.
Written by Tom Rix, Red Hat Inc.
This file is part of GNU Binutils.
@@ -89,7 +89,7 @@ ar_emul_aix_internal (bfd **after_bfd, c
}
*after_bfd = try_bfd;
- (*after_bfd)->next = temp;
+ (*after_bfd)->archive_next = temp;
return TRUE;
}
--
Alan Modra
IBM OzLabs - Australia Development Laboratory
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2007-07-04 22:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-06-27 6:41 secure-plt layout not selected Alan Modra
2007-06-27 7:13 ` Alan Modra
2007-06-27 11:50 ` Alan Modra
2007-07-05 0:19 ` Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).