This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
PR 9695 shoddy code in pdp11.c hits abort
- From: Alan Modra <amodra at bigpond dot net dot au>
- To: binutils at sourceware dot org
- Date: Mon, 19 Jan 2009 16:37:34 +1030
- Subject: PR 9695 shoddy code in pdp11.c hits abort
Applied.
PR 9695
* pdp11.c (N_BADMAG): True for anything but OMAGIC, NMAGIC, ZMAGIC.
(some_aout_object_p): Delete dead code handling QMAGIC and BMAGIC.
(adjust_z_magix): Delete dead code handling QMAGIC.
Index: bfd/pdp11.c
===================================================================
RCS file: /cvs/src/src/bfd/pdp11.c,v
retrieving revision 1.39
diff -u -p -r1.39 pdp11.c
--- bfd/pdp11.c 3 Jul 2007 14:26:42 -0000 1.39
+++ bfd/pdp11.c 19 Jan 2009 03:11:49 -0000
@@ -65,12 +65,9 @@
#define N_FLAGS(exec) 0
#define N_SET_FLAGS(exec, flags) do { } while (0)
-#define N_BADMAG(x) (((x).a_info != OMAGIC) \
- && ((x).a_info != NMAGIC) \
- && ((x).a_info != A_MAGIC3) \
- && ((x).a_info != A_MAGIC4) \
- && ((x).a_info != A_MAGIC5) \
- && ((x).a_info != A_MAGIC6))
+#define N_BADMAG(x) (N_MAGIC(x) != OMAGIC \
+ && N_MAGIC(x) != NMAGIC \
+ && N_MAGIC(x) != ZMAGIC)
#include "sysdep.h"
#include "bfd.h"
@@ -507,19 +504,12 @@ NAME (aout, some_aout_object_p) (bfd *ab
abfd->flags |= D_PAGED | WP_TEXT;
adata (abfd).magic = z_magic;
}
- else if (N_MAGIC (*execp) == QMAGIC)
- {
- abfd->flags |= D_PAGED | WP_TEXT;
- adata (abfd).magic = z_magic;
- adata (abfd).subformat = q_magic_format;
- }
else if (N_MAGIC (*execp) == NMAGIC)
{
abfd->flags |= WP_TEXT;
adata (abfd).magic = n_magic;
}
- else if (N_MAGIC (*execp) == OMAGIC
- || N_MAGIC (*execp) == BMAGIC)
+ else if (N_MAGIC (*execp) == OMAGIC)
adata (abfd).magic = o_magic;
else
{
@@ -958,10 +948,7 @@ adjust_z_magic (bfd *abfd, struct intern
execp->a_text = obj_textsec(abfd)->size;
if (ztih && (!abdp || (abdp && !abdp->exec_header_not_counted)))
execp->a_text += adata(abfd).exec_bytes_size;
- if (obj_aout_subformat (abfd) == q_magic_format)
- N_SET_MAGIC (*execp, QMAGIC);
- else
- N_SET_MAGIC (*execp, ZMAGIC);
+ N_SET_MAGIC (*execp, ZMAGIC);
/* Spec says data section should be rounded up to page boundary. */
obj_datasec(abfd)->size
--
Alan Modra
Australia Development Lab, IBM