OSDN Git Service

(root) / pf3gnuchains / gcc-fork.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 4638656)
PR target/42811
authordavek <davek@138bc75d-0d04-0410-961f-82ee72b054a4>
Sun, 21 Mar 2010 19:41:37 +0000 (19:41 +0000)
committerMasaki Muranaka <monaka@monami-software.com>
Sun, 23 May 2010 05:13:53 +0000 (14:13 +0900)
* libjava/configure.ac (DLLTOOL): Call AC_CHECK_TOOL.
(libgcj_sublib_core_extra_deps): New host-dependent configure var.
(LIBGCJ_SUBLIB_CORE_EXTRA_DEPS): AC_SUBST it.
* libjava/configure.host (libgcj_sublib_core_extra_deps): Define
appropriately on Cygwin and MinGW.
(libgcj_sublib_core_extra_deps): Add libgcj-noncore-dummy import
stub library on Cygwin and MinGW.
* libjava/Makefile.am (LIBJAVA_CORE_EXTRA): Import AC_SUBST'd
LIBGCJ_SUBLIB_CORE_EXTRA_DEPS if building sublibs, else define empty.
(libgcj_la_DEPENDENCIES): Use it.
(DLL_VERSION): New makefile macro.
(libgcj-noncore-dummy.dll.a): New build rule for dummy import stub
library.
(libgcj_noncore_la_LIBADD): Trim superfluous convenience libs.
(AM_MAKEFLAGS): Add DLLTOOL recursive propagation.
* libjava/libgcj-noncore-dummy.def: New file.
* libjava/Makefile.in: Regenerate.
* libjava/include/Makefile.in: Likewise.
* libjava/testsuite/Makefile.in: Likewise.
* libjava/configure: Likewise.
* libjava/gcj/Makefile.in: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@157606 138bc75d-0d04-0410-961f-82ee72b054a4

libjava/ChangeLog patch | blob | history
libjava/Makefile.in patch | blob | history
libjava/configure patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 9e14331..365968a 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,30 @@
 2010-03-21  Dave Korn  <dave.korn.cygwin@gmail.com>
 
 2010-03-21  Dave Korn  <dave.korn.cygwin@gmail.com>
 
+       PR target/42811
+       * libjava/configure.ac (DLLTOOL): Call AC_CHECK_TOOL.
+       (libgcj_sublib_core_extra_deps): New host-dependent configure var.
+       (LIBGCJ_SUBLIB_CORE_EXTRA_DEPS): AC_SUBST it.
+       * libjava/configure.host (libgcj_sublib_core_extra_deps): Define
+       appropriately on Cygwin and MinGW.
+       (libgcj_sublib_core_extra_deps): Add libgcj-noncore-dummy import
+       stub library on Cygwin and MinGW.
+       * libjava/Makefile.am (LIBJAVA_CORE_EXTRA): Import AC_SUBST'd
+       LIBGCJ_SUBLIB_CORE_EXTRA_DEPS if building sublibs, else define empty.
+       (libgcj_la_DEPENDENCIES): Use it.
+       (DLL_VERSION): New makefile macro.
+       (libgcj-noncore-dummy.dll.a): New build rule for dummy import stub
+       library.
+       (libgcj_noncore_la_LIBADD): Trim superfluous convenience libs.
+       (AM_MAKEFLAGS): Add DLLTOOL recursive propagation.
+       * libjava/libgcj-noncore-dummy.def: New file.
+       * libjava/Makefile.in: Regenerate.
+       * libjava/include/Makefile.in: Likewise.
+       * libjava/testsuite/Makefile.in: Likewise.
+       * libjava/configure: Likewise.
+       * libjava/gcj/Makefile.in: Likewise.
+
+2010-03-21  Dave Korn  <dave.korn.cygwin@gmail.com>
+
        PR target/42811 (prerequisite)
        * jvmti.cc (_Jv_GetJVMTIEnv): Avoid use of uninitialised memory.
 
        PR target/42811 (prerequisite)
        * jvmti.cc (_Jv_GetJVMTIEnv): Avoid use of uninitialised memory.
 
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index d53b4f3..69d70dc 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -321,6 +321,72 @@ am__DEPENDENCIES_3 = $(am__DEPENDENCIES_2) $(propertyo_files) \
 @BUILD_SUBLIBS_TRUE@am__DEPENDENCIES_4 =  \
 @BUILD_SUBLIBS_TRUE@   $(CORE_PACKAGE_SOURCE_FILES_LO)
 am__DEPENDENCIES_5 =
 @BUILD_SUBLIBS_TRUE@am__DEPENDENCIES_4 =  \
 @BUILD_SUBLIBS_TRUE@   $(CORE_PACKAGE_SOURCE_FILES_LO)
 am__DEPENDENCIES_5 =
