From 782400c48d27746425ecdeb71025e70137a9281a Mon Sep 17 00:00:00 2001 From: amodra Date: Thu, 4 Jun 2009 06:57:56 +0000 Subject: [PATCH] * dep-in.sed: Don't use \n in replacement part of s command. * Makefile.am (DEP1): LC_ALL for uniq. * Makefile.in: Regenerate. --- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 3 ++- ld/Makefile.in | 3 ++- ld/dep-in.sed | 3 ++- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index 306ed8fc4f..062a0bc01a 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2009-06-04 Alan Modra + + * 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 * scripttempl/elf.sc (PLT): Add "*(.iplt)". diff --git a/ld/Makefile.am b/ld/Makefile.am index 7cf1b36dcb..d9045deb49 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 3121f341be..aece97b21a 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 e51593b192..4f77b5de57 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/$/ \\/ -- 2.11.0