diff options
| -rw-r--r-- | bfd/ChangeLog | 20 | ||||
| -rw-r--r-- | bfd/aout-cris.c | 7 | ||||
| -rw-r--r-- | bfd/hp300bsd.c | 3 | ||||
| -rw-r--r-- | bfd/i386bsd.c | 3 | ||||
| -rw-r--r-- | bfd/i386linux.c | 3 | ||||
| -rw-r--r-- | bfd/i386lynx.c | 4 | ||||
| -rw-r--r-- | bfd/m68klinux.c | 3 | ||||
| -rw-r--r-- | bfd/m88kmach3.c | 3 | ||||
| -rw-r--r-- | bfd/mipsbsd.c | 3 | ||||
| -rw-r--r-- | bfd/newsos3.c | 3 | ||||
| -rw-r--r-- | bfd/pc532-mach.c | 3 | ||||
| -rw-r--r-- | bfd/pdp11.c | 3 | ||||
| -rw-r--r-- | bfd/sparclinux.c | 3 | ||||
| -rw-r--r-- | bfd/vaxbsd.c | 3 | ||||
| -rw-r--r-- | include/aout/ChangeLog | 6 | ||||
| -rw-r--r-- | include/aout/aout64.h | 6 | ||||
| -rw-r--r-- | include/aout/hp300hpux.h | 5 | ||||
| -rw-r--r-- | include/aout/sun4.h | 5 |
18 files changed, 42 insertions, 44 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog index b4301ebd61..d0655d286f 100644 --- 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 @@ -61,7 +77,7 @@ 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. @@ -252,7 +268,7 @@ 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. diff --git a/bfd/aout-cris.c b/bfd/aout-cris.c index c5f71b0ce0..f1f30601f4 100644 --- a/bfd/aout-cris.c +++ b/bfd/aout-cris.c @@ -1,5 +1,5 @@ /* 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. @@ -57,11 +57,6 @@ #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 diff --git a/bfd/hp300bsd.c b/bfd/hp300bsd.c index d4984192e2..2688b802e7 100644 --- 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. - 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. @@ -22,7 +22,6 @@ #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 diff --git a/bfd/i386bsd.c b/bfd/i386bsd.c index b59171c5af..d54841ce93 100644 --- a/bfd/i386bsd.c +++ b/bfd/i386bsd.c @@ -1,5 +1,5 @@ /* 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. @@ -30,7 +30,6 @@ /* 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 diff --git a/bfd/i386linux.c b/bfd/i386linux.c index dee733da35..a5bb77db12 100644 --- 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, - 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. @@ -23,7 +23,6 @@ #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) diff --git a/bfd/i386lynx.c b/bfd/i386lynx.c index 2e85724ef5..45909bf603 100644 --- 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, - 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. @@ -19,8 +19,6 @@ 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 diff --git a/bfd/m68klinux.c b/bfd/m68klinux.c index 403e4f3050..08b0010627 100644 --- 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, - 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. @@ -23,7 +23,6 @@ #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) diff --git a/bfd/m88kmach3.c b/bfd/m88kmach3.c index 2a0e2f4df4..d98b4c779f 100644 --- a/bfd/m88kmach3.c +++ b/bfd/m88kmach3.c @@ -1,5 +1,5 @@ /* 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. @@ -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 N_SHARED_LIB(x) 0 #define N_TXTSIZE(x) ((x).a_text) diff --git a/bfd/mipsbsd.c b/bfd/mipsbsd.c index db4c86b348..004ef6e754 100644 --- 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, - 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. @@ -23,7 +23,6 @@ /* #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 */\ diff --git a/bfd/newsos3.c b/bfd/newsos3.c index 5f8e1f75dd..650901c8f5 100644 --- a/bfd/newsos3.c +++ b/bfd/newsos3.c @@ -1,5 +1,5 @@ /* 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. @@ -29,7 +29,6 @@ #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 diff --git a/bfd/pc532-mach.c b/bfd/pc532-mach.c index e46653698e..b4720066d5 100644 --- a/bfd/pc532-mach.c +++ b/bfd/pc532-mach.c @@ -1,5 +1,5 @@ /* 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. @@ -46,7 +46,6 @@ #define SEGMENT_SIZE TARGET_PAGE_SIZE -#define N_SHARED_LIB(x) 0 #define SEGMENT_SIZE TARGET_PAGE_SIZE #define DEFAULT_ARCH bfd_arch_ns32k diff --git a/bfd/pdp11.c b/bfd/pdp11.c index 620d21810f..e4096f32c6 100644 --- 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 -/* There are no shared libraries. */ -#define N_SHARED_LIB(x) 0 - /* There is no flags field. */ #define N_FLAGS(exec) 0 diff --git a/bfd/sparclinux.c b/bfd/sparclinux.c index f0c1e4a203..7bb10d8e03 100644 --- 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, - 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. @@ -23,7 +23,6 @@ #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) diff --git a/bfd/vaxbsd.c b/bfd/vaxbsd.c index cf566b9dd1..21fbe58560 100644 --- 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. - 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. @@ -20,7 +20,6 @@ #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 diff --git a/include/aout/ChangeLog b/include/aout/ChangeLog index 493b2153e3..c25e610623 100644 --- 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. diff --git a/include/aout/aout64.h b/include/aout/aout64.h index 2e289b3925..f2330ca3df 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 11747613c2..c63e3b83fa 100644 --- 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. - 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 8cf0517048..213d44bb59 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). */ |