paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 06:10:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

+ jvm compiler target

Browse Source 
git-svn-id: branches/jvmbackend@18313 -
This commit is contained in:
Jonas Maebe 2011-08-20 07:37:52 +00:00
parent 20c577103f
commit 4ff56b2471
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/Makefile
View File

@ -296,7 +296,7 @@ override PACKAGE_NAME=compiler
override PACKAGE_VERSION=2.7.1 override PACKAGE_VERSION=2.7.1
unexport FPC_VERSION FPC_COMPILERINFO unexport FPC_VERSION FPC_COMPILERINFO
CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
ALLTARGETS=$(CYCLETARGETS) ALLTARGETS=$(CYCLETARGETS) jvm
ifdef ALPHA ifdef ALPHA
PPC_TARGET=alpha PPC_TARGET=alpha
endif endif
@ -330,6 +330,9 @@ endif
ifdef MIPSEL ifdef MIPSEL
PPC_TARGET=mipsel PPC_TARGET=mipsel
endif endif
ifdef JVM
PPC_TARGET=jvm
endif
ifndef PPC_TARGET ifndef PPC_TARGET
PPC_TARGET=$(CPU_TARGET) PPC_TARGET=$(CPU_TARGET)
endif endif
@ -386,6 +389,9 @@ endif
ifeq ($(CPC_TARGET),mipsel) ifeq ($(CPC_TARGET),mipsel)
CPUSUF=mipsel CPUSUF=mipsel
endif endif
ifeq ($(CPC_TARGET),jvm)
CPUSUF=jvm
endif
NOCPUDEF=1 NOCPUDEF=1
MSGFILE=msg/error$(FPCLANG).msg MSGFILE=msg/error$(FPCLANG).msg
SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH))) SVNVERSION:=$(wildcard $(addsuffix /svnversion$(SRCEXEEXT),$(SEARCHPATH)))
@ -434,6 +440,9 @@ endif
ifeq ($(PPC_TARGET),mipsel) ifeq ($(PPC_TARGET),mipsel)
override LOCALOPT+=-Fumips override LOCALOPT+=-Fumips
endif endif
ifeq ($(PPC_TARGET),jvm)
override LOCALOPT+=-Fujvm
endif
OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),) ifneq ($(findstring $(OS_TARGET),darwin linux freebsd solaris),)
@ -3477,7 +3486,7 @@ INSTALLEXEFILE=$(PPCROSSNAME)
else else
INSTALLEXEFILE=$(EXENAME) INSTALLEXEFILE=$(EXENAME)
endif endif
PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 alpha vis ia64 mips mipsel PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 alpha vis ia64 mips mipsel jvm
.PHONY: $(PPC_TARGETS) .PHONY: $(PPC_TARGETS)
$(PPC_TARGETS): $(PPC_TARGETS):
$(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all $(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all

16
compiler/Makefile.fpc
View File

@ -35,9 +35,9 @@ unexport FPC_VERSION FPC_COMPILERINFO
CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr
# All supported targets used for clean # All supported targets used for clean
ALLTARGETS=$(CYCLETARGETS) ALLTARGETS=$(CYCLETARGETS) jvm
# Allow ALPHA, POWERPC, POWERPC64, M68K, I386 defines for target cpu # Allow ALPHA, POWERPC, POWERPC64, M68K, I386, jvm defines for target cpu
ifdef ALPHA ifdef ALPHA
PPC_TARGET=alpha PPC_TARGET=alpha
endif endif
@ -71,6 +71,9 @@ endif
ifdef MIPSEL ifdef MIPSEL
PPC_TARGET=mipsel PPC_TARGET=mipsel
endif endif
ifdef JVM
PPC_TARGET=jvm
endif
# Default is to generate a compiler for the same # Default is to generate a compiler for the same
# platform as CPU_TARGET (a native compiler) # platform as CPU_TARGET (a native compiler)
@ -154,6 +157,9 @@ endif
ifeq ($(CPC_TARGET),mipsel) ifeq ($(CPC_TARGET),mipsel)
CPUSUF=mipsel CPUSUF=mipsel
endif endif
ifeq ($(CPC_TARGET),jvm)
CPUSUF=jvm
endif
# Do not define the default -d$(CPU_TARGET) because that # Do not define the default -d$(CPU_TARGET) because that
# will conflict with our -d$(CPC_TARGET) # will conflict with our -d$(CPC_TARGET)
@ -235,6 +241,10 @@ ifeq ($(PPC_TARGET),mipsel)
override LOCALOPT+=-Fumips override LOCALOPT+=-Fumips
endif endif
# jvm specific
ifeq ($(PPC_TARGET),jvm)
override LOCALOPT+=-Fujvm
endif
OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo OPTWPOCOLLECT=-OWdevirtcalls,optvmts -FW$(BASEDIR)/pp1.wpo
OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo OPTWPOPERFORM=-Owdevirtcalls,optvmts -Fw$(BASEDIR)/pp1.wpo
@ -314,7 +324,7 @@ endif
# CPU targets # CPU targets
##################################################################### #####################################################################
PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 alpha vis ia64 mips mipsel PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 alpha vis ia64 mips mipsel jvm
.PHONY: $(PPC_TARGETS) .PHONY: $(PPC_TARGETS)