diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/boehm.cc | 6 | ||||
| -rw-r--r-- | libjava/classpath/ChangeLog | 6 | ||||
| -rw-r--r-- | libjava/classpath/native/fdlibm/mprec.c | 9 | ||||
| -rw-r--r-- | libjava/configure.host | 7 | ||||
| -rw-r--r-- | libjava/java/lang/natClass.cc | 6 |
6 files changed, 36 insertions, 7 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 661bb7a..0bedfed 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2014-05-13 Bernd Edlinger <bernd.edlinger@hotmail.de> + + Fix current cygwin-64 build problems. + * configure.host: Added handling for x86_64-*-cygwin/mingw. + * boehm.cc (_Jv_GCAttachThread, _Jv_GCDetachThread): Don't compile if + GC_WIN32_THREADS is defined. + * java/lang/natClass.cc (_Jv_InterfaceAssignableFrom): Rename interface + to source_interface. + 2014-04-22 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac (THREADLIBS, THREADSPEC): Remove *-*-solaris2.9 diff --git a/libjava/boehm.cc b/libjava/boehm.cc index 855d23c..043fd00 100644 --- a/libjava/boehm.cc +++ b/libjava/boehm.cc @@ -747,7 +747,8 @@ _Jv_GCAttachThread () // The registration interface is only defined on posixy systems and // only actually works if pthread_getattr_np is defined. // FIXME: until gc7 it is simpler to disable this on solaris. -#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) +#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) \ + && !defined(GC_WIN32_THREADS) GC_register_my_thread (); #endif } @@ -755,7 +756,8 @@ _Jv_GCAttachThread () void _Jv_GCDetachThread () { -#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) +#if defined(HAVE_PTHREAD_GETATTR_NP) && !defined(GC_SOLARIS_THREADS) \ + && !defined(GC_WIN32_THREADS) GC_unregister_my_thread (); #endif } diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 4d9f1a6..4389fc0 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,9 @@ +2014-05-13 Bernd Edlinger <bernd.edlinger@hotmail.de> + + Fix current cygwin-64 build problems. + * native/fdlibm/mprec.c (_REENT_CHECK_MP, _REENT_MP_FREELIST, + _REENT_MP_P5S, __ULong, __Long): Undefine previous definitions. + 2013-09-20 Alan Modra <amodra@gmail.com> * configure: Regenerate. diff --git a/libjava/classpath/native/fdlibm/mprec.c b/libjava/classpath/native/fdlibm/mprec.c index 8a7cdc0..460c3010 100644 --- a/libjava/classpath/native/fdlibm/mprec.c +++ b/libjava/classpath/native/fdlibm/mprec.c @@ -93,12 +93,17 @@ #define _reent _Jv_reent #define _Bigint _Jv_Bigint +#undef _REENT_CHECK_MP #define _REENT_CHECK_MP(x) +#undef _REENT_MP_FREELIST #define _REENT_MP_FREELIST(x) ((x)->_freelist) +#undef _REENT_MP_P5S #define _REENT_MP_P5S(x) ((x)->_p5s) -typedef unsigned long __ULong; -typedef long __Long; +#undef __ULong +#define __ULong unsigned long +#undef __Long +#define __Long long static void * mprec_calloc (void *ignore, size_t x1, size_t x2) diff --git a/libjava/configure.host b/libjava/configure.host index f2d1bb5..c6f359c 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -365,6 +365,13 @@ EOF esac case "${host}" in + x86_64-*-cygwin* | x86_64-*-mingw*) + # Win32 DLLs are limited to 64k exported symbols each. + enable_libgcj_sublibs_default=yes + libgcj_sublib_ltflags='$(lt_host_flags) \ + -Wl,-u,_ZN3org4ietf4jgss10GSSManagerC1Ev,-L..,-lgcj-noncore-dummy' + libgcj_sublib_core_extra_deps=libgcj-noncore-dummy.dll.a + ;; *-cygwin* | *-mingw*) fallback_backtrace_h=sysdep/i386/backtrace.h # We need a frame pointer on Windows, so override BACKTRACESPEC diff --git a/libjava/java/lang/natClass.cc b/libjava/java/lang/natClass.cc index b5ad91f..00766d0 100644 --- a/libjava/java/lang/natClass.cc +++ b/libjava/java/lang/natClass.cc @@ -1870,9 +1870,9 @@ _Jv_InterfaceAssignableFrom (jclass source, jclass iface) { for (int i = 0; i < source->interface_count; i++) { - jclass interface = source->interfaces[i]; - if (iface == interface - || _Jv_InterfaceAssignableFrom (interface, iface)) + jclass source_interface = source->interfaces[i]; + if (iface == source_interface + || _Jv_InterfaceAssignableFrom (source_interface, iface)) return true; } |