unwind-dw2-fde-glibc.c: If inhibit_libc, use __register_frame* registry only.

	* unwind-dw2-fde-glibc.c: If inhibit_libc, use __register_frame*
	registry only.
	* crtstuff.c: Likewise.

From-SVN: r49212

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 444f38112a5d2b60a83a7dc3b4e04e377891cbab..52937b1639adb5b23cdae23fa459dd49c32e51a9 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2002-01-25  Jakub Jelinek  <jakub@redhat.com>
+
+       * unwind-dw2-fde-glibc.c: If inhibit_libc, use __register_frame*
+       registry only.
+       * crtstuff.c: Likewise.
+
 2002-01-25  Kazu Hirata  <kazu@hxi.com>
 
        * config/h8300/h8300.md (negation patterns): Tighten

diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index 8beb64cf51cee9dfb4ee8a55a078b59b9662ea02..4c6fc58c0e686fbbb440f98ed9b33d3b32cd6636 100644 (file)
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -67,7 +67,7 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #endif
 
 #if defined(OBJECT_FORMAT_ELF) && defined(HAVE_LD_EH_FRAME_HDR) \
-    && !defined(CRTSTUFFT_O) \
+    && !defined(inhibit_libc) && !defined(CRTSTUFFT_O) \
     && defined(__GLIBC__) && __GLIBC__ >= 2
 #include <link.h>
 # if (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \

diff --git a/gcc/unwind-dw2-fde-glibc.c b/gcc/unwind-dw2-fde-glibc.c
index ebebddda6eb36085d1a7a3725da6205c0979d992..33c678f705fae259b4beaf43043ac7c283dd0d7f 100644 (file)
--- a/gcc/unwind-dw2-fde-glibc.c
+++ b/gcc/unwind-dw2-fde-glibc.c
@@ -31,9 +31,11 @@
 
 #include "auto-host.h" /* For HAVE_LD_EH_FRAME_HDR.  */
 #include "tconfig.h"
+#ifndef inhibit_libc
 #include <stddef.h>
 #include <stdlib.h>
 #include <link.h>
+#endif
 #include "tsystem.h"
 #include "dwarf2.h"
 #include "unwind.h"
@@ -42,7 +44,7 @@
 #include "unwind-dw2-fde.h"
 #include "gthr.h"
 
-#if defined(HAVE_LD_EH_FRAME_HDR) \
+#if !defined(inhibit_libc) && defined(HAVE_LD_EH_FRAME_HDR) \
     && (__GLIBC__ > 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ > 2) \
        || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && defined(DT_CONFIG)))