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.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index b4301ebd615e64713673b37c4e5cba73e1a1b285..d0655d286f1756834998070f788f35182274e483 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,19 @@
+2009-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+       * 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.
+

 2009-10-01  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * cofflink.c (_bfd_coff_generic_relocate_section): Look for the aux
 2009-10-01  Dave Korn  <dave.korn.cygwin@gmail.com>
 
        * cofflink.c (_bfd_coff_generic_relocate_section): Look for the aux


@@ -61,7 +77,7 @@
 
 2009-09-25  Martin Thuresson  <martint@google.com>
 
 
 2009-09-25  Martin Thuresson  <martint@google.com>
 

-       Update soruces to make alpha and arm targets compile cleanly with
+       Update sources to make alpha and arm targets compile cleanly with

        -Wc++-compat:
        * ecoff.c: Add casts.
        * ecofflink.c: Add casts.
        -Wc++-compat:
        * ecoff.c: Add casts.
        * ecofflink.c: Add casts.


@@ -252,7 +268,7 @@
 
 2009-09-09  Martin Thuresson  <martin@mtme.org>
 
 
 2009-09-09  Martin Thuresson  <martin@mtme.org>
 

-       Update soruces to compile cleanly with -Wc++-compat:
+       Update sources to compile cleanly with -Wc++-compat:

        * aoutx.h: Add casts.
        * archive.c: Add casts.
        * archive64.c: Add casts.
        * aoutx.h: Add casts.
        * archive.c: Add casts.
        * archive64.c: Add casts.

diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c
index c5f71b0ce0dbf936b3afb5d465ef76964ccd1647..f1f30601f40ec3408d107bf1b182b5b0926738c6 100644 (file)
--- a/bfd/aout-cris.c
+++ b/bfd/aout-cris.c
@@ -1,5 +1,5 @@
 /* BFD backend for CRIS a.out binaries.
 /* BFD backend for CRIS a.out binaries.

-   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007
+   Copyright 2000, 2001, 2002, 2003, 2004, 2005, 2007, 2009

    Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.
    Free Software Foundation, Inc.
    Contributed by Axis Communications AB.
    Written by Hans-Peter Nilsson.


@@ -57,11 +57,6 @@
 #define TARGET_PAGE_SIZE SEGMENT_SIZE
 #define TARGETNAME "a.out-cris"
 
 #define TARGET_PAGE_SIZE SEGMENT_SIZE
 #define TARGETNAME "a.out-cris"
 

-/* N_SHARED_LIB gets this reasonable default as of 1999-07-12, but we
-   have to work with 2.9.1.  Note that N_SHARED_LIB is used in a
-   SUN-specific context, not applicable to CRIS.  */
-#define N_SHARED_LIB(x) 0
-

 /* The definition here seems not used; just provided as a convention.  */
 #define DEFAULT_ARCH bfd_arch_cris
 
 /* The definition here seems not used; just provided as a convention.  */
 #define DEFAULT_ARCH bfd_arch_cris
 

diff --git a/bfd/hp300bsd.c b/bfd/hp300bsd.c
index d4984192e2b391204dce2dac064f6de81b14b638..2688b802e7d363cf45d189d89afbc8d3c07ecbf3 100644 (file)
--- a/bfd/hp300bsd.c
+++ b/bfd/hp300bsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for HP 9000/300 (68000-based) machines running BSD Unix.
 /* BFD back-end for HP 9000/300 (68000-based) machines running BSD Unix.

-   Copyright 1992, 1994, 1995, 2001, 2003, 2005, 2007
+   Copyright 1992, 1994, 1995, 2001, 2003, 2005, 2007, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -22,7 +22,6 @@
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x) 0
 #define ENTRY_CAN_BE_ZERO
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x) 0
 #define ENTRY_CAN_BE_ZERO

-#define N_SHARED_LIB(x) 0 /* Avoids warning */

 #define TEXT_START_ADDR 0
 #define TARGET_PAGE_SIZE 4096
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR 0
 #define TARGET_PAGE_SIZE 4096
 #define SEGMENT_SIZE TARGET_PAGE_SIZE

