* 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.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index 13750e00c4b81dcfef693b44f4635a9049338605..0678a3bdf06dc3f0f81611f337cc95f8143e5ffe 100644 (file)
--- 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 e12012a01e747bf466d2206c48f81b492fa91de1..0b66f41cc338786878e30f3fa3cd9800ab919fb7 100644 (file)
--- 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 610836459d882967fbbf27bfe546e0e47f3a224d..db5ab0d7620e72b83e731fe8bc86b83a64e1f7cb 100644 (file)
--- 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 b5c0bd0fc4f01d708a8225a504461547b5b5167b..69591402afedd56bc01915c55fd3c45b74a4b690 100644 (file)
--- 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/$/ \\/