From 7bc5a74162d044cc227b38ebf24e2d1d4594ecb8 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Wed, 19 Mar 2014 15:30:18 -0500 Subject: [PATCH] Fix localplt check for GNU_IFUNC GNU_IFUNC are shown by readelf in 'Relocation section' value as "symbol()" instead of expected hexadecimal value. This causes the check-localplt script to ignore potential PLT stub begin generated by wrong IFUNC usage. This patch changes the localplt script to emit such PLT cases. --- ChangeLog | 5 +++++ scripts/localplt.awk | 10 ++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e828cc28a5..a4aab107c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-03-25 Adhemerval Zanella + + * scripts/localplt.awk: Check for PLT generated by internal IFUNC + calls. + 2014-03-25 Adhemerval Zanella * nptl/sysdeps/unix/sysv/linux/powerpc/bits/pthreadtypes.h: Revert diff --git a/scripts/localplt.awk b/scripts/localplt.awk index 2265b026f0..f55c41a037 100644 --- a/scripts/localplt.awk +++ b/scripts/localplt.awk @@ -32,9 +32,15 @@ $1 == "Offset" && $2 == "Info" { in_relocs = 1; next } NF == 0 { in_relocs = 0 } in_relocs && relocs_offset == jmprel_offset && NF >= 5 { - symval = strtonum("0x" $4); - if (symval != 0) + # Relocations against GNU_IFUNC symbols are not shown as an hexadecimal + # value, but rather as the resolver symbol followed by (). + if ($4 ~ /\(\)/) { print whatfile, $5 + } else { + symval = strtonum("0x" $4); + if (symval != 0) + print whatfile, $5 + } } in_relocs { next }