Merge pull request #5567 from kumpera/fix_59334

[mono.git] / mono / utils / mono-hwcap-sparc.c

diff --git a/mono/utils/mono-hwcap-sparc.c b/mono/utils/mono-hwcap-sparc.c
index ba849873632cf0798c66c34ecddf2990056d9873..6775a39668fc988fa031f3f4c1187eaa3ad26541 100644 (file)
--- a/mono/utils/mono-hwcap-sparc.c
+++ b/mono/utils/mono-hwcap-sparc.c
@@ -1,5 +1,6 @@
-/*
- * mono-hwcap-sparc.c: SPARC hardware feature detection
+/**
+ * \file
+ * SPARC hardware feature detection
  *
  * Authors:
  *    Alex Rønne Petersen (alexrp@xamarin.com)
@@ -19,26 +20,22 @@
  * Licensed under the MIT license. See LICENSE file in the project root for full license information.
  */
 
-#include "mono/utils/mono-hwcap-sparc.h"
+#include "mono/utils/mono-hwcap.h"
 
 #include <string.h>
-
 #if !defined(__linux__)
 #include <sys/systeminfo.h>
 #else
 #include <unistd.h>
 #endif
 
-gboolean mono_hwcap_sparc_is_v9 = FALSE;
-
 void
 mono_hwcap_arch_init (void)
 {
        char buf [1024];
 
 #if !defined(__linux__)
-       if (!sysinfo (SI_ISALIST, buf, 1024))
-               g_assert_not_reached ();
+       g_assert (sysinfo (SI_ISALIST, buf, 1024));
 #else
        /* If the page size is 8192, we're on a 64-bit SPARC, which
         * in turn means a v9 or better.
@@ -51,9 +48,3 @@ mono_hwcap_arch_init (void)
 
        mono_hwcap_sparc_is_v9 = strstr (buf, "sparcv9");
 }
-
-void
-mono_hwcap_print (FILE *f)
-{
-       g_fprintf (f, "mono_hwcap_sparc_is_v9 = %i\n", mono_hwcap_sparc_is_v9);
-}