aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1992-10-09 10:47:32 +0000
committerJohn Gilmore <gnu@cygnus>1992-10-09 10:47:32 +0000
commit366dfd0c6f87fb900cab57a10d571f3a5eadba65 (patch)
treee589511a9722e8e6b837de13040db4fe0fee0757
parent5a63b336cb756d656c1867bf1594134d6cc4fd42 (diff)
downloadgdb-366dfd0c6f87fb900cab57a10d571f3a5eadba65.zip
gdb-366dfd0c6f87fb900cab57a10d571f3a5eadba65.tar.gz
gdb-366dfd0c6f87fb900cab57a10d571f3a5eadba65.tar.bz2
* bout.c (ALIGN): Rename to ALIGNER, since system header files
on BSD 4.4 define ALIGN (sigh!).
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/bout.c12
2 files changed, 11 insertions, 6 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 54ffc05..cdffc8c 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+Fri Oct 9 03:46:37 1992 John Gilmore (gnu@cygnus.com)
+
+ * bout.c (ALIGN): Rename to ALIGNER, since system header files
+ on BSD 4.4 define ALIGN (sigh!).
+
Thu Oct 8 22:18:10 1992 Mark Eichin (eichin at tweedledumber.cygnus.com)
* libaout.h (aout_backend_data): added exec_header_not_counted
diff --git a/bfd/bout.c b/bfd/bout.c
index 41721f7..0e3c0ec 100644
--- a/bfd/bout.c
+++ b/bfd/bout.c
@@ -371,7 +371,7 @@ DEFUN (callj_callback, (abfd, reloc_entry, data, srcidx,dstidx, input_section),
#define ABS32_MAYBE_RELAXABLE 1
#define ABS32_WAS_RELAXABLE 2
-#define ALIGN 10
+#define ALIGNER 10
#define ALIGNDONE 11
static reloc_howto_type howto_reloc_callj =
HOWTO(CALLJ, 0, 2, 24, true, 0, true, true, 0,"callj", true, 0x00ffffff, 0x00ffffff,false);
@@ -391,10 +391,10 @@ static reloc_howto_type howto_reloc_abs32code =
HOWTO(ABS32CODE, 0, 2, 32, false, 0, true, true,0,"callx", true, 0xffffffff,0xffffffff,false);
static reloc_howto_type howto_align_table[] = {
- HOWTO (ALIGN, 0, 0x1, 0, false, 0, false, false, 0, "align16", false, 0, 0, false),
- HOWTO (ALIGN, 0, 0x3, 0, false, 0, false, false, 0, "align32", false, 0, 0, false),
- HOWTO (ALIGN, 0, 0x7, 0, false, 0, false, false, 0, "align64", false, 0, 0, false),
- HOWTO (ALIGN, 0, 0xf, 0, false, 0, false, false, 0, "align128", false, 0, 0, false),
+ HOWTO (ALIGNER, 0, 0x1, 0, false, 0, false, false, 0, "align16", false, 0, 0, false),
+ HOWTO (ALIGNER, 0, 0x3, 0, false, 0, false, false, 0, "align32", false, 0, 0, false),
+ HOWTO (ALIGNER, 0, 0x7, 0, false, 0, false, false, 0, "align64", false, 0, 0, false),
+ HOWTO (ALIGNER, 0, 0xf, 0, false, 0, false, false, 0, "align128", false, 0, 0, false),
};
static reloc_howto_type howto_done_align_table[] = {
@@ -1061,7 +1061,7 @@ DEFUN(b_out_relax_section,(abfd, i, symbols),
{
arelent *r = *parent;
switch (r->howto->type) {
- case ALIGN:
+ case ALIGNER:
/* An alignment reloc */
shrink = aligncode(input_section, symbols, r,shrink);
new=true;