SHT_GROUP sections are put in both the stripped and debug file.
Handle correcting the symbol table/name entry of the group only once.
The testfile was generated with the gcc annobin plugin.
Signed-off-by: Mark Wielaard <m...@klomp.org>
---
src/ChangeLog | 4 +++
src/unstrip.c | 6 +++-
tests/ChangeLog | 8 +++++
tests/Makefile.am | 3 +-
tests/run-annobingroup.sh | 68 ++++++++++++++++++++++++++++++++++++++
tests/testfile-annobingroup.o.bz2 | Bin 0 -> 1266 bytes
6 files changed, 87 insertions(+), 2 deletions(-)
create mode 100755 tests/run-annobingroup.sh
create mode 100644 tests/testfile-annobingroup.o.bz2
diff --git a/src/ChangeLog b/src/ChangeLog
index e0f1b51..37e7b62 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-21 Mark Wielaard <m...@klomp.org>
+
+ * unstrip.c (adjust_all_relocs): Skip SHT_GROUP sections.
+
2018-07-04 Mark Wielaard <m...@klomp.org>
* readelf.c (print_debug_addr_section): Rename index var to uidx.
diff --git a/src/unstrip.c b/src/unstrip.c
index 057efef..cb1f7dc 100644
--- a/src/unstrip.c
+++ b/src/unstrip.c
@@ -563,7 +563,11 @@ adjust_all_relocs (Elf *elf, Elf_Scn *symtab, const
GElf_Shdr *symshdr,
GElf_Shdr shdr_mem;
GElf_Shdr *shdr = gelf_getshdr (scn, &shdr_mem);
ELF_CHECK (shdr != NULL, _("cannot get section header: %s"));
- if (shdr->sh_type != SHT_NOBITS && shdr->sh_link == new_sh_link)
+ /* Don't redo SHT_GROUP, groups are in both the stripped and debug,
+ it will already have been done by adjust_relocs for the
+ stripped_symtab. */
+ if (shdr->sh_type != SHT_NOBITS && shdr->sh_type != SHT_GROUP
+ && shdr->sh_link == new_sh_link)
adjust_relocs (scn, scn, shdr, map, symshdr);
}
}
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 70cc9b6..45844b1 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,3 +1,11 @@
+2018-07-21 Mark Wielaard <m...@klomp.org>
+
+ * run-annobingroup.sh: New test.
+ * testfile-annobingroup.o.bz2: New test file.
+ * Makefile.am (TESTS): Add run-annobingroup.sh.
+ (EXTRA_DIST): Add run-annobingroup.sh and
+ testfile-annobingroup.o.bz2.
+
2018-07-19 Andreas Schwab <sch...@suse.de>
* Makefile.am (TESTS): Add run-strip-test12.sh.
diff --git a/tests/Makefile.am b/tests/Makefile.am
index e04bd7d..b7a0e17 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -87,7 +87,7 @@ TESTS = run-arextract.sh run-arsymtest.sh run-ar.sh newfile
test-nlist \
run-strip-test6.sh run-strip-test7.sh run-strip-test8.sh \
run-strip-test9.sh run-strip-test10.sh run-strip-test11.sh \
run-strip-test12.sh \
- run-strip-nothing.sh run-strip-g.sh \
+ run-strip-nothing.sh run-strip-g.sh run-annobingroup.sh \
run-strip-groups.sh run-strip-reloc.sh run-strip-strmerge.sh \
run-strip-nobitsalign.sh run-strip-remove-keep.sh \
run-unstrip-test.sh run-unstrip-test2.sh run-unstrip-test3.sh \
@@ -194,6 +194,7 @@ EXTRA_DIST = run-arextract.sh run-arsymtest.sh run-ar.sh \
run-strip-test9.sh run-strip-test10.sh run-strip-test11.sh \
run-strip-test12.sh \
run-strip-nothing.sh run-strip-remove-keep.sh run-strip-g.sh \
+ run-annobingroup.sh testfile-annobingroup.o.bz2 \
run-strip-strmerge.sh run-strip-nobitsalign.sh \
testfile-nobitsalign.bz2 testfile-nobitsalign.strip.bz2 \
run-strip-reloc.sh hello_i386.ko.bz2 hello_x86_64.ko.bz2 \
diff --git a/tests/run-annobingroup.sh b/tests/run-annobingroup.sh
new file mode 100755
index 0000000..5f08b35
--- /dev/null
+++ b/tests/run-annobingroup.sh
@@ -0,0 +1,68 @@
+#! /bin/sh
+# Copyright (C) 2018 Red Hat, Inc.
+# This file is part of elfutils.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# elfutils is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+. $srcdir/test-subr.sh
+
+# Testfile generated by annobin, creates group.
+# strip and unstrip it. Check group symbol/name is correct.
+
+# echo "int __attribute__((cold)) foo (void) { return 42; }" \
+# > testfile-annobingroup.c
+# gcc -g -O2 -fplugin=annobin -c testfile-annobingroup.c
+testfiles testfile-annobingroup.o
+
+tempfiles merged.elf stripped.elf debugfile.elf remerged.elf
+
+testrun_compare ${abs_top_builddir}/src/readelf -g testfile-annobingroup.o <<
EOF
+
+Section group [ 1] '.group' with signature '.text.unlikely.group' contains 3
entries:
+ [ 7] .gnu.build.attributes..text.unlikely
+ [ 8] .rela.gnu.build.attributes..text.unlikely
+ [ 9] .text.unlikely
+EOF
+
+testrun ${abs_top_builddir}/src/strip -o stripped.elf -f debugfile.elf
testfile-annobingroup.o
+
+testrun_compare ${abs_top_builddir}/src/readelf -g stripped.elf << EOF
+
+Section group [ 1] '.group' with signature '.text.unlikely.group' contains 3
entries:
+ [ 7] .gnu.build.attributes..text.unlikely
+ [ 8] .rela.gnu.build.attributes..text.unlikely
+ [ 9] .text.unlikely
+EOF
+
+testrun_compare ${abs_top_builddir}/src/readelf -g debugfile.elf << EOF
+
+Section group [ 1] '.group' with signature '.text.unlikely.group' contains 3
entries:
+ [ 7] .gnu.build.attributes..text.unlikely
+ [ 8] .rela.gnu.build.attributes..text.unlikely
+ [ 9] .text.unlikely
+EOF
+
+testrun ${abs_top_builddir}/src/unstrip -o remerged.elf stripped.elf
debugfile.elf
+
+testrun_compare ${abs_top_builddir}/src/readelf -g remerged.elf << EOF
+
+Section group [ 1] '.group' with signature '.text.unlikely.group' contains 3
entries:
+ [ 7] .gnu.build.attributes..text.unlikely
+ [ 8] .rela.gnu.build.attributes..text.unlikely
+ [ 9] .text.unlikely
+EOF
+
+testrun ${abs_top_builddir}/src/elfcmp testfile-annobingroup.o remerged.elf
+
+exit 0
diff --git a/tests/testfile-annobingroup.o.bz2
b/tests/testfile-annobingroup.o.bz2
new file mode 100644
index
0000000000000000000000000000000000000000..b1ca7ea18c5dc556e9418e0f07c561502c40f6d0
GIT binary patch
literal 1266
zcmV<O1P%K_T4*^jL0KkKSrAHE<p2eYfB*mg|Nigy|Nr~v(t-c)|8Up{Lc~NMK*UKv
zNJT(Ep$O0fb!?tZHBQT$9T3qbq#I18N1|wYnWWPrMt}_f00Te(00000&;ZaGAsI{v
z$>@PkQ$~g$0BAG-00T_`000dD13&<gB26Up)Ou<djF~hVXd6V(&;S550MKX+00000
z&;%F&CIARxV3+^`Fal)3GGG8kMkXTx3;+NmQd85_Ptt==)izT`fuIIW8feqe9*_VA
zhMuOG0gyBU1O|XJQ_3v5?oVTq&Z;_P#3)}P2|Rh2uC>?Rv<4+ng^P2Ag}5MMk&hNC
zHw{pW8>!W&nt<Rwf~t!;U37?XSyk>vTc8Dy<uI!Ty2u8w_seD((eJ#x5kRDqiE*iq
z6pR?~O=(u-lr;CYxw+YN+~Hz#rCHXCmN!hIG~`jEgxJ{Ol`L3W%dQ<4+Kem<dt&YZ
znMX<oC;W=!pvnrb+O2B2RqNp};vq7@?x0BgqUr1Kx!JfsZ-q(ZbOMhyNPvN^pdd(y
z{)Hq!i&>b><azVN*jc#{ig;D1C~0h^m(I+qF)Un)w|21aaQT#8X0KXSE5MR1Hqb*M
zf}Ct8GDWcn34EaxtVT@1xuX`eR2-6abdY4RP{3_3dlE0&5Ektt8HiG`v>?Y|Btd|(
z#)1tXVhlJ09~I=ZEJ1}{#aRI6FezXIVo5e6HYC~-Z=}`apiPN%Sb)zq<j^)CY%iFR
z3`wz#jOac4I03(V#=zszOwS<hQt=&wsKwDLungQFfffpr>H!XkJoSQbOO1_xMoMtZ
zRuzDzs)qXwL6X!J+Q;6?k+(Muv5mZabmxH;LA59iR$Nu4787pGGStpa*o<Oatqq+Y
zz4chB-u;ELqp6cMhN*}+Z58^JBt<H00s=-;zuLl3(n}u2)U%m}mYMll2x2H<cr|6R
z_WSoUYMQyYfi}iTttgCV>qd>BO3`f4Z!u5pjcs}21k|9eB@w}+MP`Z^xUK}m7&f5?
zt*pN_c>t?4MZ6e|BLn^DuP_R+0P`TTtD;J?Sr#fuAhb0N74oG_$PYoWmPOZ^$&sM}
zfHsFO;qT_Ofa&H9jS2=TzEJw7%dcA<LK+xlK9R2aiq}~Jd+A5uS_IZ2QWy?2=RVU`
zOeT#E%u&unWeLZmUZM*a8}2fMn5>|{mEt<i=t+q|gvx1z5q$kUCWD<(!ybC?v`UV!
zYny=?5FKkY&vL?Ppy#t4hSG?uQ2?EqP3GtzB+Ra*jGg&;a0oZge}okuxenw_`#Axl
z4(18B>f@!8C_-uUXTbJ^XaWL9*fzk@Aw`lzYP&@f(6p{YUZ^WE(-sPmE;f|{{70%=
zQ8LKE+rr*3rok434i5+{g_61!XbVtqv<nBEHH6k8T(L#2Sg=cw&Jc(&Xkr%;Hel{=
zv@W4J3nM6BmZi>W0>HvW>QDw*Q4`W5B5@%q3MS~BIq-^Ls{T_a3lRlK?jkCU5+Frk
z8S->esVuUfjNL+EotV%>E5@y4WJKv{5aPZDS_mN~xCIp&NoxZQ)C&!3^8j1~M6D7%
z`6`GgBJU)C(gVg3)R0DDBKS%I2*h#9Xa@=g*b@@5e(gHUMHg5TK?u>{!xJ>AmjfEW
c+=X0P8)%cL;!RE}f2aQ!az!{$kPu2*<x~|h#sB~S
literal 0
HcmV?d00001
--
1.8.3.1
