aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2012-05-03 09:52:29 -0700
committerRoland McGrath <roland@hack.frob.com>2012-05-03 09:52:47 -0700
commitd3dfcc4187a4e790d72ede37f8241a25adeb2483 (patch)
tree04c8e489ff1ea872618f27b42eb4dd07e1774004
parent0c51e5500a96fdee2d7222bf0939be6b81322ec1 (diff)
downloadglibc-d3dfcc4187a4e790d72ede37f8241a25adeb2483.tar
glibc-d3dfcc4187a4e790d72ede37f8241a25adeb2483.tar.gz
glibc-d3dfcc4187a4e790d72ede37f8241a25adeb2483.tar.bz2
glibc-d3dfcc4187a4e790d72ede37f8241a25adeb2483.zip
Fix make clean for recent elf/Makefile changes.
-rw-r--r--ChangeLog6
-rw-r--r--elf/Makefile6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c6795cbb82..db2f8bd29c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-05-03 Roland McGrath <roland@hack.frob.com>
+
+ * elf/Makefile (common-generated): Set this instead of generated for
+ .dyn, .phdr, .jmprel files. Remove $(common-objpfx) from the
+ $(all-built-dso)-derived lists.
+
2012-05-03 Andreas Jaeger <aj@suse.de>
* sysdeps/i386/fpu/libm-test-ulps: Update.
diff --git a/elf/Makefile b/elf/Makefile
index 47729c37ff..8743ee0ceb 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -899,7 +899,7 @@ $(all-built-dso:=.dyn): %.dyn: %
LC_ALL=C $(READELF) -W -d $< > $@T
test -s $@T
mv -f $@T $@
-generated += $(all-built-dso:=.dyn)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.dyn)
$(objpfx)check-textrel.out: $(..)scripts/check-textrel.awk \
$(all-built-dso:=.dyn)
@@ -925,7 +925,7 @@ $(all-built-dso:=.phdr): %.phdr: %
LC_ALL=C $(READELF) -W -l $< > $@T
test -s $@T
mv -f $@T $@
-generated += $(all-built-dso:=.phdr)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.phdr)
$(objpfx)check-execstack.out: $(..)scripts/check-execstack.awk \
$(objpfx)execstack-default \
@@ -941,7 +941,7 @@ $(all-built-dso:=.jmprel): %.jmprel: % Makefile
LC_ALL=C $(READELF) -W -S -d -r $< > $@T
test -s $@T
mv -f $@T $@
-generated += $(all-built-dso:=.jmprel)
+common-generated += $(all-built-dso:$(common-objpfx)%=%.jmprel)
check-data := $(firstword $(wildcard \
$(foreach D,$(add-ons) scripts,\