Patch from Richard Henderson to fix alpha-linux alloca redefinition problems.

	* alpha/xm-alpha.h (alloca): Define alloca to builtin_alloca for GNUC
	if not already defined, and USE_C_ALLOCA not defined.

From-SVN: r14977

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5d5d718a25bedd002f8b879de9e3d78491f24d91..81a208a12ef0068bad45c95d3abdd8ad0f5e1575 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 27 16:35:29 1997  Richard Henderson  <rth@cygnus.com>
+
+       * alpha/xm-alpha.h (alloca): Define alloca to builtin_alloca for GNUC
+       if not already defined, and USE_C_ALLOCA not defined.
+
 Wed Aug 27 16:08:43 1997  Jim Wilson  <wilson@cygnus.com>
 
        * config.guess: Replace with script that uses ../config.guess.

diff --git a/gcc/config/alpha/xm-alpha.h b/gcc/config/alpha/xm-alpha.h
index 642e1cf1a6e0c4e1b2f1910de64b1dda9130cfad..2cf8917609b2a874dc97f2dd67b0897b5e7dd112 100644 (file)
--- a/gcc/config/alpha/xm-alpha.h
+++ b/gcc/config/alpha/xm-alpha.h
@@ -41,12 +41,18 @@ Boston, MA 02111-1307, USA.  */
 #define        SUCCESS_EXIT_CODE       0
 #define        FATAL_EXIT_CODE         33
 
-/* If not compiled with GNU C, use the builtin alloca.  */
-#if !defined(__GNUC__) && !defined(_WIN32)
+/* If compiled with GNU C, use the builtin alloca.  */
+#ifndef alloca
+#if defined(__GNUC__) && !defined(USE_C_ALLOCA)
+#define alloca __builtin_alloca
+#else
+#if !defined(_WIN32) && !defined(USE_C_ALLOCA)
 #include <alloca.h>
 #else
 extern void *alloca ();
 #endif
+#endif
+#endif
 
 /* The host compiler has problems with enum bitfields since it makes
    them signed so we can't fit all our codes in.  */