diff --git a/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/lib/Target/SparcV9/SparcV9TargetMachine.cpp
index e8f9c9e..948cbfb 100644
--- a/lib/Target/SparcV9/SparcV9TargetMachine.cpp
+++ b/lib/Target/SparcV9/SparcV9TargetMachine.cpp
@@ -125,16 +125,12 @@
 //---------------------------------------------------------------------------
 
 UltraSparc::UltraSparc()
-  : TargetMachine("UltraSparc-Native"),
+  : TargetMachine("UltraSparc-Native", 4),
     schedInfo(*this),
     regInfo(*this),
     frameInfo(*this),
     cacheInfo(*this),
-    optInfo(*this)
-{
-  optSizeForSubWordData = 4;
-  minMemOpWordSize = 8; 
-  maxAtomicMemOpWordSize = 8;
+    optInfo(*this) {
 }
 
 
diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp
index 1207a6e..20e7522 100644
--- a/lib/Target/TargetData.cpp
+++ b/lib/Target/TargetData.cpp
@@ -81,7 +81,7 @@
 //===----------------------------------------------------------------------===//
 
 TargetData::TargetData(const std::string &TargetName,
-                       bool isLittleEndian,
+                       bool isLittleEndian, unsigned char SubWordSize,
                        unsigned char IntRegSize, unsigned char PtrSize,
                        unsigned char PtrAl, unsigned char DoubleAl,
                        unsigned char FloatAl, unsigned char LongAl, 
@@ -91,6 +91,7 @@
   AnnotationManager::registerAnnotationFactory(AID, TypeAnFactory, this);
 
   LittleEndian     = isLittleEndian;
+  SubWordDataSize  = SubWordSize;
   IntegerRegSize   = IntRegSize;
   PointerSize      = PtrSize;
   PointerAlignment = PtrAl;