Permalink
Browse files

Changed from bits to wordsize, as suggested by Paolo

svn path=/trunk/mono/; revision=113553
  • Loading branch information...
1 parent 36e8fdf commit 4232f1f3c70d326fe375207060f5fd4bcf87eabe @migueldeicaza migueldeicaza committed Sep 19, 2008
Showing with 15 additions and 15 deletions.
  1. +1 −1 man/mono-config.5
  2. +14 −14 mono/metadata/mono-config.c
View
@@ -84,7 +84,7 @@ This is the name of the architecture for which the mapping should be applied.
Allowed values are: x86, x86-64, sparc, ppc, s390, s390x, arm, mips,
alpha, hppa, ia64.
.TP
-.I bits
+.I wordsize
This is the size of registers on the target architecture, it can be
either 32 or 64.
.PP
@@ -43,40 +43,40 @@
#if defined(__i386__)
#define CONFIG_CPU "x86"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#elif defined(__x86_64__)
#define CONFIG_CPU "x86-64"
-#define CONFIG_BITS "64"
+#define CONFIG_WORDSIZE "64"
#elif defined(sparc) || defined(__sparc__)
#define CONFIG_CPU "sparc"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#elif defined(__ppc64__) || defined(__powerpc64__)
#define CONFIG_CPU "ppc64"
-#define CONFIG_BITS "64"
+#define CONFIG_WORDSIZE "64"
#elif defined(__ppc__) || defined(__powerpc__)
#define CONFIG_CPU "ppc"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#elif defined(__s390x__)
#define CONFIG_CPU "s390x"
-#define CONFIG_BITS "64"
+#define CONFIG_WORDSIZE "64"
#elif defined(__s390__)
#define CONFIG_CPU "s390"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#elif defined(__arm__)
#define CONFIG_CPU "arm"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#elif defined(__ia64__)
#define CONFIG_CPU "ia64"
-#define CONFIG_BITS "64"
+#define CONFIG_WORDSIZE "64"
#elif defined(__alpha__)
#define CONFIG_CPU "alpha"
-#define CONFIG_BITS "64"
+#define CONFIG_WORDSIZE "64"
#elif defined(hppa) || defined(__hppa__)
#define CONFIG_CPU "hppa"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#elif defined(mips) || defined(__mips) || defined(_mips)
#define CONFIG_CPU "mips"
-#define CONFIG_BITS "32"
+#define CONFIG_WORDSIZE "32"
#else
#warning Unknown CPU
#define CONFIG_CPU "unknownCPU"
@@ -259,7 +259,7 @@ dllmap_start (gpointer user_data,
info->ignore = TRUE;
else if (strcmp (attribute_names [i], "cpu") == 0 && !arch_matches (CONFIG_CPU, attribute_values [i]))
info->ignore = TRUE;
- else if (strcmp (attribute_names [i], "bits") == 0 && !arch_matches (CONFIG_BITS, attribute_values [i]))
+ else if (strcmp (attribute_names [i], "wordsize") == 0 && !arch_matches (CONFIG_WORDSIZE, attribute_values [i]))
info->ignore = TRUE;
}
if (!info->ignore)
@@ -278,7 +278,7 @@ dllmap_start (gpointer user_data,
ignore = TRUE;
else if (strcmp (attribute_names [i], "cpu") == 0 && !arch_matches (CONFIG_CPU, attribute_values [i]))
ignore = TRUE;
- else if (strcmp (attribute_names [i], "bits") == 0 && !arch_matches (CONFIG_BITS, attribute_values [i]))
+ else if (strcmp (attribute_names [i], "wordsize") == 0 && !arch_matches (CONFIG_WORDSIZE, attribute_values [i]))
ignore = TRUE;
}
if (!dll)

0 comments on commit 4232f1f

Please sign in to comment.