* alloca-norm.h (alloca, GCC case): Don't redefine alloca if it

        was alr eady defined previously.
        * Makefile.in (INSTALL): Use ../install-sh, not install.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@18170 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c35a168..43fe6dd 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -36,6 +36,15 @@ Thu Dec  4 17:25:19 1997  Jeffrey A Law  (law@cygnus.com)
 
        * strsignal.c (sys_nsig): Try NSIG and _NSIG.
 
+Wed Nov 19 13:37:06 1997  Michael Meissner  <meissner@cygnus.com>
+
+       * alloca-norm.h (alloca, GCC case): Don't redefine alloca if it
+       was alr eady defined previously.
+
+Mon Nov 10 12:48:03 1997  Philippe De Muyter  <phdm@macqel.be>
+
+       * Makefile.in (INSTALL): Use ../install-sh, not install.
+
 Tue Oct 28 23:41:15 1997  Judy Goldberg  <jodyg@idt.net>
 
        * Makefile.in (CFILES): Add pexecute.c.

diff --git a/libiberty/Makefile.in b/libiberty/Makefile.in
index 71d02a3..b68d1f5 100644 (file)
--- a/libiberty/Makefile.in
+++ b/libiberty/Makefile.in
@@ -59,7 +59,7 @@ MULTISUBDIR =
 MULTIDO = true
 MULTICLEAN = true
 
-INSTALL = install -c
+INSTALL = $(SHELL) $(srcdir)/../install-sh -c
 INSTALL_PROGRAM = $(INSTALL)
 INSTALL_DATA = $(INSTALL)
 

diff --git a/libiberty/alloca-norm.h b/libiberty/alloca-norm.h
index 394a653..bda4fc0 100644 (file)
--- a/libiberty/alloca-norm.h
+++ b/libiberty/alloca-norm.h
@@ -1,7 +1,9 @@
 /* "Normal" configuration for alloca.  */
 
 #ifdef __GNUC__
+#ifndef alloca
 #define alloca __builtin_alloca
+#endif
 #else /* ! defined (__GNUC__) */
 #if defined (sparc) && defined (sun)
 #include <alloca.h>