diff options
| -rw-r--r-- | gas/ChangeLog | 6 | ||||
| -rw-r--r-- | gas/Makefile.am | 9 | ||||
| -rw-r--r-- | gas/Makefile.in | 9 | ||||
| -rw-r--r-- | gas/dep-in.sed | 3 |
4 files changed, 18 insertions, 9 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog index 13750e0..0678a3b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2009-06-04 Alan Modra <amodra@bigpond.net.au> + + * 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. + 2009-06-01 H.J. Lu <hongjiu.lu@intel.com> PR gas/10198 diff --git a/gas/Makefile.am b/gas/Makefile.am index e12012a..0b66f41 100644 --- a/gas/Makefile.am +++ b/gas/Makefile.am @@ -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_HFILES) 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; \ diff --git a/gas/Makefile.in b/gas/Makefile.in index 6108364..db5ab0d 100644 --- a/gas/Makefile.in +++ b/gas/Makefile.in @@ -4979,7 +4979,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 $@ @@ -5009,7 +5010,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; \ @@ -5050,7 +5051,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; \ @@ -5088,7 +5089,7 @@ DEP2: $(TARGET_CPU_HFILES) $(OBJ_FORMAT_HFILES) 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; \ diff --git a/gas/dep-in.sed b/gas/dep-in.sed index b5c0bd0..6959140 100644 --- a/gas/dep-in.sed +++ b/gas/dep-in.sed @@ -47,5 +47,6 @@ s! write\.h!!g s/ *$// s/ */ /g s/^ */A/ -s/ / \\\nB/g +s/ / \\\ +B/g $s/$/ \\/ |