[llvm-branch-commits] [cfe-branch] r105118 - /cfe/branches/Apple/whitney/lib/Basic/Targets.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Sat May 29 19:12:18 2010
New Revision: 105118

URL: http://llvm.org/viewvc/llvm-project?rev=105118&view=rev
Log:
Merge r105116:
--
Author: Daniel Dunbar <daniel at zuster.org>
Date:   Sun May 30 00:07:30 2010 +0000

    Accept '#pragma options align=mac68k' on Darwin/PPC and Darwin/PPC64.

Modified:
    cfe/branches/Apple/whitney/lib/Basic/Targets.cpp

Modified: cfe/branches/Apple/whitney/lib/Basic/Targets.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/whitney/lib/Basic/Targets.cpp?rev=105118&r1=105117&r2=105118&view=diff
==============================================================================
--- cfe/branches/Apple/whitney/lib/Basic/Targets.cpp (original)
+++ cfe/branches/Apple/whitney/lib/Basic/Targets.cpp Sat May 29 19:12:18 2010
@@ -600,6 +600,27 @@
 };
 } // end anonymous namespace.
 
+
+namespace {
+class DarwinPPCTargetInfo :
+  public DarwinTargetInfo<PPCTargetInfo> {
+public:
+  DarwinPPCTargetInfo(const std::string& triple)
+    : DarwinTargetInfo<PPCTargetInfo>(triple) {
+    HasAlignMac68kSupport = true;
+  }
+};
+
+class DarwinPPC64TargetInfo :
+  public DarwinTargetInfo<PPC64TargetInfo> {
+public:
+  DarwinPPC64TargetInfo(const std::string& triple)
+    : DarwinTargetInfo<PPC64TargetInfo>(triple) {
+    HasAlignMac68kSupport = true;
+  }
+};
+} // end anonymous namespace.
+
 namespace {
 // MBlaze abstract base class
 class MBlazeTargetInfo : public TargetInfo {
@@ -2327,14 +2348,14 @@
 
   case llvm::Triple::ppc:
     if (os == llvm::Triple::Darwin)
-      return new DarwinTargetInfo<PPCTargetInfo>(T);
+      return new DarwinPPCTargetInfo(T);
     else if (os == llvm::Triple::FreeBSD)
       return new FreeBSDTargetInfo<PPC32TargetInfo>(T);
     return new PPC32TargetInfo(T);
 
   case llvm::Triple::ppc64:
     if (os == llvm::Triple::Darwin)
-      return new DarwinTargetInfo<PPC64TargetInfo>(T);
+      return new DarwinPPC64TargetInfo(T);
     else if (os == llvm::Triple::Lv2)
       return new PS3PPUTargetInfo<PPC64TargetInfo>(T);
     else if (os == llvm::Triple::FreeBSD)