From: David Henkel-Wallace <gumby@cygnus>
Date: Sun, 10 Jul 1994 16:15:07 +0000 (+0000)
Subject: Sun Jul 10 09:12:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=4852416e2ab34207e84273b9f6b035d2dfe169b0;p=binutils-gdb.git

Sun Jul 10 09:12:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)

        * aoutx.h (bfd_free_cached_info): Change name of FREE to BFCI_FREE
        in order not to collide with LynxOS's definition of FREE in
        /usr/include/sys/proc.h
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 92be04bfd95..4886c39a8f7 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,14 @@
+Sun Jul 10 09:12:02 1994  D. V. Henkel-Wallace  (gumby@cygnus.com)
+
+	* aoutx.h (bfd_free_cached_info): Change name of FREE to BFCI_FREE
+	in order not to collide with LynxOS's definition of FREE in
+	/usr/include/sys/proc.h
+
+Thu Jul  7 14:18:06 1994  Ian Lance Taylor  (ian@sanguine.cygnus.com)
+
+	* reloc.c (bfd_perform_relocation): Don't clobber the relocation
+	value for coff-Intel-little or coff-Intel-big.  Hack upon hack.
+
 Thu Jul  7 10:10:34 1994  Peter Schauer  (pes@regent.e-technik.tu-muenchen.de)
 
 	* aoutx.h (howto_table_std):  Add entry for GOT relocations
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index c53b44696f6..e3ca98ff5ff 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -198,7 +198,7 @@ HOWTO( 4,	       0,  0, 	8,  true,  0, complain_overflow_signed,  0,"DISP8",	tru
 HOWTO( 5,	       0,  1, 	16, true,  0, complain_overflow_signed,  0,"DISP16",	true, 0x0000ffff,0x0000ffff, false),
 HOWTO( 6,	       0,  2, 	32, true,  0, complain_overflow_signed,  0,"DISP32",	true, 0xffffffff,0xffffffff, false),
 HOWTO( 7,	       0,  4, 	64, true,  0, complain_overflow_signed,  0,"DISP64",	true, 0xfeedface,0xfeedface, false),
-{ -1 },
+HOWTO( 8,	       0,  2,    0, false, 0, complain_overflow_bitfield,0,"GOT_REL",	false,         0,0x00000000, false),
 HOWTO( 9,	       0,  1,   16, false, 0, complain_overflow_bitfield,0,"BASE16",	false,0xffffffff,0xffffffff, false),
 HOWTO(10,	       0,  2,   32, false, 0, complain_overflow_bitfield,0,"BASE32",	false,0xffffffff,0xffffffff, false),
 { -1 },
@@ -2694,13 +2694,13 @@ NAME(aout,bfd_free_cached_info) (abfd)
   if (bfd_get_format (abfd) != bfd_object)
     return true;
 
-#define FREE(x) if (x != NULL) { free (x); x = NULL; }
-  FREE (obj_aout_symbols (abfd));
-  FREE (obj_aout_external_syms (abfd));
-  FREE (obj_aout_external_strings (abfd));
+#define BFCI_FREE(x) if (x != NULL) { free (x); x = NULL; }
+  BFCI_FREE (obj_aout_symbols (abfd));
+  BFCI_FREE (obj_aout_external_syms (abfd));
+  BFCI_FREE (obj_aout_external_strings (abfd));
   for (o = abfd->sections; o != (asection *) NULL; o = o->next)
-    FREE (o->relocation);
-#undef FREE
+    BFCI_FREE (o->relocation);
+#undef BFCI_FREE
 
   return true;
 }