* makefile dependency revamp
@ 2009-05-26 3:38 Alan Modra
2009-06-03 18:39 ` Ralf Wildenhues
0 siblings, 1 reply; 5+ messages in thread
From: Alan Modra @ 2009-05-26 3:38 UTC (permalink / raw)
To: binutils
The aim of this patch is to consistently generate dependencies despite
the fact that various versions of gcc differ in -MM output. Older
versions of gcc (eg. gcc-3.3) suppress duplicate dependencies, perhaps
by accident, due to emitting a dependency after checking whether a
header has a multiple inclusion macro guard. Newer versions of gcc
don't seem to do this, and I also found that a version of gcc-3.4.5 I
happened to have lying around didn't take note of the macro guard in
hashtab.h for some reason.
So, we need to sort and uniq the object files dependencies, but be
careful to keep the first dependency (the main .c file) in place for
makefile rules using $<. I found a few other tweaks were needed, most
notably the gas multi-obj dependencies now are not edited by dep.sed
and automake complained about a trailing backslash continuation
followed by a blank line.
bfd/
* dep-in.sed: Don't modify .o to .lo here. Output one filename
per line with all lines having continuation backslash. Prefix
first line with "A", following lines with "B".
* Makefile.am (DEP): Don't use dep.sed here.
(DEP1): Run $MKDEP on single files, modify .o to .lo here. Use
dep.sed here on dependencies, sort and uniq.
* Makefile.in: Regenerate.
opcodes/
* dep-in.sed: Don't modify .o to .lo here. Output one filename
per line with all lines having continuation backslash. Prefix
first line with "A", following lines with "B".
* Makefile.am (DEP): Don't use dep.sed here.
(DEP1): Run $MKDEP on single files, modify .o to .lo here. Use
dep.sed here on dependencies, sort and uniq.
* Makefile.in: Regenerate.
binutils/
* dep-in.sed: Output one filename per line with all lines having
continuation backslash. Prefix first line with "A", following
lines with "B".
* Makefile.am (DEP): Don't use dep.sed here.
(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
sort and uniq.
* Makefile.in: Regenerate.
gas/
* dep-in.sed: Output one filename per line with all lines having
continuation backslash. Prefix first line with "A", following
lines with "B".
* Makefile.am (DEP): Don't use dep.sed here.
(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
sort and uniq.
(DEPTC, DEPOBJ, DEP2): Use dep.sed on dependencies, sort and uniq.
Emit multi dependencies on one line.
* Makefile.in: Regenerate.
gprof/
* dep-in.sed: Output one filename per line with all lines having
continuation backslash. Prefix first line with "A", following
lines with "B".
* Makefile.am (DEP): Don't use dep.sed here.
(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
sort and uniq.
* Makefile.in: Regenerate.
ld/
* dep-in.sed: Output one filename per line with all lines having
continuation backslash. Prefix first line with "A", following
lines with "B".
* Makefile.am (DEP): Don't use dep.sed here.
(DEP1): Run $MKDEP on single files, use dep.sed here on dependencies,
sort and uniq.
* Makefile.in: Regenerate.
I've trimmed the regenerated Makefile.am dependency changes from
the following diffs since I hit the 400k post limit..
Index: bfd/dep-in.sed
===================================================================
RCS file: /cvs/src/src/bfd/dep-in.sed,v
retrieving revision 1.7
diff -u -p -r1.7 dep-in.sed
--- bfd/dep-in.sed 29 Oct 2005 23:47:42 -0000 1.7
+++ bfd/dep-in.sed 25 May 2009 13:40:58 -0000
@@ -3,7 +3,6 @@
s/\\\n */ /g
t loop
-s!\.o:!.lo:!
s! \./! !g
s! @BFD_H@!!g
s!@SRCDIR@/../include!$(INCDIR)!g
@@ -11,7 +10,7 @@ s!@TOPDIR@/include!$(INCDIR)!g
s!@SRCDIR@/../opcodes!$(srcdir)/../opcodes!g
s!@TOPDIR@/opcodes!$(srcdir)/../opcodes!g
s!@SRCDIR@/!!g
-s! hosts/[^ ]*\.h! !g
+s! hosts/[^ ]*\.h!!g
s! sysdep.h!!g
s! \.\./bfd/sysdep.h!!g
s! libbfd.h!!g
@@ -21,12 +20,8 @@ s! \$(INCDIR)/ansidecl\.h!!g
s! \$(INCDIR)/symcat\.h!!g
s! \.\./intl/libintl\.h!!g
-s/\\\n */ /g
-
s/ *$//
s/ */ /g
-s/ *:/:/g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
- /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.227
diff -u -p -r1.227 Makefile.am
--- bfd/Makefile.am 22 May 2009 09:33:14 -0000 1.227
+++ bfd/Makefile.am 25 May 2009 13:40:59 -0000
@@ -909,18 +909,23 @@ uninstall_libbfd:
DEP: dep.sed $(CFILES) $(HFILES) bfd.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- sed -f dep.sed < DEP1 > DEPA
- echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
- if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+ echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+ if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
echo 'make DEP failed!'; exit 1; \
else \
- mv -f DEPA $@; \
+ mv -f DEP1 $@; \
fi
DEP1: $(CFILES)
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
- $(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+ for f in $?; do \
+ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+ sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
+ done
+ rm -f DEPA
mv -f DEP2 $@
dep.sed: dep-in.sed config.status
Index: opcodes/dep-in.sed
===================================================================
RCS file: /cvs/src/src/opcodes/dep-in.sed,v
retrieving revision 1.4
diff -u -p -r1.4 dep-in.sed
--- opcodes/dep-in.sed 30 Oct 2005 17:40:28 -0000 1.4
+++ opcodes/dep-in.sed 25 May 2009 13:41:02 -0000
@@ -3,7 +3,6 @@
s/\\\n */ /g
t loop
-s!\.o:!.lo:!
s! \./! !g
s! @BFD_H@! $(BFD_H)!g
s!@INCDIR@!$(INCDIR)!g
@@ -13,12 +12,8 @@ s!@TOPDIR@/bfd!$(BFDDIR)!g
s!@SRCDIR@/!!g
s! \.\./intl/libintl\.h!!g
-s/\\\n */ /g
-
s/ *$//
s/ */ /g
-s/ *:/:/g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
- /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.137
diff -u -p -r1.137 Makefile.am
--- opcodes/Makefile.am 22 May 2009 09:33:16 -0000 1.137
+++ opcodes/Makefile.am 25 May 2009 13:41:02 -0000
@@ -641,18 +641,23 @@ sh-dis.lo: sh-dis.c
DEP: dep.sed $(CFILES) $(HFILES) config.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- sed -f dep.sed < DEP1 > DEPA
- echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
- if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+ echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+ if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
echo 'make DEP failed!'; exit 1; \
else \
- mv -f DEPA $@; \
+ mv -f DEP1 $@; \
fi
DEP1: $(CFILES)
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
- $(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+ for f in $?; do \
+ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+ sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
+ done
+ rm -f DEPA
mv -f DEP2 $@
dep.sed: dep-in.sed config.status
Index: binutils/dep-in.sed
===================================================================
RCS file: /cvs/src/src/binutils/dep-in.sed,v
retrieving revision 1.4
diff -u -p -r1.4 dep-in.sed
--- binutils/dep-in.sed 30 Oct 2005 17:40:28 -0000 1.4
+++ binutils/dep-in.sed 25 May 2009 13:40:59 -0000
@@ -1,6 +1,7 @@
:loop
/\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
s! \./! !g
s!@INCDIR@!$(INCDIR)!g
@@ -11,11 +12,8 @@ s!@SRCDIR@/!!g
s!@OBJDIR@/!!g
s! \.\./intl/libintl\.h!!g
-s/\\\n */ /g
-
s/ *$//
s/ */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
- /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.107
diff -u -p -r1.107 Makefile.am
--- binutils/Makefile.am 22 May 2009 09:33:15 -0000 1.107
+++ binutils/Makefile.am 25 May 2009 13:40:59 -0000
@@ -398,18 +398,23 @@ DISTCLEANFILES = sysroff.c sysroff.h sit
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- sed -f dep.sed < DEP1 > DEPA
- echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
- if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+ echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+ if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
echo 'make DEP failed!'; exit 1; \
else \
- mv -f DEPA $@; \
+ mv -f DEP1 $@; \
fi
DEP1: $(CFILES) $(GENERATED_CFILES)
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
- $(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+ for f in $?; do \
+ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+ sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
+ done
+ rm -f DEPA
mv -f DEP2 $@
dep.sed: dep-in.sed config.status
Index: gas/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gas/dep-in.sed,v
retrieving revision 1.11
diff -u -p -r1.11 dep-in.sed
--- gas/dep-in.sed 17 Feb 2007 13:33:56 -0000 1.11
+++ gas/dep-in.sed 25 May 2009 13:40:59 -0000
@@ -1,6 +1,7 @@
:loop
/\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
s! \.\./! !g
s! \./! !g
@@ -43,11 +44,8 @@ s! symbols\.h!!g
s! tc\.h!!g
s! write\.h!!g
-s/\\\n */ /g
-
s/ *$//
s/ */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
- /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.169
diff -u -p -r1.169 Makefile.am
--- gas/Makefile.am 22 May 2009 09:33:15 -0000 1.169
+++ gas/Makefile.am 25 May 2009 13:41:00 -0000
@@ -893,12 +893,12 @@ DEP: dep.sed $(DEP_FILE_DEPS) DEPTC DEPO
$(MAKE) MKDEP="$(MKDEP)" srcdir="$${srcdir}" VPATH="$${srcdir}" DEP1
rm -rf DEPDIR
echo 'AMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.' > DEPA
- sed -f dep.sed < DEPTC >> DEPA
- sed -f dep.sed < DEPOBJ >> DEPA
- sed -f dep.sed < DEP2 >> DEPA
+ cat < DEPTC >> DEPA
+ cat < DEPOBJ >> DEPA
+ cat < DEP2 >> DEPA
echo 'BMKDEP = #DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING ABOVE.' >> DEPA
echo '#MKDEP DO NOT PUT ANYTHING BETWEEN THIS LINE AND THE MATCHING WARNING BELOW.' >> DEPA
- sed -f dep.sed < DEP1 >> DEPA
+ cat < DEP1 >> DEPA
echo '$$(OBJS): $$(DEP_@target''_cpu_type@_@obj''_format@)' >> DEPA
echo '$$(TARG_CPU_O): $$(DEPTC_@target''_cpu_type@_@obj''_format@)' >> DEPA
echo '$$(OBJ_FORMAT_O): $$(DEPOBJ_@target''_cpu_type@_@obj''_format@)' >> DEPA
@@ -918,8 +918,14 @@ DEP1: $(CFILES) $(MULTI_CFILES)
echo '' > targ-env.h; \
echo '' > itbl-cpu.h; \
echo '' > itbl-parse.h; \
- $(MKDEP) $(DEP_FLAGS) $? > DEP
- mv -f DEPDIR/DEP $@
+ rm -f DEP2; \
+ for f in $?; do \
+ $(MKDEP) $(DEP_FLAGS) $$f > DEP; \
+ sed -n -e '1s/: .*/: \\/p' -e q < DEP >> DEP2; \
+ sed -e '1s/.*://' -f ../dep.sed < DEP | LC_ALL=C sort | uniq | \
+ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
+ done
+ mv -f DEPDIR/DEP2 $@
# Work out the special dependencies for the tc-*.c files.
DEPTC: $(TARGET_CPU_CFILES)
@@ -941,11 +947,14 @@ DEPTC: $(TARGET_CPU_CFILES)
else \
echo '' > cgen-desc.h; \
fi ;\
- rm -f dummy.c; \
- cp $${srcdir}/config/tc-$${c}.c dummy.c; \
- $(MKDEP) $(DEP_FLAGS) dummy.c | \
- sed -e "s/dummy.o: dummy.c/DEPTC_$${c}_$${o} =/" >> ../DEPTCA; \
- rm -f dummy.c; \
+ rm -f dumtc.c; \
+ cp $${srcdir}/config/tc-$${c}.c dumtc.c; \
+ echo "DEPTC_$${c}_$${o} = \\" >> ../DEPTCA; \
+ $(MKDEP) $(DEP_FLAGS) dumtc.c | \
+ sed -e '1s/dumtc.o: //' -f ../dep.sed | \
+ LC_ALL=C sort | uniq | \
+ sed -e '/^A/d' -e 's/^B/ /' -e '$$s/ \\$$//' >> ../DEPTCA; \
+ rm -f dumtc.c; \
else true; fi; \
done; \
done
@@ -953,14 +962,14 @@ DEPTC: $(TARGET_CPU_CFILES)
echo ' $$(INCDIR)/obstack.h $$(BFDDIR)/libhppa.h \' >> DEPTCA
echo ' $$(INCDIR)/opcode/hppa.h $$(BFDDIR)/som.h' >> DEPTCA
for c in $(MULTI_CPU_TYPES); do \
- echo "DEPTC_$${c}"'_multi = \' >> DEPTCA; \
+ x="DEPTC_$${c}_multi ="; \
for o in $(OBJ_FORMATS); do \
$(MULTI_CPU_OBJ_VALID) \
if [ x$${valid} = xyes ]; then \
- echo '$$(DEPTC_'"$${c}_$${o}"') \' >> DEPTCA; \
+ x="$$x"' $$(DEPTC_'"$${c}_$${o}"')'; \
else true; fi; \
done; \
- echo '' >> DEPTCA; \
+ echo "$$x" >> DEPTCA; \
done
mv -f DEPTCA DEPTC
@@ -979,11 +988,14 @@ DEPOBJ: $(OBJ_FORMAT_CFILES)
echo '#include "te-generic.h"' > targ-env.h; \
echo '' > itbl-cpu.h; \
echo '' > itbl-parse.h; \
- rm -f dummy.c; \
- cp $${srcdir}/config/obj-$${o}.c dummy.c; \
- $(MKDEP) $(DEP_FLAGS) dummy.c | \
- sed -e "s/dummy.o: dummy.c/DEPOBJ_$${c}_$${o} =/" >> ../DEPOBJA; \
- rm -f dummy.c; \
+ rm -f dumobj.c; \
+ cp $${srcdir}/config/obj-$${o}.c dumobj.c; \
+ echo "DEPOBJ_$${c}_$${o} = \\" >> ../DEPOBJA; \
+ $(MKDEP) $(DEP_FLAGS) dumobj.c | \
+ sed -e "s/dumobj.o: //" -f ../dep.sed | \
+ LC_ALL=C sort | uniq | \
+ sed -e '/^A/d' -e 's/^B/ /' -e '$$s/ \\$$//' >> ../DEPOBJA; \
+ rm -f dumobj.c; \
else true; fi; \
done; \
done
@@ -992,14 +1004,14 @@ DEPOBJ: $(OBJ_FORMAT_CFILES)
echo ' $$(BFDDIR)/som.h $$(INCDIR)/aout/stab_gnu.h \' >> DEPOBJA
echo ' $$(INCDIR)/aout/stab.def' >> DEPOBJA
for c in $(MULTI_CPU_TYPES); do \
- echo "DEPOBJ_$${c}"'_multi = \' >> DEPOBJA; \
+ x="DEPOBJ_$${c}_multi ="; \
for o in $(OBJ_FORMATS); do \
$(MULTI_CPU_OBJ_VALID) \
if [ x$${valid} = xyes ]; then \
- echo '$$(DEPOBJ_'"$${c}_$${o}"') \' >> DEPOBJA; \
+ x="$$x"' $$(DEPOBJ_'"$${c}_$${o}"')'; \
else true; fi; \
done; \
- echo '' >> DEPOBJA; \
+ echo "$$x" >> DEPOBJA; \
done
mv -f DEPOBJA DEPOBJ
@@ -1016,21 +1028,24 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_
if [ x$${valid} = xyes ]; then \
echo '#include "tc-'"$${c}"'.h"' > targ-cpu.h; \
echo '#include "obj-'"$${o}"'.h"' > dummy.c; \
+ echo "DEP_$${c}_$${o} = \\" >> ../DEP2A; \
$(MKDEP) $(DEP_FLAGS) dummy.c | \
- sed -e "s/dummy.o: dummy.c/DEP_$${c}_$${o} =/" >> ../DEP2A; \
+ sed -e "s/dummy.o: //" -f ../dep.sed | \
+ LC_ALL=C sort | uniq | \
+ sed -e '/^A/d' -e 's/^B/ /' -e '$$s/ \\$$//' >> ../DEP2A; \
else true; fi; \
done; \
done
echo 'DEP_hppa_som = $$(BFDDIR)/som.h' >> DEP2A
for c in $(MULTI_CPU_TYPES); do \
- echo "DEP_$${c}"'_multi = \' >> DEP2A; \
+ x="DEP_$${c}_multi ="; \
for o in $(OBJ_FORMATS); do \
$(MULTI_CPU_OBJ_VALID) \
if [ x$${valid} = xyes ]; then \
- echo '$$(DEP_'"$${c}_$${o}"') \' >> DEP2A; \
+ x="$$x"' $$(DEP_'"$${c}_$${o}"')'; \
else true; fi; \
done; \
- echo '' >> DEP2A; \
+ echo "$$x" >> DEP2A; \
done
mv -f DEP2A DEP2
Index: gprof/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gprof/dep-in.sed,v
retrieving revision 1.3
diff -u -p -r1.3 dep-in.sed
--- gprof/dep-in.sed 14 Aug 2003 07:04:30 -0000 1.3
+++ gprof/dep-in.sed 25 May 2009 13:41:01 -0000
@@ -1,7 +1,9 @@
:loop
/\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
+s! \./! !g
s!@INCDIR@!$(INCDIR)!g
s!@TOPDIR@/include!$(INCDIR)!g
s!@BFDDIR@!$(BFDDIR)!g
@@ -10,11 +12,8 @@ s!@SRCDIR@/!!g
s!@OBJDIR@/!!g
s! \.\./intl/libintl\.h!!g
-s/\\\n */ /g
-
s/ *$//
s/ */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
- /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.46
diff -u -p -r1.46 Makefile.am
--- gprof/Makefile.am 22 May 2009 09:33:15 -0000 1.46
+++ gprof/Makefile.am 25 May 2009 13:41:01 -0000
@@ -181,18 +181,23 @@ install-data-local: install-info
DEP: dep.sed $(gprof_SOURCES) $(noinst_HEADERS) gconfig.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- sed -f dep.sed < DEP1 > DEPA
- echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
- if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+ echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+ if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
echo 'make DEP failed!'; exit 1; \
else \
- mv -f DEPA $@; \
+ mv -f DEP1 $@; \
fi
DEP1: $(gprof_SOURCES)
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
- $(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+ for f in $?; do \
+ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+ sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
+ done
+ rm -f DEPA
mv -f DEP2 $@
dep.sed: dep-in.sed config.status
Index: ld/dep-in.sed
===================================================================
RCS file: /cvs/src/src/ld/dep-in.sed,v
retrieving revision 1.5
diff -u -p -r1.5 dep-in.sed
--- ld/dep-in.sed 30 Oct 2005 17:40:28 -0000 1.5
+++ ld/dep-in.sed 25 May 2009 13:41:01 -0000
@@ -1,6 +1,7 @@
:loop
/\\$/N
-/\\$/b loop
+s/\\\n */ /g
+t loop
s! \./! !g
s!@INCDIR@!$(INCDIR)!g
@@ -11,11 +12,8 @@ s!@SRCDIR@/!!g
s! \.\./bfd/hosts/[^ ]*\.h! !g
s! \.\./intl/libintl\.h!!g
-s/\\\n */ /g
-
s/ *$//
s/ */ /g
-/:$/d
-
-s/\(.\{50\}[^ ]*\) /\1 \\\
- /g
+s/^ */A/
+s/ / \\\nB/g
+$s/$/ \\/
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.264
diff -u -p -r1.264 Makefile.am
--- ld/Makefile.am 22 May 2009 09:33:15 -0000 1.264
+++ ld/Makefile.am 25 May 2009 13:41:02 -0000
@@ -2009,18 +2009,23 @@ endif
DEP: dep.sed $(CFILES) $(HFILES) $(GENERATED_CFILES) $(GENERATED_HFILES) config.h
rm -f DEP1
$(MAKE) MKDEP="$(MKDEP)" DEP1
- sed -f dep.sed < DEP1 > DEPA
- echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEPA
- if grep ' /' DEPA > /dev/null 2> /dev/null; then \
+ echo '# IF YOU PUT ANYTHING HERE IT WILL GO AWAY' >> DEP1
+ if grep ' /' DEP1 > /dev/null 2> /dev/null; then \
echo 'make DEP failed!'; exit 1; \
else \
- mv -f DEPA $@; \
+ mv -f DEP1 $@; \
fi
DEP1: $(CFILES) $(GENERATED_CFILES)
echo '# DO NOT DELETE THIS LINE -- mkdep uses it.' > DEP2
echo '# DO NOT PUT ANYTHING AFTER THIS LINE, IT WILL GO AWAY.' >> DEP2
- $(MKDEP) $(INCLUDES) $(CFLAGS) $? >> DEP2
+ for f in $?; do \
+ $(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
+ sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
+ done
+ rm -f DEPA
mv -f DEP2 $@
dep.sed: dep-in.sed config.status
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: makefile dependency revamp
2009-05-26 3:38 makefile dependency revamp Alan Modra
@ 2009-06-03 18:39 ` Ralf Wildenhues
2009-06-03 20:31 ` Ian Lance Taylor
2009-06-04 6:58 ` Alan Modra
0 siblings, 2 replies; 5+ messages in thread
From: Ralf Wildenhues @ 2009-06-03 18:39 UTC (permalink / raw)
To: binutils
Hello Alan,
* Alan Modra wrote on Tue, May 26, 2009 at 05:38:37AM CEST:
> The aim of this patch is to consistently generate dependencies despite
> the fact that various versions of gcc differ in -MM output.
I'm sure I must be missing something blatantly obvious, but:
why is bintuils generating dependencies in trees that use automake
anyway? Is there anything wrong with automatic dependency tracking?
Why is the only directory in src that uses automatice dependency
tracking (gdb) the one that does not use automake?
Note that it's the 'cygnus' option that turns off dep tracking; see
<http://www.gnu.org/software/automake/manual/html_node/Cygnus.html>
for all the things it changes (but which could mostly be had with other
automake options, too).
Thanks for enlightening me, and please Cc: me on replies,
Ralf
PS: see a couple of bugs below; also, I intend to prepare patches to
update the src/GCC trees to recent Autoconf and Automake, sometime soon.
> --- bfd/dep-in.sed 29 Oct 2005 23:47:42 -0000 1.7
> +++ bfd/dep-in.sed 25 May 2009 13:40:58 -0000
> @@ -21,12 +20,8 @@ s! \$(INCDIR)/ansidecl\.h!!g
> s! \$(INCDIR)/symcat\.h!!g
> s! \.\./intl/libintl\.h!!g
>
> -s/\\\n */ /g
> -
> s/ *$//
> s/ */ /g
> -s/ *:/:/g
> -/:$/d
> -
> -s/\(.\{50\}[^ ]*\) /\1 \\\
> - /g
> +s/^ */A/
> +s/ / \\\nB/g
BTW, \n is only portable in sed script in the BRE part (left hand side
of s command), but not in the replacement part. There, you should use
a literal newline escaped with a backslash. Several instances of this.
> --- bfd/Makefile.am 22 May 2009 09:33:14 -0000 1.227
> +++ bfd/Makefile.am 25 May 2009 13:40:59 -0000
> + sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
Not setting LC_ALL to the same value for uniq as for sort as is asking
for trouble. Several instances of this, too.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: makefile dependency revamp
2009-06-03 18:39 ` Ralf Wildenhues
@ 2009-06-03 20:31 ` Ian Lance Taylor
2009-06-04 5:58 ` Ralf Wildenhues
2009-06-04 6:58 ` Alan Modra
1 sibling, 1 reply; 5+ messages in thread
From: Ian Lance Taylor @ 2009-06-03 20:31 UTC (permalink / raw)
To: Ralf Wildenhues; +Cc: binutils
Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:
> I'm sure I must be missing something blatantly obvious, but:
> why is bintuils generating dependencies in trees that use automake
> anyway? Is there anything wrong with automatic dependency tracking?
Historically we did it because 1) our dependency tracking system
preceded to conversion to automake, so we had it anyhow; 2) when we
converted to automake, automake's dependency tracking was not reliable
for all compilers, and since the binutils are required for gcc on some
platforms people do build the binutils with all sorts of compilers.
These days it may be quite reasonable to switch over to automake's
dependency tracking.
Ian
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: makefile dependency revamp
2009-06-03 20:31 ` Ian Lance Taylor
@ 2009-06-04 5:58 ` Ralf Wildenhues
0 siblings, 0 replies; 5+ messages in thread
From: Ralf Wildenhues @ 2009-06-04 5:58 UTC (permalink / raw)
To: Ian Lance Taylor; +Cc: binutils
Hello Ian,
* Ian Lance Taylor wrote on Wed, Jun 03, 2009 at 10:31:16PM CEST:
> Ralf Wildenhues <Ralf.Wildenhues@gmx.de> writes:
>
> > I'm sure I must be missing something blatantly obvious, but:
> > why is bintuils generating dependencies in trees that use automake
> > anyway? Is there anything wrong with automatic dependency tracking?
>
> Historically we did it because 1) our dependency tracking system
> preceded to conversion to automake, so we had it anyhow; 2) when we
> converted to automake, automake's dependency tracking was not reliable
> for all compilers, and since the binutils are required for gcc on some
> platforms people do build the binutils with all sorts of compilers.
OK, thanks for the explanation.
> These days it may be quite reasonable to switch over to automake's
> dependency tracking.
Guess I'll be looking at that then, too.
Cheers,
Ralf
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: makefile dependency revamp
2009-06-03 18:39 ` Ralf Wildenhues
2009-06-03 20:31 ` Ian Lance Taylor
@ 2009-06-04 6:58 ` Alan Modra
1 sibling, 0 replies; 5+ messages in thread
From: Alan Modra @ 2009-06-04 6:58 UTC (permalink / raw)
To: Ralf Wildenhues; +Cc: binutils
On Wed, Jun 03, 2009 at 08:39:02PM +0200, Ralf Wildenhues wrote:
> Is there anything wrong with automatic dependency tracking?
> Why is the only directory in src that uses automatice dependency
> tracking (gdb) the one that does not use automake?
If automake's dependency generation "just works" for most non-gcc
compilers in use, I'd be happy to throw away the current "make dep"
scheme.
> PS: see a couple of bugs below;
Thanks!
bfd/
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
Run "make dep-am".
* Makefile.in: Regenerate.
binutils/
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
Run "make dep-am".
* Makefile.in: Regenerate.
gas/
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1, DEPTC, DEPOBJ, DEP2): LC_ALL for uniq.
* Makefile.in: Regenerate.
gprof/
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
* Makefile.in: Regenerate.
ld/
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
* Makefile.in: Regenerate.
opcodes/
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
* Makefile.in: Regenerate.
Index: bfd/dep-in.sed
===================================================================
RCS file: /cvs/src/src/bfd/dep-in.sed,v
retrieving revision 1.8
diff -u -p -r1.8 dep-in.sed
--- bfd/dep-in.sed 26 May 2009 03:19:15 -0000 1.8
+++ bfd/dep-in.sed 4 Jun 2009 05:45:43 -0000
@@ -23,5 +23,6 @@ s! \.\./intl/libintl\.h!!g
s/ *$//
s/ */ /g
s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
$s/$/ \\/
Index: bfd/Makefile.am
===================================================================
RCS file: /cvs/src/src/bfd/Makefile.am,v
retrieving revision 1.229
diff -u -p -r1.229 Makefile.am
--- bfd/Makefile.am 26 May 2009 14:12:02 -0000 1.229
+++ bfd/Makefile.am 4 Jun 2009 05:45:20 -0000
@@ -930,7 +930,8 @@ DEP1: $(CFILES)
for f in $?; do \
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
- sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
done
rm -f DEPA
@@ -1252,14 +1253,14 @@ cpu-cr16.lo: \
cpu-cr16.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
-cpu-cris.lo: \
- cpu-cris.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h
cpu-cr16c.lo: \
cpu-cr16c.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
+cpu-cris.lo: \
+ cpu-cris.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h
cpu-crx.lo: \
cpu-crx.c \
$(INCDIR)/filenames.h \
@@ -1296,13 +1297,6 @@ cpu-hppa.lo: \
cpu-hppa.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
-cpu-ia64.lo: \
- cpu-ia64.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- $(INCDIR)/opcode/ia64.h \
- $(srcdir)/../opcodes/ia64-opc.h \
- cpu-ia64-opc.c
cpu-i370.lo: \
cpu-i370.c \
$(INCDIR)/filenames.h \
@@ -1319,6 +1313,13 @@ cpu-i960.lo: \
cpu-i960.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
+cpu-ia64.lo: \
+ cpu-ia64.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ $(INCDIR)/opcode/ia64.h \
+ $(srcdir)/../opcodes/ia64-opc.h \
+ cpu-ia64-opc.c
cpu-ip2k.lo: \
cpu-ip2k.c \
$(INCDIR)/filenames.h \
@@ -1331,6 +1332,14 @@ cpu-lm32.lo: \
cpu-lm32.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
+cpu-m10200.lo: \
+ cpu-m10200.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h
+cpu-m10300.lo: \
+ cpu-m10300.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h
cpu-m32c.lo: \
cpu-m32c.c \
$(INCDIR)/filenames.h \
@@ -1356,14 +1365,6 @@ cpu-m88k.lo: \
cpu-m88k.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
-cpu-m10200.lo: \
- cpu-m10200.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h
-cpu-m10300.lo: \
- cpu-m10300.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h
cpu-maxq.lo: \
cpu-maxq.c \
$(INCDIR)/filenames.h \
@@ -1396,10 +1397,6 @@ cpu-mt.lo: \
cpu-mt.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
-cpu-or32.lo: \
- cpu-or32.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h
cpu-ns32k.lo: \
cpu-ns32k.c \
$(INCDIR)/filenames.h \
@@ -1409,6 +1406,10 @@ cpu-openrisc.lo: \
cpu-openrisc.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
+cpu-or32.lo: \
+ cpu-or32.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h
cpu-pdp11.lo: \
cpu-pdp11.c \
$(INCDIR)/filenames.h \
@@ -1475,12 +1476,16 @@ cpu-vax.lo: \
cpu-vax.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
+cpu-w65.lo: \
+ cpu-w65.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h
cpu-we32k.lo: \
cpu-we32k.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
-cpu-w65.lo: \
- cpu-w65.c \
+cpu-xc16x.lo: \
+ cpu-xc16x.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
cpu-xstormy16.lo: \
@@ -1491,10 +1496,6 @@ cpu-xtensa.lo: \
cpu-xtensa.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h
-cpu-xc16x.lo: \
- cpu-xc16x.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h
cpu-z80.lo: \
cpu-z80.c \
$(INCDIR)/filenames.h \
@@ -1684,6 +1685,18 @@ coff-aux.lo: \
coffcode.h \
coffswap.h \
libcoff.h
+coff-go32.lo: \
+ coff-go32.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/i386.h \
+ $(INCDIR)/coff/internal.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ coff-i386.c \
+ coffcode.h \
+ coffswap.h \
+ libcoff.h
coff-h8300.lo: \
coff-h8300.c \
$(INCDIR)/bfdlink.h \
@@ -1730,18 +1743,6 @@ coff-i860.lo: \
coffcode.h \
coffswap.h \
libcoff.h
-coff-go32.lo: \
- coff-go32.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/coff/external.h \
- $(INCDIR)/coff/i386.h \
- $(INCDIR)/coff/internal.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- coff-i386.c \
- coffcode.h \
- coffswap.h \
- libcoff.h
coff-i960.lo: \
coff-i960.c \
$(INCDIR)/bfdlink.h \
@@ -1928,23 +1929,23 @@ coff-u68k.lo: \
coffcode.h \
coffswap.h \
libcoff.h
-coff-we32k.lo: \
- coff-we32k.c \
+coff-w65.lo: \
+ coff-w65.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/we32k.h \
+ $(INCDIR)/coff/w65.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
coffcode.h \
coffswap.h \
libcoff.h
-coff-w65.lo: \
- coff-w65.c \
+coff-we32k.lo: \
+ coff-we32k.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/w65.h \
+ $(INCDIR)/coff/we32k.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
coffcode.h \
@@ -2023,6 +2024,70 @@ ecofflink.lo: \
$(INCDIR)/objalloc.h \
libcoff.h \
libecoff.h
+elf-attrs.lo: \
+ elf-attrs.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ elf-bfd.h
+elf-eh-frame.lo: \
+ elf-eh-frame.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/dwarf2.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ elf-bfd.h
+elf-m10200.lo: \
+ elf-m10200.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ elf-bfd.h \
+ elf32-target.h
+elf-m10300.lo: \
+ elf-m10300.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/mn10300.h \
+ $(INCDIR)/elf/reloc-macros.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ elf-bfd.h \
+ elf32-target.h
+elf-strtab.lo: \
+ elf-strtab.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ elf-bfd.h
+elf-vxworks.lo: \
+ elf-vxworks.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/vxworks.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ elf-bfd.h \
+ elf-vxworks.h
elf.lo: \
elf.c \
$(INCDIR)/bfdlink.h \
@@ -2359,19 +2424,6 @@ elf32-m32r.lo: \
$(INCDIR)/hashtab.h \
elf-bfd.h \
elf32-target.h
-elf32-m68k.lo: \
- elf32-m68k.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/m68k.h \
- $(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- $(INCDIR)/opcode/m68k.h \
- elf-bfd.h \
- elf32-target.h
elf32-m68hc11.lo: \
elf32-m68hc11.c \
$(INCDIR)/bfdlink.h \
@@ -2414,37 +2466,27 @@ elf32-m68hc1x.lo: \
$(INCDIR)/opcode/m68hc11.h \
elf-bfd.h \
elf32-m68hc1x.h
-elf32-m88k.lo: \
- elf32-m88k.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- elf-bfd.h \
- elf32-target.h
-elf-m10200.lo: \
- elf-m10200.c \
+elf32-m68k.lo: \
+ elf32-m68k.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/m68k.h \
+ $(INCDIR)/elf/reloc-macros.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
+ $(INCDIR)/opcode/m68k.h \
elf-bfd.h \
elf32-target.h
-elf-m10300.lo: \
- elf-m10300.c \
+elf32-m88k.lo: \
+ elf32-m88k.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/mn10300.h \
- $(INCDIR)/elf/reloc-macros.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
elf-bfd.h \
elf32-target.h
elf32-mcore.lo: \
@@ -2472,25 +2514,6 @@ elf32-mep.lo: \
$(INCDIR)/libiberty.h \
elf-bfd.h \
elf32-target.h
-elfxx-mips.lo: \
- elfxx-mips.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/coff/ecoff.h \
- $(INCDIR)/coff/external.h \
- $(INCDIR)/coff/mips.h \
- $(INCDIR)/coff/sym.h \
- $(INCDIR)/coff/symconst.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/mips.h \
- $(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- elf-bfd.h \
- elf-vxworks.h \
- elfxx-mips.h
elf32-mips.lo: \
elf32-mips.c \
$(INCDIR)/bfdlink.h \
@@ -2602,27 +2625,20 @@ elf32-ppc.lo: \
elf-vxworks.h \
elf32-ppc.h \
elf32-target.h
-elf32-sh64.lo: \
- elf32-sh64.c \
+elf32-s390.lo: \
+ elf32-s390.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/sh.h \
+ $(INCDIR)/elf/s390.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- $(srcdir)/../opcodes/sh-opc.h \
- $(srcdir)/../opcodes/sh64-opc.h \
elf-bfd.h \
- elf-vxworks.h \
- elf32-sh-relocs.h \
- elf32-sh.c \
- elf32-sh64.h \
elf32-target.h
-elf32-sh64-com.lo: \
- elf32-sh64-com.c \
+elf32-sh-symbian.lo: \
+ elf32-sh-symbian.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
@@ -2631,20 +2647,12 @@ elf32-sh64-com.lo: \
$(INCDIR)/elf/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(srcdir)/../opcodes/sh64-opc.h \
- elf-bfd.h \
- elf32-sh64.h
-elf32-s390.lo: \
- elf32-s390.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/s390.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ $(srcdir)/../opcodes/sh-opc.h \
elf-bfd.h \
+ elf-vxworks.h \
+ elf32-sh-relocs.h \
+ elf32-sh.c \
elf32-target.h
elf32-sh.lo: \
elf32-sh.c \
@@ -2662,8 +2670,8 @@ elf32-sh.lo: \
elf-vxworks.h \
elf32-sh-relocs.h \
elf32-target.h
-elf32-sh-symbian.lo: \
- elf32-sh-symbian.c \
+elf32-sh64-com.lo: \
+ elf32-sh64-com.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
@@ -2672,28 +2680,28 @@ elf32-sh-symbian.lo: \
$(INCDIR)/elf/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- $(srcdir)/../opcodes/sh-opc.h \
+ $(srcdir)/../opcodes/sh64-opc.h \
elf-bfd.h \
- elf-vxworks.h \
- elf32-sh-relocs.h \
- elf32-sh.c \
- elf32-target.h
-elfxx-sparc.lo: \
- elfxx-sparc.c \
+ elf32-sh64.h
+elf32-sh64.lo: \
+ elf32-sh64.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/sparc.h \
+ $(INCDIR)/elf/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/libiberty.h \
- $(INCDIR)/opcode/sparc.h \
+ $(srcdir)/../opcodes/sh-opc.h \
+ $(srcdir)/../opcodes/sh64-opc.h \
elf-bfd.h \
elf-vxworks.h \
- elfxx-sparc.h
+ elf32-sh-relocs.h \
+ elf32-sh.c \
+ elf32-sh64.h \
+ elf32-target.h
elf32-sparc.lo: \
elf32-sparc.c \
$(INCDIR)/bfdlink.h \
@@ -2748,45 +2756,45 @@ elf32-vax.lo: \
$(INCDIR)/hashtab.h \
elf-bfd.h \
elf32-target.h
-elf32-xstormy16.lo: \
- elf32-xstormy16.c \
+elf32-xc16x.lo: \
+ elf32-xc16x.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/dwarf2.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/xstormy16.h \
+ $(INCDIR)/elf/xc16x.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/libiberty.h \
elf-bfd.h \
elf32-target.h
-elf32-xtensa.lo: \
- elf32-xtensa.c \
+elf32-xstormy16.lo: \
+ elf32-xstormy16.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/xtensa.h \
+ $(INCDIR)/elf/xstormy16.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/xtensa-config.h \
- $(INCDIR)/xtensa-isa.h \
+ $(INCDIR)/libiberty.h \
elf-bfd.h \
elf32-target.h
-elf32-xc16x.lo: \
- elf32-xc16x.c \
+elf32-xtensa.lo: \
+ elf32-xtensa.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
- $(INCDIR)/elf/dwarf2.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/xc16x.h \
+ $(INCDIR)/elf/xtensa.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
+ $(INCDIR)/xtensa-config.h \
+ $(INCDIR)/xtensa-isa.h \
elf-bfd.h \
elf32-target.h
elf32.lo: \
@@ -2813,47 +2821,40 @@ elflink.lo: \
$(INCDIR)/objalloc.h \
$(INCDIR)/safe-ctype.h \
elf-bfd.h
-elf-attrs.lo: \
- elf-attrs.c \
+elfxx-mips.lo: \
+ elfxx-mips.c \
$(INCDIR)/bfdlink.h \
+ $(INCDIR)/coff/ecoff.h \
+ $(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/mips.h \
+ $(INCDIR)/coff/sym.h \
+ $(INCDIR)/coff/symconst.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/mips.h \
+ $(INCDIR)/elf/reloc-macros.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/libiberty.h \
- elf-bfd.h
-elf-strtab.lo: \
- elf-strtab.c \
+ elf-bfd.h \
+ elf-vxworks.h \
+ elfxx-mips.h
+elfxx-sparc.lo: \
+ elfxx-sparc.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/reloc-macros.h \
+ $(INCDIR)/elf/sparc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/libiberty.h \
- elf-bfd.h
-elf-eh-frame.lo: \
- elf-eh-frame.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/dwarf2.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- elf-bfd.h
-elf-vxworks.lo: \
- elf-vxworks.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/vxworks.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
+ $(INCDIR)/opcode/sparc.h \
elf-bfd.h \
- elf-vxworks.h
+ elf-vxworks.h \
+ elfxx-sparc.h
epoc-pe-arm.lo: \
epoc-pe-arm.c \
$(INCDIR)/bfdlink.h \
@@ -2909,10 +2910,6 @@ hp300hpux.lo: \
aout-target.h \
aoutx.h \
libaout.h
-som.lo: \
- som.c \
- $(INCDIR)/alloca-conf.h \
- $(INCDIR)/filenames.h
i386aout.lo: \
i386aout.c \
$(INCDIR)/aout/aout64.h \
@@ -2983,6 +2980,17 @@ i386lynx.lo: \
$(INCDIR)/hashtab.h \
aout-target.h \
libaout.h
+i386mach3.lo: \
+ i386mach3.c \
+ $(INCDIR)/aout/aout64.h \
+ $(INCDIR)/aout/ar.h \
+ $(INCDIR)/aout/stab.def \
+ $(INCDIR)/aout/stab_gnu.h \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ aout-target.h \
+ libaout.h
i386msdos.lo: \
i386msdos.c \
$(INCDIR)/bfdlink.h \
@@ -3001,17 +3009,6 @@ i386netbsd.lo: \
aout-target.h \
libaout.h \
netbsd.h
-i386mach3.lo: \
- i386mach3.c \
- $(INCDIR)/aout/aout64.h \
- $(INCDIR)/aout/ar.h \
- $(INCDIR)/aout/stab.def \
- $(INCDIR)/aout/stab_gnu.h \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- aout-target.h \
- libaout.h
i386os9k.lo: \
i386os9k.c \
$(INCDIR)/bfdlink.h \
@@ -3134,25 +3131,25 @@ nlm32-i386.lo: \
libnlm.h \
nlm-target.h \
nlmswap.h
-nlm32-sparc.lo: \
- nlm32-sparc.c \
+nlm32-ppc.lo: \
+ nlm32-ppc.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/nlm/common.h \
$(INCDIR)/nlm/external.h \
$(INCDIR)/nlm/internal.h \
- $(INCDIR)/nlm/sparc32-ext.h \
+ $(INCDIR)/nlm/ppc-ext.h \
libnlm.h \
nlm-target.h \
nlmswap.h
-nlm32-ppc.lo: \
- nlm32-ppc.c \
+nlm32-sparc.lo: \
+ nlm32-sparc.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/nlm/common.h \
$(INCDIR)/nlm/external.h \
$(INCDIR)/nlm/internal.h \
- $(INCDIR)/nlm/ppc-ext.h \
+ $(INCDIR)/nlm/sparc32-ext.h \
libnlm.h \
nlm-target.h \
nlmswap.h
@@ -3207,16 +3204,8 @@ pdp11.lo: \
$(INCDIR)/safe-ctype.h \
aout-target.h \
libaout.h
-pef.lo: \
- pef.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- $(INCDIR)/safe-ctype.h \
- pef-traceback.h \
- pef.h
-pe-arm.lo: \
- pe-arm.c \
+pe-arm-wince.lo: \
+ pe-arm-wince.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/arm.h \
$(INCDIR)/coff/external.h \
@@ -3228,9 +3217,10 @@ pe-arm.lo: \
coffcode.h \
libcoff.h \
libpei.h \
+ pe-arm.c \
peicode.h
-pei-arm.lo: \
- pei-arm.c \
+pe-arm.lo: \
+ pe-arm.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/arm.h \
$(INCDIR)/coff/external.h \
@@ -3243,184 +3233,191 @@ pei-arm.lo: \
libcoff.h \
libpei.h \
peicode.h
-pe-arm-wince.lo: \
- pe-arm-wince.c \
+pe-i386.lo: \
+ pe-i386.c \
$(INCDIR)/bfdlink.h \
- $(INCDIR)/coff/arm.h \
$(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/i386.h \
$(INCDIR)/coff/internal.h \
$(INCDIR)/coff/pe.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-arm.c \
+ coff-i386.c \
coffcode.h \
libcoff.h \
libpei.h \
- pe-arm.c \
peicode.h
-pei-arm-wince.lo: \
- pei-arm-wince.c \
+pe-mcore.lo: \
+ pe-mcore.c \
$(INCDIR)/bfdlink.h \
- $(INCDIR)/coff/arm.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
+ $(INCDIR)/coff/mcore.h \
$(INCDIR)/coff/pe.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-arm.c \
+ coff-mcore.c \
coffcode.h \
libcoff.h \
libpei.h \
- pei-arm.c \
peicode.h
-pe-i386.lo: \
- pe-i386.c \
+pe-mips.lo: \
+ pe-mips.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
- $(INCDIR)/coff/i386.h \
$(INCDIR)/coff/internal.h \
+ $(INCDIR)/coff/mipspe.h \
$(INCDIR)/coff/pe.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-i386.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pei-i386.lo: \
- pei-i386.c \
+pe-ppc.lo: \
+ pe-ppc.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
- $(INCDIR)/coff/i386.h \
$(INCDIR)/coff/internal.h \
$(INCDIR)/coff/pe.h \
+ $(INCDIR)/coff/powerpc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-i386.c \
+ coff-ppc.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pe-mcore.lo: \
- pe-mcore.c \
+pe-sh.lo: \
+ pe-sh.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/mcore.h \
$(INCDIR)/coff/pe.h \
+ $(INCDIR)/coff/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-mcore.c \
+ $(INCDIR)/libiberty.h \
+ coff-sh.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pei-mcore.lo: \
- pei-mcore.c \
+pef.lo: \
+ pef.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ $(INCDIR)/safe-ctype.h \
+ pef-traceback.h \
+ pef.h
+pei-arm-wince.lo: \
+ pei-arm-wince.c \
$(INCDIR)/bfdlink.h \
+ $(INCDIR)/coff/arm.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/mcore.h \
$(INCDIR)/coff/pe.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-mcore.c \
+ coff-arm.c \
coffcode.h \
libcoff.h \
libpei.h \
+ pei-arm.c \
peicode.h
-pe-ppc.lo: \
- pe-ppc.c \
+pei-arm.lo: \
+ pei-arm.c \
$(INCDIR)/bfdlink.h \
+ $(INCDIR)/coff/arm.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
$(INCDIR)/coff/pe.h \
- $(INCDIR)/coff/powerpc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-ppc.c \
+ coff-arm.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pei-ppc.lo: \
- pei-ppc.c \
+pei-i386.lo: \
+ pei-i386.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/i386.h \
$(INCDIR)/coff/internal.h \
$(INCDIR)/coff/pe.h \
- $(INCDIR)/coff/powerpc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-ppc.c \
+ coff-i386.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pe-sh.lo: \
- pe-sh.c \
+pei-mcore.lo: \
+ pei-mcore.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
+ $(INCDIR)/coff/mcore.h \
$(INCDIR)/coff/pe.h \
- $(INCDIR)/coff/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- coff-sh.c \
+ coff-mcore.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pei-sh.lo: \
- pei-sh.c \
+pei-mips.lo: \
+ pei-mips.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
+ $(INCDIR)/coff/mipspe.h \
$(INCDIR)/coff/pe.h \
- $(INCDIR)/coff/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- coff-sh.c \
coffcode.h \
libcoff.h \
libpei.h \
- peicode.h
-pe-mips.lo: \
pe-mips.c \
+ peicode.h
+pei-ppc.lo: \
+ pei-ppc.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/mipspe.h \
$(INCDIR)/coff/pe.h \
+ $(INCDIR)/coff/powerpc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
+ coff-ppc.c \
coffcode.h \
libcoff.h \
libpei.h \
peicode.h
-pei-mips.lo: \
- pei-mips.c \
+pei-sh.lo: \
+ pei-sh.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/mipspe.h \
$(INCDIR)/coff/pe.h \
+ $(INCDIR)/coff/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ coff-sh.c \
coffcode.h \
libcoff.h \
libpei.h \
- pe-mips.c \
peicode.h
plugin.lo: \
plugin.c \
- $(INCDIR)/plugin-api.h \
$(INCDIR)/filenames.h \
- plugin.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h
+ $(INCDIR)/libiberty.h \
+ $(INCDIR)/plugin-api.h \
+ plugin.h
ppcboot.lo: \
ppcboot.c \
$(INCDIR)/filenames.h \
@@ -3445,6 +3442,10 @@ riscix.lo: \
$(INCDIR)/hashtab.h \
aout-target.h \
libaout.h
+som.lo: \
+ som.c \
+ $(INCDIR)/alloca-conf.h \
+ $(INCDIR)/filenames.h
sparclinux.lo: \
sparclinux.c \
$(INCDIR)/aout/aout64.h \
@@ -3493,8 +3494,8 @@ sunos.lo: \
aout-target.h \
aoutf1.h \
libaout.h
-vaxnetbsd.lo: \
- vaxnetbsd.c \
+vax1knetbsd.lo: \
+ vax1knetbsd.c \
$(INCDIR)/aout/aout64.h \
$(INCDIR)/aout/ar.h \
$(INCDIR)/aout/stab.def \
@@ -3505,8 +3506,8 @@ vaxnetbsd.lo: \
aout-target.h \
libaout.h \
netbsd.h
-vax1knetbsd.lo: \
- vax1knetbsd.c \
+vaxbsd.lo: \
+ vaxbsd.c \
$(INCDIR)/aout/aout64.h \
$(INCDIR)/aout/ar.h \
$(INCDIR)/aout/stab.def \
@@ -3515,10 +3516,9 @@ vax1knetbsd.lo: \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
aout-target.h \
- libaout.h \
- netbsd.h
-vaxbsd.lo: \
- vaxbsd.c \
+ libaout.h
+vaxnetbsd.lo: \
+ vaxnetbsd.c \
$(INCDIR)/aout/aout64.h \
$(INCDIR)/aout/ar.h \
$(INCDIR)/aout/stab.def \
@@ -3527,18 +3527,13 @@ vaxbsd.lo: \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
aout-target.h \
- libaout.h
+ libaout.h \
+ netbsd.h
versados.lo: \
versados.c \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/libiberty.h
-vms.lo: \
- vms.c \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- vms.h
vms-gsd.lo: \
vms-gsd.c \
$(INCDIR)/bfdlink.h \
@@ -3565,6 +3560,12 @@ vms-tir.lo: \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
vms.h
+vms.lo: \
+ vms.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ vms.h
vmsutil.lo: \
vmsutil.c \
vmsutil.h
@@ -3624,6 +3625,19 @@ coff-alpha.lo: \
ecoffswap.h \
libcoff.h \
libecoff.h
+coff-x86_64.lo: \
+ coff-x86_64.c \
+ $(INCDIR)/bfdlink.h \
+ $(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/internal.h \
+ $(INCDIR)/coff/pe.h \
+ $(INCDIR)/coff/x86_64.h \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h \
+ $(INCDIR)/libiberty.h \
+ coffcode.h \
+ coffswap.h \
+ libcoff.h
coff64-rs6000.lo: \
coff64-rs6000.c \
$(INCDIR)/bfdlink.h \
@@ -3649,33 +3663,33 @@ demo64.lo: \
aout-target.h \
aoutf1.h \
libaout.h
-pei-ia64.lo: \
- pei-ia64.c \
+elf32-score.lo: \
+ elf32-score.c \
$(INCDIR)/bfdlink.h \
- $(INCDIR)/coff/external.h \
- $(INCDIR)/coff/ia64.h \
- $(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/pe.h \
+ $(INCDIR)/elf/common.h \
+ $(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/reloc-macros.h \
+ $(INCDIR)/elf/score.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- coff-ia64.c \
- coffcode.h \
- libcoff.h \
- libpei.h \
- peicode.h
-elf64-x86-64.lo: \
- elf64-x86-64.c \
+ $(INCDIR)/libiberty.h \
+ elf-bfd.h \
+ elf32-score.h \
+ elf32-target.h
+elf32-score7.lo: \
+ elf32-score7.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/x86-64.h \
+ $(INCDIR)/elf/score.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- bfd_stdint.h \
+ $(INCDIR)/libiberty.h \
elf-bfd.h \
- elf64-target.h
+ elf32-score.h
elf64-alpha.lo: \
elf64-alpha.c \
$(INCDIR)/aout/ar.h \
@@ -3697,22 +3711,6 @@ elf64-alpha.lo: \
elf64-target.h \
libcoff.h \
libecoff.h
-elf64-hppa.lo: \
- elf64-hppa.c \
- $(INCDIR)/alloca-conf.h \
- $(INCDIR)/bfdlink.h \
- $(INCDIR)/elf/common.h \
- $(INCDIR)/elf/external.h \
- $(INCDIR)/elf/hppa.h \
- $(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h \
- elf-bfd.h \
- elf-hppa.h \
- elf64-hppa.h \
- elf64-target.h \
- libhppa.h
elf64-gen.lo: \
elf64-gen.c \
$(INCDIR)/bfdlink.h \
@@ -3723,27 +3721,22 @@ elf64-gen.lo: \
$(INCDIR)/hashtab.h \
elf-bfd.h \
elf64-target.h
-elfn32-mips.lo: \
- elfn32-mips.c \
+elf64-hppa.lo: \
+ elf64-hppa.c \
+ $(INCDIR)/alloca-conf.h \
$(INCDIR)/bfdlink.h \
- $(INCDIR)/coff/ecoff.h \
- $(INCDIR)/coff/external.h \
- $(INCDIR)/coff/internal.h \
- $(INCDIR)/coff/mips.h \
- $(INCDIR)/coff/sym.h \
- $(INCDIR)/coff/symconst.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
+ $(INCDIR)/elf/hppa.h \
$(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/mips.h \
$(INCDIR)/elf/reloc-macros.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- ecoffswap.h \
elf-bfd.h \
- elf32-target.h \
- elfxx-mips.h \
- genlink.h
+ elf-hppa.h \
+ elf64-hppa.h \
+ elf64-target.h \
+ libhppa.h
elf64-mips.lo: \
elf64-mips.c \
$(INCDIR)/aout/ar.h \
@@ -3803,71 +3796,78 @@ elf64-s390.lo: \
$(INCDIR)/hashtab.h \
elf-bfd.h \
elf64-target.h
-elf32-score.lo: \
- elf32-score.c \
+elf64-sh64.lo: \
+ elf64-sh64.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/score.h \
+ $(INCDIR)/elf/sh.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
elf-bfd.h \
- elf32-score.h \
- elf32-target.h
-elf32-score7.lo: \
- elf32-score7.c \
+ elf64-target.h
+elf64-sparc.lo: \
+ elf64-sparc.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/score.h \
+ $(INCDIR)/elf/sparc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
+ $(INCDIR)/opcode/sparc.h \
elf-bfd.h \
- elf32-score.h
-elf64-sh64.lo: \
- elf64-sh64.c \
+ elf64-target.h \
+ elfxx-sparc.h
+elf64-x86-64.lo: \
+ elf64-x86-64.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
$(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/sh.h \
+ $(INCDIR)/elf/x86-64.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
+ bfd_stdint.h \
elf-bfd.h \
elf64-target.h
-elf64-sparc.lo: \
- elf64-sparc.c \
+elf64.lo: \
+ elf64.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
- $(INCDIR)/elf/reloc-macros.h \
- $(INCDIR)/elf/sparc.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/opcode/sparc.h \
+ $(INCDIR)/libiberty.h \
elf-bfd.h \
- elf64-target.h \
- elfxx-sparc.h
-elf64.lo: \
- elf64.c \
+ elfcode.h \
+ elfcore.h
+elfn32-mips.lo: \
+ elfn32-mips.c \
$(INCDIR)/bfdlink.h \
+ $(INCDIR)/coff/ecoff.h \
+ $(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/internal.h \
+ $(INCDIR)/coff/mips.h \
+ $(INCDIR)/coff/sym.h \
+ $(INCDIR)/coff/symconst.h \
$(INCDIR)/elf/common.h \
$(INCDIR)/elf/external.h \
$(INCDIR)/elf/internal.h \
+ $(INCDIR)/elf/mips.h \
+ $(INCDIR)/elf/reloc-macros.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
+ ecoffswap.h \
elf-bfd.h \
- elfcode.h \
- elfcore.h
+ elf32-target.h \
+ elfxx-mips.h \
+ genlink.h
mmo.lo: \
mmo.c \
$(INCDIR)/elf/mmix.h \
@@ -3896,8 +3896,8 @@ nlm64.lo: \
$(INCDIR)/nlm/internal.h \
libnlm.h \
nlmcode.h
-coff-x86_64.lo: \
- coff-x86_64.c \
+pe-x86_64.lo: \
+ pe-x86_64.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
$(INCDIR)/coff/internal.h \
@@ -3906,20 +3906,21 @@ coff-x86_64.lo: \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
$(INCDIR)/libiberty.h \
+ coff-x86_64.c \
coffcode.h \
- coffswap.h \
- libcoff.h
-pe-x86_64.lo: \
- pe-x86_64.c \
+ libcoff.h \
+ libpei.h \
+ peicode.h
+pei-ia64.lo: \
+ pei-ia64.c \
$(INCDIR)/bfdlink.h \
$(INCDIR)/coff/external.h \
+ $(INCDIR)/coff/ia64.h \
$(INCDIR)/coff/internal.h \
$(INCDIR)/coff/pe.h \
- $(INCDIR)/coff/x86_64.h \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
- $(INCDIR)/libiberty.h \
- coff-x86_64.c \
+ coff-ia64.c \
coffcode.h \
libcoff.h \
libpei.h \
@@ -3948,6 +3949,10 @@ aix386-core.lo: \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
libcoff.h
+cisco-core.lo: \
+ cisco-core.c \
+ $(INCDIR)/filenames.h \
+ $(INCDIR)/hashtab.h
hpux-core.lo: \
hpux-core.c \
$(INCDIR)/filenames.h \
@@ -3976,10 +3981,6 @@ trad-core.lo: \
$(INCDIR)/filenames.h \
$(INCDIR)/hashtab.h \
libaout.h
-cisco-core.lo: \
- cisco-core.c \
- $(INCDIR)/filenames.h \
- $(INCDIR)/hashtab.h
elf32-ia64.lo: \
elf32-ia64.c \
$(INCDIR)/bfdlink.h \
Index: binutils/dep-in.sed
===================================================================
RCS file: /cvs/src/src/binutils/dep-in.sed,v
retrieving revision 1.5
diff -u -p -r1.5 dep-in.sed
--- binutils/dep-in.sed 26 May 2009 03:19:38 -0000 1.5
+++ binutils/dep-in.sed 4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
s/ *$//
s/ */ /g
s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
$s/$/ \\/
Index: binutils/Makefile.am
===================================================================
RCS file: /cvs/src/src/binutils/Makefile.am,v
retrieving revision 1.108
diff -u -p -r1.108 Makefile.am
--- binutils/Makefile.am 26 May 2009 03:19:38 -0000 1.108
+++ binutils/Makefile.am 4 Jun 2009 05:45:21 -0000
@@ -411,7 +411,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
for f in $?; do \
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
- sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
done
rm -f DEPA
@@ -496,6 +497,7 @@ addr2line.o: \
ar.o: \
ar.c \
$(BFDDIR)/libbfd.h \
+ $(BFDDIR)/plugin.h \
$(INCDIR)/alloca-conf.h \
$(INCDIR)/ansidecl.h \
$(INCDIR)/aout/ar.h \
@@ -764,6 +766,7 @@ nlmconv.o: \
nm.o: \
nm.c \
$(BFDDIR)/elf-bfd.h \
+ $(BFDDIR)/plugin.h \
$(INCDIR)/alloca-conf.h \
$(INCDIR)/ansidecl.h \
$(INCDIR)/aout/ranlib.h \
Index: gas/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gas/dep-in.sed,v
retrieving revision 1.12
diff -u -p -r1.12 dep-in.sed
--- gas/dep-in.sed 26 May 2009 03:19:49 -0000 1.12
+++ gas/dep-in.sed 4 Jun 2009 05:45:43 -0000
@@ -47,5 +47,6 @@ s! write\.h!!g
s/ *$//
s/ */ /g
s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
$s/$/ \\/
Index: gas/Makefile.am
===================================================================
RCS file: /cvs/src/src/gas/Makefile.am,v
retrieving revision 1.170
diff -u -p -r1.170 Makefile.am
--- gas/Makefile.am 26 May 2009 03:19:49 -0000 1.170
+++ gas/Makefile.am 4 Jun 2009 05:45:21 -0000
@@ -922,7 +922,8 @@ DEP1: $(CFILES) $(MULTI_CFILES)
for f in $?; do \
$(MKDEP) $(DEP_FLAGS) $$f > DEP; \
sed -n -e '1s/: .*/: \\/p' -e q < DEP >> DEP2; \
- sed -e '1s/.*://' -f ../dep.sed < DEP | LC_ALL=C sort | uniq | \
+ sed -e '1s/.*://' -f ../dep.sed < DEP | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
done
mv -f DEPDIR/DEP2 $@
@@ -952,7 +953,7 @@ DEPTC: $(TARGET_CPU_CFILES)
echo "DEPTC_$${c}_$${o} = \\" >> ../DEPTCA; \
$(MKDEP) $(DEP_FLAGS) dumtc.c | \
sed -e '1s/dumtc.o: //' -f ../dep.sed | \
- LC_ALL=C sort | uniq | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e '/^A/d' -e 's/^B/ /' -e '$$s/ \\$$//' >> ../DEPTCA; \
rm -f dumtc.c; \
else true; fi; \
@@ -993,7 +994,7 @@ DEPOBJ: $(OBJ_FORMAT_CFILES)
echo "DEPOBJ_$${c}_$${o} = \\" >> ../DEPOBJA; \
$(MKDEP) $(DEP_FLAGS) dumobj.c | \
sed -e "s/dumobj.o: //" -f ../dep.sed | \
- LC_ALL=C sort | uniq | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e '/^A/d' -e 's/^B/ /' -e '$$s/ \\$$//' >> ../DEPOBJA; \
rm -f dumobj.c; \
else true; fi; \
@@ -1031,7 +1032,7 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_
echo "DEP_$${c}_$${o} = \\" >> ../DEP2A; \
$(MKDEP) $(DEP_FLAGS) dummy.c | \
sed -e "s/dummy.o: //" -f ../dep.sed | \
- LC_ALL=C sort | uniq | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e '/^A/d' -e 's/^B/ /' -e '$$s/ \\$$//' >> ../DEP2A; \
else true; fi; \
done; \
Index: gprof/dep-in.sed
===================================================================
RCS file: /cvs/src/src/gprof/dep-in.sed,v
retrieving revision 1.4
diff -u -p -r1.4 dep-in.sed
--- gprof/dep-in.sed 26 May 2009 03:20:00 -0000 1.4
+++ gprof/dep-in.sed 4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
s/ *$//
s/ */ /g
s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
$s/$/ \\/
Index: gprof/Makefile.am
===================================================================
RCS file: /cvs/src/src/gprof/Makefile.am,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile.am
--- gprof/Makefile.am 26 May 2009 03:20:00 -0000 1.47
+++ gprof/Makefile.am 4 Jun 2009 05:45:22 -0000
@@ -194,7 +194,8 @@ DEP1: $(gprof_SOURCES)
for f in $?; do \
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
- sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
done
rm -f DEPA
Index: ld/dep-in.sed
===================================================================
RCS file: /cvs/src/src/ld/dep-in.sed,v
retrieving revision 1.6
diff -u -p -r1.6 dep-in.sed
--- ld/dep-in.sed 26 May 2009 03:20:10 -0000 1.6
+++ ld/dep-in.sed 4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
s/ *$//
s/ */ /g
s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
$s/$/ \\/
Index: ld/Makefile.am
===================================================================
RCS file: /cvs/src/src/ld/Makefile.am,v
retrieving revision 1.265
diff -u -p -r1.265 Makefile.am
--- ld/Makefile.am 26 May 2009 03:20:10 -0000 1.265
+++ ld/Makefile.am 4 Jun 2009 05:45:23 -0000
@@ -2022,7 +2022,8 @@ DEP1: $(CFILES) $(GENERATED_CFILES)
for f in $?; do \
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
sed -n -e '1s/: .*/: \\/p' -e q < DEPA >> DEP2; \
- sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
done
rm -f DEPA
Index: opcodes/dep-in.sed
===================================================================
RCS file: /cvs/src/src/opcodes/dep-in.sed,v
retrieving revision 1.5
diff -u -p -r1.5 dep-in.sed
--- opcodes/dep-in.sed 26 May 2009 03:19:28 -0000 1.5
+++ opcodes/dep-in.sed 4 Jun 2009 05:45:43 -0000
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
s/ *$//
s/ */ /g
s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
$s/$/ \\/
Index: opcodes/Makefile.am
===================================================================
RCS file: /cvs/src/src/opcodes/Makefile.am,v
retrieving revision 1.138
diff -u -p -r1.138 Makefile.am
--- opcodes/Makefile.am 26 May 2009 03:19:28 -0000 1.138
+++ opcodes/Makefile.am 4 Jun 2009 05:45:23 -0000
@@ -654,7 +654,8 @@ DEP1: $(CFILES)
for f in $?; do \
$(MKDEP) $(INCLUDES) $(CFLAGS) $$f > DEPA; \
sed -n -e '1s/\.o: .*/.lo: \\/p' -e q < DEPA >> DEP2; \
- sed -e '1s/.*: //' -f dep.sed < DEPA | LC_ALL=C sort | uniq | \
+ sed -e '1s/.*: //' -f dep.sed < DEPA | \
+ LC_ALL=C sort | LC_ALL=C uniq | \
sed -e 's/^[AB]/ /' -e '$$s/ \\$$//' >> DEP2; \
done
rm -f DEPA
--
Alan Modra
Australia Development Lab, IBM
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-06-04 6:58 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-05-26 3:38 makefile dependency revamp Alan Modra
2009-06-03 18:39 ` Ralf Wildenhues
2009-06-03 20:31 ` Ian Lance Taylor
2009-06-04 5:58 ` Ralf Wildenhues
2009-06-04 6:58 ` Alan Modra
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).