diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc
index 7e94447..cdef95e 100644
--- a/gcc/config/i386/i386-expand.cc
+++ b/gcc/config/i386/i386-expand.cc
@@ -544,6 +544,7 @@ ix86_expand_move (machine_mode mode, rtx operands[])
 
   /* Special case inserting 64-bit values into a TImode register.  */
   if (TARGET_64BIT
+      && (optimize || ix86_function_naked (current_function_decl))
       && (mode == DImode || mode == DFmode)
       && SUBREG_P (op0)
       && GET_MODE (SUBREG_REG (op0)) == TImode