From c2926ab7fcb024cb9e8716f003f0eb72c416fc98 Mon Sep 17 00:00:00 2001
From: "J.T. Conklin" <jtc@acorntoolworks.com>
Date: Thu, 28 Jul 1994 21:23:28 +0000
Subject: [PATCH] * Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Use newlib if
 it is   there and we are using the gcc from the tree.

* gdb.base/types.c: Removed.
---
 gdb/testsuite/ChangeLog   |  5 +++++
 gdb/testsuite/Makefile.in | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index e46d6ce..a5fcb65 100644
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,5 +1,10 @@
 Thu Jul 28 12:54:07 1994  J.T. Conklin  (jtc@phishhead.cygnus.com)
 
+	* Makefile.in (CC_FOR_TARGET, CXX_FOR_TARGET): Use newlib if it is
+	  there and we are using the gcc from the tree.
+
+	* gdb.base/types.c: Removed.
+
 	* gdb.base/configure.in: Look for makefile fragments in ../config.
 	  Recognize i386-*-netware.
 	* gdb.c++/configure.in: Likewise.
diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in
index 7b95d29..99bd029 100644
--- a/gdb/testsuite/Makefile.in
+++ b/gdb/testsuite/Makefile.in
@@ -82,7 +82,11 @@ RUNTEST_FOR_TARGET = `\
 
 CC_FOR_TARGET = ` \
   if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
+    if [ -f $${rootme}/../../newlib/Makefile ]; then \
+      echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/ -idirafter $${rootme}/../../newlib/targ-include -idirafter $${rootsrc}/../../newlib/libc/include -nostdinc; \
+    else \
+      echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
+    fi; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CC); \
@@ -94,7 +98,11 @@ CC_FOR_TARGET = ` \
 CXX = gcc
 CXX_FOR_TARGET = ` \
   if [ -f $${rootme}/../../gcc/xgcc ] ; then \
-    echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
+    if [ -f $${rootme}/../../newlib/Makefile ]; then
+      echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/ -idirafter $${rootme}/../../newlib/targ-include -idirafter $${rootsrc}/../../newlib/libc/include -nostdinc; \
+    else \
+      echo $${rootme}/../../gcc/xgcc -B$${rootme}/../../gcc/; \
+    fi; \
   else \
     if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \
       echo $(CXX); \
-- 
2.7.4