From 72c7c913b4bfd72a05b6085b3477201f1cbcac9a Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 25 Jan 2002 12:22:52 +0100 Subject: [PATCH] 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 --- gcc/ChangeLog | 6 ++++++ gcc/crtstuff.c | 2 +- gcc/unwind-dw2-fde-glibc.c | 4 +++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 444f38112a5..52937b1639a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2002-01-25 Jakub Jelinek + + * unwind-dw2-fde-glibc.c: If inhibit_libc, use __register_frame* + registry only. + * crtstuff.c: Likewise. + 2002-01-25 Kazu Hirata * config/h8300/h8300.md (negation patterns): Tighten diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c index 8beb64cf51c..4c6fc58c0e6 100644 --- 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 # 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 ebebddda6eb..33c678f705f 100644 --- 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 #include #include +#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)))