diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8ca2e73..f331185 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-19  Lokesh Janghel  <lokeshjanghel91@gmail.com>
+
+	* config/i386/i386.c(function_value_ms_64): Return AX_REG instead
+	of FIRST_SSE_REG for 4 or 8 byte modes.
+
 2018-11-16  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* config/s390/s390.md
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index c18c60a..41def54 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -9005,11 +9005,6 @@ function_value_ms_64 (machine_mode orig_mode, machine_mode mode,
 	      && !COMPLEX_MODE_P (mode))
 	    regno = FIRST_SSE_REG;
 	  break;
-	case 8:
-	case 4:
-	  if (mode == SFmode || mode == DFmode)
-	    regno = FIRST_SSE_REG;
-	  break;
 	default:
 	  break;
         }
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 647ea5d..76f2982 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2018-11-19  Lokesh Janghel  <lokeshjanghel91@gmail.com>
+	
+	PR target/85667
+	* gcc.target/pr85667-1.c: New testcase.
+	* gcc.target/pr85667-2.c: New testcase.
+	* gcc.target/pr85667-3.c: New testcase.
+	* gcc.target/pr85667-4.c: New testcase.
+
 2018-11-16  Ilya Leoshkevich  <iii@linux.ibm.com>
 
 	* gcc.target/s390/md/rXsbg_mode_sXl.c: Do not use arithmetic in
diff --git a/gcc/testsuite/gcc.target/i386/pr85667-1.c b/gcc/testsuite/gcc.target/i386/pr85667-1.c
new file mode 100644
index 0000000..cb3acbb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr85667-1.c
@@ -0,0 +1,28 @@
+/* { dg-do run { target lp64 } } */
+void abort ();
+typedef struct
+{
+  float x;
+} Float;
+
+Float __attribute__((ms_abi)) fn1 ()
+{
+  Float v;
+  v.x = 3.145;
+  return v;
+}
+Float fn2 ()
+{
+  Float v;
+  v.x = 3.145;
+  return v;
+}
+int main ()
+{
+  Float a, b;
+  a = fn1 ();
+  b = fn2 ();
+  if (a.x == 3.145f && b.x == 3.145f)
+    return 0; 
+  abort ();   
+}
diff --git a/gcc/testsuite/gcc.target/i386/pr85667-2.c b/gcc/testsuite/gcc.target/i386/pr85667-2.c
new file mode 100644
index 0000000..a080d64
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr85667-2.c
@@ -0,0 +1,13 @@
+/* { dg-do compile { target lp64 } } */
+/* { dg-options "-O2" } */
+/* { dg-final { scan-assembler-times "movl\[^\n\r]*, %eax|mov\[ \t]*eax," 1 } } */
+typedef struct
+{
+  float x;
+} Float;
+Float __attribute__((ms_abi)) fn1 ()
+{
+  Float v;
+  v.x = 3.145;
+  return v;
+}
diff --git a/gcc/testsuite/gcc.target/i386/pr85667-3.c b/gcc/testsuite/gcc.target/i386/pr85667-3.c
new file mode 100644
index 0000000..6636e0e
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr85667-3.c
@@ -0,0 +1,28 @@
+/* { dg-do run { target lp64 } } */
+void abort ();
+typedef struct
+{
+  double x;
+} Double;
+
+Double __attribute__((ms_abi)) fn1 ()
+{
+  Double v;
+  v.x = 3.145;
+  return v;
+}
+Double fn2 ()
+{
+  Double v;
+  v.x = 3.145;
+  return v;
+}
+int main ()
+{
+  Double a, b;
+  a = fn1 ();
+  b = fn2 ();
+  if (a.x == 3.145 && b.x == 3.145)
+    return 0; 
+  abort ();   
+}
diff --git a/gcc/testsuite/gcc.target/i386/pr85667-4.c b/gcc/testsuite/gcc.target/i386/pr85667-4.c
new file mode 100644
index 0000000..7a98acb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr85667-4.c
@@ -0,0 +1,14 @@
+/* { dg-do compile { target lp64 } } */
+/* { dg-options "-O2" } */
+/* { dg-final { scan-assembler-times "movq\[^\n\r]*, %rax|mov\[ \t]*rax," 1 } } */
+typedef struct
+{
+ double x;
+}Double;
+
+Double  __attribute__((ms_abi)) fn1 ()
+{
+  Double v;
+  v.x = 3.145;
+  return v;
+}