* enabled threading feature for jvm target so that rtl/inc/genmath.inc

    compiles again there (it's possible to take the address of arbitrary
    threadvars on the jvm platform, but not of arbitrary other variables)
  - disabled inclusion of generic thread manager and threadvar support
    on the jvm target if the threading feature is enabled

git-svn-id: trunk@23322 -

compiler/options.pas

@@ -2579,7 +2579,7 @@ begin
     system_jvm_java32,
     system_jvm_android32:
       target_unsup_features:=[f_heap,f_textio,f_consoleio,f_fileio,
-         f_variants,f_objects,f_threading,f_commandargs,
+         f_variants,f_objects,f_commandargs,
          f_processes,f_stackcheck,f_dynlibs,f_softfpu,f_objectivec1,f_resources];
     else
       target_unsup_features:=[];

rtl/java/jsystem.inc

@@ -1408,7 +1408,7 @@ end;
                           Thread support
 *****************************************************************************}
 
-{$ifdef FPC_HAS_FEATURE_THREADING}
+{$if defined(FPC_HAS_FEATURE_THREADING) and not defined(cpujvm)}
 { Generic threadmanager }
 {$i thread.inc}
 
@@ -1419,7 +1419,7 @@ end;
 { OS Dependent implementation }
 {$i systhrd.inc}
 {$endif DISABLE_NO_THREAD_MANAGER}
-{$endif FPC_HAS_FEATURE_THREADING}
+{$endif FPC_HAS_FEATURE_THREADING and not cpujvm}
 
 
 {*****************************************************************************

rtl/java/jsystemh.inc

@@ -848,9 +848,9 @@ const
 *****************************************************************************}
 
 { Generic threadmanager }
-{$ifdef FPC_HAS_FEATURE_THREADING}
+{$if defined(FPC_HAS_FEATURE_THREADING) and not defined(cpujvm)}
 {$i threadh.inc}
-{$endif FPC_HAS_FEATURE_THREADING}
+{$endif FPC_HAS_FEATURE_THREADING and not cpujvm}
 
 {*****************************************************************************
                           Resources support