diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3f183fb14277649cb0d9114e0ac71443624b37bf..4956f15102fad859cd48caa5fe1e060a9241d3fc 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2019-05-23  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/90552
+	* config/i386/i386.c (gen_rtx_cost):
+	Use ix86_tune_cost instead of ix86_cost.
+
 2019-05-23  Bill Schmidt  <wschmidt@linux.ibm.com>
 	    Michael Meissner  <meissner@linux.ibm.com>
 	    Segher Boessenkool  <segher@kernel.crashing.org>
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 463e78112f061d014ee5479f9d04809f767b32e0..79fcb5c4e57011db9b9f82fe4300e19e36fe2474 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -19124,7 +19124,8 @@ ix86_rtx_costs (rtx x, machine_mode mode, int outer_code_i, int opno,
   rtx mask;
   enum rtx_code code = GET_CODE (x);
   enum rtx_code outer_code = (enum rtx_code) outer_code_i;
-  const struct processor_costs *cost = speed ? ix86_cost : &ix86_size_cost;
+  const struct processor_costs *cost
+    = speed ? ix86_tune_cost : &ix86_size_cost;
   int src_cost;
 
   switch (code)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f659e45935409ced90b8e2bd713c70f6d914947d..e3d9041604e71cf4db1fd52ff188444b2556b704 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2019-05-23  Uroš Bizjak  <ubizjak@gmail.com>
+
+	PR target/90552
+	* gcc.target/i386/pr90552.c: New test.
+
 2019-05-23  Mark Eggleston  <mark.eggleston@codethink.com>
 
 	* gfortran.dg/fmt_f_default_field_width_1.f90: Hide REAL(16) behind
diff --git a/gcc/testsuite/gcc.target/i386/pr90552.c b/gcc/testsuite/gcc.target/i386/pr90552.c
new file mode 100644
index 0000000000000000000000000000000000000000..59b7e847700e033669a2f6205dfcee1c04557a1e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr90552.c
@@ -0,0 +1,11 @@
+/* PR target/90552 *
+/* { dg-do compile } */
+/* { dg-options "-Os" } */
+
+__attribute__((optimize(2)))
+int foo (int x)
+{
+  return x / 3;
+}
+
+/* { dg-final { scan-assembler-not "idiv" } } */