From 6d1227b86c27202e6711be4858ccf407ae155091 Mon Sep 17 00:00:00 2001
From: Jason Eckhardt <jle@rice.edu>
Date: Sun, 24 Aug 2003 20:54:05 +0000
Subject: 2003-08-24  Jason Eckhardt  <jle@rice.edu>

	* coff-i860.c (CALC_ADDEND): Define to be a no-op.
---
 bfd/ChangeLog   | 4 ++++
 bfd/coff-i860.c | 6 ++++++
 2 files changed, 10 insertions(+)

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 6fe12d5..3d9995c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,5 +1,9 @@
 2003-08-24  Jason Eckhardt  <jle@rice.edu>
 
+	* coff-i860.c (CALC_ADDEND): Define to be a no-op. 
+
+2003-08-24  Jason Eckhardt  <jle@rice.edu>
+
 	* elf32-i860.c (elf32_i860_relocate_pc16): Subtract 4 and
 	shift by 2 before storing the relocated value.
 
diff --git a/bfd/coff-i860.c b/bfd/coff-i860.c
index 0d642ab..74b599c 100644
--- a/bfd/coff-i860.c
+++ b/bfd/coff-i860.c
@@ -462,6 +462,9 @@ static reloc_howto_type howto_table[] =
    FIXME: This macro refers to symbols and asect; these are from the
    calling function, not the macro arguments.  */
 
+/* FIXME: This was copied from the i386 version originally but
+   appears to be wrong for i860.  For now we'll do nothing.  */
+#if 0
 #define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)		\
   {								\
     coff_symbol_type *coffsym = (coff_symbol_type *) NULL;	\
@@ -481,6 +484,9 @@ static reloc_howto_type howto_table[] =
     if (ptr && howto_table[reloc.r_type].pc_relative)		\
       cache_ptr->addend += asect->vma;				\
   }
+#else
+#define CALC_ADDEND(abfd, ptr, reloc, cache_ptr)
+#endif
 
 /* We use the special COFF backend linker.  */
 #define coff_relocate_section _bfd_coff_generic_relocate_section
-- 
cgit v1.1