Merged r5589 and r5590 from trunk:

* configure.ac: Fixed CFLAGS for cygwin.
* src/threads/native/threads.c: Inserted asserts for cygwin.
* src/vm/jit/i386/cygwin/Makefile.am: See below.
* src/vm/jit/i386/cygwin/md-asm.h: Added.
* src/vm/jit/i386/cygwin/md-os.c: Inserted asserts.
* src/vm/jit/i386/cygwin/ucontext.c: Added 3rd party file.
* src/vm/jit/i386/cygwin/ucontext.h: Added 3rd party file.

* src/cacao/.cvsignore, src/cacaoh/.cvsignore,
src/vm/jit/tools/.cvsignore: Added ignores for cygwin and
modified properties accordingly.

--HG--
branch : unified_variables

diff --git a/configure.ac b/configure.ac
index 635dcd6b8c980816ca9078307876c2af10cd0bba..94b76138227aad929ca95c4c786e9c7d6598f479 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -77,7 +77,8 @@ dnl host type
 case "$host_os" in
 *cygwin* )
     OS_DIR="cygwin"
-    CFLAGS="$CFLAGS -D__WINDOWS__ -D__CYGWIN__ -ansi -pedantic -Wall -Wno-long-long"
+    INTRP_CFLAGS="$ARCH_CFLAGS -D__WINDOWS__ -D__CYGWIN__ -Wall -Wno-long-long"
+    ARCH_CFLAGS="$ARCH_CFLAGS -D__WINDOWS__ -D__CYGWIN__ -ansi -pedantic -Wall -Wno-long-long"
     ;;
 
 *darwin* )

diff --git a/src/cacao/.cvsignore b/src/cacao/.cvsignore
index 1dedc8f47dafb2e12f937be68bcd78be17b25ca8..c3b42d486e53cce5a14a5694e57ae692814dc5f3 100644 (file)
--- a/src/cacao/.cvsignore
+++ b/src/cacao/.cvsignore
@@ -8,3 +8,4 @@ Makefile
 Makefile.in
 TAGS
 cacao
+cacao.exe

diff --git a/src/cacaoh/.cvsignore b/src/cacaoh/.cvsignore
index b86b59311152dd9a5ee1043f3ba0c7b5eebbac9a..0c6e784695c34a5e2f0d597e1ffd04e0fbfaa28e 100644 (file)
--- a/src/cacaoh/.cvsignore
+++ b/src/cacaoh/.cvsignore
@@ -8,3 +8,4 @@ Makefile
 Makefile.in
 TAGS
 cacaoh
+cacaoh.exe

diff --git a/src/native/jni.c b/src/native/jni.c
index 84f2566c95bb88c5e2d0a50b9b25555f4033d7be..c2e6dabfac010489d918afb94e58b58262a1628c 100644 (file)
--- a/src/native/jni.c
+++ b/src/native/jni.c
@@ -32,7 +32,7 @@
             Christian Thalinger
                        Edwin Steiner
 
-   $Id: jni.c 5573 2006-09-28 20:39:40Z twisti $
+   $Id: jni.c 5580 2006-09-29 12:46:15Z edwin $
 
 */
 

diff --git a/src/threads/native/threads.c b/src/threads/native/threads.c
index c43f0dd62b413a897dc768f229c55b46f9be6a08..a9925e60b318ec5e127d37e86726cdfa1badcf50 100644 (file)
--- a/src/threads/native/threads.c
+++ b/src/threads/native/threads.c
@@ -29,7 +29,7 @@
    Changes: Christian Thalinger
                        Edwin Steiner
 
-   $Id: threads.c 5255 2006-08-21 15:17:48Z twisti $
+   $Id: threads.c 5590 2006-09-30 13:51:12Z michi $
 
 */
 
@@ -569,6 +569,9 @@ void threads_cast_stopworld(void)
        pthread_mutex_lock(&threadlistlock);
 #if defined(__DARWIN__)
        threads_cast_darwinstop();
+#elif defined(__CYGWIN__)
+       /* TODO */
+       assert(0);
 #else
        count = threads_cast_sendsignals(GC_signum1(), 0);
        for (i=0; i<count; i++)
@@ -584,6 +587,9 @@ void threads_cast_startworld(void)
        threads_cast_darwinresume();
 #elif defined(__MIPS__)
        threads_cast_irixresume();
+#elif defined(__CYGWIN__)
+       /* TODO */
+       assert(0);
 #else
        threads_cast_sendsignals(GC_signum2(), -1);
 #endif
@@ -609,6 +615,9 @@ static void threads_sigsuspend_handler(ucontext_t *ctx)
        threads_sem_post(&suspend_ack);
        pthread_cond_wait(&suspend_cond, &suspend_ack_lock);
        pthread_mutex_unlock(&suspend_ack_lock);
+#elif defined(__CYGWIN__)
+       /* TODO */
+       assert(0);
 #else
        threads_sem_post(&suspend_ack);
 

diff --git a/src/vm/jit/tools/.cvsignore b/src/vm/jit/tools/.cvsignore
index 11e10c5d1d007621f8de6d0fbd9946fdcfa5298b..6e6bd7a05faf42496612b0bde304f0c9e1aaabd1 100644 (file)
--- a/src/vm/jit/tools/.cvsignore
+++ b/src/vm/jit/tools/.cvsignore
@@ -5,3 +5,4 @@ Makefile
 Makefile.in
 TAGS
 genoffsets
+genoffsets.exe