summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bfd/ChangeLog7
-rw-r--r--bfd/elfxx-ia64.c8
-rw-r--r--include/ChangeLog5
-rw-r--r--include/bfdlink.h4
4 files changed, 18 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 48ebc5e8890..b889b255e6e 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2003-12-04 H.J. Lu <hongjiu.lu@intel.com>
+
+ * elfxx-ia64.c (elfNN_ia64_relax_section): Use the
+ need_relax_finalize field in link_info instead of
+ relax_finalizing to check if the relax finalize pass is being
+ done.
+
2003-12-04 Dmitry Semyonov <Dmitry.Semyonov@oktet.ru>
* coff-arm.c (coff_arm_relocate_section, bfd_arm_process_before_allocation):
diff --git a/bfd/elfxx-ia64.c b/bfd/elfxx-ia64.c
index c9da05fd547..aba571a415e 100644
--- a/bfd/elfxx-ia64.c
+++ b/bfd/elfxx-ia64.c
@@ -714,7 +714,7 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
the relax finalize pass. */
if ((sec->flags & SEC_RELOC) == 0
|| sec->reloc_count == 0
- || (link_info->relax_finalizing
+ || (!link_info->need_relax_finalize
&& sec->need_finalize_relax == 0))
return TRUE;
@@ -765,14 +765,14 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
case R_IA64_PCREL21BI:
case R_IA64_PCREL21M:
case R_IA64_PCREL21F:
- if (link_info->relax_finalizing)
+ if (!link_info->need_relax_finalize)
continue;
is_branch = TRUE;
break;
case R_IA64_LTOFF22X:
case R_IA64_LDXMOV:
- if (!link_info->relax_finalizing)
+ if (link_info->need_relax_finalize)
{
sec->need_finalize_relax = 1;
continue;
@@ -1073,7 +1073,7 @@ elfNN_ia64_relax_section (abfd, sec, link_info, again)
/* ??? Resize .rela.got too. */
}
- if (link_info->relax_finalizing)
+ if (!link_info->need_relax_finalize)
sec->need_finalize_relax = 0;
*again = changed_contents || changed_relocs;
diff --git a/include/ChangeLog b/include/ChangeLog
index d7c752be505..4328b98a45c 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2003-12-04 H.J. Lu <hongjiu.lu@intel.com>
+
+ * bfdlink.h (bfd_link_info): Change relax_finalizing to
+ need_relax_finalize.
+
2003-12-03 Alan Modra <amodra@bigpond.net.au>
* bfdlink.h (struct bfd_link_hash_entry): Rename "next" to "und_next".
diff --git a/include/bfdlink.h b/include/bfdlink.h
index f31046dfd1c..a989f64f4ca 100644
--- a/include/bfdlink.h
+++ b/include/bfdlink.h
@@ -285,8 +285,8 @@ struct bfd_link_info
/* TRUE if global symbols in discarded sections should be stripped. */
unsigned int strip_discarded: 1;
- /* TRUE if relaxation is being finalized. */
- unsigned int relax_finalizing: 1;
+ /* TRUE if the final relax pass is needed. */
+ unsigned int need_relax_finalize: 1;
/* TRUE if generating a position independent executable. */
unsigned int pie: 1;