aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJ.T. Conklin <jtc@acorntoolworks.com>1996-01-17 00:17:13 +0000
committerJ.T. Conklin <jtc@acorntoolworks.com>1996-01-17 00:17:13 +0000
commit9ac5703369807cd5d8bb3e42a58259e1fde72796 (patch)
tree889f38567ed69a8a3415fb41a1179f67399c6b8f
parentb9a48f1406a467f327cec3c6821a33b89829351f (diff)
downloadgdb-9ac5703369807cd5d8bb3e42a58259e1fde72796.zip
gdb-9ac5703369807cd5d8bb3e42a58259e1fde72796.tar.gz
gdb-9ac5703369807cd5d8bb3e42a58259e1fde72796.tar.bz2
* srconv.c (wr_hd): Space size within segment was being
stored in segment identifier field.
-rw-r--r--binutils/ChangeLog5
-rw-r--r--binutils/srconv.c30
2 files changed, 20 insertions, 15 deletions
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index c472f64..af37fa3 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,8 @@
+Tue Jan 16 16:15:49 1996 J.T. Conklin <jtc@rtl.cygnus.com>
+
+ * srconv.c (wr_hd): Space size within segment was being
+ stored in segment identifier field.
+
Tue Jan 16 12:07:25 1996 Stan Shebs <shebs@andros.cygnus.com>
* mpw-config.in (BUILD_NLMCONV, BUILD_SRCONV, SYSINFO_PROG,
diff --git a/binutils/srconv.c b/binutils/srconv.c
index 904083a..fca3dfd 100644
--- a/binutils/srconv.c
+++ b/binutils/srconv.c
@@ -25,7 +25,6 @@
All debugging information is preserved */
#include <bfd.h>
-#include "sysdep.h"
#include "bucomm.h"
#include "sysroff.h"
#include "coffgrok.h"
@@ -172,8 +171,13 @@ writeINT (n, ptr, idx, size, file)
int byte = *idx / 8;
if (size == -2)
- size = 4;
- if (size == -1)
+ {
+ if (sh)
+ size = 4;
+ else if (h8300)
+ size = 2;
+ }
+ else if (size == -1)
size = 0;
if (byte > 240)
@@ -346,13 +350,9 @@ wr_un (ptr, sfile, first, nsecs)
}
}
if (sh)
- {
- un.tool = "C_SH";
- }
- if (h8300)
- {
- un.tool = "C_H8/300H";
- }
+ un.tool = "C_SH";
+ else if (h8300)
+ un.tool = "C_H8/300H";
un.tcd = DATE;
un.linker = "L_GX00";
un.lcd = DATE;
@@ -385,9 +385,9 @@ wr_hd (p)
{
case bfd_arch_h8300:
hd.au = 8;
- hd.si = 32;
+ hd.si = 0;
hd.afl = 2;
- hd.spcsz = 0;
+ hd.spcsz = 32;
hd.segsz = 0;
hd.segsh = 0;
hd.cpu = "H8300H";
@@ -395,9 +395,9 @@ wr_hd (p)
break;
case bfd_arch_sh:
hd.au = 8;
- hd.si = 32;
+ hd.si = 0;
hd.afl = 4;
- hd.spcsz = 0;
+ hd.spcsz = 32;
hd.segsz = 0;
hd.segsh = 0;
hd.cpu = "SH";
@@ -1119,7 +1119,7 @@ walk_tree_symbol (sfile, section, symbol, nest)
{
if (sh)
dsy.reg = rname_sh[symbol->where->offset];
- if (h8300)
+ else if (h8300)
dsy.reg = rname_h8300[symbol->where->offset];
}