PR gas/13224

[deliverable/binutils-gdb.git] / gas / config / aout_gnu.h

diff --git a/gas/config/aout_gnu.h b/gas/config/aout_gnu.h
index badf9cb21c73b0b6d31c95280ed6682eda9c7d9e..99186b9010aafe85cc7e9bfcc101b86d2d1a58f9 100644 (file)
--- a/gas/config/aout_gnu.h
+++ b/gas/config/aout_gnu.h
@@ -1,12 +1,13 @@
 /* This file is aout_gnu.h
 
-   Copyright (C) 1987-1992 Free Software Foundation, Inc.
+   Copyright 1987, 1988, 1989, 1990, 1991, 1992, 1993, 1994, 2000, 2002,
+   2005, 2007 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
    GAS is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   the Free Software Foundation; either version 3, or (at your option)
    any later version.
 
    GAS is distributed in the hope that it will be useful,
@@ -16,7 +17,8 @@
 
    You should have received a copy of the GNU General Public License
    along with GAS; see the file COPYING.  If not, write to
-   the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
+   the Free Software Foundation, 51 Franklin Street - Fifth Floor,
+   Boston, MA 02110-1301, USA.  */
 
 #ifndef __A_OUT_GNU_H__
 #define __A_OUT_GNU_H__
@@ -25,15 +27,15 @@
    relocations, and one which uses extended relocations.
 
    Today, the extended reloc uses are
-   TC_SPARC, TC_A29K
+   TC_SPARC
 
    each must define the enum reloc_type
 
 */
 
-#define USE_EXTENDED_RELOC (defined(TC_SPARC) || defined(TC_A29K))
+#define USE_EXTENDED_RELOC defined(TC_SPARC)
 
-#if defined(TC_SPARC) || defined(TC_A29K)
+#if defined(TC_SPARC)
 enum reloc_type
   {
     RELOC_8, RELOC_16, RELOC_32,/* simple relocations */
@@ -61,8 +63,7 @@ enum reloc_type
     NO_RELOC
   };
 
-#endif /* TC_SPARC or TC_A29K */
-
+#endif /* TC_SPARC */
 
 #define __GNU_EXEC_MACROS__
 
@@ -119,6 +120,7 @@ enum machine_type
     M_386 = 100,
     M_29K = 101,
     M_RS6000 = 102,            /* IBM RS/6000 */
+    M_VAX4K_NETBSD = 150,
     /* HP/BSD formats */
     M_HP200 = 200,             /* hp200 (68010) BSD binary */
     M_HP300 = 300,             /* hp300 (68020+68881) BSD binary */
@@ -183,7 +185,6 @@ enum machine_type
                         sizeof (struct exec))
 #endif
 
-
 #ifndef N_DATOFF
 #define N_DATOFF(x)    ( N_TXTOFF(x) + (x).a_text )
 #endif
@@ -317,7 +318,6 @@ struct reloc_ext_bytes
     unsigned char r_addend[4];
   };
 
-
 #define        RELOC_EXT_BITS_EXTERN_BIG       0x80
 #define        RELOC_EXT_BITS_EXTERN_LITTLE    0x01
 
@@ -345,8 +345,6 @@ struct reloc_info_extended
 
 /* The standard, old-fashioned, Berkeley compatible relocation struct */
 
-
-
 #ifdef TC_I860
 /* NOTE: three bits max, see struct reloc_info_i860.r_type */
 enum i860_reloc_type
@@ -362,7 +360,6 @@ enum highlow_type
     NO_SPEC = 0, PAIR, HIGH, HIGHADJ,
   };
 
-
 struct reloc_info_i860
 {
   unsigned long r_address;
@@ -381,7 +378,6 @@ struct reloc_info_i860
 
 #endif /* TC_I860 */
 
-
 struct reloc_std_bytes
   {
     unsigned char r_address[4];