X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gas%2Fas.h;h=3d95d14571528073edfc4b7b7be0254bfc1b7340;hb=63fd3b826bd48b24777f41e323f7bf932350edbf;hp=fe649888bd631725bcafc256d979f4dbbcced900;hpb=0a9ef439079f50221dad9eb5248387236d370c87;p=deliverable%2Fbinutils-gdb.git

diff --git a/gas/as.h b/gas/as.h
index fe649888bd..3d95d14571 100644
--- a/gas/as.h
+++ b/gas/as.h
@@ -1,5 +1,6 @@
 /* as.h - global header file
-   Copyright (C) 1987, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 2000
+   Copyright 1987, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998,
+   1999, 2000, 2001, 2002
    Free Software Foundation, Inc.
 
    This file is part of GAS, the GNU Assembler.
@@ -42,28 +43,19 @@
 /* This is the code recommended in the autoconf documentation, almost
    verbatim.  If it doesn't work for you, let me know, and notify
    djm@gnu.ai.mit.edu as well.  */
-/* Added #undef for DJ Delorie.  The right fix is to ensure that as.h
-   is included first, before even any system header files, in all files
-   that use it.  KR 1994.11.03 */
 /* Added void* version for STDC case.  This is to be compatible with
    the declaration in bison.simple, used for m68k operand parsing.
    --KR 1995.08.08 */
 /* Force void* decl for hpux.  This is what Bison uses.  --KR 1995.08.16 */
 
-/* AIX requires this to be the first thing in the file.  */
-#ifdef __GNUC__
-# ifndef alloca
-#  ifdef __STDC__
-extern void *alloca ();
-#  else
-extern char *alloca ();
-#  endif
-# endif
-#else
+#ifndef __GNUC__
 # if HAVE_ALLOCA_H
 #  include <alloca.h>
 # else
 #  ifdef _AIX
+/* Indented so that pre-ansi C compilers will ignore it, rather than
+   choke on it.  Some versions of AIX require this to be the first
+   thing in the file.  */
  #pragma alloca
 #  else
 #   ifndef alloca /* predefined by HP cc +Olibcalls */
@@ -75,13 +67,12 @@ extern void *alloca ();
 #   endif /* alloca */
 #  endif /* _AIX */
 # endif /* HAVE_ALLOCA_H */
-#endif
+#endif /* __GNUC__ */
 
 /* Now, tend to the rest of the configuration.  */
 
 /* System include files first...  */
 #include <stdio.h>
-#include <ctype.h>
 #ifdef HAVE_STRING_H
 #include <string.h>
 #else
@@ -100,7 +91,7 @@ extern void *alloca ();
 #include <sys/types.h>
 #endif
 
-#include <getopt.h>
+#include "getopt.h"
 /* The first getopt value for machine-independent long options.
    150 isn't special; it's just an arbitrary non-ASCII char value.  */
 #define OPTION_STD_BASE 150
@@ -177,7 +168,7 @@ extern char **environ;
 
 /* Hack to make "gcc -Wall" not complain about obstack macros.  */
 #if !defined (memcpy) && !defined (bcopy)
-#define bcopy(src,dest,size)	memcpy(dest,src,size)
+#define bcopy(src,dest,size)	memcpy (dest, src, size)
 #endif
 
 /* Make Saber happier on obstack.h.  */
@@ -622,6 +613,16 @@ void eh_frame_convert_frag PARAMS ((fragS *));
 /* this one starts the chain of target dependant headers */
 #include "targ-env.h"
 
+#ifdef OBJ_MAYBE_ELF
+#define IS_ELF (OUTPUT_FLAVOR == bfd_target_elf_flavour)
+#else
+#ifdef OBJ_ELF
+#define IS_ELF 1
+#else
+#define IS_ELF 0
+#endif
+#endif
+
 #include "write.h"
 #include "frags.h"
 #include "hash.h"