aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJeff Law <law@gcc.gnu.org>1997-09-10 22:18:16 -0600
committerJeff Law <law@gcc.gnu.org>1997-09-10 22:18:16 -0600
commit0326887985771b6f97f4f4f94ec58ce4e2f39a37 (patch)
treed575d25e7ff36350b038badab67398ab696b959d /gcc
parentf2e4e16f79a6e3764a07b77162024fa4a88d9ffa (diff)
downloadgcc-0326887985771b6f97f4f4f94ec58ce4e2f39a37.zip
gcc-0326887985771b6f97f4f4f94ec58ce4e2f39a37.tar.gz
gcc-0326887985771b6f97f4f4f94ec58ce4e2f39a37.tar.bz2
Back out Kenner's Makefile.in patch.
From-SVN: r15403
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/Makefile.in26
2 files changed, 12 insertions, 20 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 59c29ec..d82d402 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -18,12 +18,6 @@ Wed Sep 10 16:01:15 1997 Jim Wilson <wilson@cygnus.com>
* libgcc2.c (__enable_execute_stack): Check for __sysV88__ not
__DOLPHIN__ or sysV88.
-Wed Sep 10 16:16:07 1997 Richard Kenner (kenner@vlsi1.ultra.nyu.edu)
-
- * Makefile.in (LN): Add new symbol.
- (FLAGS_TO_PASS): Pass it down.
- (stage[1-4]-start): Use $(LN), not "ln -s".
-
Wed Sep 10 14:58:40 1997 Jim Wilson <wilson@cygnus.com>
* emit-rtl.c (gen_lowpart_common): For a SUBREG, add in word when
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 481295b..76e7a7f 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -73,7 +73,6 @@ LEX = flex
LEXFLAGS =
AR = ar
AR_FLAGS = rc
-LN = @symbolic_link@
DLLTOOL = dlltool
SHELL = /bin/sh
# on sysV, define this as cp.
@@ -531,7 +530,6 @@ FLAGS_TO_PASS = \
"LDFLAGS=$(LDFLAGS)" \
"LEX=$(LEX)" \
"LEXFLAGS=$(LEXFLAGS)" \
- "LN=$(LN)" \
"MAKEINFO=$(MAKEINFO)" \
"MAKEINFOFLAGS=$(MAKEINFOFLAGS)" \
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
@@ -2671,9 +2669,9 @@ stage1-start:
-mv $(STAGESTUFF) stage1
# Copy as/ld if they exist to stage dir, so that running xgcc from the stage
# dir will work properly.
- -if [ -f as$(exeext) ] ; then $(LN) ../as$(exeext) stage1 ; else true ; fi
- -if [ -f ld$(exeext) ] ; then $(LN) ../ld$(exeext) stage1 ; else true ; fi
- -if [ -f collect-ld$(exeext) ] ; then $(LN) ../collect-ld$(exeext) stage1 ; else true ; fi
+ -if [ -f as$(exeext) ] ; then ln -s ../as$(exeext) stage1 || cp as$(exeext) stage1 ; else true ; fi
+ -if [ -f ld$(exeext) ] ; then ln -s ../ld$(exeext) stage1 || cp ld$(exeext) stage1 ; else true ; fi
+ -if [ -f collect-ld$(exeext) ] ; then ln -s ../collect-ld$(exeext) stage1 || cp collect-ld$(exeext) stage1 ; else true ; fi
-rm -f stage1/libgcc.a
-cp libgcc.a stage1
-if $(RANLIB_TEST) ; then $(RANLIB) stage1/libgcc.a; else true; fi
@@ -2692,9 +2690,9 @@ stage2-start:
-mv $(STAGESTUFF) stage2
# Copy as/ld if they exist to stage dir, so that running xgcc from the stage
# dir will work properly.
- -if [ -f as$(exeext) ] ; then $(LN) ../as$(exeext) stage2 ; else true ; fi
- -if [ -f ld$(exeext) ] ; then $(LN) ../ld$(exeext) stage2 ; else true ; fi
- -if [ -f collect-ld ] ; then $(LN) ../collect-ld$(exeext) stage2 ; else true ; fi
+ -if [ -f as$(exeext) ] ; then ln -s ../as$(exeext) stage2 || cp as$(exeext) stage2 ; else true ; fi
+ -if [ -f ld$(exeext) ] ; then ln -s ../ld$(exeext) stage2 || cp ld$(exeext) stage2 ; else true ; fi
+ -if [ -f collect-ld ] ; then ln -s ../collect-ld$(exeext) stage2 || cp collect-ld$(exeext) stage2 ; else true ; fi
-rm -f stage2/libgcc.a
-cp libgcc.a stage2
-if $(RANLIB_TEST) ; then $(RANLIB) stage2/libgcc.a; else true; fi
@@ -2713,9 +2711,9 @@ stage3-start:
-mv $(STAGESTUFF) stage3
# Copy as/ld if they exist to stage dir, so that running xgcc from the stage
# dir will work properly.
- -if [ -f as$(exeext) ] ; then $(LN) ../as$(exeext) stage3 ; else true ; fi
- -if [ -f ld$(exeext) ] ; then $(LN) ../ld$(exeext) stage3 ; else true ; fi
- -if [ -f collect-ld$(exeext) ] ; then $(LN) ../collect-ld$(exeext) stage3 ; else true ; fi
+ -if [ -f as$(exeext) ] ; then ln -s ../as$(exeext) stage3 || cp as$(exeext) stage3 ; else true ; fi
+ -if [ -f ld$(exeext) ] ; then ln -s ../ld$(exeext) stage3 || cp ld$(exeext) stage3 ; else true ; fi
+ -if [ -f collect-ld$(exeext) ] ; then ln -s ../collect-ld$(exeext) stage3 || cp collect-ld$(exeext) stage3 ; else true ; fi
-rm -f stage3/libgcc.a
-cp libgcc.a stage3
-if $(RANLIB_TEST) ; then $(RANLIB) stage3/libgcc.a; else true; fi
@@ -2734,9 +2732,9 @@ stage4-start:
-mv $(STAGESTUFF) stage4
# Copy as/ld if they exist to stage dir, so that running xgcc from the stage
# dir will work properly.
- -if [ -f as$(exeext) ] ; then $(LN) ../as$(exeext) stage4 ; else true ; fi
- -if [ -f ld$(exeext) ] ; then $(LN) ../ld$(exeext) stage4 ; else true ; fi
- -if [ -f collect-ld$(exeext) ] ; then $(LN) ../collect-ld$(exeext) stage4 ; else true ; fi
+ -if [ -f as$(exeext) ] ; then ln -s ../as$(exeext) stage4 || cp as$(exeext) stage4 ; else true ; fi
+ -if [ -f ld$(exeext) ] ; then ln -s ../ld$(exeext) stage4 || cp ld$(exeext) stage4 ; else true ; fi
+ -if [ -f collect-ld$(exeext) ] ; then ln -s ../collect-ld$(exeext) stage4 || cp collect-ld$(exeext) stage4 ; else true ; fi
-rm -f stage4/libgcc.a
-cp libgcc.a stage4
-if $(RANLIB_TEST) ; then $(RANLIB) stage4/libgcc.a; else true; fi