* 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/gprof/ChangeLog b/gprof/ChangeLog
index 0b7e5db0b98622133da49f570417b3426b75cca0..56c478a30fe60522ee1990f1b7d2efad678fbe31 100644 (file)
--- a/gprof/ChangeLog
+++ b/gprof/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-05-26  Nick Clifton  <nickc@redhat.com>
 
        * po/id.po: Updated Indonesian translation.

diff --git a/gprof/Makefile.am b/gprof/Makefile.am
index a2a42177a2779263b4b90bd953a0132c9d01129f..12d794beedb9cd31e8e4828fd18d603cdbb5319a 100644 (file)
--- a/gprof/Makefile.am
+++ b/gprof/Makefile.am
@@ -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

diff --git a/gprof/Makefile.in b/gprof/Makefile.in
index a9dc9201e4aad167941b62a2dfd1445a50146489..e711f533673f2a7625d421c65540735fc8db9e41 100644 (file)
--- a/gprof/Makefile.in
+++ b/gprof/Makefile.in
@@ -966,7 +966,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

diff --git a/gprof/dep-in.sed b/gprof/dep-in.sed
index 04612289e00a710372849daf7f96115eb36d3058..4823f1e3829cfd61978278d4b9e1644878e50faf 100644 (file)
--- a/gprof/dep-in.sed
+++ b/gprof/dep-in.sed
@@ -15,5 +15,6 @@ s! \.\./intl/libintl\.h!!g
 s/ *$//
 s/  */ /g
 s/^ */A/
-s/ / \\\nB/g
+s/ / \\\
+B/g
 $s/$/ \\/

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 306ed8fc4fa03cc8baeb1c77d66a226fc391c4bb..062a0bc01afa1ec3747c54f3a1d3c0a3f4377122 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 7cf1b36dcb77798b02fda51e118770005d75e552..d9045deb496cef7653a441dca05fc53a915438e5 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 3121f341be0fe3c68eeb7378a4de1e9b7da73e3b..aece97b21a9ac862727cfd8ad5e9df5ee5d7ae74 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 e51593b19257385b0c8d6bc43141ea2502ae78b7..4f77b5de5721f0329a13fce0e9bb277cad4e87f0 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/$/ \\/

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 21eff9e0ff657653d4975187bc35a6d3c5c26e88..7b8e100d5f5d7187b1bd1956c30766824b343d5e 100644 (file)
--- a/opcodes/ChangeLog
+++ b/opcodes/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-02  Nick Clifton  <nickc@redhat.com>
 
        * po/nl.po: Updated Dutch translation.

diff --git a/opcodes/Makefile.am b/opcodes/Makefile.am
index 665bdd411a5f3c8188261f5b1ebf82acb742f22e..d2a76c7736f7084f5c499317ef57fd4d6d000fde 100644 (file)
--- a/opcodes/Makefile.am
+++ b/opcodes/Makefile.am
@@ -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

diff --git a/opcodes/Makefile.in b/opcodes/Makefile.in
index b1eb9d421dbe841c17c839936ae2595992455edf..9dc3c55c2390fff7aeb062c59b6df80af5030127 100644 (file)
--- a/opcodes/Makefile.in
+++ b/opcodes/Makefile.in
@@ -1219,7 +1219,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

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