You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2008/03/27 15:13:09 UTC
svn commit: r641826 - in /harmony/enhanced/drlvm/trunk:
make/vm/common-vm.xml make/vm/jitrino.xml vm/include/open/hythread.h
vm/include/open/hythread_ext.h vm/port/include/port_barriers.h
vm/thread/src/thread_native_basic.c
Author: tellison
Date: Thu Mar 27 07:13:07 2008
New Revision: 641826
URL: http://svn.apache.org/viewvc?rev=641826&view=rev
Log:
Apply patch HARMONY-5557 ([build] Problem building Harmony on MSVC 2005)
Modified:
harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml
harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml
harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h
harmony/enhanced/drlvm/trunk/vm/port/include/port_barriers.h
harmony/enhanced/drlvm/trunk/vm/thread/src/thread_native_basic.c
Modified: harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml?rev=641826&r1=641825&r2=641826&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/common-vm.xml Thu Mar 27 07:13:07 2008
@@ -103,6 +103,8 @@
<defineset define="HY_NO_SIG" if="hy.skip.sig"/>
<defineset define="HY_LOCAL_ZLIB" if="hy.skip.zlib"/>
+ <compilerarg value="/wd4996" if="is.windows" />
+
</compiler>
<compiler id="common.cpp.compiler" name="${hy.cpp.compiler}" extends="common.compiler">
Modified: harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml?rev=641826&r1=641825&r2=641826&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml (original)
+++ harmony/enhanced/drlvm/trunk/make/vm/jitrino.xml Thu Mar 27 07:13:07 2008
@@ -108,7 +108,7 @@
<target name="-init-win" depends="-common-vm" if="is.windows">
<compiler id="plaf.cpp.compiler" extends="common.cpp.compiler">
<!-- _CRT_SECURE_NO_DEPRECATE added to suppress a huge amount of complaints from msvc em64t compiler -->
- <defineset define="_MBCS,_REENTRANT,__SMP__,_CRT_SECURE_NO_DEPRECATE,_HAS_ITERATOR_DEBUGGING=0,_SECURE_SCL=0" />
+ <defineset define="_MBCS,_REENTRANT,__SMP__,_HAS_ITERATOR_DEBUGGING=0,_SECURE_SCL=0" />
<compilerarg value="/TP" />
<compilerarg value="/Zc:forScope" />
Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h?rev=641826&r1=641825&r2=641826&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread.h Thu Mar 27 07:13:07 2008
@@ -18,6 +18,12 @@
#if !defined(HYTHREAD_H)
#define HYTHREAD_H
+#ifdef _WIN32
+# if (_MSC_VER >= 1400)
+# include <intrin.h>
+# endif
+#endif
+
#if defined(__cplusplus)
extern "C" {
#endif
@@ -27,14 +33,6 @@
#include <stddef.h>
#include "hycomp.h"
-
-#ifdef _WIN32
-# if (_MSC_VER >= 1400)
-# include <intrin.h>
-# endif
-#endif
-
-
/*
* Idea behind these declarations is to make some functions static inlined for
* all files that include hythread_ext.h/hythread.h except one, that
@@ -544,4 +542,5 @@
#endif
#endif /* HYTHREAD_H */
+
Modified: harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h?rev=641826&r1=641825&r2=641826&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/include/open/hythread_ext.h Thu Mar 27 07:13:07 2008
@@ -118,12 +118,11 @@
#define HYTHREAD_EXT_H
#include "open/types.h"
+#include "open/hythread.h"
#if defined(__cplusplus)
extern "C" {
#endif
-
-#include "open/hythread.h"
#include <open/types.h>
#include <apr_pools.h>
Modified: harmony/enhanced/drlvm/trunk/vm/port/include/port_barriers.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/port/include/port_barriers.h?rev=641826&r1=641825&r2=641826&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/port/include/port_barriers.h (original)
+++ harmony/enhanced/drlvm/trunk/vm/port/include/port_barriers.h Thu Mar 27 07:13:07 2008
@@ -30,6 +30,13 @@
* @defgroup port_barriers Memory read/write barriers
*/
+#ifdef _WIN32
+# if (_MSC_VER >= 1400)
+# include <intrin.h>
+# include <emmintrin.h>
+# endif
+#endif
+
#ifdef __cplusplus
extern "C" {
#endif
@@ -93,10 +100,6 @@
void _WriteBarrier(void);
void _mm_mfence(void);
void _mm_sfence(void);
-#else
- /* VC++ 2005 */
- #include <intrin.h>
- #include <emmintrin.h>
#endif
#if !defined(__INTEL_COMPILER)
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=641826&r1=641825&r2=641826&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 Mar 27 07:13:07 2008
@@ -336,7 +336,7 @@
void VMCALL hythread_set_self(hythread_t thread) {
#ifndef _WIN64
# if (_MSC_VER >= 1400)
- __writefsdword(offsetof(NT_TIB, ArbitraryUserPointer), thread);
+ __writefsdword(offsetof(NT_TIB, ArbitraryUserPointer), (unsigned long)thread);
# else
_asm{
mov eax, thread