From f5db5282c0f2c4085854e6b5920c41ff4fb27ff0 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Tue, 3 Dec 2002 23:55:48 +0000 Subject: [PATCH] * srec.c (srec_write_symbols): Restore '$' prefix to address accidentally removed in 2002-04-04 change. (srec_get_symtab): Use 0 instead of `(long) FALSE'. --- bfd/ChangeLog | 6 ++++++ bfd/srec.c | 11 ++++++----- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index c16c741d9..d711333f1 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,9 @@ +2002-12-04 Alan Modra + + * srec.c (srec_write_symbols): Restore '$' prefix to address + accidentally removed in 2002-04-04 change. + (srec_get_symtab): Use 0 instead of `(long) FALSE'. + 2002-12-03 Nick Clifton * elf32-ppc.c (apuinfo_list_init): New function. diff --git a/bfd/srec.c b/bfd/srec.c index f792d971d..cd31907ba 100644 --- a/bfd/srec.c +++ b/bfd/srec.c @@ -1095,24 +1095,25 @@ srec_write_symbols (abfd) && (s->flags & BSF_DEBUGGING) == 0) { /* Just dump out non debug symbols. */ - char buf[42], *p; + char buf[43], *p; len = strlen (s->name); if (bfd_bwrite (" ", (bfd_size_type) 2, abfd) != 2 || bfd_bwrite (s->name, len, abfd) != len) return FALSE; - sprintf_vma (buf + 1, (s->value + sprintf_vma (buf + 2, (s->value + s->section->output_section->lma + s->section->output_offset)); - p = buf + 1; + p = buf + 2; while (p[0] == '0' && p[1] != 0) p++; len = strlen (p); p[len] = '\r'; p[len + 1] = '\n'; + *--p = '$'; *--p = ' '; - len += 3; + len += 4; if (bfd_bwrite (p, len, abfd) != len) return FALSE; } @@ -1203,7 +1204,7 @@ srec_get_symtab (abfd, alocation) csymbols = (asymbol *) bfd_alloc (abfd, symcount * sizeof (asymbol)); if (csymbols == NULL && symcount != 0) - return (long) FALSE; + return 0; abfd->tdata.srec_data->csymbols = csymbols; for (s = abfd->tdata.srec_data->symbols, c = csymbols; -- 2.11.4.GIT