[llvm-branch-commits] [llvm-branch] r89825 - /llvm/branches/Apple/Zoidberg/lib/Target/PowerPC/PPCFrameInfo.h

[Dale Johannesen]

Author: johannes
Date: Tue Nov 24 19:00:57 2009
New Revision: 89825

URL: http://llvm.org/viewvc/llvm-project?rev=89825&view=rev
Log:
$ svn merge -c 89824 https://dalej@llvm.org/svn/llvm-project/llvm/trunk
--- Merging r89824 into '.':
U    lib/Target/PowerPC/PPCFrameInfo.h


Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/PowerPC/PPCFrameInfo.h

Modified: llvm/branches/Apple/Zoidberg/lib/Target/PowerPC/PPCFrameInfo.h
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/PowerPC/PPCFrameInfo.h?rev=89825&r1=89824&r2=89825&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/PowerPC/PPCFrameInfo.h (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/PowerPC/PPCFrameInfo.h Tue Nov 24 19:00:57 2009
@@ -94,11 +94,11 @@
     if (TM.getSubtarget<PPCSubtarget>().isDarwinABI()) {
       NumEntries = 1;
       if (TM.getSubtarget<PPCSubtarget>().isPPC64()) {
-        static const SpillSlot darwin64Offsets[] = {PPC::X31, -8};
-        return darwin64Offsets;
+        static const SpillSlot darwin64Offsets = {PPC::X31, -8};
+        return &darwin64Offsets;
       } else {
-        static const SpillSlot darwinOffsets[] = {PPC::R31, -4};
-        return darwinOffsets;
+        static const SpillSlot darwinOffsets = {PPC::R31, -4};
+        return &darwinOffsets;
       }
     }