+am__libgcj_la_SOURCES_DIST = prims.cc jni.cc exception.cc \
+       stacktrace.cc link.cc defineclass.cc verify.cc jvmti.cc \
+       interpret.cc gnu/classpath/jdwp/natVMFrame.cc \
+       gnu/classpath/jdwp/natVMMethod.cc \
+       gnu/classpath/jdwp/natVMVirtualMachine.cc \
+       gnu/classpath/natConfiguration.cc \
+       gnu/classpath/natSystemProperties.cc \
+       gnu/classpath/natVMStackWalker.cc gnu/gcj/natCore.cc \
+       gnu/gcj/convert/JIS0208_to_Unicode.cc \
+       gnu/gcj/convert/JIS0212_to_Unicode.cc \
+       gnu/gcj/convert/Unicode_to_JIS.cc gnu/gcj/convert/natIconv.cc \
+       gnu/gcj/convert/natInput_EUCJIS.cc \
+       gnu/gcj/convert/natInput_SJIS.cc \
+       gnu/gcj/convert/natOutput_EUCJIS.cc \
+       gnu/gcj/convert/natOutput_SJIS.cc \
+       gnu/gcj/io/natSimpleSHSStream.cc gnu/gcj/io/shs.cc \
+       gnu/gcj/jvmti/natBreakpoint.cc \
+       gnu/gcj/jvmti/natNormalBreakpoint.cc \
+       gnu/gcj/runtime/natFinalizerThread.cc \
+       gnu/gcj/runtime/natSharedLibLoader.cc \
+       gnu/gcj/runtime/natSystemClassLoader.cc \
+       gnu/gcj/runtime/natStringBuffer.cc gnu/gcj/util/natDebug.cc \
+       gnu/gcj/util/natGCInfo.cc gnu/java/lang/natMainThread.cc \
+       gnu/java/lang/management/natVMClassLoadingMXBeanImpl.cc \
+       gnu/java/lang/management/natVMCompilationMXBeanImpl.cc \
+       gnu/java/lang/management/natVMGarbageCollectorMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryManagerMXBeanImpl.cc \
+       gnu/java/lang/management/natVMMemoryPoolMXBeanImpl.cc \
+       gnu/java/lang/management/natVMOperatingSystemMXBeanImpl.cc \
+       gnu/java/lang/management/natVMRuntimeMXBeanImpl.cc \
+       gnu/java/lang/management/natVMThreadMXBeanImpl.cc \
+       gnu/java/net/natPlainDatagramSocketImpl.cc \
+       gnu/java/net/natPlainSocketImpl.cc \
+       gnu/java/net/protocol/core/natCoreInputStream.cc \
+       gnu/java/nio/natVMPipe.cc gnu/java/nio/natVMSelector.cc \
+       gnu/java/nio/natNIOServerSocket.cc \
+       gnu/java/nio/natVMChannel.cc \
+       gnu/java/nio/channels/natFileChannelImpl.cc \
+       gnu/java/security/jce/prng/natVMSecureRandom.cc \
+       java/io/natFile.cc java/io/natVMObjectInputStream.cc \
+       java/io/natVMObjectStreamClass.cc java/lang/natCharacter.cc \
+       java/lang/natClass.cc java/lang/natClassLoader.cc \
+       java/lang/natConcreteProcess.cc java/lang/natVMDouble.cc \
+       java/lang/natVMFloat.cc java/lang/natMath.cc \
+       java/lang/natObject.cc java/lang/natRuntime.cc \
+       java/lang/natString.cc java/lang/natAbstractStringBuffer.cc \
+       java/lang/natSystem.cc java/lang/natThread.cc \
+       java/lang/natThreadLocal.cc java/lang/natVMClassLoader.cc \
+       java/lang/natVMProcess.cc java/lang/natVMThrowable.cc \
+       java/lang/ref/natReference.cc java/lang/reflect/natArray.cc \
+       java/lang/reflect/natConstructor.cc \
+       java/lang/reflect/natField.cc java/lang/reflect/natMethod.cc \
+       java/lang/reflect/natVMProxy.cc java/net/natVMInetAddress.cc \
+       java/net/natVMNetworkInterface.cc \
+       java/net/natVMURLConnection.cc \
+       java/nio/channels/natVMChannels.cc \
+       java/nio/natVMDirectByteBufferImpl.cc \
+       java/security/natVMAccessController.cc \
+       java/security/natVMAccessControlState.cc \
+       java/text/natCollator.cc java/util/natVMTimeZone.cc \
+       java/util/concurrent/atomic/natAtomicLong.cc \
+       java/util/logging/natLogger.cc java/util/zip/natDeflater.cc \
+       java/util/zip/natInflater.cc sun/misc/natUnsafe.cc boehm.cc \
+       nogc.cc posix.cc win32.cc darwin.cc posix-threads.cc \
+       win32-threads.cc no-threads.cc
 @INTERPRETER_TRUE@am__objects_2 = jvmti.lo interpret.lo
 @INTERPRETER_TRUE@am__objects_3 = gnu/classpath/jdwp/natVMFrame.lo \
 @INTERPRETER_TRUE@     gnu/classpath/jdwp/natVMMethod.lo \
 @INTERPRETER_TRUE@am__objects_2 = jvmti.lo interpret.lo
 @INTERPRETER_TRUE@am__objects_3 = gnu/classpath/jdwp/natVMFrame.lo \
 @INTERPRETER_TRUE@     gnu/classpath/jdwp/natVMMethod.lo \
diff --git a/libjava/configure b/libjava/configure
index 6be8109..37c8548 100755 (executable)
--- a/libjava/configure
+++ b/libjava/configure
@@ -13338,7 +13338,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13341 "configure"
+#line 13340 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13444,7 +13444,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 13447 "configure"
+#line 13446 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19423,7 +19423,7 @@ if test "${enable_sjlj_exceptions+set}" = set; then :
   enableval=$enable_sjlj_exceptions; :
 else
   cat > conftest.$ac_ext << EOF
   enableval=$enable_sjlj_exceptions; :
 else
   cat > conftest.$ac_ext << EOF
-#line 19426 "configure"
+#line 19311 "configure"
 struct S { ~S(); };
 void bar();
 void foo()
 struct S { ~S(); };
 void bar();
 void foo()
About OSDN
Find Software
Develop Software
Help