Skip to content

Commit

Permalink
Fix linknamespace test handling of architecture-specific st_other.
Browse files Browse the repository at this point in the history
For mips16, some of the linknamespace tests were failing because
[MIPS16] annotations in readelf output were wrongly interpreted as
falling in the symbol index field, meaning symbol index values were
wrongly interpreted as symbol names and such names as 1 and 2 then
resulted in namespace test failures.

This patch fixes this by removing the annotations for such
architecture-specific st_other bits before splitting the readelf
output into fields.  Tested for x86_64 and mips16.

	* conform/linknamespace.pl (list_syms): Remove \[.*?\] before
	splitting into fields.
  • Loading branch information
Joseph Myers committed May 12, 2015
1 parent f13c2a8 commit 8e65ea4
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2015-05-12 Joseph Myers <joseph@codesourcery.com>

* conform/linknamespace.pl (list_syms): Remove \[.*?\] before
splitting into fields.

2015-05-12 Leonhard Holz <leonhard.holz@web.de>

* locale/categories.def: Define _NL_COLLATE_ENCODING_TYPE.
Expand Down
3 changes: 3 additions & 0 deletions conform/linknamespace.pl
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ sub list_syms {
next;
}
s/^\s*//;
# Architecture-specific st_other bits appear inside [] and disrupt
# the format of readelf output.
s/\[.*?\]//;
my (@fields) = split (/\s+/, $_);
if (@fields < 8) {
next;
Expand Down

0 comments on commit 8e65ea4

Please sign in to comment.