summaryrefslogtreecommitdiff
path: root/libssp
diff options
context:
space:
mode:
authorktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-13 10:37:17 +0000
committerktietz <ktietz@138bc75d-0d04-0410-961f-82ee72b054a4>2009-04-13 10:37:17 +0000
commit724518ff7b8d00e2cad390ccfa46ebbbcde93024 (patch)
tree335455541813df2f5b8923adfb23ab8d29c6d755 /libssp
parent7ad9dc69f6756676d4f935ef2d0775b41d71c9eb (diff)
downloadgcc-724518ff7b8d00e2cad390ccfa46ebbbcde93024.tar.gz
2009-04-13 Ozkan Sezer <sezeroz@gmail.com>
PR target/39062 * ssp.c: Also include malloc.h for alloca(). MinGW needs it. * configure.ac: Also check for malloc.h. * configure: Regenerated. * config.h.in: Regenerated. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@146000 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libssp')
-rw-r--r--libssp/ChangeLog8
-rw-r--r--libssp/config.h.in3
-rwxr-xr-xlibssp/configure2
-rw-r--r--libssp/configure.ac2
-rw-r--r--libssp/ssp.c3
5 files changed, 16 insertions, 2 deletions
diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index 0276535d9df..d8d3c7410c0 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,3 +1,11 @@
+2009-04-13 Ozkan Sezer <sezeroz@gmail.com>
+
+ PR target/39062
+ * ssp.c: Also include malloc.h for alloca(). MinGW needs it.
+ * configure.ac: Also check for malloc.h.
+ * configure: Regenerated.
+ * config.h.in: Regenerated.
+
2009-04-09 Nick Clifton <nickc@redhat.com>
* strcat-chk.c: Change copyright header to refer to version 3
diff --git a/libssp/config.h.in b/libssp/config.h.in
index 501a4f37ec2..91c59890292 100644
--- a/libssp/config.h.in
+++ b/libssp/config.h.in
@@ -3,6 +3,9 @@
/* Define to 1 if you have the <alloca.h> header file. */
#undef HAVE_ALLOCA_H
+/* Define to 1 if you have the <malloc.h> header file. */
+#undef HAVE_MALLOC_H
+
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
diff --git a/libssp/configure b/libssp/configure
index ee2a41fd495..7276c0b0cf9 100755
--- a/libssp/configure
+++ b/libssp/configure
@@ -3989,7 +3989,7 @@ done
-for ac_header in alloca.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h
+for ac_header in alloca.h malloc.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h
do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/libssp/configure.ac b/libssp/configure.ac
index 99b4edfe104..f3a66ec975a 100644
--- a/libssp/configure.ac
+++ b/libssp/configure.ac
@@ -90,7 +90,7 @@ LDFLAGS="$save_LDFLAGS"
AC_MSG_RESULT($ssp_use_symver)
AM_CONDITIONAL(LIBSSP_USE_SYMVER, [test "x$ssp_use_symver" = xyes])
-AC_CHECK_HEADERS(alloca.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h)
+AC_CHECK_HEADERS(alloca.h malloc.h paths.h syslog.h string.h unistd.h fcntl.h stdio.h limits.h)
if test x$gcc_no_link = xyes; then
# Presume the ISO C functions are available; add target-specific
diff --git a/libssp/ssp.c b/libssp/ssp.c
index e7babe2179e..aaa5a322c8d 100644
--- a/libssp/ssp.c
+++ b/libssp/ssp.c
@@ -36,6 +36,9 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#ifdef HAVE_ALLOCA_H
# include <alloca.h>
#endif
+#ifdef HAVE_MALLOC_H
+# include <malloc.h>
+#endif
#ifdef HAVE_STRING_H
# include <string.h>
#endif