Gas buys into ../include. Files merged.

diff --git a/gas/a.out.gnu.h b/gas/a.out.gnu.h
index 4ae86afd4e262145d7c9c2a0612a1aa68e28bbef..2a532bb17aa31293e851e5334cbf1ddb055d2906 100755 (executable)
--- a/gas/a.out.gnu.h
+++ b/gas/a.out.gnu.h
@@ -289,6 +289,12 @@ struct relocation_info
      be undocumented.  */
   unsigned int r_baserel:1;    /* Linkage table relative */
   unsigned int r_jmptable:1;   /* pc-relative to jump table */
+
+#ifdef TC_NS32K
+#define r_bsr  r_baserel
+#define r_disp r_jmptable
+#endif /* TC_NS32K */
+
   unsigned int r_relative:1;   /* "relative relocation" */
   /* unused */
   unsigned int r_pad:1;                /* Padding -- set to zero */

diff --git a/include/reloc.h b/include/reloc.h
index b8e46a575904b85343ab38129af92f885416db36..27868653c4a9d67ca6c7badf26a56e6278e9d2a4 100755 (executable)
--- a/include/reloc.h
+++ b/include/reloc.h
@@ -1,3 +1,22 @@
+/* reloc.h -- Header file for relocation information.
+   Copyright (C) 1989,1990 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 1, or (at your option)
+any later version.
+
+GAS is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+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, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+
 /* Relocation types for a.out files using reloc_info_extended
    (SPARC and AMD 29000). */
 
@@ -21,6 +40,11 @@ enum reloc_type
 /* 29K relocation types */
     RELOC_JUMPTARG, RELOC_CONST,     RELOC_CONSTH,
 
+#ifndef NO_V9
+/* sparc v9 */
+    RELOC_WDISP14, RELOC_WDISP21,
+#endif /* NO_V9 */
+
     NO_RELOC
 };
 
@@ -36,3 +60,5 @@ enum reloc_type
 "XXX_28", "XXX_29", "XXX_30", "XXX_31"
 
 #endif /* _RELOC_H_READ_ */
+
+/* end of reloc.h */

diff --git a/include/stab.def b/include/stab.def
index 2ef91c008b623e4cba2e0f089da448fe37d7743b..93e3b3300023fd1dfaf5b2fda4fbfc34f44f4532 100755 (executable)
--- a/include/stab.def
+++ b/include/stab.def
@@ -73,8 +73,10 @@ __define_stab (N_SOL, 0x84, "SOL")
    value is corresponding address.  */
 __define_stab (N_SLINE, 0x44, "SLINE")
 /* Similar, for data segment.  */
+/* FIXME-NOW: gas's copy had 0x46 here. */
 __define_stab (N_DSLINE, 0x66, "DSLINE")
 /* Similar, for bss segment.  */
+/* FIXME-NOW: gas's copy had 0x48 here. */
 __define_stab (N_BSLINE, 0x68, "BSLINE")
 
 /* Beginning of an include file.  Only Sun uses this.