[ruby-dev:9612] patches for Cygwin 1.1.0

わたなべです.

来週には Cygwin 1.1.1 を出すとか言ってるけど 1.1.0 対応です.

DLEXT は .so にしちゃうのも過激なので .dll も見るように
DLEXT2 を新たに追加しました.

gcc 2.95.2 だとわけのわからない stack pointer 操作が入り,
C で対応するのが面倒なので asm で直接 call するようしました.

-- 
わたなべひろふみ

Mon May  1 23:42:44 2000  WATANABE Hirofumi  <[e-mail]>

	* configure.in, eval.c: add DLEXT2. now DLEXT on Cygwin is "so".

	* defines.h: use dllimport, dllexport for Cygwin 1.1.x.

	* ruby.h: ditto.
	
	* cygwin/GNUmakefile.in: ditto.

	* ext/Win32API/Win32API.c: directly "call" in asm statement for
	  gcc 2.95.x or newer.


diff -u1r -x configure ruby-1.5.3/configure.in 1.5.3/configure.in
--- ruby-1.5.3/configure.in	Wed Apr 12 20:28:16 2000
+++ 1.5.3/configure.in	Mon May 01 00:11:50 2000
@@ -398,2 +398,3 @@
 AC_SUBST(DLEXT)dnl
+AC_SUBST(DLEXT2)dnl
 
@@ -555,4 +556,6 @@
 	 	AC_DEFINE(DLEXT, ".bundle");;
-    cygwin*)	DLEXT=dll
-	 	AC_DEFINE(DLEXT, ".dll");;
+    cygwin*)	DLEXT=so
+	 	AC_DEFINE(DLEXT, ".so")
+		DLEXT2=dll
+	 	AC_DEFINE(DLEXT2, ".dll");;
     os2_emx*)	DLEXT=dll
diff -u1r -x configure ruby-1.5.3/cygwin/GNUmakefile.in 1.5.3/cygwin/GNUmakefile.in
--- ruby-1.5.3/cygwin/GNUmakefile.in	Thu Jan 13 22:09:19 2000
+++ 1.5.3/cygwin/GNUmakefile.in	Mon May 01 00:11:50 2000
@@ -8,2 +8 @@
 	$(LDSHARED) $(DLDFLAGS) -o $(RUBYCWDLL) --output-lib=$(LIBRUBY_SO) --dllname=$(RUBYCWDLL) -Wl,-e,__cygwin_noncygwin_dll_entry@12 --add-stdcall-alias $(OBJS) dmyext.o
-	@NM@ --extern-only $(OBJS) dmyext.o | sed -n '/^........ [CD] _\(.*\)$$/s//#define \1 (*__imp_\1)/p' >import.h 
diff -u1r -x configure ruby-1.5.3/defines.h 1.5.3/defines.h
--- ruby-1.5.3/defines.h	Fri Feb 18 01:16:58 2000
+++ 1.5.3/defines.h	Mon May 01 00:11:50 2000
@@ -36,2 +36,10 @@
 
+#if defined __CYGWIN__
+# if defined USEIMPORTLIB
+#  define EXTERN extern __declspec(dllimport)
+# else
+#  define EXTERN extern __declspec(dllexport)
+# endif
+#endif
+
 #ifndef EXTERN
@@ -64,3 +72,3 @@
 
-#if defined(__CYGWIN__) || defined(DJGPP) || defined(__BOW__)
+#if defined(DJGPP) || defined(__BOW__)
 #undef HAVE_SETITIMER
diff -u1r -x configure ruby-1.5.3/eval.c 1.5.3/eval.c
--- ruby-1.5.3/eval.c	Tue Apr 18 21:59:13 2000
+++ 1.5.3/eval.c	Mon May 01 01:27:12 2000
@@ -4945,2 +4945,12 @@
 	    }
+#ifdef DLEXT2
+	    else if (strcmp(ext, DLEXT2) != 0) {
+		buf = ALLOCA_N(char, strlen(file)+sizeof(DLEXT2)+1);
+		strcpy(buf, feature);
+		ext = strrchr(buf, '.');
+		strcpy(ext, DLEXT2);
+		file = feature = buf;
+		if (rb_provided(feature)) return Qfalse;
+	    }
+#endif
 	    file = rb_find_file(file);
@@ -4970,2 +4980,11 @@
     }
+#ifdef DLEXT2
+    strcpy(buf, RSTRING(fname)->ptr);
+    strcat(buf, DLEXT2);
+    file = rb_find_file(buf);
+    if (file) {
+	feature = buf;
+	goto load_dyna;
+    }
+#endif
     rb_raise(rb_eLoadError, "No such file to load -- %s",
diff -u1r -x configure ruby-1.5.3/ext/Win32API/Win32API.c 1.5.3/ext/Win32API/Win32API.c
--- ruby-1.5.3/ext/Win32API/Win32API.c	Mon Mar 06 21:59:01 2000
+++ 1.5.3/ext/Win32API/Win32API.c	Mon May 01 00:11:50 2000
@@ -134,2 +134,3 @@
     int items;
+    int ret;
 
@@ -164,3 +165,3 @@
 		}
-#elif defined(__CYGWIN__) || defined(__MINGW32__)
+#elif defined __GNUC__
 		asm volatile ("pushl %0" :: "g" (lParam));
@@ -186,3 +187,3 @@
 		}
-#elif defined(__CYGWIN__) || defined(__MINGW32__)
+#elif defined __GNUC__
 		asm volatile ("pushl %0" :: "g" (pParam));
@@ -196,2 +197,18 @@
 
+#if defined __GNUC__
+    asm volatile ("call *%1" : "=r" (ret) : "g" (ApiFunction));
+    switch (texport) {
+    case _T_NUMBER:
+    case _T_INTEGER:
+	Return = INT2NUM(ret);
+	break;
+    case _T_POINTER:
+	Return = rb_str_new2((char *)ret);
+	break;
+    case _T_VOID:
+    default:
+	Return = INT2NUM(0);
+	break;
+    }
+#else
     switch (texport) {
@@ -216,2 +233,3 @@
     }
+#endif
     return Return;
diff -u1r -x configure ruby-1.5.3/ruby.h 1.5.3/ruby.h
--- ruby-1.5.3/ruby.h	Tue Mar 07 22:09:55 2000
+++ 1.5.3/ruby.h	Mon May 01 00:11:50 2000
@@ -73,12 +73,2 @@
 
-#if defined(__CYGWIN32__)
-#if defined(USEIMPORTLIB)
-#include "import.h"
-#else
-#if !defined(__CYGWIN__)
-#define environ (*__imp___cygwin_environ)
-#endif
-#endif
-#endif
-
 #ifdef _AIX