From 559d7baf896f333a1f32eb350d00491321e1ac24 Mon Sep 17 00:00:00 2001 From: "K. Richard Pixley" Date: Wed, 30 Jun 1993 22:48:51 +0000 Subject: [PATCH] * Makefile.in (ldgram.[hc]): rewrite this rule in such a way that gnu make can run in parallel without colliding on yacc's static file names. --- ld/ChangeLog | 14 ++++++++++++++ ld/Makefile.in | 13 ++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 6592c12c9a4..03227c2c823 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,5 +1,19 @@ +Wed Jun 30 15:45:55 1993 K. Richard Pixley (rich@sendai.cygnus.com) + + * Makefile.in (ldgram.[hc]): rewrite this rule in such a way that + gnu make can run in parallel without colliding on yacc's static + file names. + +Tue Jun 29 12:20:36 1993 Ian Lance Taylor (ian@cygnus.com) + + * ldmain.c (subfile_wanted_p): Don't dump core if there are no + symbols. + Mon Jun 28 12:22:11 1993 David J. Mackenzie (djm@thepub.cygnus.com) + * genscripts.sh (LIB_PATH): Only add /usr/local/lib if it's + different from libdir. + * Makefile.in (scriptdir): Base on tooldir, not datadir. Sat Jun 26 12:03:57 1993 David J. Mackenzie (djm@thepub.cygnus.com) diff --git a/ld/Makefile.in b/ld/Makefile.in index a27e3eafec0..2181f439408 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -41,7 +41,9 @@ man9dir = $(mandir)/man9 infodir = $(prefix)/info includedir = $(prefix)/include docdir = $(datadir)/doc -scriptdir = $(datadir)/ld +# We can't put the scripts in $(datadir) because the SEARCH_DIR +# directives need to be different for native and cross linkers. +scriptdir = $(tooldir)/lib/ld gcclibdir = $(libdir)/gcc/$(target_alias) @@ -76,7 +78,7 @@ LIB_PATH = BASEDIR = ../.. INCLUDE = $(srcdir)/../include -INCLUDES = -I. -I$(srcdir) -I../include -I$(srcdir)/../bfd -I../bfd -I$(INCLUDE) +INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../bfd -I../bfd -I$(INCLUDE) # What version of the manual to build DOCVER = gen @@ -166,7 +168,12 @@ all: $(LD_PROG) info: ld.info -ldgram.h ldgram.c: ldgram.y +# This somewhat odd makefile construction prevents a parallel gnu make +# from spinning off two bison processes concurrently. This is +# important because yacc uses static file names and multiple instances +# will collide. +ldgram.h ldgram.c: ldgram-files +ldgram-files: ldgram.y $(BISON) $(BISONFLAGS) -d $(srcdir)/ldgram.y mv -f y.tab.c ldgram.c mv -f y.tab.h ldgram.h -- 2.30.2