Commit 7fa881ec authored by Finkel, Hal's avatar Finkel, Hal
Browse files

Merge in r168799 (PPC bug fix). 

llvm-svn: 168842
parent 697b8aaa

llvm/lib/Target/PowerPC/MCTargetDesc/PPCMCTargetDesc.cpp

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ static MCAsmInfo *createPPCMCAsmInfo(const Target &T, StringRef TT) { 


  // Initial state of the frame pointer is R1.

  MachineLocation Dst(MachineLocation::VirtualFP);

  MachineLocation Src(PPC::R1, 0);

  MachineLocation Src(isPPC64? PPC::X1 : PPC::R1, 0);

  MAI->addInitialFrameState(0, Dst, Src);



  return MAI;

llvm/test/MC/PowerPC/ppc64-initial-cfa.ll

0 → 100644
+41 −0
Original line number Diff line number Diff line 
;; RUN: llc -mtriple=powerpc64-unknown-linux-gnu -filetype=obj %s -o - | \

;; RUN: elf-dump --dump-section-data | FileCheck %s



;; FIXME: this file should be in .s form, change when asm parser is available.



define void @f() {

entry:

  ret void

}



;; CHECK:      ('sh_name', 0x{{.*}}) # '.eh_frame'

;; CHECK-NEXT: ('sh_type', 0x00000001)

;; CHECK-NEXT: ('sh_flags', 0x0000000000000002)

;; CHECK-NEXT: ('sh_addr', 0x{{.*}})

;; CHECK-NEXT: ('sh_offset', 0x{{.*}})

;; CHECK-NEXT: ('sh_size', 0x0000000000000030)

;; CHECK-NEXT: ('sh_link', 0x00000000)

;; CHECK-NEXT: ('sh_info', 0x00000000)

;; CHECK-NEXT: ('sh_addralign', 0x0000000000000008)

;; CHECK-NEXT: ('sh_entsize', 0x0000000000000000)

;; CHECK-NEXT: ('_section_data', '00000010 00000000 017a5200 01784101 000c0100 00000018 00000018 00000000 00000000 00000000 00000010 00000000')



;; CHECK:      ('sh_name', 0x{{.*}}) # '.rela.eh_frame'

;; CHECK-NEXT: ('sh_type', 0x00000004)

;; CHECK-NEXT: ('sh_flags', 0x0000000000000000)

;; CHECK-NEXT: ('sh_addr', 0x{{.*}})

;; CHECK-NEXT: ('sh_offset', 0x{{.*}})

;; CHECK-NEXT: ('sh_size', 0x0000000000000018)

;; CHECK-NEXT: ('sh_link', 0x{{.*}})

;; CHECK-NEXT: ('sh_info', 0x{{.*}})

;; CHECK-NEXT: ('sh_addralign', 0x0000000000000008)

;; CHECK-NEXT: ('sh_entsize', 0x0000000000000018)

;; CHECK-NEXT: ('_relocations', [

;; CHECK-NEXT:  # Relocation 0

;; CHECK-NEXT:  (('r_offset', 0x000000000000001c)

;; CHECK-NEXT:   ('r_sym', 0x{{.*}})

;; CHECK-NEXT:   ('r_type', 0x00000026)

;; CHECK-NEXT:   ('r_addend', 0x0000000000000000)

;; CHECK-NEXT:  ),

;; CHECK-NEXT: ])