From 7a7cf2615c98b7f3ea386b26e5552bd0dad37f42 Mon Sep 17 00:00:00 2001 From: Kai Tietz Date: Fri, 3 Feb 2012 11:35:06 +0100 Subject: [PATCH] re PR java/48512 ([4.6] gcj spec files references incorrectly crtmt.o on i686-w64-mingw32 target) PR libjava/48512 * configure.ac (THREADSTARTFILESPEC): Don't add crtmet.o file for w64 windows targets. * configure: Regenerated. From-SVN: r183868 --- libjava/ChangeLog | 7 +++++++ libjava/configure | 9 +++++++-- libjava/configure.ac | 9 +++++++-- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b27b55beaed6..3a08d210ae5f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2012-02-03 Kai Tietz + + PR libjava/48512 + * configure.ac (THREADSTARTFILESPEC): Don't add crtmet.o file for + w64 windows targets. + * configure: Regenerated. + 2011-11-24 Jakub Jelinek PR bootstrap/50888 diff --git a/libjava/configure b/libjava/configure index 73ebd03fd1e2..3a722c772caf 100755 --- a/libjava/configure +++ b/libjava/configure @@ -20796,9 +20796,14 @@ $as_echo "#define _POSIX_PTHREAD_SEMANTICS 1" >>confdefs.h # FIXME: In Java we are able to detect thread death at the end of # Thread.run() so we should be able to clean up the exception handling # contexts ourselves. - THREADSTARTFILESPEC='crtmt%O%s' + case "$host" in + *-w64-mingw*) + ;; + *) + THREADSTARTFILESPEC='crtmt%O%s' + ;; + esac ;; - none) THREADH=no-threads.h ;; diff --git a/libjava/configure.ac b/libjava/configure.ac index b8f299dca6ea..276b36fd9831 100644 --- a/libjava/configure.ac +++ b/libjava/configure.ac @@ -1135,9 +1135,14 @@ case "$THREADS" in # FIXME: In Java we are able to detect thread death at the end of # Thread.run() so we should be able to clean up the exception handling # contexts ourselves. - THREADSTARTFILESPEC='crtmt%O%s' + case "$host" in + *-w64-mingw*) + ;; + *) + THREADSTARTFILESPEC='crtmt%O%s' + ;; + esac ;; - none) THREADH=no-threads.h ;; -- 2.47.2