* leave jvmbackend branch in a proper state (fixes from trunk merge)jvmbackend

--- Merging r21075 through r21076 into '.':
U    Makefile.fpc
U    compiler/symdef.pas
U    compiler/defcmp.pas
U    Makefile
--- Merging r21078 into '.':
U    compiler/cfileutl.pas



git-svn-id: http://svn.freepascal.org/svn/fpc/branches/jvmbackend@21083 3ad0048d-3df7-0310-abae-a5850022a9f2

5 files changed, 15 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index ce2cb22937..b3b1178eec 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/25]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2012/04/27]
 #
 default: help
 MAKEFILETARGETS=i386-linux i386-go32v2 i386-win32 i386-os2 i386-freebsd i386-beos i386-haiku i386-netbsd i386-solaris i386-qnx i386-netware i386-openbsd i386-wdosx i386-darwin i386-emx i386-watcom i386-netwlibc i386-wince i386-embedded i386-symbian i386-nativent i386-iphonesim m68k-linux m68k-freebsd m68k-netbsd m68k-amiga m68k-atari m68k-openbsd m68k-palmos m68k-embedded powerpc-linux powerpc-netbsd powerpc-amiga powerpc-macos powerpc-darwin powerpc-morphos powerpc-embedded powerpc-wii powerpc-aix sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-netbsd x86_64-solaris x86_64-openbsd x86_64-darwin x86_64-win64 x86_64-embedded arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux jvm-java jvm-android
@@ -2637,6 +2637,7 @@ ifdef IDE
 	$(MAKE) installer_all $(BUILDOPTS)
 endif
 	$(ECHOREDIR) Build > $(BUILDSTAMP)
+	$(ECHOREDIR) Build > base.$(BUILDSTAMP)
 buildbase: base.$(BUILDSTAMP)
 base.$(BUILDSTAMP):
 	$(MAKE) compiler_cycle RELEASE=1
diff --git a/Makefile.fpc b/Makefile.fpc
index 7ca940dae8..528ce7685c 100644
--- a/Makefile.fpc
+++ b/Makefile.fpc
@@ -264,6 +264,7 @@ ifdef IDE
         $(MAKE) installer_all $(BUILDOPTS)
 endif
         $(ECHOREDIR) Build > $(BUILDSTAMP)
+        $(ECHOREDIR) Build > base.$(BUILDSTAMP)
 
 buildbase: base.$(BUILDSTAMP)
 base.$(BUILDSTAMP):
diff --git a/compiler/cfileutl.pas b/compiler/cfileutl.pas
index ad275e2044..0fae786e0a 100644
--- a/compiler/cfileutl.pas
+++ b/compiler/cfileutl.pas
@@ -1506,7 +1506,7 @@ end;
       var
         quote_script: tscripttype;
       begin
-        if not(cs_link_on_target in current_settings.globalswitches) then
+        if (cs_link_on_target in current_settings.globalswitches) then
           quote_script:=target_info.script
         else
           quote_script:=source_info.script;
diff --git a/compiler/defcmp.pas b/compiler/defcmp.pas
index cb17f59d1a..2034171305 100644
--- a/compiler/defcmp.pas
+++ b/compiler/defcmp.pas
@@ -764,7 +764,7 @@ implementation
                    begin
                      { ugly, but delphi allows it }
                      if (cdo_explicit in cdoptions) and
-                        is_class_or_interface_or_objc_or_java(def_from) then
+                        is_class_or_interface_or_dispinterface_or_objc_or_java(def_from) then
                        begin
                          { in Java enums /are/ class instances, and hence such
                            typecasts must not be treated as integer-like
diff --git a/compiler/symdef.pas b/compiler/symdef.pas
index a45bc25cfb..8eda47a1e5 100644
--- a/compiler/symdef.pas
+++ b/compiler/symdef.pas
@@ -950,6 +950,7 @@ interface
     function is_class_or_interface(def: tdef): boolean;
     function is_class_or_interface_or_objc(def: tdef): boolean;
     function is_class_or_interface_or_objc_or_java(def: tdef): boolean;
+    function is_class_or_interface_or_dispinterface_or_objc_or_java(def: tdef): boolean;
     function is_class_or_interface_or_object(def: tdef): boolean;
     function is_class_or_interface_or_dispinterface(def: tdef): boolean;
     function is_implicit_pointer_object_type(def: tdef): boolean;
@@ -6605,6 +6606,15 @@ implementation
       end;
 
 
+    function is_class_or_interface_or_dispinterface_or_objc_or_java(def: tdef): boolean;
+      begin
+        result:=
+          assigned(def) and
+          (def.typ=objectdef) and
+          (tobjectdef(def).objecttype in [odt_class,odt_interfacecom,odt_interfacecorba,odt_dispinterface,odt_objcclass,odt_objcprotocol,odt_javaclass,odt_interfacejava]);
+      end;
+
+
     function is_class_or_interface_or_object(def: tdef): boolean;
       begin
         result:=