Merge pull request #1287 from akoeplinger/fix-appconfig-performancecounters

[mono.git] / mono / mini / mini-amd64.h

diff --git a/mono/mini/mini-amd64.h b/mono/mini/mini-amd64.h
index 7baab9d6e6e50909bb2041d689218f284e7cf829..e942f578226606a72ee6bcf6e940002b7745621a 100644 (file)
--- a/mono/mini/mini-amd64.h
+++ b/mono/mini/mini-amd64.h
@@ -167,9 +167,6 @@ struct MonoLMF {
         * If the third lowest bit is set, then this is a MonoLMFTramp structure.
         */
        gpointer    previous_lmf;
-#ifdef HOST_WIN32
-       gpointer    lmf_addr;
-#endif
 #if defined(__default_codegen__) || defined(HOST_WIN32)
        guint64     rip;
 #elif defined(__native_client_codegen__)
@@ -312,7 +309,7 @@ typedef struct {
 
 #define MONO_ARCH_NOMAP32BIT
 
-#elif defined (__FreeBSD__)
+#elif defined (__FreeBSD__) || defined(__FreeBSD_kernel__)
 
 #define REG_RAX 7
 #define REG_RCX 4
@@ -384,7 +381,7 @@ typedef struct {
 #define MONO_ARCH_HAVE_GET_TRAMPOLINES 1
 
 #define MONO_ARCH_AOT_SUPPORTED 1
-#if !defined( HOST_WIN32 ) && !defined( __native_client__ )
+#if !defined( __native_client__ )
 #define MONO_ARCH_SOFT_DEBUG_SUPPORTED 1
 #endif