Author: dsanders Date: Mon Jun 22 16:11:02 2015 New Revision: 240333 URL: http://llvm.org/viewvc/llvm-project?rev=240333&view=rev Log: Partially Merging r237790: ------------------------------------------------------------------------ r237790 | dsanders | 2015-05-20 14:19:19 +0100 (Wed, 20 May 2015) | 15 lines
[mips] Fix ehframe-indirect.ll test. Summary: -check-prefix replaces the default CHECK prefix rather than adding to it and must be explicitly re-added. Also added the N32 cases. Reviewers: petarj Reviewed By: petarj Subscribers: tberghammer, llvm-commits Differential Revision: http://reviews.llvm.org/D9668 ------------------------------------------------------------------------ Merged all except the N32 cases which seem to require later patches that are fine on the trunk but don't seem to work on the branch. Modified: llvm/branches/release_36/ (props changed) llvm/branches/release_36/test/CodeGen/Mips/ehframe-indirect.ll Propchange: llvm/branches/release_36/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 22 16:11:02 2015 @@ -1,3 +1,3 @@ /llvm/branches/Apple/Pertwee:110850,110961 /llvm/branches/type-system-rewrite:133420-134817 -/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226151,226164-226166,226170-226171,226182,226407-226409,226473,226588,226616,226652,226664,226708,226711,226755,226791,226808-226809,226905,227005,227084-227085,227087,227089,227250,227260-227261,227269,227290,227294,227299,227319,227339,227430,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228403,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229731,229911,230058,230235,230500,230657,230742,230748,230956,231219,231227,231237,231563,231601,232046,232085,232189,232382,233904,236457,236635,238751 +/llvm/trunk:155241,226023,226029,226044,226046,226048,226058,226075,226151,226164-226166,226170-226171,226182,226407-226409,226473,226588,226616,226652,226664,226708,226711,226755,226791,226808-226809,226905,227005,227084-227085,227087,227089,227250,227260-227261,227269,227290,227294,227299,227319,227339,227430,227491,227584,227603,227628,227670,227809,227815,227903,227934,227972,227983,228049,228129,228168,228331,228403,228411,228444,228490,228500,228507,228518,228525,228565,228656,228760-228761,228793,228842,228899,228957,228969,228979,229029,229343,229351-229352,229421,229495,229529,229731,229911,230058,230235,230500,230657,230742,230748,230956,231219,231227,231237,231563,231601,232046,232085,232189,232382,233904,236457,236635,237790,238751 Modified: llvm/branches/release_36/test/CodeGen/Mips/ehframe-indirect.ll URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_36/test/CodeGen/Mips/ehframe-indirect.ll?rev=240333&r1=240332&r2=240333&view=diff ============================================================================== --- llvm/branches/release_36/test/CodeGen/Mips/ehframe-indirect.ll (original) +++ llvm/branches/release_36/test/CodeGen/Mips/ehframe-indirect.ll Mon Jun 22 16:11:02 2015 @@ -1,16 +1,16 @@ -; RUN: llc -mtriple=mipsel-linux-gnu < %s | FileCheck -check-prefix=CHECK32 %s -; RUN: llc -mtriple=mipsel-linux-android < %s | FileCheck -check-prefix=CHECK32 %s -; RUN: llc -mtriple=mips64el-linux-gnu < %s | FileCheck -check-prefix=CHECK64 %s -; RUN: llc -mtriple=mips64el-linux-android < %s | FileCheck -check-prefix=CHECK64 %s +; RUN: llc -mtriple=mipsel-linux-gnu < %s | FileCheck -check-prefix=ALL -check-prefix=O32 %s +; RUN: llc -mtriple=mipsel-linux-android < %s | FileCheck -check-prefix=ALL -check-prefix=O32 %s +; RUN: llc -mtriple=mips64el-linux-gnu < %s | FileCheck -check-prefix=ALL -check-prefix=N64 %s +; RUN: llc -mtriple=mips64el-linux-android < %s | FileCheck -check-prefix=ALL -check-prefix=N64 %s define i32 @main() { -; CHECK: .cfi_startproc -; CHECK: .cfi_personality 128, DW.ref.__gxx_personality_v0 +; ALL: .cfi_startproc +; ALL: .cfi_personality 128, DW.ref.__gxx_personality_v0 entry: invoke void @foo() to label %cont unwind label %lpad -; CHECK: foo -; CHECK: jalr +; ALL: foo +; ALL: jalr lpad: %0 = landingpad { i8*, i32 } personality i8* @@ -20,20 +20,20 @@ lpad: cont: ret i32 0 } -; CHECK: .cfi_endproc +; ALL: .cfi_endproc declare i32 @__gxx_personality_v0(...) declare void @foo() -; CHECK: .hidden DW.ref.__gxx_personality_v0 -; CHECK: .weak DW.ref.__gxx_personality_v0 -; CHECK: .section .data.DW.ref.__gxx_personality_v0,"aGw",@progbits,DW.ref.__gxx_personality_v0,comdat -; CHECK32: .align 2 -; CHECK64: .align 3 -; CHECK: .type DW.ref.__gxx_personality_v0,@object -; CHECK32: .size DW.ref.__gxx_personality_v0, 4 -; CHECK64: .size DW.ref.__gxx_personality_v0, 8 -; CHECK: DW.ref.__gxx_personality_v0: -; CHECK32: .4byte __gxx_personality_v0 -; CHECK64: .8byte __gxx_personality_v0 +; ALL: .hidden DW.ref.__gxx_personality_v0 +; ALL: .weak DW.ref.__gxx_personality_v0 +; ALL: .section .data.DW.ref.__gxx_personality_v0,"aGw",@progbits,DW.ref.__gxx_personality_v0,comdat +; O32: .align 2 +; N64: .align 3 +; ALL: .type DW.ref.__gxx_personality_v0,@object +; O32: .size DW.ref.__gxx_personality_v0, 4 +; N64: .size DW.ref.__gxx_personality_v0, 8 +; ALL: DW.ref.__gxx_personality_v0: +; O32: .4byte __gxx_personality_v0 +; N64: .8byte __gxx_personality_v0 _______________________________________________ llvm-branch-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits
