From ec5c64d4722af2e6a13fbfa81e1b2022df823c51 Mon Sep 17 00:00:00 2001
From: "U-JOELDICEXPVM\\Joel Dice" <Joel Dice@joeldicexpvm.(none)>
Date: Fri, 13 Feb 2009 17:03:46 -0700
Subject: [PATCH] fix Cygwin build

---
 makefile      | 4 ++--
 src/compile.S | 2 +-
 src/x86.S     | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/makefile b/makefile
index 87fc2329f1..227d5cd4e4 100644
--- a/makefile
+++ b/makefile
@@ -127,8 +127,8 @@ ifeq ($(platform),windows)
 		objcopy = i586-mingw32msvc-objcopy
 		strip = i586-mingw32msvc-strip
 	else
-		build-cflags = $(common-cflags) \
-			"-I$(JAVA_HOME)/include/win32" -I$(src) -mthreads
+		common-cflags += "-I$(JAVA_HOME)/include/win32"
+		build-cflags = $(common-cflags) -I$(src) -mthreads
 		ifeq ($(build-platform),cygwin)
 			build-lflags += -mno-cygwin
 			build-cflags += -mno-cygwin
diff --git a/src/compile.S b/src/compile.S
index c19e6f484f..90416024ee 100644
--- a/src/compile.S
+++ b/src/compile.S
@@ -71,7 +71,7 @@ test:
 
 #elif defined __i386__
 
-#  if defined __APPLE__ || defined __MINGW32__
+#  if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
 .globl _vmInvoke
 _vmInvoke: 
 #  else
diff --git a/src/x86.S b/src/x86.S
index 830b9f08e5..4655cb5312 100644
--- a/src/x86.S
+++ b/src/x86.S
@@ -120,7 +120,7 @@ vmJump:
 
 #elif defined __i386__
 
-#  if defined __APPLE__ || defined __MINGW32__
+#  if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
 .globl _vmNativeCall
 _vmNativeCall: 
 #  else
@@ -197,7 +197,7 @@ exit:
    popl   %ebp
    ret
      
-#  if defined __APPLE__ || defined __MINGW32__
+#  if defined __APPLE__ || defined __MINGW32__ || defined __CYGWIN32__
 .globl _vmJump
 _vmJump:
 #  else