about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2012-10-08 14:04:15 -0700
committerJonathan Nieder <jrnieder@gmail.com>2012-10-08 14:04:15 -0700
commit55f115345ab8b9e0f149d07ee0f825cfb47c0a41 (patch)
tree7d486d134aaad3a664866153849f60d242d00117
parent1ab2935061bc800f008aba6c423ab9fe69c4cac0 (diff)
downloadglibc-55f115345ab8b9e0f149d07ee0f825cfb47c0a41.tar.gz
glibc-55f115345ab8b9e0f149d07ee0f825cfb47c0a41.tar.xz
glibc-55f115345ab8b9e0f149d07ee0f825cfb47c0a41.zip
Makerules (check-abi-%): force C locale when running objdump
abilist.awk relies on English-language output to find the "file
format" header line in "objdump --dynamic-syms" output, so force the
locale.

Without this change, "make check" fails in non-English locales:

| diff -p -U 0 ../sysdeps/unix/sysv/linux/x86_64/64/nptl/libBrokenLocale.abilist [...]/locale/libBrokenLocale.symlist
| --- ../sysdeps/unix/sysv/linux/x86_64/64/nptl/libBrokenLocale.abilist   2012-10-02 18:33:50.761863147 -0700
| +++ [...]/locale/libBrokenLocale.symlist    2012-10-03 00:11:22.877234252 -0700
| @@ -0,0 +1 @@
| +Don't grok this line: [...]/locale/libBrokenLocale.so:     format de fichier elf64-x86-64
| make[2]: *** [check-abi-libBrokenLocale] Erreur 1
-rw-r--r--ChangeLog6
-rw-r--r--Makerules2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7d00f662ea..ff1583e79a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-08  Jonathan Nieder  <jrnieder@gmail.com>
+
+	[BZ #14660]
+	* Makerules (%.dynsym): Force C locale when running
+	$(OBJDUMP) --dynamic-syms.
+
 2012-10-08  Andreas Schwab  <schwab@linux-m68k.org>
 
 	* sysdeps/unix/sysv/linux/powerpc/get_timebase_freq.c: Include
diff --git a/Makerules b/Makerules
index 1281b9446a..ebb9895039 100644
--- a/Makerules
+++ b/Makerules
@@ -1149,7 +1149,7 @@ ifeq ($(versioning),yes)
 	mv -f $@T $@
 
 %.dynsym: %.so
-	$(OBJDUMP) --dynamic-syms $< > $@T
+	LC_ALL=C $(OBJDUMP) --dynamic-syms $< > $@T
 	mv -f $@T $@
 
 vpath %.abilist $(+sysdep_dirs)