From aecc8dbdd7c44d405b1c25eca21dd82fed12b249 Mon Sep 17 00:00:00 2001
From: meissner <meissner@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 5 Oct 1999 19:59:03 +0000
Subject: [PATCH] Do not include stddef.h if building trampoline support and
 inhibit_libc is defined

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@29831 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog | 5 +++--
 gcc/libgcc2.c | 4 +++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 61256e1fe64..261079c3613 100644
--- 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 3c3bbe839cc..a05d7fd52aa 100644
--- 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
 
-- 
2.11.4.GIT