2 files changed, 5 insertions, 3 deletions
diff --git a/clang/include/clang/Basic/TargetInfo.h b/clang/include/clang/Basic/TargetInfo.h
index dc28e8d2bd2..d135fe00ab0 100644
--- a/clang/include/clang/Basic/TargetInfo.h
+++ b/clang/include/clang/Basic/TargetInfo.h
@@ -39,6 +39,7 @@ protected:
   unsigned IntWidth, IntAlign;
   unsigned DoubleWidth, DoubleAlign;
   unsigned LongWidth, LongAlign;
+  unsigned LongLongWidth, LongLongAlign;
   
   const llvm::fltSemantics *FloatFormat, *DoubleFormat, *LongDoubleFormat;
 
@@ -93,8 +94,8 @@ public:
   
   /// getLongLongWidth/Align - Return the size of 'signed long long' and
   /// 'unsigned long long' for this target, in bits.
-  unsigned getLongLongWidth() const { return 64; } // FIXME
-  unsigned getLongLongAlign() const { return 64; } // FIXME
+  unsigned getLongLongWidth() const { return LongLongWidth; }
+  unsigned getLongLongAlign() const { return LongLongAlign; }
   
   /// getWcharWidth/Align - Return the size of 'wchar_t' for this target, in
   /// bits.
diff --git a/clang/lib/Basic/TargetInfo.cpp b/clang/lib/Basic/TargetInfo.cpp
index 259a6170cd8..dd1fe648d42 100644
--- a/clang/lib/Basic/TargetInfo.cpp
+++ b/clang/lib/Basic/TargetInfo.cpp
@@ -24,8 +24,9 @@ TargetInfo::TargetInfo(const std::string &T) : Triple(T) {
   // Set defaults.  These should be overridden by concrete targets as needed.
   CharIsSigned = true;
   WCharWidth = WCharAlign = 32;
-  LongWidth = LongAlign = 32;
   IntWidth = IntAlign = 32;
+  LongWidth = LongAlign = 32;
+  LongLongWidth = LongLongAlign = 64;
   DoubleWidth = 64;
   DoubleAlign = 32;
   FloatFormat = &llvm::APFloat::IEEEsingle;