From 2aaaab7ceb246c0a3ee1750fca8d207586ab02e6 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Fri, 22 Jul 1994 15:13:33 +0000 Subject: [PATCH] * aoutx.h (NAME(aout,some_aout_object_p)): Just check STAT_FOR_EXEC, don't check MACH. * m88kmach3.c (MACH): Don't define. * config/i386-mach3.mt (TDEFINES): Define STAT_FOR_EXEC. * config/m88k-mach3.mt (TDEFINES): Likewise. * config/mips-mach3.mt (TDEFINES): Likewise. --- bfd/ChangeLog | 9 +++++++++ bfd/aoutx.h | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index e3a1519..3beb1ce 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +Fri Jul 22 11:07:14 1994 Ian Lance Taylor (ian@sanguine.cygnus.com) + + * aoutx.h (NAME(aout,some_aout_object_p)): Just check + STAT_FOR_EXEC, don't check MACH. + * m88kmach3.c (MACH): Don't define. + * config/i386-mach3.mt (TDEFINES): Define STAT_FOR_EXEC. + * config/m88k-mach3.mt (TDEFINES): Likewise. + * config/mips-mach3.mt (TDEFINES): Likewise. + Thu Jul 21 17:24:31 1994 Stan Shebs (shebs@andros.cygnus.com) * i386mach3.c: Reverted to version from before Jul 5 1994 changes. diff --git a/bfd/aoutx.h b/bfd/aoutx.h index 0bcc860..f350cb4 100644 --- a/bfd/aoutx.h +++ b/bfd/aoutx.h @@ -562,7 +562,7 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) result = (*callback_to_real_object_p)(abfd); -#if defined(MACH) || defined(STAT_FOR_EXEC) +#ifdef STAT_FOR_EXEC /* The original heuristic doesn't work in some important cases. The * a.out file has no information about the text start address. For * files (like kernels) linked to non-standard addresses (ld -Ttext @@ -578,7 +578,7 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) && ((stat_buf.st_mode & 0111) != 0)) abfd->flags |= EXEC_P; } -#else /* ! MACH */ +#else /* ! defined (STAT_FOR_EXEC) */ /* Now that the segment addresses have been worked out, take a better guess at whether the file is executable. If the entry point is within the text segment, assume it is. (This makes files @@ -590,7 +590,7 @@ NAME(aout,some_aout_object_p) (abfd, execp, callback_to_real_object_p) if ((execp->a_entry >= obj_textsec(abfd)->vma) && (execp->a_entry < obj_textsec(abfd)->vma + obj_textsec(abfd)->_raw_size)) abfd->flags |= EXEC_P; -#endif /* MACH */ +#endif /* ! defined (STAT_FOR_EXEC) */ if (result) { #if 0 /* These should be set correctly anyways. */ -- 2.7.4