harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ibere...@apache.org
Subject svn commit: r796956 - in /harmony/enhanced/drlvm/trunk/vm: gc_gen/src/common/gc_platform.h port/src/signals/linux/signals_common.cpp thread/src/thread_native_basic.c
Date Thu, 23 Jul 2009 06:09:06 GMT
Author: iberezhn
Date: Thu Jul 23 06:09:06 2009
New Revision: 796956

URL: http://svn.apache.org/viewvc?rev=796956&view=rev
Log:
Fix build on FreeBSD

Modified:
    harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h
    harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_common.cpp
    harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c

Modified: harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h?rev=796956&r1=796955&r2=796956&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/gc_gen/src/common/gc_platform.h Thu Jul 23 06:09:06 2009
@@ -66,7 +66,7 @@
 #define prefetchnta(pref_addr)	_mm_prefetch((char*)(pref_addr), _MM_HINT_NTA )
 #endif /*ALLOC_PREFETCH*/
 
-#elif defined (__linux__)
+#elif defined (__linux__) || defined (FREEBSD)
 #define FORCE_INLINE inline  __attribute__((always_inline))
 
 #ifdef PREFETCH_SUPPORTED

Modified: harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_common.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_common.cpp?rev=796956&r1=796955&r2=796956&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_common.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/src/signals/linux/signals_common.cpp Thu Jul 23 06:09:06
2009
@@ -268,9 +268,9 @@
 // For signals that must change their default behavior
 struct sig_redef
 {
-    int             signal;
-    sighandler_t    handler;
-    bool            set_up;
+    int     signal;
+    sig_t   handler;
+    bool    set_up;
 };
 
 static sig_redef signals_other[] =
@@ -278,7 +278,7 @@
     { SIGPIPE, SIG_IGN, false }
 };
 
-static sighandler_t old_handlers[sizeof(signals_other)/sizeof(signals_other[0])];
+static sig_t old_handlers[sizeof(signals_other)/sizeof(signals_other[0])];
 
 
 static void restore_signals()

Modified: harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c?rev=796956&r1=796955&r2=796956&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c (original)
+++ harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c Thu Jul 23 06:09:06 2009
@@ -888,7 +888,7 @@
 } // hythread_set_state
 
 IDATA VMCALL hythread_get_thread_id_offset() {
-    return (U_32)&((HyThread *)0)->thread_id;
+    return (U_32)(size_t)&((HyThread *)0)->thread_id;
 } // hythread_get_thread_id_offset
 
 IDATA VMCALL hythread_set_thread_stop_callback(hythread_t thread,



Mime
View raw message