Do not include stddef.h if building trampoline support and inhibit_libc is defined

From-SVN: r29831

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61256e1fe64fcfb36d8290439abe919fe3daf143..261079c36135c33341ade1c7d0c1ed6db640a3d2 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,7 +1,8 @@
 Tue Oct  5 15:37:04 1999  Michael Meissner  <meissner@cygnus.com>
 
-       * libgcc2.c (toplevel): If inhibit_libc is defined, declare
-       malloc, free, and atexit.  Don't include stddef.h twice.
+       * libgcc2.c (toplevel): If inhibit_libc is defined and not
+       building the trampoline support, declare malloc, free, and
+       atexit.
        (__clear_cache): Mark arguments as potentially unused.
        
        * frame.c (toplevel): If inhibit_libc is defined, declare

diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 3c3bbe839cc363ea1aa844d6127737869f909453..a05d7fd52aa267420bd2b662504481e5bb61b428 100644 (file)
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -42,6 +42,7 @@ Boston, MA 02111-1307, USA.  */
 #include <unistd.h>
 
 #else
+#ifndef L_trampoline
 #include <stddef.h>
 #ifndef malloc
 extern void *malloc (size_t);
@@ -53,10 +54,11 @@ extern void free (void *);
 extern int atexit(void (*)(void));
 #endif
 #endif
+#endif
 
 #include "machmode.h"
 #include "defaults.h" 
-#if !defined(L_trampoline) && !defined(inhibit_libc)
+#ifndef L_trampoline
 #include <stddef.h>
 #endif