* as.h: Don't define const or volatile.

	* flonum.h: Don't define const.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 3c29b3c026fa790516a951b10198530cab7c1d5d..17c12d87b6a219dea3bc23647d0c1ede2c114ecf 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,8 @@
 Mon Jul  8 14:11:49 1996  Ian Lance Taylor  <ian@cygnus.com>
 
+       * as.h: Don't define const or volatile.
+       * flonum.h: Don't define const.
+
        * config/tc-m68k.c (tc_gen_reloc): Change the code appropriately
        if fx_pcrel is set.  Correct setting the addend case in the
        OBJ_ELF case (from Andreas Schwab

diff --git a/gas/as.h b/gas/as.h
index 7ae19514b6dec07876864cb5704ce2401d79f8ff..f796178ebf88c59c83b4e2e35b4e474299322702 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -189,15 +189,6 @@ extern PTR bfd_alloc_by_size_t PARAMS ((bfd *abfd, size_t sz));
 #define __FILE__ "unknown"
 #endif /* __FILE__ */
 
-#ifndef __STDC__
-#ifndef const
-#define const
-#endif
-#ifndef volatile
-#define volatile
-#endif
-#endif /* ! __STDC__ */
-
 #ifndef FOPEN_WB
 #ifdef GO32
 #include "fopen-bin.h"
@@ -446,6 +437,10 @@ struct frag
      create a union here.  */
   char fr_pcrel_adjust, fr_bsr;
 
+  /* Where the frag was created, or where it became a variant frag.  */
+  char *fr_file;
+  unsigned int fr_line;
+
   /* Data begins here.  */
   char fr_literal[1];
 };

diff --git a/gas/flonum.h b/gas/flonum.h
index ee45a6e365b5d449c23b567407da8a7b8e40f517..5649764e37ad692df5e3521a3662960a1f3da50a 100644 (file)
--- a/gas/flonum.h
+++ b/gas/flonum.h
@@ -1,6 +1,6 @@
 /* flonum.h - Floating point package
 
-   Copyright (C) 1987, 1990, 1991, 1992 Free Software Foundation, Inc.
+   Copyright (C) 1987, 1990, 1991, 1992, 1994 Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
 
@@ -16,7 +16,7 @@
 
    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.  */
+   the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /***********************************************************************\
  *                                                                     *
@@ -30,9 +30,6 @@
  *     please tell me your nomenclature for flonums!                   *
  *                                                                     *
  \***********************************************************************/
-#if (__STDC__ != 1) && !defined(const)
-#define const                  /* empty */
-#endif
 
 #include "bignum.h"
 
@@ -92,23 +89,14 @@ extern const int table_size_of_flonum_powers_of_ten;
  *                                                                     *
  \***********************************************************************/
 
-#if __STDC__ == 1
+int atof_generic PARAMS ((char **address_of_string_pointer,
+                         const char *string_of_decimal_marks,
+                         const char *string_of_decimal_exponent_marks,
+                         FLONUM_TYPE * address_of_generic_floating_point_number));
 
-int atof_generic (char **address_of_string_pointer,
-                 const char *string_of_decimal_marks,
-                 const char *string_of_decimal_exponent_marks,
-                 FLONUM_TYPE * address_of_generic_floating_point_number);
-
-void flonum_copy (FLONUM_TYPE * in, FLONUM_TYPE * out);
-void flonum_multip (const FLONUM_TYPE * a, const FLONUM_TYPE * b, FLONUM_TYPE * product);
-
-#else /* not __STDC__ */
-
-int atof_generic ();
-void flonum_copy ();
-void flonum_multip ();
-
-#endif /* not __STDC__ */
+void flonum_copy PARAMS ((FLONUM_TYPE * in, FLONUM_TYPE * out));
+void flonum_multip PARAMS ((const FLONUM_TYPE * a, const FLONUM_TYPE * b,
+                           FLONUM_TYPE * product));
 
 /***********************************************************************\
  *                                                                     *