--- Merging r37118 into '.':

U    Makefile
U    Makefile.fpc
U    compiler/Makefile
U    compiler/Makefile.fpc
 U   .
--- Recording mergeinfo for merge of r37118 into '.':
 G   .
--- Merging r37119 into '.':
G    compiler/Makefile.fpc
G    compiler/Makefile
 G   .
--- Recording mergeinfo for merge of r37119 into '.':
 G   .
--- Merging r37120 into '.':
A    rtl/gba/rtl.cfg
--- Recording mergeinfo for merge of r37120 into '.':
 G   .

git-svn-id: tags/release_3_0_4@37121 -
This commit is contained in:
marco 2017-09-03 12:28:26 +00:00
commit 14b2977744
6 changed files with 38 additions and 11 deletions

1
.gitattributes vendored
View File

@ -8535,6 +8535,7 @@ rtl/gba/gbabiosh.inc svneol=native#text/plain
rtl/gba/libc.inc svneol=native#text/plain
rtl/gba/libch.inc svneol=native#text/plain
rtl/gba/prt0.as svneol=native#text/plain
rtl/gba/rtl.cfg svneol=native#text/plain
rtl/gba/rtldefs.inc svneol=native#text/plain
rtl/gba/sysdir.inc svneol=native#text/plain
rtl/gba/sysfile.inc svneol=native#text/plain

View File

@ -467,7 +467,7 @@ endif
endif
BuildOnlyBaseCPUs=jvm
ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba msdos $(BuildOnlyBaseCPUs)
NOUTILSTARGETS=embedded gba nds msdos $(BuildOnlyBaseCPUs)
ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
ifdef BUILDFULLNATIVE
UTILS=1

View File

@ -203,7 +203,7 @@ endif
BuildOnlyBaseCPUs=jvm
ifneq ($(wildcard utils),)
NOUTILSTARGETS=embedded gba msdos $(BuildOnlyBaseCPUs)
NOUTILSTARGETS=embedded gba nds msdos $(BuildOnlyBaseCPUs)
ifeq ($(findstring $(OS_TARGET),$(NOUTILSTARGETS)),)
ifdef BUILDFULLNATIVE
UTILS=1

View File

@ -545,6 +545,9 @@ endif
ifeq ($(OS_TARGET),msdos)
NoNativeBinaries=1
endif
ifeq ($(OS_TARGET),nds)
NoNativeBinaries=1
endif
ifeq ($(FULL_TARGET),i386-linux)
override TARGET_DIRS+=utils
endif
@ -3995,13 +3998,11 @@ cycle:
$(MAKE) 'FPC=$(BASEDIR)/$(TEMPNAME)' OS_TARGET=$(OS_SOURCE) EXENAME=$(PPCROSSNAME) CROSSBINDIR= BINUTILSPREFIX= CROSSCYCLEBOOTSTRAP=1 cycleclean compiler CYCLELEVEL=2
ifndef CROSSINSTALL
$(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl CYCLELEVEL=3
ifneq ($(OS_TARGET),embedded)
ifneq ($(OS_TARGET),gba)
ifndef NoNativeBinaries
$(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler CYCLELEVEL=3
endif
endif
endif
endif
else
cycle: override FPC=
cycle:

View File

@ -323,6 +323,9 @@ endif
ifeq ($(OS_TARGET),msdos)
NoNativeBinaries=1
endif
ifeq ($(OS_TARGET),nds)
NoNativeBinaries=1
endif
[rules]
#####################################################################
@ -682,14 +685,10 @@ cycle:
# ppc<ARCH> (target native)
ifndef CROSSINSTALL
$(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl CYCLELEVEL=3
# building a native compiler for embedded targets is not possible
ifneq ($(OS_TARGET),embedded)
# building a native compiler for the arm-gba target is not possible
ifneq ($(OS_TARGET),gba)
ifndef NoNativeBinaries
$(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler CYCLELEVEL=3
endif
endif
endif
endif
@ -715,7 +714,6 @@ cycle:
# ppc<ARCH> (target native)
ifndef CROSSINSTALL
$(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(RTLOPT) $(CROSSOPT)' rtlclean rtl CYCLELEVEL=3
# building a native compiler for JVM and embedded targets is not possible
ifndef NoNativeBinaries
$(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' 'OPT=$(strip $(LOCALOPT) $(CROSSOPT))' cycleclean compiler CYCLELEVEL=3
endif

27
rtl/gba/rtl.cfg Normal file
View File

@ -0,0 +1,27 @@
-Sf-
-SfHEAP
-SfINITFINAL
-SfCLASSES
-SfEXCEPTIONS
-SfEXITCODE
-SfANSISTRINGS
-SfWIDESTRINGS
-SfTEXTIO
# -SfCONSOLEIO
-SfFILEIO
-SfRANDOM
-SfVARIANTS
-SfOBJECTS
-SfRESOURCES
-SfDYNARRAYS
-SfTHREADING
-SfCOMMANDARGS
-SfPROCESSES
-SfSTACKCHECK
# -SfDYNLIBS
-SfEXITCODE
#ifdef CPUARM
-SfSOFTFPU
-SfRTTI
#endif CPUARM