diff options
| author | Alan Modra <amodra@gmail.com> | 2009-06-04 06:57:56 +0000 |
|---|---|---|
| committer | Alan Modra <amodra@gmail.com> | 2009-06-04 06:57:56 +0000 |
| commit | 67a648f17aaf9902891ec61c8025b98612dbbab4 (patch) | |
| tree | 881d0c8205eb31c8a802629f459b397a9cabd4a2 /ld | |
| parent | 26d1917c555cb057baa061fa476ec0e5c0965280 (diff) | |
| download | binutils-67a648f17aaf9902891ec61c8025b98612dbbab4.tar.gz binutils-67a648f17aaf9902891ec61c8025b98612dbbab4.tar.bz2 binutils-67a648f17aaf9902891ec61c8025b98612dbbab4.zip | |
* dep-in.sed: Don't use \n in replacement part of s command.
* Makefile.am (DEP1): LC_ALL for uniq.
* Makefile.in: Regenerate.
Diffstat (limited to 'ld')
| -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 |
4 files changed, 12 insertions, 3 deletions
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/$/ \\/ |