harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arc...@apache.org
Subject svn commit: r380969 - in /incubator/harmony/enhanced/jchevm/libjc: arch/i386/i386_definitions.h arch/i386/i386_libjc.h jc_invoke.c os_functions.c properties.c
Date Sat, 25 Feb 2006 19:24:48 GMT
Author: archie
Date: Sat Feb 25 11:24:48 2006
New Revision: 380969

URL: http://svn.apache.org/viewcvs?rev=380969&view=rev
Log:
Fixes for Cygwin.

Modified:
    incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_definitions.h
    incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h
    incubator/harmony/enhanced/jchevm/libjc/jc_invoke.c
    incubator/harmony/enhanced/jchevm/libjc/os_functions.c
    incubator/harmony/enhanced/jchevm/libjc/properties.c

Modified: incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_definitions.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_definitions.h?rev=380969&r1=380968&r2=380969&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_definitions.h (original)
+++ incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_definitions.h Sat Feb 25 11:24:48
2006
@@ -34,9 +34,11 @@
 /* Fixes for Cygwin */
 #ifdef __CYGWIN__
 #undef _JC_LIBRARY_FMT
-#define _JC_LIBRARY_FMT		"cyg%s.dll"
+#define _JC_LIBRARY_FMT			"cyg%s-0.dll"
 #define sched_get_priority_max(x)	(15)
 #define sched_get_priority_min(x)	(1)
+#define PTHREAD_STACK_MIN		1024
+#define _JC_NO_THREAD_ATTRIBUTES	1
 #endif
 
 #endif	/* _ARCH_I386_DEFINITIONS_H_ */

Modified: incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h?rev=380969&r1=380968&r2=380969&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h (original)
+++ incubator/harmony/enhanced/jchevm/libjc/arch/i386/i386_libjc.h Sat Feb 25 11:24:48 2006
@@ -61,6 +61,14 @@
 	return (const void *)buf[0].__jmpbuf[4];
 }
 
+#elif defined(__CYGWIN__)
+
+extern inline const void *
+_jc_jmpbuf_sp(const sigjmp_buf buf)
+{
+	return (const void *)buf[7];
+}
+
 #else
 #error "Unsupported O/S for i386 machine context functions"
 #endif

Modified: incubator/harmony/enhanced/jchevm/libjc/jc_invoke.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/jc_invoke.c?rev=380969&r1=380968&r2=380969&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/jc_invoke.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/jc_invoke.c Sat Feb 25 11:24:48 2006
@@ -110,7 +110,9 @@
 	"Show additional options", NULL },
     {	"version",		'V', POPT_ARG_NONE,   NULL, OPT_VERSION,
 	"Display version and exit", NULL },
+#ifndef __CYGWIN__
 	POPT_AUTOHELP
+#endif
 	POPT_TABLEEND
 };
 static const	int jc_num_options

Modified: incubator/harmony/enhanced/jchevm/libjc/os_functions.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/os_functions.c?rev=380969&r1=380968&r2=380969&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/os_functions.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/os_functions.c Sat Feb 25 11:24:48 2006
@@ -110,6 +110,20 @@
 	return num;
 }
 
+#elif defined(__CYGWIN__)
+
+/************************************************************************
+ *				CYGWIN					*
+ ************************************************************************/
+
+#include <unistd.h>
+
+int
+_jc_num_cpus(_jc_env *env)
+{
+	return (int)sysconf(_SC_NPROCESSORS_ONLN);
+}
+
 /************************************************************************
  *				Others					*
  ************************************************************************/

Modified: incubator/harmony/enhanced/jchevm/libjc/properties.c
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/jchevm/libjc/properties.c?rev=380969&r1=380968&r2=380969&view=diff
==============================================================================
--- incubator/harmony/enhanced/jchevm/libjc/properties.c (original)
+++ incubator/harmony/enhanced/jchevm/libjc/properties.c Sat Feb 25 11:24:48 2006
@@ -127,9 +127,14 @@
 
 	/* Set user timezone */
 	now = time(NULL);
+#ifdef __CYGWIN__
+	if (_jc_set_property(env, "user.timezone", _tzname[0]) != JNI_OK)
+		return JNI_ERR;
+#else
 	if (_jc_set_property(env,
 	    "user.timezone", localtime(&now)->tm_zone) != JNI_OK)
 		return JNI_ERR;
+#endif
 
 	/* Set operating system info */
 	if (uname(&uts) == -1) {



Mime
View raw message