[llvm-branch-commits] [llvm-branch] r142809 - in /llvm/branches/release_30: ./ test/MC/ARM/elf-thumbfunc-reloc.ll

[Bill Wendling]

Author: void
Date: Mon Oct 24 12:33:30 2011
New Revision: 142809

URL: http://llvm.org/viewvc/llvm-project?rev=142809&view=rev
Log:
Merging r142806:
------------------------------------------------------------------------
r142806 | grosbach | 2011-10-24 10:26:26 -0700 (Mon, 24 Oct 2011) | 1 line

Update test for r142801.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_30/   (props changed)
    llvm/branches/release_30/test/MC/ARM/elf-thumbfunc-reloc.ll

Propchange: llvm/branches/release_30/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Oct 24 12:33:30 2011
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801
+/llvm/trunk:142039,142055,142058,142112,142123,142125,142165,142168,142243,142350,142482,142486,142489,142491-142493,142537,142550,142559,142573-142574,142801,142806

Modified: llvm/branches/release_30/test/MC/ARM/elf-thumbfunc-reloc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_30/test/MC/ARM/elf-thumbfunc-reloc.ll?rev=142809&r1=142808&r2=142809&view=diff
==============================================================================
--- llvm/branches/release_30/test/MC/ARM/elf-thumbfunc-reloc.ll (original)
+++ llvm/branches/release_30/test/MC/ARM/elf-thumbfunc-reloc.ll Mon Oct 24 12:33:30 2011
@@ -22,7 +22,7 @@
 
 
 ; make sure that bl 0 <foo> (fff7feff) is correctly encoded
-; CHECK: '_section_data', '704700bf 2de90048 fff7feff bde80008'
+; CHECK: '_section_data', '704700bf 2de90048 fff7feff bde80088'
 
 ;  Offset     Info    Type            Sym.Value  Sym. Name
 ; 00000008  0000070a R_ARM_THM_CALL    00000001   foo