[mono/mono] [3 commits] dd149e75: Add missing ; characters to mono-hwcap-sparc.c. Fixes build failure.

"Zoltan Varga ([email protected])" <[email protected]>
Newsgroups gmane.comp.gnome.mono.patches
Message-ID <00000141cae267b8-9292a9f6-9b20-4908-a5f7-934fffe6af59-000000@email.amazonses.com>
   Branch: refs/heads/master
     Home: https://github.com/mono/mono
  Compare: https://github.com/mono/mono/compare/49017bc699b4...dc0bf73e8476

   Commit: dd149e75e6d885a14b33d04a13a32a18dff7885b
   Author: Jo Shields <[email protected]> (directhex)
     Date: 2013-10-18 08:07:52 GMT
      URL: https://github.com/mono/mono/commit/dd149e75e6d885a14b33d04a13a32a18dff7885b

Add missing ; characters to mono-hwcap-sparc.c. Fixes build failure.

Changed paths:
  M mono/utils/mono-hwcap-sparc.c

Modified: mono/utils/mono-hwcap-sparc.c
===================================================================
@@ -49,9 +49,9 @@
 	 * 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");

   Commit: 842b67d5467ab54d3f14cd25c5ad9c02b32dd33f
   Author: Jo Shields <[email protected]> (directhex)
     Date: 2013-10-18 08:36:00 GMT
      URL: https://github.com/mono/mono/commit/842b67d5467ab54d3f14cd25c5ad9c02b32dd33f

Define REG_SP on SPARC in sgen-archdep.h, if needed.

This definition is stolen from exceptions-sparc.c

Changed paths:
  M mono/metadata/sgen-archdep.h

Modified: 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 {	\

   Commit: dc0bf73e84761280c25913b31f158dee887e4445
   Author: Zoltan Varga <[email protected]> (vargaz)
     Date: 2013-10-18 09:22:32 GMT
      URL: https://github.com/mono/mono/commit/dc0bf73e84761280c25913b31f158dee887e4445

Merge pull request #781 from directhex/master

SPARC build fixes

Changed paths:
  M mono/metadata/sgen-archdep.h
  M mono/utils/mono-hwcap-sparc.c

Modified: 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 {	\

Modified: mono/utils/mono-hwcap-sparc.c
===================================================================
@@ -49,9 +49,9 @@
 	 * 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");


_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.