From: Michael Meissner <meissner@cygnus.com>
Date: Mon, 29 Dec 1997 12:59:45 +0000 (+0000)
Subject: Do not define inhibit_libc if it was already defined
X-Git-Tag: releases/libf2c-0.5.21~267
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=eff0f7ace59d116aeb10213bbdd434c447dcb630;p=thirdparty%2Fgcc.git

Do not define inhibit_libc if it was already defined

From-SVN: r17258
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 05ecb58e73fa..3fd15371742c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 29 15:58:18 1997  Michael Meissner  <meissner@cygnus.com>
+
+	* libgcc2.c (inhibit_libc): Don't define inhibit_libc when cross
+	compiling if it was already defined.
+
 Sun Dec 28 00:32:16 1997  Jeffrey A Law  (law@cygnus.com)
 
 	* flow.c (find_basic_blocks): Don't create a new basic block
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index 46dbdaafb16e..cd656760d167 100644
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -49,7 +49,7 @@ Boston, MA 02111-1307, USA.  */
 /* In a cross-compilation situation, default to inhibiting compilation
    of routines that use libc.  */
 
-#ifdef CROSS_COMPILE
+#if defined(CROSS_COMPILE) && !defined(inhibit_libc)
 #define inhibit_libc
 #endif