diff --git a/kernel/x86/xdot.S b/kernel/x86/xdot.S
index 4a5af4642..929763271 100644
--- a/kernel/x86/xdot.S
+++ b/kernel/x86/xdot.S
@@ -307,7 +307,11 @@
 	popl	%ebx
 	popl	%esi
 	popl	%edi
+#if defined(F_INTERFACE) && defined(RETURN_BY_STACK)
+	ret	$0x4
+#else
 	ret
+#endif
 	ALIGN_3
 
 .L88:
@@ -326,6 +330,10 @@
 	popl	%ebx
 	popl	%esi
 	popl	%edi
-	ret
 
+#if defined(F_INTERFACE) && defined(RETURN_BY_STACK)
+	ret	$0x4
+#else
+	ret
+#endif
 	EPILOGUE
diff --git a/kernel/x86/zdot.S b/kernel/x86/zdot.S
index aa4481f97..9d8866ad0 100644
--- a/kernel/x86/zdot.S
+++ b/kernel/x86/zdot.S
@@ -283,7 +283,11 @@
 	popl	%ebx
 	popl	%esi
 	popl	%edi
+#if defined(DOUBLE) || defined(XDOUBLE)
+	ret	$0x4
+#else
 	ret
+#endif
 	ALIGN_3
 
 .L88:
@@ -305,6 +309,10 @@
 	popl	%ebx
 	popl	%esi
 	popl	%edi
-	ret
 
+#if defined(DOUBLE) || defined(XDOUBLE)
+	ret	$0x4
+#else
+	ret
+#endif
 	EPILOGUE
diff --git a/kernel/x86/zdot_sse2.S b/kernel/x86/zdot_sse2.S
index 2a174fb5d..efebe637b 100644
--- a/kernel/x86/zdot_sse2.S
+++ b/kernel/x86/zdot_sse2.S
@@ -1542,7 +1542,5 @@
 	popl	%esi
 	popl	%edi
 /*remove the hidden return value address from the stack.*/
-	popl	%ecx
-	xchgl	%ecx, 0(%esp)
-	ret
+	ret	$0x4
 	EPILOGUE