summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorDavid Marx <David.Marx@Sun.COM>2009-05-13 17:53:30 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2009-05-15 11:24:15 -0700
commit94c5093c8bc803d0b14429b5a4d07ae46da865cc (patch)
treeb5189c995fbed88a05702723689cca219c4412be /hw
parent2be5eecb4b0f30b9c55d12521415edbb88c1f8fd (diff)
Solaris: Make sure non-inline versions of asm routines end with ret statements
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
Diffstat (limited to 'hw')
-rw-r--r--hw/xfree86/os-support/solaris/solaris-amd64.S2
-rw-r--r--hw/xfree86/os-support/solaris/solaris-ia32.S2
-rw-r--r--hw/xfree86/os-support/solaris/solaris-sparcv8plus.S2
3 files changed, 3 insertions, 3 deletions
diff --git a/hw/xfree86/os-support/solaris/solaris-amd64.S b/hw/xfree86/os-support/solaris/solaris-amd64.S
index 9f5e58cb0..4a0e0f48a 100644
--- a/hw/xfree86/os-support/solaris/solaris-amd64.S
+++ b/hw/xfree86/os-support/solaris/solaris-amd64.S
@@ -32,7 +32,7 @@
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
-#define FUNCTION_END(f) SET_SIZE(f)
+#define FUNCTION_END(f) ret; SET_SIZE(f)
#endif
FUNCTION_START(inb,4)
diff --git a/hw/xfree86/os-support/solaris/solaris-ia32.S b/hw/xfree86/os-support/solaris/solaris-ia32.S
index e2d9cf60a..280154bab 100644
--- a/hw/xfree86/os-support/solaris/solaris-ia32.S
+++ b/hw/xfree86/os-support/solaris/solaris-ia32.S
@@ -32,7 +32,7 @@
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
-#define FUNCTION_END(f) SET_SIZE(f)
+#define FUNCTION_END(f) ret; SET_SIZE(f)
#endif
FUNCTION_START(inb,4)
diff --git a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
index fb23942ef..dbaa0308b 100644
--- a/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
+++ b/hw/xfree86/os-support/solaris/solaris-sparcv8plus.S
@@ -33,7 +33,7 @@
#define _ASM
#include <sys/asm_linkage.h>
#define FUNCTION_START(f,n) ENTRY(f)
-#define FUNCTION_END(f) SET_SIZE(f)
+#define FUNCTION_END(f) retl; nop; SET_SIZE(f)
#endif
/* Converted from common/compiler.h gcc inline format to Sun cc inline