paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 17:19:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed fpc_unicodestr_compare_equal (has to return 0 in case of

Browse Source 
equality, not 1)

git-svn-id: branches/jvmbackend@18490 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:04:11 +00:00
parent 1daff40e8e
commit 4c0849a592
2 changed files with 65 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
rtl/java/Makefile
View File

@ -286,193 +286,193 @@ CPU_UNITS=lpc21x4 at91sam7x256 stellaris stm32f103
endif
GRAPHDIR=$(INC)/graph
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-go32v2)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-win32)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-os2)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-freebsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-beos)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-haiku)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-solaris)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-qnx)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-netware)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-openbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-wdosx)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-darwin)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-emx)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-watcom)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-netwlibc)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-wince)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-symbian)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-nativent)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),i386-iphonesim)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-freebsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-amiga)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-atari)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-openbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-palmos)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),m68k-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-amiga)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-macos)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-darwin)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-morphos)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),sparc-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),sparc-netbsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),sparc-solaris)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),sparc-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),x86_64-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),x86_64-freebsd)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),x86_64-solaris)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),x86_64-darwin)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),x86_64-win64)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),x86_64-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-palmos)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-darwin)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-wince)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-gba)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-nds)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),arm-symbian)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc64-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc64-darwin)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),powerpc64-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),avr-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),armeb-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),armeb-embedded)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),mipsel-linux)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
ifeq ($(FULL_TARGET),jvm-java)
override TARGET_UNITS+=$(SYSTEMUNIT) objpas
override TARGET_UNITS+=$(SYSTEMUNIT) objpas jdk15
endif
override INSTALL_FPCPACKAGE=y
ifeq ($(FULL_TARGET),i386-linux)
@ -2153,6 +2153,7 @@ objpas$(PPUEXT): objpas.pp
strings$(PPUEXT) : $(INC)/strings.pp $(INC)/stringsi.inc \
$(PROCINC)/strings.inc $(PROCINC)/stringss.inc \
$(SYSTEMUNIT)$(PPUEXT)
jdk15$(PPUEXT) : $(SYSTEMUNIT)$(PPUEXT) objpas$(PPUEXT) jdk15.inc jdk15.pas
dos$(PPUEXT) : dos.pp $(INC)/filerec.inc $(INC)/textrec.inc strings$(PPUEXT) \
$(SYSTEMUNIT)$(PPUEXT)
objects$(PPUEXT) : $(INC)/objects.pp dos$(PPUEXT) $(SYSTEMUNIT)$(PPUEXT)

2
rtl/java/ustrings.inc
View File

@ -718,7 +718,7 @@ Function fpc_UnicodeStr_Compare_Equal(const S1,S2 : UnicodeString): SizeInt; com
Var
MaxI : SizeInt;
begin
result:=ord(JLString(S1).equals(JLString(S2)));
result:=ord(not JLString(S1).equals(JLString(S2)));
end;
function fpc_UnicodeStr_SetLength(const S : UnicodeString; l : SizeInt): UnicodeString; compilerproc;