From 8ddebae79537231ef7205373b7d0602117a3d47e Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Fri, 2 Oct 2009 14:40:41 +0000 Subject: [PATCH] include/aout/ * aout64.h (N_SHARED_LIB): Define as zero if not already defined. * sun4.h (N_SHARED_LIB): Define. * hp300hpux.h (N_SHARED_LIB): Don't define. bfd/ * aout-cris.c (N_SHARED_LIB): Don't define. * hp300bsd.c (N_SHARED_LIB): Don't define. * i386bsd.c (N_SHARED_LIB): Don't define. * i386linux.c (N_SHARED_LIB): Don't define. * i386lynx.c (N_SHARED_LIB): Don't define. * m68klinux.c (N_SHARED_LIB): Don't define. * m88kmach3.c (N_SHARED_LIB): Don't define. * mipsbsd.c (N_SHARED_LIB): Don't define. * newsos3.c (N_SHARED_LIB): Don't define. * pc532-mach.c (N_SHARED_LIB): Don't define. * pdp11.c (N_SHARED_LIB): Don't define. * sparclinux.c (N_SHARED_LIB): Don't define. * vaxbsd.c (N_SHARED_LIB): Don't define. --- include/aout/ChangeLog | 6 ++++++ include/aout/aout64.h | 6 +----- include/aout/hp300hpux.h | 5 +---- include/aout/sun4.h | 5 ++++- 4 files changed, 12 insertions(+), 10 deletions(-) diff --git a/include/aout/ChangeLog b/include/aout/ChangeLog index 493b2153e..c25e61062 100644 --- a/include/aout/ChangeLog +++ b/include/aout/ChangeLog @@ -1,3 +1,9 @@ +2009-10-02 Alan Modra + + * aout64.h (N_SHARED_LIB): Define as zero if not already defined. + * sun4.h (N_SHARED_LIB): Define. + * hp300hpux.h (N_SHARED_LIB): Don't define. + 2008-08-28 Tristan Gingold * stab.def: Add BNSYM, ENSYM, OSO for darwin. diff --git a/include/aout/aout64.h b/include/aout/aout64.h index 2e289b392..f2330ca3d 100644 --- a/include/aout/aout64.h +++ b/include/aout/aout64.h @@ -1,6 +1,6 @@ /* `a.out' object-file definitions, including extensions to 64-bit fields - Copyright 1999, 2000, 2001, 2003 Free Software Foundation, Inc. + Copyright 1999, 2000, 2001, 2003, 2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -141,11 +141,7 @@ struct external_exec /* Sun shared libraries, not linux. This macro is only relevant for ZMAGIC files. */ #ifndef N_SHARED_LIB -#if defined (TEXT_START_ADDR) && TEXT_START_ADDR == 0 #define N_SHARED_LIB(x) (0) -#else -#define N_SHARED_LIB(x) ((x).a_entry < TEXT_START_ADDR) -#endif #endif /* Returning 0 not TEXT_START_ADDR for OMAGIC and NMAGIC is based on diff --git a/include/aout/hp300hpux.h b/include/aout/hp300hpux.h index 11747613c..c63e3b83f 100644 --- a/include/aout/hp300hpux.h +++ b/include/aout/hp300hpux.h @@ -1,5 +1,5 @@ /* Special version of for use under hp-ux. - Copyright 1988, 1993, 1995, 2001 Free Software Foundation, Inc. */ + Copyright 1988, 1993, 1995, 2001, 2009 Free Software Foundation, Inc. */ struct hp300hpux_exec_bytes { @@ -114,6 +114,3 @@ struct hp300hpux_header_extension #define TARGET_PAGE_SIZE 0x1000 #define SEGMENT_SIZE 0x1000 #define TEXT_START_ADDR 0 - -#undef N_SHARED_LIB -#define N_SHARED_LIB(x) ( 0 /* no shared libraries */ ) diff --git a/include/aout/sun4.h b/include/aout/sun4.h index 8cf051704..213d44bb5 100644 --- a/include/aout/sun4.h +++ b/include/aout/sun4.h @@ -1,6 +1,6 @@ /* SPARC-specific values for a.out files - Copyright 2001 Free Software Foundation, Inc. + Copyright 2001, 2009 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -43,6 +43,9 @@ expected text address. These kludges have gotta go! For linked files, should reflect reality if we know it. */ +#define N_SHARED_LIB(x) ((x).a_entry < TEXT_START_ADDR \ + && (x).a_text >= EXEC_BYTES_SIZE) + /* This differs from the version in aout64.h (which we override by defining it here) only for NMAGIC (we return TEXT_START_ADDR+EXEC_BYTES_SIZE; they return 0). */ -- 2.43.5