* as.h (alloca): Don't declare if __GNUC__. Remove an old comment.

	Comment indentation of #pragma.
	* macro.c (alloca): Likewise.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 4df8f3affaadd3a287bb5de01828adb655f4d6af..3858797fc7e49f52bc4b1711a90a8bc5f9a474c2 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,5 +1,9 @@
 2001-08-10  Alan Modra  <amodra@bigpond.net.au>
 
+       * as.h (alloca): Don't declare if __GNUC__.  Remove an old comment.
+       Comment indentation of #pragma.
+       * macro.c (alloca): Likewise.
+
        * config/tc-ppc.c: Revert 2001-08-08.
 
 2001-08-09  Alan Modra  <amodra@bigpond.net.au>

diff --git a/gas/as.h b/gas/as.h
index 75abfa94877a2fda73d190eac00092fcbbc88f7b..7da5ed2a5d92f13123ef25188151264c76778ba4 100644 (file)
--- a/gas/as.h
+++ b/gas/as.h
@@ -43,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 */
@@ -76,7 +67,7 @@ extern void *alloca ();
 #   endif /* alloca */
 #  endif /* _AIX */
 # endif /* HAVE_ALLOCA_H */
-#endif
+#endif /* __GNUC__ */
 
 /* Now, tend to the rest of the configuration.  */
 

diff --git a/gas/macro.c b/gas/macro.c
index e93cdce6e7bacc6f3eef2b1bd0d40eaec4a3aa07..e78855b9350b291ec4a16608eadee9f047bda086 100644 (file)
--- a/gas/macro.c
+++ b/gas/macro.c
@@ -24,20 +24,14 @@
 
 #include "config.h"
 
-/* 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 */
@@ -49,7 +43,7 @@ extern void *alloca ();
 #   endif /* alloca */
 #  endif /* _AIX */
 # endif /* HAVE_ALLOCA_H */
-#endif
+#endif /* __GNUC__ */
 
 #include <stdio.h>
 #ifdef HAVE_STRING_H