Index: opt_etable.cxx
===================================================================
--- opt_etable.cxx	(revision 3495)
+++ opt_etable.cxx	(working copy)
@@ -2911,11 +2911,9 @@
 	}
 	if (cr->Opr() == OPR_ILOADX)
 	  Warn_todo("ETABLE::Bottom_up_cr: Indexed load.");
-#ifdef TARG_SL
         if (cr->Dtyp() == MTYPE_I2 && cr->Dsctyp() == MTYPE_I2) {
             cr->Set_dtyp(MTYPE_I4);
         } 
-#endif        
 	if (!is_istore) {
 	  CODEREP *ivar_vsym = cr->Get_ivar_vsym();
 	  if (cr->Ilod_base()->Is_non_volatile_terminal(Opt_stab()) &&
Index: opt_emit_template.h
===================================================================
--- opt_emit_template.h	(revision 3495)
+++ opt_emit_template.h	(working copy)
@@ -647,16 +647,16 @@
     {
       AUX_STAB_ENTRY *aux_entry = 
 	emitter->Opt_stab()->Aux_stab_entry(exp->Aux_id());
-#ifdef TARG_SL
       if (exp->Dtyp() == MTYPE_I2 && exp->Dsctyp() == MTYPE_I2) {
         wn = WN_Create((aux_entry->Bit_size() > 0 && aux_entry->Field_id() == 0)
-			? OPR_LDBITS : OPR_LDID,
-	   	        MTYPE_I4, exp->Dsctyp(), 0); 
-      } else
-#endif
-      wn = WN_Create((aux_entry->Bit_size() > 0 && aux_entry->Field_id() == 0)
-			? OPR_LDBITS : OPR_LDID,
-		     exp->Dtyp(), exp->Dsctyp(), 0); 
+                       ? OPR_LDBITS : OPR_LDID,
+                       MTYPE_I4, exp->Dsctyp(), 0); 
+      }
+      else {
+        wn = WN_Create((aux_entry->Bit_size() > 0 && aux_entry->Field_id() == 0)
+                       ? OPR_LDBITS : OPR_LDID,
+                       exp->Dtyp(), exp->Dsctyp(), 0); 
+      }
       TY_IDX ty_idx = exp->Lod_ty();
       Is_True(ty_idx, ("Gen_exp_wn: NULL Lod_ty() for CK_VAR node"));
       UINT16 field_id = exp->Field_id();
Index: opt_htable.cxx
===================================================================
--- opt_htable.cxx	(revision 3495)
+++ opt_htable.cxx	(working copy)
@@ -2332,11 +2332,9 @@
       dtyp = dsctyp;  // necessary canonicalization
   }
   
-#ifdef TARG_SL
   if (dtyp == MTYPE_I2 && dsctyp == MTYPE_I2) {
     dtyp = MTYPE_I4;
   }
-#endif  
 #ifdef Is_True_On
   // check dtyp and dsctyp consistency
   if (MTYPE_is_float(dtyp)) {
@@ -4123,11 +4121,9 @@
         }
         dtyp = Mtype_from_class_size(dsctyp, dtyp);
       }
-#ifdef TARG_SL
-        if (dtyp == MTYPE_I2 && dsctyp == MTYPE_I2) {
-          dtyp = MTYPE_I4;
-        }
-#endif
+      if (dtyp == MTYPE_I2 && dsctyp == MTYPE_I2) {
+        dtyp = MTYPE_I4;
+      }
       opc = OPCODE_make_op(opr == OPR_ISTORE ? OPR_ILOAD : OPR_ILDBITS, dtyp, dsctyp);
       base_ccr.Set_scale(base_ccr.Scale() + WN_offset(Wn()));
       base_ccr.Trim_to_16bits(WN_kid(Wn(), 1), htable);
Index: opt_cfg.cxx
===================================================================
--- opt_cfg.cxx	(revision 3495)
+++ opt_cfg.cxx	(working copy)
@@ -1827,11 +1827,10 @@
       else 
         rtype = Mtype_TransferSign(dsctyp, rtype);
       
-#ifdef TARG_SL
       if (rtype == MTYPE_I2 && dsctyp == MTYPE_I2) {
         rtype = MTYPE_I4;
       }
-#endif
+
       load = WN_CreateIload(OPR_ILOAD, rtype, dsctyp, WN_offset(stmt), 
                 TY_pointed(WN_ty(stmt)), WN_ty(stmt), 
                 Copy_addr_expr(WN_kid1(stmt), _opt_stab->Alias_classification()), 
Index: opt_fold.cxx
===================================================================
--- opt_fold.cxx	(revision 3495)
+++ opt_fold.cxx	(working copy)
@@ -923,14 +923,14 @@
       // cr->Dsctyp() is meaningless for FP constants
       return OPCODE_make_op(OPR_CONST, cr->Dtyp(), MTYPE_V);
     case CK_VAR:
-#ifdef TARG_SL
       if ( cr->Dtyp() == MTYPE_I2 &&  cr->Dsctyp() == MTYPE_I2) {
         return OPCODE_make_op(cr->Bit_field_valid() ? OPR_LDBITS : OPR_LDID,
-			      MTYPE_I4, cr->Dsctyp());
-      } else
-#endif
-      return OPCODE_make_op(cr->Bit_field_valid() ? OPR_LDBITS : OPR_LDID,
-			    cr->Dtyp(), cr->Dsctyp());
+                              MTYPE_I4, cr->Dsctyp());
+      }
+      else {
+        return OPCODE_make_op(cr->Bit_field_valid() ? OPR_LDBITS : OPR_LDID,
+                              cr->Dtyp(), cr->Dsctyp());
+      }
     default:
       FmtAssert(FALSE,("CRSIMP, CR_opcode, unknown kind, 0x%x",cr->Kind()));
       return OPCODE_UNKNOWN;		// to satisfy compiler
