This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

GNU C Library master sources branch master updated. glibc-2.16-ports-merge-447-g72bd208


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  72bd208846535725ea28b8173e79ef60e57a968c (commit)
       via  55f115345ab8b9e0f149d07ee0f825cfb47c0a41 (commit)
      from  1ab2935061bc800f008aba6c423ab9fe69c4cac0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=72bd208846535725ea28b8173e79ef60e57a968c

commit 72bd208846535725ea28b8173e79ef60e57a968c
Author: Jonathan Nieder <jrnieder@gmail.com>
Date:   Mon Oct 8 14:04:23 2012 -0700

    nptl_db/Makefile: force C locale when running readelf
    
    db-symbols.awk relies on English-language readelf output to find the
    beginning of the symbol table, 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/libthread_db.abilist [...]/nptl_db/libthread_db.symlist
    | readelf -W -s [...]/nptl/libpthread.so | gawk -f [...]/nptl_db/db-symbols.v.i > [...]/nptl_db/db-symbols.out
    | make[2]: *** [[...]/nptl_db/db-symbols.out] Erreur 1

diff --git a/nptl_db/ChangeLog b/nptl_db/ChangeLog
index fe1778e..4175149 100644
--- a/nptl_db/ChangeLog
+++ b/nptl_db/ChangeLog
@@ -1,3 +1,9 @@
+2012-10-08  Jonathan Nieder  <jrnieder@gmail.com>
+
+	[BZ #14661]
+	* Makefile ($(objpfx)db-symbols.out): Force C locale when running
+	readelf -s.
+
 2012-03-07  Ulrich Drepper  <drepper@gmail.com>
 
 	* Makefile (distribute): Remove variable.
diff --git a/nptl_db/Makefile b/nptl_db/Makefile
index d15fb9e..6ccb3d0 100644
--- a/nptl_db/Makefile
+++ b/nptl_db/Makefile
@@ -60,6 +60,6 @@ $(objpfx)libthread_db.so: $(common-objpfx)libc.so \
 tests: $(objpfx)db-symbols.out
 $(objpfx)db-symbols.out: $(objpfx)db-symbols.v.i \
 			 $(common-objpfx)nptl/libpthread.so
-	readelf -W -s $(filter %.so,$^) | $(AWK) -f $< > $@
+	LC_ALL=C readelf -W -s $(filter %.so,$^) | $(AWK) -f $< > $@
 
 $(objpfx)db-symbols.v.i: db-symbols.awk

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=55f115345ab8b9e0f149d07ee0f825cfb47c0a41

commit 55f115345ab8b9e0f149d07ee0f825cfb47c0a41
Author: Jonathan Nieder <jrnieder@gmail.com>
Date:   Mon Oct 8 14:04:15 2012 -0700

    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

diff --git a/ChangeLog b/ChangeLog
index 7d00f66..ff1583e 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 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)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog         |    6 ++++++
 Makerules         |    2 +-
 nptl_db/ChangeLog |    6 ++++++
 nptl_db/Makefile  |    2 +-
 4 files changed, 14 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]