Merge pull request #781 from directhex/master

SPARC build fixes
mono · Oct 18, 2013 · dc0bf73 · dc0bf73
2 parents 49017bc + 842b67d
commit dc0bf73
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/mono/metadata/sgen-archdep.h b/mono/metadata/sgen-archdep.h
@@ -201,6 +201,10 @@
 	)
 #endif
 
+#ifndef REG_SP
+#define REG_SP REG_O6
+#endif
+
 #define ARCH_SIGCTX_SP(ctx)	(((ucontext_t *)(ctx))->uc_mcontext.gregs [REG_SP])
 #define ARCH_SIGCTX_IP(ctx)	(((ucontext_t *)(ctx))->uc_mcontext.gregs [REG_PC])
 #define ARCH_COPY_SIGCTX_REGS(a,ctx) do {	\

diff --git a/mono/utils/mono-hwcap-sparc.c b/mono/utils/mono-hwcap-sparc.c
@@ -49,9 +49,9 @@ mono_hwcap_arch_init (void)
 	 * in turn means a v9 or better.
 	 */
 	if (getpagesize () == 8192)
-		strcpy (buf, "sparcv9")
+		strcpy (buf, "sparcv9");
 	else
-		strcpy (buf, "sparcv8")
+		strcpy (buf, "sparcv8");
 #endif
 
 	mono_hwcap_sparc_is_v9 = strstr (buf, "sparcv9");