diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | scripts/abilist.awk | 14 |
2 files changed, 10 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index c4dae980a2..b5ed08254c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-11-26 Carlos O'Donell <carlos@redhat.com> + + * scripts/abilist.awk: Handle .tdata. Error for unknown combinations. + Error for unknown lines. + 2018-11-26 Joseph Myers <joseph@codesourcery.com> * scripts/build-many-glibcs.py (Context.fix_glibc_timestamps): diff --git a/scripts/abilist.awk b/scripts/abilist.awk index bad7c3807e..b40be91f82 100644 --- a/scripts/abilist.awk +++ b/scripts/abilist.awk @@ -39,7 +39,6 @@ $2 == "l" { next } # If the target uses ST_OTHER, it will be output before the symbol name. $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) { - weak = $2; type = $3; size = $5; sub(/^0*/, "", size); @@ -55,7 +54,7 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) { if (version == "GLIBC_PRIVATE") next; desc = ""; - if (type == "D" && $4 == ".tbss") { + if (type == "D" && ($4 == ".tbss" || $4 == ".tdata")) { type = "T"; } else if (type == "D" && $4 == ".opd") { @@ -90,14 +89,10 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) { size = ""; } else { - desc = symbol " " version " " weak " ? " type " " $4 " " $5; - } - if (size == " 0x") { - desc = symbol " " version " " weak " ? " type " " $4 " " $5; + print "ERROR: Unable to handle this type of symbol." + exit 1 } - # Disabled -- weakness should not matter to shared library ABIs any more. - #if (weak == "w") type = tolower(type); if (desc == "") desc = symbol " " type size; @@ -113,7 +108,8 @@ $2 == "g" || $2 == "w" && (NF == 7 || NF == 8) { NF == 0 || /DYNAMIC SYMBOL TABLE/ || /file format/ { next } { - print "Don't grok this line:", $0 + print "ERROR: Unable to interpret this line:", $0 + exit 1 } function emit(end) { |