aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Law <law@gcc.gnu.org>1998-02-22 09:46:27 -0700
committerJeff Law <law@gcc.gnu.org>1998-02-22 09:46:27 -0700
commit8b715b2abcb3991955cb800e07144f6d6b7c6595 (patch)
tree861ccc22492acbc0b35cd579b4d08026709a3a0b
parentb134508bdf7c7be232163aca51789a455db9cb76 (diff)
downloadgcc-8b715b2abcb3991955cb800e07144f6d6b7c6595.zip
gcc-8b715b2abcb3991955cb800e07144f6d6b7c6595.tar.gz
gcc-8b715b2abcb3991955cb800e07144f6d6b7c6595.tar.bz2
alloca-norm.h (alloca, GCC case): Don't redefine alloca if it was alr eady defined previously.
* 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. From-SVN: r18170
-rw-r--r--libiberty/ChangeLog9
-rw-r--r--libiberty/Makefile.in2
-rw-r--r--libiberty/alloca-norm.h2
3 files changed, 12 insertions, 1 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c35a168..43fe6dd 100644
--- 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
--- 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
--- 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>