From b98612f1fd9f751389044d28cfa5e66fbf2f1a7f Mon Sep 17 00:00:00 2001 From: "J.T. Conklin" Date: Thu, 28 Jul 1994 21:57:31 +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. (LD_FOR_TARGET): Look for ld in ../ld/ld.new. --- gdb/ChangeLog | 8 ++++++-- gdb/Makefile.in | 21 +++++++++++++++------ 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 78bdc8e..1c78a09 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +Thu Jul 28 14:52:01 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. + (LD_FOR_TARGET): Look for ld in ../ld/ld.new. + Thu Jul 28 10:43:36 1994 Fred Fish (fnf@cygnus.com) * Makefile.in (annotate.o): Add dependencies. @@ -48,8 +54,6 @@ Mon Jul 25 11:50:57 1994 Stan Shebs (shebs@andros.cygnus.com) Mon Jul 25 11:36:02 1994 J.T. Conklin (jtc@phishhead.cygnus.com) - * Makefile.in (LD_FOR_TARGET): Look for ld in ../ld/ld.new. - * i386-nlmstub.c: Add support for NODE, PORT and BAUD command line arguments. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 3eb0128..ca2c500 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -232,7 +232,11 @@ FLAGS_TO_PASS = \ 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); \ @@ -245,7 +249,11 @@ CXX = gcc CXX_FOR_TARGET = ` \ if [ -f $${rootme}/../gcc/Makefile ] ; 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); \ @@ -283,8 +291,8 @@ NWSOURCE = /gaunt/grossman/unsupported/Novell NWINCLUDES = $(NWSOURCE)/novh40 LD_FOR_TARGET = ` \ - if [ -f $${rootme}/../binutils/ld ] ; then \ - echo $${rootme}/../binutils/ld; \ + if [ -f $${rootme}/../ld/ld.new ] ; then \ + echo $${rootme}/../ld/ld.new; \ else \ if [ "$(host_canonical)" = "$(target_canonical)" ] ; then \ echo $(LD); \ @@ -506,6 +514,7 @@ installcheck: check: force @if [ -f testsuite/Makefile ]; then \ rootme=`pwd`; export rootme; \ + rootsrc=`cd $(srcdir); pwd`; export rootsrc; \ cd testsuite; \ $(MAKE) $(TARGET_FLAGS_TO_PASS) check; \ else true; fi @@ -589,10 +598,10 @@ gdb: $(OBS) $(TSOBS) $(ADD_DEPS) $(CDEPS) init.o init.o $(OBS) $(TSOBS) $(ADD_FILES) $(CLIBS) $(LOADLIBES) prelude.o: $(NWSOURCE)/prelude.c - rootme=`pwd`; export rootme; $(CC_FOR_TARGET) -g -I $(NWINCLUDES) -c $(NWSOURCE)/prelude.c + rootme=`pwd`; export rootme; rootsrc=`cd $(srcdir); pwd`; export rootsrc; $(CC_FOR_TARGET) -g -I $(NWINCLUDES) -c $(NWSOURCE)/prelude.c i386-nlmstub.o: $(srcdir)/i386-nlmstub.c - rootme=`pwd`; export rootme; $(CC_FOR_TARGET) -g -I $(NWINCLUDES) -c $(srcdir)/i386-nlmstub.c + rootme=`pwd`; export rootme; rootsrc=`cd $(srcdir); pwd`; export rootsrc; $(CC_FOR_TARGET) -g -I $(NWINCLUDES) -c $(srcdir)/i386-nlmstub.c nlmstub.o: prelude.o i386-nlmstub.o rootme=`pwd`; export rootme; $(LD_FOR_TARGET) -r -o nlmstub.o prelude.o i386-nlmstub.o -- 2.7.4