You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2007/10/28 12:25:39 UTC
svn commit: r589336 - in /harmony/enhanced/drlvm/trunk/vm/jitrino/src:
codegenerator/ia32/Ia32Tls.cpp shared/mkernel.cpp
Author: hindessm
Date: Sun Oct 28 04:25:38 2007
New Revision: 589336
URL: http://svn.apache.org/viewvc?rev=589336&view=rev
Log:
I think these should be okay on FreeBSD too.
Modified:
harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.cpp
harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.cpp
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.cpp?rev=589336&r1=589335&r2=589336&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/codegenerator/ia32/Ia32Tls.cpp Sun Oct 28 04:25:38 2007
@@ -55,7 +55,7 @@
#elif defined(_WIN32)
// Fast access through FS:[0x14]
tlsBase = createTlsBaseLoadWin(irManager, ctrlNode, tlsBaseType);
-#elif defined(__linux__)
+#elif defined(__linux__) || defined(FREEBSD)
// On Linux, try the fast way
tlsBase = createTlsBaseLoadLin(irManager, ctrlNode, tlsBaseType);
#else
Modified: harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.cpp
URL: http://svn.apache.org/viewvc/harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.cpp?rev=589336&r1=589335&r2=589336&view=diff
==============================================================================
--- harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.cpp (original)
+++ harmony/enhanced/drlvm/trunk/vm/jitrino/src/shared/mkernel.cpp Sun Oct 28 04:25:38 2007
@@ -209,7 +209,7 @@
cpuid
mov fflags, edx
};
-#elif defined (__linux__)
+#elif defined (__linux__) || defined(FREEBSD)
unsigned int stub;
//ebx must be restored for -fPIC
__asm__ __volatile__ (