diff options
| -rw-r--r-- | gprof/ChangeLog | 6 | ||||
| -rw-r--r-- | gprof/Makefile.am | 3 | ||||
| -rw-r--r-- | gprof/Makefile.in | 3 | ||||
| -rw-r--r-- | gprof/dep-in.sed | 3 | ||||
| -rw-r--r-- | ld/ChangeLog | 6 | ||||
| -rw-r--r-- | ld/Makefile.am | 3 | ||||
| -rw-r--r-- | ld/Makefile.in | 3 | ||||
| -rw-r--r-- | ld/dep-in.sed | 3 | ||||
| -rw-r--r-- | opcodes/ChangeLog | 6 | ||||
| -rw-r--r-- | opcodes/Makefile.am | 3 | ||||
| -rw-r--r-- | opcodes/Makefile.in | 3 | ||||
| -rw-r--r-- | opcodes/dep-in.sed | 3 |
12 files changed, 36 insertions, 9 deletions
diff --git a/gprof/ChangeLog b/gprof/ChangeLog index 0b7e5db0b98..56c478a30fe 100644 --- 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 a2a42177a27..12d794beedb 100644 --- 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 a9dc9201e4a..e711f533673 100644 --- 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 04612289e00..4823f1e3829 100644 --- 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 306ed8fc4fa..062a0bc01af 100644 --- 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 7cf1b36dcb7..d9045deb496 100644 --- 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 3121f341be0..aece97b21a9 100644 --- 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 e51593b1925..4f77b5de572 100644 --- 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 21eff9e0ff6..7b8e100d5f5 100644 --- 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 665bdd411a5..d2a76c7736f 100644 --- 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 b1eb9d421db..9dc3c55c239 100644 --- 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 df8bc1eec11..56403a97810 100644 --- 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/$/ \\/ |