commit 9d871e98c80898042fb8cfd20a58feadae1ba60c
author Dan Albert <danalbert@google.com> Mon Jan 04 18:35:34 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jan 04 18:35:34 2016 +0000
tree 67c0a99a7bfa160e0736741a7e09e64c6d0f0c0d
parent 02467650210aab057ba17ec43a94d17e001f62af
parent 020413b1ab0181745b3ac86e20fa51dce1589266

Merge "[4.9] Disable inlining of memcpy for x86 with 'rep movs'."

gcc-4.9/gcc/config/i386/i386.c

diff --git a/gcc-4.9/gcc/config/i386/i386.c b/gcc-4.9/gcc/config/i386/i386.c
index fab5c88..9f57c6e 100644
--- a/gcc-4.9/gcc/config/i386/i386.c
+++ b/gcc-4.9/gcc/config/i386/i386.c
@@ -1673,7 +1673,7 @@
 };
 
 static stringop_algs slm_memcpy[2] = {
-  {libcall, {{11, loop, false}, {-1, rep_prefix_4_byte, false}}},
+  {libcall, {{11, loop, false}, {-1, libcall, false}}},
   {libcall, {{32, loop, false}, {64, rep_prefix_4_byte, false},
              {8192, rep_prefix_8_byte, false}, {-1, libcall, false}}}};
 static stringop_algs slm_memset[2] = {