From 55f115345ab8b9e0f149d07ee0f825cfb47c0a41 Mon Sep 17 00:00:00 2001 From: Jonathan Nieder Date: Mon, 8 Oct 2012 14:04:15 -0700 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ Makerules | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 7d00f66..ff1583e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-10-08 Jonathan Nieder + + [BZ #14660] + * Makerules (%.dynsym): Force C locale when running + $(OBJDUMP) --dynamic-syms. + 2012-10-08 Andreas Schwab * sysdeps/unix/sysv/linux/powerpc/get_timebase_freq.c: Include diff --git a/Makerules b/Makerules index 1281b94..ebb9895 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) -- 2.7.4