[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Libjit] [PATCH v2 2/3] Don't use Win32 API on Cygwin
From: |
Ken Brown |
Subject: |
[Libjit] [PATCH v2 2/3] Don't use Win32 API on Cygwin |
Date: |
Sat, 1 Sep 2018 10:27:47 -0400 |
---
ChangeLog | 13 +++++++++++++
jit/jit-config.h | 6 +-----
jit/jit-elf-read.c | 2 +-
jit/jit-intrinsic.c | 8 ++++----
jitdynamic/jit-dynlib.c | 7 +------
tools/gen-apply-helper.h | 3 +--
6 files changed, 21 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 09b4202..09fe37d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2018-09-01 Ken Brown <address@hidden>
+
+ Don't use Win32 API on Cygwin.
+ * jit/jit-config.h: Don't define JIT_WIN32_PLATFORM on Cygwin.
+ Remove the definitions of JIT_WIN32_NATIVE and JIT_WIN32_CYGWIN,
+ which are no longer needed.
+ * jit/jit-elf-read.c:
+ * jit/jit-intrinsic.c:
+ * jitdynamic/jit-dynlib.c: Replace all uses of JIT_WIN32_NATIVE by
+ JIT_WIN32_PLATFORM.
+ * tools/gen-apply-helper.h: Don't define PLATFORM_IS_WIN32 on
+ Cygwin.
+
2018-09-01 Ken Brown <address@hidden>
* configure.ac: Don't use -mno-cygwin in the Cygwin build. This
diff --git a/jit/jit-config.h b/jit/jit-config.h
index ad52a89..520dfe1 100644
--- a/jit/jit-config.h
+++ b/jit/jit-config.h
@@ -28,11 +28,7 @@
/*
* Determine what kind of system we are running on.
*/
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-# define JIT_WIN32_CYGWIN 1
-# define JIT_WIN32_PLATFORM 1
-#elif defined(_WIN32) || defined(WIN32)
-# define JIT_WIN32_NATIVE 1
+#if defined(_WIN32) || defined(WIN32)
# define JIT_WIN32_PLATFORM 1
#elif defined(__APPLE__) && defined(__MACH__)
# define JIT_DARWIN_PLATFORM 1
diff --git a/jit/jit-elf-read.c b/jit/jit-elf-read.c
index bb1d670..1b5c1de 100644
--- a/jit/jit-elf-read.c
+++ b/jit/jit-elf-read.c
@@ -120,7 +120,7 @@ existing format was better than inventing a completely new
one.
/*
* Deal with platform differences in the file descriptor routines.
*/
-#ifdef JIT_WIN32_NATIVE
+#ifdef JIT_WIN32_PLATFORM
#define sys_open _open
#define sys_close _close
#define sys_read _read
diff --git a/jit/jit-intrinsic.c b/jit/jit-intrinsic.c
index cc0e11f..78bfeed 100644
--- a/jit/jit-intrinsic.c
+++ b/jit/jit-intrinsic.c
@@ -26,7 +26,7 @@
#elif defined(HAVE_MATH_H)
#include <math.h>
#endif
-#ifdef JIT_WIN32_NATIVE
+#ifdef JIT_WIN32_PLATFORM
#include <float.h>
#if !defined(isnan)
#define isnan(value) _isnan((value))
@@ -1626,7 +1626,7 @@ jit_float32 jit_float32_tanh(jit_float32 value1)
@*/
jit_int jit_float32_is_finite(jit_float32 value)
{
-#if defined(hpux) || defined(JIT_WIN32_NATIVE)
+#if defined(hpux) || defined(JIT_WIN32_PLATFORM)
return isfinite(value);
#else /* !hpux */
#if defined(HAVE_FINITEF)
@@ -2118,7 +2118,7 @@ jit_float64 jit_float64_tanh(jit_float64 value1)
@*/
jit_int jit_float64_is_finite(jit_float64 value)
{
-#if defined(hpux) || defined(JIT_WIN32_NATIVE)
+#if defined(hpux) || defined(JIT_WIN32_PLATFORM)
return isfinite(value);
#else /* !hpux */
#if defined(HAVE_FINITE)
@@ -2679,7 +2679,7 @@ jit_nfloat jit_nfloat_tanh(jit_nfloat value1)
@*/
jit_int jit_nfloat_is_finite(jit_nfloat value)
{
-#if defined(hpux) || defined(JIT_WIN32_NATIVE)
+#if defined(hpux) || defined(JIT_WIN32_PLATFORM)
return isfinite(value);
#else /* !hpux */
#if defined(HAVE_FINITEL) && !defined(JIT_NFLOAT_IS_DOUBLE)
diff --git a/jitdynamic/jit-dynlib.c b/jitdynamic/jit-dynlib.c
index 960bfed..a318ae3 100644
--- a/jitdynamic/jit-dynlib.c
+++ b/jitdynamic/jit-dynlib.c
@@ -26,11 +26,6 @@
#include <config.h>
#ifdef JIT_WIN32_PLATFORM
#include <windows.h>
- #ifndef JIT_WIN32_NATIVE
- #ifdef HAVE_SYS_CYGWIN_H
- #include <sys/cygwin.h>
- #endif
- #endif
#else
#ifdef HAVE_DLFCN_H
#include <dlfcn.h>
@@ -227,7 +222,7 @@ const char *jit_dynlib_get_suffix(void)
return "dylib";
}
-#elif defined(JIT_WIN32_PLATFORM) /* Native Win32 or Cygwin */
+#elif defined(JIT_WIN32_PLATFORM)
jit_dynlib_handle_t jit_dynlib_open(const char *name)
{
diff --git a/tools/gen-apply-helper.h b/tools/gen-apply-helper.h
index 825f359..771af6c 100644
--- a/tools/gen-apply-helper.h
+++ b/tools/gen-apply-helper.h
@@ -30,8 +30,7 @@
#endif
#if defined(__i386) || defined(__i386__) || defined(_M_IX86)
# define PLATFORM_IS_X86 1
-# if defined(__CYGWIN__) || defined(__CYGWIN32__) \
- || defined(_WIN32) || defined(WIN32)
+# if defined(_WIN32) || defined(WIN32)
# define PLATFORM_IS_WIN32 1
# include <malloc.h>
# ifndef alloca
--
2.17.0