aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Gilmore <gnu@cygnus>1991-04-25 04:22:55 +0000
committerJohn Gilmore <gnu@cygnus>1991-04-25 04:22:55 +0000
commitd6a554ae83d74bcdfbf7b41c262eae4043194df6 (patch)
tree7a611b2aa59d4eee0e40d4cd543eadfab68ece78
parentbad3df6720febc5e2e5e4a2af6acbb3bdd66b048 (diff)
downloadgdb-d6a554ae83d74bcdfbf7b41c262eae4043194df6.zip
gdb-d6a554ae83d74bcdfbf7b41c262eae4043194df6.tar.gz
gdb-d6a554ae83d74bcdfbf7b41c262eae4043194df6.tar.bz2
Minor changes to accomodate merging of three include file directories.
-rw-r--r--bfd/Makefile.in2
-rwxr-xr-xbfd/aout.c13
-rw-r--r--bfd/archive.c4
-rw-r--r--bfd/ieee.c4
-rw-r--r--bfd/sunos.c13
5 files changed, 20 insertions, 16 deletions
diff --git a/bfd/Makefile.in b/bfd/Makefile.in
index 4048dbb..607a26c 100644
--- a/bfd/Makefile.in
+++ b/bfd/Makefile.in
@@ -23,7 +23,7 @@ srcdir = .
RANLIB = ranlib
AR =
-INCDIR = $(srcdir)/../include-cygnus
+INCDIR = $(srcdir)/../include
CSEARCH = -I$(INCDIR)
#### host and target dependent Makefile fragments come in here.
diff --git a/bfd/aout.c b/bfd/aout.c
index e9f3423..fb9dfd2 100755
--- a/bfd/aout.c
+++ b/bfd/aout.c
@@ -312,8 +312,8 @@ sunos4_object_p (abfd)
obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
obj_datasec (abfd)->filepos = N_DATOFF(*execp);
- obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
- obj_datasec (abfd)->rel_filepos = N_DROFF(*execp);
+ obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
+ obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
obj_textsec (abfd)->flags = (execp->a_trsize != 0 ?
(SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_HAS_CONTENTS) :
@@ -506,10 +506,10 @@ sunos4_write_object_contents (abfd)
sunos4_write_syms (abfd);
- bfd_seek (abfd, (long)(N_TROFF(*execp)), false);
+ bfd_seek (abfd, (long)(N_TRELOFF(*execp)), false);
if (!sunos4_squirt_out_relocs (abfd, obj_textsec (abfd))) return false;
- bfd_seek (abfd, (long)(N_DROFF(*execp)), false);
+ bfd_seek (abfd, (long)(N_DRELOFF(*execp)), false);
if (!sunos4_squirt_out_relocs (abfd, obj_datasec (abfd))) return false;
}
@@ -1137,8 +1137,9 @@ DEFUN(sunos4_slurp_symbol_table, (abfd),
symbol_count = symbol_size / sizeof (struct nlist);
strings = bfd_alloc(abfd, string_size + 1);
- cached = bfd_zalloc(abfd, symbol_count * sizeof(aout_symbol_type));
- syms = bfd_alloc(abfd, symbol_size);
+ cached = (aout_symbol_type *)
+ bfd_zalloc(abfd, symbol_count * sizeof(aout_symbol_type));
+ syms = (struct nlist *) bfd_alloc(abfd, symbol_size);
bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET);
if (bfd_read ((PTR)syms, 1, symbol_size, abfd) != symbol_size) {
diff --git a/bfd/archive.c b/bfd/archive.c
index 530b0aa..1313540 100644
--- a/bfd/archive.c
+++ b/bfd/archive.c
@@ -417,6 +417,8 @@ bfd_slurp_bsd_armap (abfd)
/* The archive has at least 16 bytes in it */
bfd_seek (abfd, -16L, SEEK_CUR);
+ /* This should be using RANLIBMAG, but at least it can be grepped for
+ in this comment. */
if (strncmp (nextname, "__.SYMDEF ", 16)) {
bfd_has_map (abfd) = false;
return true;
@@ -1107,7 +1109,7 @@ bsd_write_armap (arch, elength, map, orl_count, stridx)
stat (arch->filename, &statbuf);
memset ((char *)(&hdr), 0, sizeof (struct ar_hdr));
- sprintf (hdr.ar_name, "__.SYMDEF");
+ sprintf (hdr.ar_name, RANLIBMAG);
sprintf (hdr.ar_size, "%-10d", (int) mapsize);
sprintf (hdr.ar_date, "%ld", statbuf.st_mtime);
hdr.ar_fmag[0] = '`'; hdr.ar_fmag[1] = '\n';
diff --git a/bfd/ieee.c b/bfd/ieee.c
index 66cf793..3f17115 100644
--- a/bfd/ieee.c
+++ b/bfd/ieee.c
@@ -816,7 +816,7 @@ DEFUN(ieee_archive_p,(abfd),
boolean loop;
ieee_ar_data_type *ar;
unsigned int i;
- return 0;
+ return 0; /* FIXME */
ieee_seek(abfd, (file_ptr) 0);
if (this_byte(abfd) != Module_Beginning) return (bfd_target*)NULL;
next_byte(abfd);
@@ -900,6 +900,7 @@ DEFUN(ieee_object_p,(abfd),
unsigned int part;
ieee_data_type *ieee;
char buffer[300];
+
ieee_data(abfd) = 0;
ieee_mkobject(abfd);
ieee = ieee_data(abfd);
@@ -909,7 +910,6 @@ DEFUN(ieee_object_p,(abfd),
ptr(abfd)= buffer;
if (*(ptr(abfd)++) != Module_Beginning) goto fail;
-
ieee->read_symbols= false;
ieee->read_data= false;
diff --git a/bfd/sunos.c b/bfd/sunos.c
index e9f3423..fb9dfd2 100644
--- a/bfd/sunos.c
+++ b/bfd/sunos.c
@@ -312,8 +312,8 @@ sunos4_object_p (abfd)
obj_textsec (abfd)->filepos = N_TXTOFF(*execp);
obj_datasec (abfd)->filepos = N_DATOFF(*execp);
- obj_textsec (abfd)->rel_filepos = N_TROFF(*execp);
- obj_datasec (abfd)->rel_filepos = N_DROFF(*execp);
+ obj_textsec (abfd)->rel_filepos = N_TRELOFF(*execp);
+ obj_datasec (abfd)->rel_filepos = N_DRELOFF(*execp);
obj_textsec (abfd)->flags = (execp->a_trsize != 0 ?
(SEC_ALLOC | SEC_LOAD | SEC_RELOC | SEC_HAS_CONTENTS) :
@@ -506,10 +506,10 @@ sunos4_write_object_contents (abfd)
sunos4_write_syms (abfd);
- bfd_seek (abfd, (long)(N_TROFF(*execp)), false);
+ bfd_seek (abfd, (long)(N_TRELOFF(*execp)), false);
if (!sunos4_squirt_out_relocs (abfd, obj_textsec (abfd))) return false;
- bfd_seek (abfd, (long)(N_DROFF(*execp)), false);
+ bfd_seek (abfd, (long)(N_DRELOFF(*execp)), false);
if (!sunos4_squirt_out_relocs (abfd, obj_datasec (abfd))) return false;
}
@@ -1137,8 +1137,9 @@ DEFUN(sunos4_slurp_symbol_table, (abfd),
symbol_count = symbol_size / sizeof (struct nlist);
strings = bfd_alloc(abfd, string_size + 1);
- cached = bfd_zalloc(abfd, symbol_count * sizeof(aout_symbol_type));
- syms = bfd_alloc(abfd, symbol_size);
+ cached = (aout_symbol_type *)
+ bfd_zalloc(abfd, symbol_count * sizeof(aout_symbol_type));
+ syms = (struct nlist *) bfd_alloc(abfd, symbol_size);
bfd_seek (abfd, obj_sym_filepos (abfd), SEEK_SET);
if (bfd_read ((PTR)syms, 1, symbol_size, abfd) != symbol_size) {