From e34104d16c982d526a3415d5476ab131378668de Mon Sep 17 00:00:00 2001 From: Alexander Shaposhnikov Date: Tue, 20 Mar 2018 19:50:14 +0000 Subject: [PATCH] [llvm-objcopy] Revert the tests from r328012 Temporarily revert the tests from r328012 as well. llvm-svn: 328026 --- llvm/test/tools/llvm-objcopy/Inputs/groups.o | Bin 5368 -> 0 bytes llvm/test/tools/llvm-objcopy/group-unchanged.test | 56 --------------------- llvm/test/tools/llvm-objcopy/group.test | 56 --------------------- llvm/test/tools/llvm-objcopy/strip-dwo-groups.test | 40 --------------- 4 files changed, 152 deletions(-) delete mode 100644 llvm/test/tools/llvm-objcopy/Inputs/groups.o delete mode 100644 llvm/test/tools/llvm-objcopy/group-unchanged.test delete mode 100644 llvm/test/tools/llvm-objcopy/group.test delete mode 100644 llvm/test/tools/llvm-objcopy/strip-dwo-groups.test diff --git a/llvm/test/tools/llvm-objcopy/Inputs/groups.o b/llvm/test/tools/llvm-objcopy/Inputs/groups.o deleted file mode 100644 index e92b98046a37999b039dd1db84ddeb74a81c997b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5368 zcmd5Ounk}s@SDgi~c23BC(YN=)RBC_f;#Ak$Q+xa6 znY{>e2ppk!BGxuCC;!6AiR(W8udn(oA6mubs=d0HUUwVK<=Sd`G?UBZ(zh&mUVS{9 ztyb4pGPTBHc5&Iu`i2=uX*YMIFyah3`HE96jTW5Y^3Yh`KAayND^%RWL-{eMRB&>m zm0LRpqNwRye#EXgL!R~b3mMyDnMMG=~OWnEOnU1Cbu zq9nYf<)%Nk2|V8d{{{Rm_yh1i!2bgO8~h*e7vRg_pTHrkRRkOb)4IjMJ>Vaq+g?o> z5g}g2kQI|M6b=_*Aj2|ZMP=kTWa}gzB1&SH=%OYTu_E33AcU+0T;kz#kY)IpfUX>i z#NqlBFl!SJ5hW3>)Wo_YvF*?;1B3pfSmJ>NqR$;UzS?VH$lAc-l<$kojvU;<|cCiWdext1kn2ZkX; zvk;)fIB$l8ao$KF5E0?JdwnQwM#VT18QK4AaZhw|uoavF_Y8~B;C3<$ZQITnIEnBn zE6@koX^0(Z3~0#L4-KW73aS%@_<&UW(HAqL_45`0N0Ac3@^ABmzO2$8khS%q*TP4oz5GvjZa_EYdr08txu#T>hQ_ zHUd7V)$gx4u>C&ne}*BceS(%Nq*rhX{L?Q1(fJ}GoNO4U^&z62K+HJLJk1bZVcWzr zLpXghnEI4JIQtUB`=4?4Ns|&pI5E>9B@otW-_SgT*%&R?&-iUh$Mp~%e2xMIoh>59 z{qu!>nm`cYtyv8|0Xoj}PZ$x|?^chVSFcBp&vQlN<*`uQ-S9LiL9|wS-U%NKa6Rw5 zhUGI zR#sfR@B=J}TVE@A=jv|L1Xt}918m?vM^NC`^crn0w&MWs?^OEBu&sLkCfo8~s8uRW z*9$JVEm*f&Uai#hKJLAGcf~G~MOz^Ouv+un%*lJt+|l&x@*`~q)#X)J0q)X5rGbHp z42I*`CA8;O{I*eZY|qY=n_fX==8oStdw799#J>equ`%@h#W7!3hxJw3I2svUaSwEa z@jhnLNhR<(Wt`6k_fJ63_aEaqbx3%e2ce*|z-Ncg_uIhw*-2~vtO{a#@~8JC=i>Hi zV1E4+T%)>@`Mtp^v;HUGO#bHk;u+<@`PrZQ-0oKY`>K9^4^#d0KIgi*rTOVp|H~?& zS(jP=?Htn>|HG<4o@dHW5ZBH4AAwPRszawYRL5L@vL)g+34!H66FmQ}cQo0wrEivr zkvaR*kEc$iZ4Q8mk^Ps-$sCtydpiJL3q8+836s{J_EhVHEO zXXrVWZhBGqn-@;g_QPHLFQ}K|CwkBhwr_U8$mMypD11%`BQo>TIq9^1e^To=<9pHF zQ24h@bN##yG0EjM74#@|G&1wopzD5}rV8#vd` z@I&zLH2yyI{hd*UH2>Fw*`L?t{vbbx+ir8}`*D672?VqLxn1(lcgUYc2s6J2e{<}V Q=_8eYNhPF)zGbHWue9(8sQ>@~ diff --git a/llvm/test/tools/llvm-objcopy/group-unchanged.test b/llvm/test/tools/llvm-objcopy/group-unchanged.test deleted file mode 100644 index 9e86172..0000000 --- a/llvm/test/tools/llvm-objcopy/group-unchanged.test +++ /dev/null @@ -1,56 +0,0 @@ -# RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -remove-section=.text.bar %t %t2 -# RUN: llvm-readobj -elf-section-groups %t2 | FileCheck %s - -# In this test the section .text.bar is getting removed, since this section -# goes after all the sections comprising a group, the content of the -# section .group doesn't change. - -# CHECK: Name: .group -# CHECK-NEXT: Index: 1 -# CHECK-NEXT: Link: 3 -# CHECK-NEXT: Info: 2 -# CHECK-NEXT: Type: COMDAT (0x1) -# CHECK-NEXT: Signature: foo -# CHECK: .text.foo (2) - ---- !ELF -FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 -Sections: - - Name: .group - Type: SHT_GROUP - Link: .symtab - AddressAlign: 0x0000000000000004 - Info: foo - Members: - - SectionOrType: GRP_COMDAT - - SectionOrType: .text.foo - - Name: .text.foo - Type: SHT_PROGBITS - Flags: [ SHF_ALLOC, SHF_EXECINSTR, SHF_GROUP ] - AddressAlign: 0x0000000000000010 - - Name: .text.bar - Type: SHT_PROGBITS - Flags: [ SHF_ALLOC, SHF_EXECINSTR ] - AddressAlign: 0x0000000000000010 -Symbols: - Local: - - Name: .text.foo - Type: STT_SECTION - Section: .text.foo - - Name: .text.bar - Type: STT_SECTION - Section: .text.bar - Weak: - - Name: foo - Type: STT_FUNC - Section: .text.foo - Size: 0x0000000000000000 - - Name: bar - Type: STT_FUNC - Section: .text.bar - Size: 0x0000000000000000 diff --git a/llvm/test/tools/llvm-objcopy/group.test b/llvm/test/tools/llvm-objcopy/group.test deleted file mode 100644 index 4023f12..0000000 --- a/llvm/test/tools/llvm-objcopy/group.test +++ /dev/null @@ -1,56 +0,0 @@ -# RUN: yaml2obj %s > %t -# RUN: llvm-objcopy -remove-section=.text.bar %t %t2 -# RUN: llvm-readobj -elf-section-groups %t2 | FileCheck %s - -# In this test the section .text.bar is getting removed, as a result, -# the indices of the sections which go after .text.bar will change, -# thus the fields Link, Info and the content of .group should be updated. - -# CHECK: Name: .group -# CHECK-NEXT: Index: 1 -# CHECK-NEXT: Link: 3 -# CHECK-NEXT: Info: 2 -# CHECK-NEXT: Type: COMDAT (0x1) -# CHECK-NEXT: Signature: foo -# CHECK: .text.foo (2) - ---- !ELF -FileHeader: - Class: ELFCLASS64 - Data: ELFDATA2LSB - Type: ET_REL - Machine: EM_X86_64 -Sections: - - Name: .group - Type: SHT_GROUP - Link: .symtab - AddressAlign: 0x0000000000000004 - Info: foo - Members: - - SectionOrType: GRP_COMDAT - - SectionOrType: .text.foo - - Name: .text.bar - Type: SHT_PROGBITS - Flags: [ SHF_ALLOC, SHF_EXECINSTR ] - AddressAlign: 0x0000000000000010 - - Name: .text.foo - Type: SHT_PROGBITS - Flags: [ SHF_ALLOC, SHF_EXECINSTR, SHF_GROUP ] - AddressAlign: 0x0000000000000010 -Symbols: - Local: - - Name: .text.bar - Type: STT_SECTION - Section: .text.bar - - Name: .text.foo - Type: STT_SECTION - Section: .text.foo - Weak: - - Name: bar - Type: STT_FUNC - Section: .text.bar - Size: 0x0000000000000000 - - Name: foo - Type: STT_FUNC - Section: .text.foo - Size: 0x0000000000000000 diff --git a/llvm/test/tools/llvm-objcopy/strip-dwo-groups.test b/llvm/test/tools/llvm-objcopy/strip-dwo-groups.test deleted file mode 100644 index 957bb55..0000000 --- a/llvm/test/tools/llvm-objcopy/strip-dwo-groups.test +++ /dev/null @@ -1,40 +0,0 @@ -# RUN: cp %p/Inputs/groups.o %t -# RUN: llvm-objcopy -strip-dwo %t -# RUN: llvm-readobj -elf-section-groups %t | FileCheck %s - -// Source code of groups.o: -// -// template -// struct S { -// static constexpr T X = T(1); -// T getX() { return X; } -// }; -// void f() { -// S A; -// S B; -// int a = A.getX(); -// int b = B.getX(); -// } -// -// clang -g -gsplit-dwarf -std=c++11 -c groups.cpp -o groups.o - -// `llvm-objcopy -strip-dwo` strips out dwo sections, as a result, the index of -// the symbol table, the indices of the symbols and the indices of the sections -// which go after the removed ones will change. Consequently, the fields -// Link, Info and the content of .group need to be updated. In the past -// `llvm-objcopy -strip-dwo` used to produce invalid binaries with -// broken .group section, this test verifies the correctness of -// Link, Info and the content of this section. - -CHECK: Name: .group (179) -CHECK-NEXT: Index: 17 -CHECK-NEXT: Link: 19 -CHECK-NEXT: Info: 14 -CHECK: .text._ZN1SIiE4getXEv (2) - -CHECK: Name: .group (179) -CHECK-NEXT: Index: 18 -CHECK-NEXT: Link: 19 -CHECK-NEXT: Info: 13 -CHECK: .text._ZN1SIdE4getXEv (4) -CHECK-NEXT: .rela.text._ZN1SIdE4getXEv (21) -- 2.7.4