diff --git a/bfd/i386bsd.c b/bfd/i386bsd.c
index b59171c5af2e351c7092144c5a131177cb4428fd..d54841ce9300a77c6dc64a922668e6a7a97c48a6 100644 (file)
--- a/bfd/i386bsd.c
+++ b/bfd/i386bsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for i386 a.out binaries under BSD.
 /* BFD back-end for i386 a.out binaries under BSD.

-   Copyright 1990, 1991, 1992, 1993, 1994, 2001, 2005, 2007
+   Copyright 1990, 1991, 1992, 1993, 1994, 2001, 2005, 2007, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -30,7 +30,6 @@
 
 /* ZMAGIC files start at address 0.  This does not apply to QMAGIC.  */
 #define TEXT_START_ADDR 0
 
 /* ZMAGIC files start at address 0.  This does not apply to QMAGIC.  */
 #define TEXT_START_ADDR 0

-#define N_SHARED_LIB(x) 0

 
 #define        TARGET_PAGE_SIZE        4096
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE
 
 #define        TARGET_PAGE_SIZE        4096
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE

diff --git a/bfd/i386linux.c b/bfd/i386linux.c
index dee733da359a0757a6a8c1adad9527034bd0cde5..a5bb77db12d005b9675d6a36be1a96dd90ee2f2a 100644 (file)
--- a/bfd/i386linux.c
+++ b/bfd/i386linux.c
@@ -1,6 +1,6 @@
 /* BFD back-end for linux flavored i386 a.out binaries.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,
 /* BFD back-end for linux flavored i386 a.out binaries.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2001, 2002, 2003,

-   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -23,7 +23,6 @@
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define        SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR        0x0
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define        SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR        0x0

-#define N_SHARED_LIB(x) 0

 
 #define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
 
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN)
 

diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c
index 2e85724ef5f7d3c49fb7c6f14ddc812d47d58e48..45909bf603c997d2a1a0533af25f3740a723c666 100644 (file)
--- a/bfd/i386lynx.c
+++ b/bfd/i386lynx.c
@@ -1,6 +1,6 @@
 /* BFD back-end for i386 a.out binaries under LynxOS.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2001, 2002,
 /* BFD back-end for i386 a.out binaries under LynxOS.
    Copyright 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1999, 2001, 2002,

-   2003, 2005, 2007 Free Software Foundation, Inc.
+   2003, 2005, 2007, 2009 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -19,8 +19,6 @@
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 
    Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
    MA 02110-1301, USA.  */
 

-#define N_SHARED_LIB(x) 0
-

 #define TEXT_START_ADDR 0
 #define TARGET_PAGE_SIZE 4096
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR 0
 #define TARGET_PAGE_SIZE 4096
 #define SEGMENT_SIZE TARGET_PAGE_SIZE

diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c
index 403e4f3050a3bbdd58bbadf5c3d6f4f4b816b856..08b0010627c7c8ca04aea06f033bacf5b11c61a7 100644 (file)
--- a/bfd/m68klinux.c
+++ b/bfd/m68klinux.c
@@ -1,6 +1,6 @@
 /* BFD back-end for linux flavored m68k a.out binaries.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
 /* BFD back-end for linux flavored m68k a.out binaries.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,

-   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -23,7 +23,6 @@
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define        SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR        0x0
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define        SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR        0x0

-#define N_SHARED_LIB(x) 0

 
 #define MACHTYPE_OK(mtype) ((mtype) == M_68020 || (mtype) == M_UNKNOWN)
 
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_68020 || (mtype) == M_UNKNOWN)
 

diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c
index 2a0e2f4df4d18ac8f050f5e07c5e410bce51fbfe..d98b4c779faef930e7a7b08569b7ea0ae5dff903 100644 (file)
--- a/bfd/m88kmach3.c
+++ b/bfd/m88kmach3.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Motorola m88k a.out (Mach 3) binaries.
 /* BFD back-end for Motorola m88k a.out (Mach 3) binaries.

-   Copyright 1990, 1991, 1993, 1994, 1995, 2001, 2003, 2005, 2007
+   Copyright 1990, 1991, 1993, 1994, 1995, 2001, 2003, 2005, 2007, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -23,7 +23,6 @@
 #define SEGMENT_SIZE   0x20000
 #define TEXT_START_ADDR        0
 #define N_HEADER_IN_TEXT(x)    1               /* (N_MAGIG(x) == ZMAGIC) */
 #define SEGMENT_SIZE   0x20000
 #define TEXT_START_ADDR        0
 #define N_HEADER_IN_TEXT(x)    1               /* (N_MAGIG(x) == ZMAGIC) */

-#define N_SHARED_LIB(x) 0

 
 #define N_TXTSIZE(x)   ((x).a_text)
 
 
 #define N_TXTSIZE(x)   ((x).a_text)
 

diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c
index db4c86b348f3d0e97109def3adfa47302849a966..004ef6e754f28eb06b6438fef57d18b4d30e6cde 100644 (file)
--- a/bfd/mipsbsd.c
+++ b/bfd/mipsbsd.c
@@ -1,6 +1,6 @@
 /* BFD backend for MIPS BSD (a.out) binaries.
    Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
 /* BFD backend for MIPS BSD (a.out) binaries.
    Copyright 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003,

-   2005, 2007 Free Software Foundation, Inc.
+   2005, 2007, 2009 Free Software Foundation, Inc.

    Written by Ralph Campbell.
 
    This file is part of BFD, the Binary File Descriptor library.
    Written by Ralph Campbell.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -23,7 +23,6 @@
 
 /* #define ENTRY_CAN_BE_ZERO */
 #define N_HEADER_IN_TEXT(x) 1
 
 /* #define ENTRY_CAN_BE_ZERO */
 #define N_HEADER_IN_TEXT(x) 1

-#define N_SHARED_LIB(x) 0

 #define N_TXTADDR(x) \
     (N_MAGIC(x) != ZMAGIC ? (x).a_entry :      /* object file or NMAGIC */\
            TEXT_START_ADDR + EXEC_BYTES_SIZE   /* no padding */\
 #define N_TXTADDR(x) \
     (N_MAGIC(x) != ZMAGIC ? (x).a_entry :      /* object file or NMAGIC */\
            TEXT_START_ADDR + EXEC_BYTES_SIZE   /* no padding */\

diff --git a/bfd/newsos3.c b/bfd/newsos3.c
index 5f8e1f75dd44f802afeba7c9b2626931cf25ba89..650901c8f53b8442fc74a0457a86769376ad498b 100644 (file)
--- a/bfd/newsos3.c
+++ b/bfd/newsos3.c
@@ -1,5 +1,5 @@
 /* BFD back-end for NewsOS3 (Sony, 68k) binaries.
 /* BFD back-end for NewsOS3 (Sony, 68k) binaries.

-   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2003, 2005, 2007
+   Copyright 1990, 1991, 1994, 1995, 2000, 2001, 2003, 2005, 2007, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -29,7 +29,6 @@
 #define MY(OP) CONCAT2 (newsos3_,OP)
 #define TARGETNAME "a.out-newsos3"
 #define ENTRY_CAN_BE_ZERO
 #define MY(OP) CONCAT2 (newsos3_,OP)
 #define TARGETNAME "a.out-newsos3"
 #define ENTRY_CAN_BE_ZERO

-#define N_SHARED_LIB(x) 0 /* Avoids warning when compiled with -Wall.  */

 #define DEFAULT_ARCH bfd_arch_m68k
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x) 0
 #define DEFAULT_ARCH bfd_arch_m68k
 #define TARGET_IS_BIG_ENDIAN_P
 #define N_HEADER_IN_TEXT(x) 0

diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c
index e46653698e5bee0695b03b9ecad16b29be68a925..b4720066d57e3d7ecb4351e9c749ac2c5d5a6b0c 100644 (file)
--- a/bfd/pc532-mach.c
+++ b/bfd/pc532-mach.c
@@ -1,5 +1,5 @@
 /* BFD back-end for Mach3/532 a.out-ish binaries.
 /* BFD back-end for Mach3/532 a.out-ish binaries.

-   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001, 2002, 2005, 2007
+   Copyright 1990, 1991, 1992, 1994, 1995, 2000, 2001, 2002, 2005, 2007, 2009

    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.
    Free Software Foundation, Inc.
 
    This file is part of BFD, the Binary File Descriptor library.


@@ -46,7 +46,6 @@
 
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE
 
 
 #define        SEGMENT_SIZE    TARGET_PAGE_SIZE
 

-#define N_SHARED_LIB(x) 0

 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_ns32k
 
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define DEFAULT_ARCH bfd_arch_ns32k
 

diff --git a/bfd/pdp11.c b/bfd/pdp11.c
index 620d21810f31e7c78a802cdc51ae7fa85a7b586c..e4096f32c6f2eac952f4eaba90ad951ef222bc10 100644 (file)
--- a/bfd/pdp11.c
+++ b/bfd/pdp11.c
@@ -58,9 +58,6 @@
 /* The header is not included in the text segment.  */
 #define N_HEADER_IN_TEXT(x)    0
 
 /* The header is not included in the text segment.  */
 #define N_HEADER_IN_TEXT(x)    0
 

-/* There are no shared libraries.  */
-#define N_SHARED_LIB(x)        0
-

 /* There is no flags field.  */
 #define N_FLAGS(exec)          0
 
 /* There is no flags field.  */
 #define N_FLAGS(exec)          0
 

diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c
index f0c1e4a203cf5c1b7730cef09055cc01aebbd393..7bb10d8e03b5c699fc978d097568601ff6be3c6f 100644 (file)
--- a/bfd/sparclinux.c
+++ b/bfd/sparclinux.c
@@ -1,6 +1,6 @@
 /* BFD back-end for linux flavored sparc a.out binaries.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,
 /* BFD back-end for linux flavored sparc a.out binaries.
    Copyright 1992, 1993, 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002,

-   2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+   2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -23,7 +23,6 @@
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define SEGMENT_SIZE           TARGET_PAGE_SIZE
 #define TEXT_START_ADDR                0x0
 #define ZMAGIC_DISK_BLOCK_SIZE 1024
 #define SEGMENT_SIZE           TARGET_PAGE_SIZE
 #define TEXT_START_ADDR                0x0

-#define N_SHARED_LIB(x)                0

 
 #define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_UNKNOWN)
 
 
 #define MACHTYPE_OK(mtype) ((mtype) == M_SPARC || (mtype) == M_UNKNOWN)
 

diff --git a/bfd/vaxbsd.c b/bfd/vaxbsd.c
index cf566b9dd13bbce455155403ef6f2548f5042ec2..21fbe58560b3fa895f62d57b2e4fae8da36d7957 100644 (file)
--- a/bfd/vaxbsd.c
+++ b/bfd/vaxbsd.c
@@ -1,5 +1,5 @@
 /* BFD back-end for BSD and Ultrix/VAX (1K page size) a.out-ish binaries.
 /* BFD back-end for BSD and Ultrix/VAX (1K page size) a.out-ish binaries.

-   Copyright 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
+   Copyright 2002, 2003, 2005, 2007, 2009 Free Software Foundation, Inc.

 
    This file is part of BFD, the Binary File Descriptor library.
 
 
    This file is part of BFD, the Binary File Descriptor library.
 


@@ -20,7 +20,6 @@
 
 #define N_HEADER_IN_TEXT(x) 0
 #define ENTRY_CAN_BE_ZERO
 
 #define N_HEADER_IN_TEXT(x) 0
 #define ENTRY_CAN_BE_ZERO

-#define N_SHARED_LIB(x) 0 /* Avoids warning */

 #define TEXT_START_ADDR 0
 #define TARGET_PAGE_SIZE 1024
 #define SEGMENT_SIZE TARGET_PAGE_SIZE
 #define TEXT_START_ADDR 0
 #define TARGET_PAGE_SIZE 1024
 #define SEGMENT_SIZE TARGET_PAGE_SIZE

diff --git a/include/aout/ChangeLog b/include/aout/ChangeLog
index 493b2153e390e4ec64e6dc5ece574f79d80b06f7..c25e610623161ecc42520af4a3d2b2ed75304ed1 100644 (file)
--- a/include/aout/ChangeLog
+++ b/include/aout/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-02  Alan Modra  <amodra@bigpond.net.au>
+
+       * 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  <gingold@adacore.com>
 
        * stab.def: Add BNSYM, ENSYM, OSO for darwin.
 2008-08-28  Tristan Gingold  <gingold@adacore.com>
 
        * stab.def: Add BNSYM, ENSYM, OSO for darwin.

diff --git a/include/aout/aout64.h b/include/aout/aout64.h
index 2e289b3925dee88a7a0bbb698e02467d01d83a4c..f2330ca3df2a4edf2957e560e46817ee833e50f9 100644 (file)
--- 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
 
 /* `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
 
    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
 /* 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)
 #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
 #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 11747613c20bb9ca9ebf3946cafff41ee7d5ada3..c63e3b83fa5a808bc3129c1e5387ad9d75e0cd57 100644 (file)
--- a/include/aout/hp300hpux.h
+++ b/include/aout/hp300hpux.h
@@ -1,5 +1,5 @@
 /* Special version of <a.out.h> for use under hp-ux.
 /* Special version of <a.out.h> 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
 {
 
 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
 #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 8cf05170483d518c7d832c4d95ae8787da1f1ad2..213d44bb59bc83da79d0d32088652145bf9aaac8 100644 (file)
--- a/include/aout/sun4.h
+++ b/include/aout/sun4.h
@@ -1,6 +1,6 @@
 /* SPARC-specific values for a.out files 
 
 /* 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
 
    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.  */
 
    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).  */
 /* 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).  */