* dep-in.sed: Don't use \n in replacement part of s command.

	* Makefile.am (DEP1): LC_ALL for uniq.
	* Makefile.in: Regenerate.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 306ed8f..062a0bc 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/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): LC_ALL for uniq.
+       * Makefile.in: Regenerate.
+
 2009-06-01  H.J. Lu  <hongjiu.lu@intel.com>
 
        * scripttempl/elf.sc (PLT): Add "*(.iplt)".

diff --git a/ld/Makefile.am b/ld/Makefile.am
index 7cf1b36..d9045de 100644 (file)
--- a/ld/Makefile.am
+++ b/ld/Makefile.am
@@ -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

diff --git a/ld/Makefile.in b/ld/Makefile.in
index 3121f34..aece97b 100644 (file)
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -2827,7 +2827,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

diff --git a/ld/dep-in.sed b/ld/dep-in.sed
index e51593b..4f77b5d 100644 (file)
--- a/ld/dep-in.sed
+++ b/ld/dep-in.sed
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/