From 90afe13b8b0327f7b4d423d6470099b1c71c9419 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 3 Sep 2017 12:21:11 +0000 Subject: [PATCH 1/3] * merged 30017 git-svn-id: branches/fixes_3_0@37118 - --- Makefile | 117 +---------------------- Makefile.fpc | 2 +- compiler/Makefile | 213 ++---------------------------------------- compiler/Makefile.fpc | 10 +- 4 files changed, 18 insertions(+), 324 deletions(-) diff --git a/Makefile b/Makefile index 86f45482c9..9ff879172d 100644 --- a/Makefile +++ b/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-02-13 rev 35434] # 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 i386-android i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-android i386-aros 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 x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -473,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 @@ -639,12 +633,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=compiler rtl utils packages ide installer endif @@ -675,9 +663,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=compiler rtl utils packages ide installer endif @@ -717,21 +702,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=compiler rtl utils packages ide installer endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=compiler rtl utils packages ide installer -endif override INSTALL_FPCPACKAGE=y ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) @@ -1128,21 +1101,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -1409,7 +1367,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -1422,7 +1379,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -1522,9 +1478,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -1623,7 +1576,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -1795,10 +1748,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -2331,22 +2280,6 @@ TARGET_DIRS_PACKAGES=1 TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2427,14 +2360,6 @@ TARGET_DIRS_PACKAGES=1 TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2539,14 +2464,6 @@ TARGET_DIRS_PACKAGES=1 TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_COMPILER=1 TARGET_DIRS_RTL=1 @@ -2555,30 +2472,6 @@ TARGET_DIRS_PACKAGES=1 TARGET_DIRS_IDE=1 TARGET_DIRS_INSTALLER=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_COMPILER=1 -TARGET_DIRS_RTL=1 -TARGET_DIRS_UTILS=1 -TARGET_DIRS_PACKAGES=1 -TARGET_DIRS_IDE=1 -TARGET_DIRS_INSTALLER=1 -endif ifdef TARGET_DIRS_COMPILER compiler_all: $(MAKE) -C compiler all diff --git a/Makefile.fpc b/Makefile.fpc index df9d6007a2..d48652550e 100644 --- a/Makefile.fpc +++ b/Makefile.fpc @@ -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 diff --git a/compiler/Makefile b/compiler/Makefile index 121f7fc9c2..c6c34613a3 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,11 +1,11 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2016-11-06 rev 34805] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2017-02-13 rev 35434] # default: all -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 i386-android i386-aros 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 x86_64-iphonesim x86_64-aros x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android arm-aros powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-embedded i8086-msdos i8086-win16 aarch64-linux aarch64-darwin +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 i386-android i386-aros 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 x86_64-dragonfly arm-linux arm-palmos arm-darwin arm-wince arm-gba arm-nds arm-embedded arm-symbian arm-android powerpc64-linux powerpc64-darwin powerpc64-embedded powerpc64-aix avr-embedded armeb-linux armeb-embedded mips-linux mipsel-linux mipsel-embedded mipsel-android jvm-java jvm-android i8086-msdos BSDs = freebsd netbsd openbsd darwin dragonfly UNIXs = linux $(BSDs) solaris qnx haiku aix -LIMIT83fs = go32v2 os2 emx watcom msdos win16 +LIMIT83fs = go32v2 os2 emx watcom msdos OSNeedsComspecToRunBatch = go32v2 watcom FORCE: .PHONY: FORCE @@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t endif override FPCOPT+=-Cp$(SUBARCH) endif -ifeq ($(FULL_TARGET),avr-embedded) -ifeq ($(SUBARCH),) -$(error When compiling for avr-embedded, a sub-architecture (e.g. SUBARCH=avr25 or SUBARCH=avr35) must be defined) -endif -override FPCOPT+=-Cp$(SUBARCH) -endif ifeq ($(FULL_TARGET),mipsel-embedded) ifeq ($(SUBARCH),) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) @@ -551,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 @@ -710,12 +707,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_DIRS+=utils -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_DIRS+=utils endif @@ -746,9 +737,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_DIRS+=utils endif @@ -788,21 +776,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_DIRS+=utils endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_DIRS+=utils -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_DIRS+=utils -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_DIRS+=utils -endif ifeq ($(FULL_TARGET),i386-linux) override TARGET_PROGRAMS+=pp endif @@ -962,12 +938,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override TARGET_PROGRAMS+=pp -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override TARGET_PROGRAMS+=pp endif @@ -998,9 +968,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),arm-aros) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),powerpc64-linux) override TARGET_PROGRAMS+=pp endif @@ -1040,21 +1007,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),i8086-embedded) -override TARGET_PROGRAMS+=pp -endif ifeq ($(FULL_TARGET),i8086-msdos) override TARGET_PROGRAMS+=pp endif -ifeq ($(FULL_TARGET),i8086-win16) -override TARGET_PROGRAMS+=pp -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override TARGET_PROGRAMS+=pp -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override TARGET_PROGRAMS+=pp -endif override INSTALL_FPCPACKAGE=y ifeq ($(FULL_TARGET),i386-linux) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) @@ -1215,12 +1170,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif @@ -1251,9 +1200,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif @@ -1293,21 +1239,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_INCLUDEDIR+=$(CPC_TARGET) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1467,12 +1401,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1503,9 +1431,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1545,21 +1470,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_TARGETDIR+=. endif @@ -1719,12 +1632,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_TARGETDIR+=. endif @@ -1755,9 +1662,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_TARGETDIR+=. endif @@ -1797,21 +1701,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_TARGETDIR+=. endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_TARGETDIR+=. -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_TARGETDIR+=. -endif ifeq ($(FULL_TARGET),i386-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1971,12 +1863,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif -ifeq ($(FULL_TARGET),x86_64-aros) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -2007,9 +1893,6 @@ endif ifeq ($(FULL_TARGET),arm-android) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),arm-aros) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),powerpc64-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -2049,21 +1932,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),i8086-embedded) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifeq ($(FULL_TARGET),i8086-msdos) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif -ifeq ($(FULL_TARGET),i8086-win16) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif -ifeq ($(FULL_TARGET),aarch64-linux) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) -endif ifdef REQUIRE_UNITSDIR override UNITSDIR+=$(REQUIRE_UNITSDIR) endif @@ -2459,21 +2330,6 @@ STATICLIBPREFIX= STATICLIBEXT=.a SHORTSUFFIX=d16 endif -ifeq ($(OS_TARGET),embedded) -ifeq ($(CPU_TARGET),i8086) -STATICLIBPREFIX= -STATICLIBEXT=.a -else -EXEEXT=.bin -endif -SHORTSUFFIX=emb -endif -ifeq ($(OS_TARGET),win16) -STATICLIBPREFIX= -STATICLIBEXT=.a -SHAREDLIBEXT=.dll -SHORTSUFFIX=w16 -endif ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),) FPCMADE=fpcmade.$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX) @@ -2888,12 +2744,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) REQUIRE_PACKAGES_RTL=1 endif @@ -2924,9 +2774,6 @@ endif ifeq ($(FULL_TARGET),arm-android) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),arm-aros) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -2966,21 +2813,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -REQUIRE_PACKAGES_RTL=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) REQUIRE_PACKAGES_RTL=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -REQUIRE_PACKAGES_RTL=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -REQUIRE_PACKAGES_RTL=1 -endif ifdef REQUIRE_PACKAGES_RTL PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) ifneq ($(PACKAGEDIR_RTL),) @@ -3031,7 +2866,6 @@ endif ifeq ($(OS_SOURCE),openbsd) override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) -override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH) endif ifndef CROSSBOOTSTRAP ifneq ($(BINUTILSPREFIX),) @@ -3044,7 +2878,6 @@ endif ifndef CROSSCOMPILE ifneq ($(BINUTILSPREFIX),) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) -override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX) endif endif ifdef UNITDIR @@ -3144,9 +2977,6 @@ endif ifdef OPT override FPCOPT+=$(OPT) endif -ifdef FPMAKEBUILDOPT -override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT) -endif ifdef FPCOPTDEF override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) endif @@ -3338,7 +3168,7 @@ endif fpc_sourceinstall: distclean $(MKDIR) $(INSTALL_SOURCEDIR) $(COPYTREE) $(BASEDIR)/* $(INSTALL_SOURCEDIR) -fpc_exampleinstall: $(EXAMPLEINSTALLTARGET) $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) +fpc_exampleinstall: $(addsuffix _distclean,$(TARGET_EXAMPLEDIRS)) ifdef HASEXAMPLES $(MKDIR) $(INSTALL_EXAMPLEDIR) endif @@ -3510,10 +3340,6 @@ endif ifdef DEBUGSYMEXT -$(DEL) *$(DEBUGSYMEXT) endif -ifdef LOCALFPMAKEBIN - -$(DEL) $(LOCALFPMAKEBIN) - -$(DEL) $(FPMAKEBINOBJ) -endif fpc_distclean: cleanall .PHONY: fpc_baseinfo override INFORULES+=fpc_baseinfo @@ -3781,12 +3607,6 @@ endif ifeq ($(FULL_TARGET),x86_64-embedded) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),x86_64-iphonesim) -TARGET_DIRS_UTILS=1 -endif -ifeq ($(FULL_TARGET),x86_64-aros) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),x86_64-dragonfly) TARGET_DIRS_UTILS=1 endif @@ -3817,9 +3637,6 @@ endif ifeq ($(FULL_TARGET),arm-android) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),arm-aros) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),powerpc64-linux) TARGET_DIRS_UTILS=1 endif @@ -3859,21 +3676,9 @@ endif ifeq ($(FULL_TARGET),jvm-android) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),i8086-embedded) -TARGET_DIRS_UTILS=1 -endif ifeq ($(FULL_TARGET),i8086-msdos) TARGET_DIRS_UTILS=1 endif -ifeq ($(FULL_TARGET),i8086-win16) -TARGET_DIRS_UTILS=1 -endif -ifeq ($(FULL_TARGET),aarch64-linux) -TARGET_DIRS_UTILS=1 -endif -ifeq ($(FULL_TARGET),aarch64-darwin) -TARGET_DIRS_UTILS=1 -endif ifdef TARGET_DIRS_UTILS utils_all: $(MAKE) -C utils all @@ -4193,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) +ifneq NoNativeBinaries $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler CYCLELEVEL=3 endif endif endif -endif else cycle: override FPC= cycle: diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index 2732c43e98..6636dc523b 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -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 (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) +ifneq NoNativeBinaries $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler CYCLELEVEL=3 endif endif -endif endif @@ -715,7 +714,6 @@ cycle: # ppc (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 From 7a93b39ad01b05e4a956a8c5bf941452b0092ba9 Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 3 Sep 2017 12:22:20 +0000 Subject: [PATCH 2/3] * r30023 git-svn-id: branches/fixes_3_0@37119 - --- compiler/Makefile | 2 +- compiler/Makefile.fpc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index c6c34613a3..a0704744a1 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -3998,7 +3998,7 @@ 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 NoNativeBinaries +ifndef NoNativeBinaries $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler CYCLELEVEL=3 endif endif diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index 6636dc523b..6e1b1bf12c 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -685,7 +685,7 @@ cycle: # ppc (target native) ifndef CROSSINSTALL $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' rtlclean rtl CYCLELEVEL=3 -ifneq NoNativeBinaries +ifndef NoNativeBinaries $(MAKE) 'FPC=$(BASEDIR)/$(PPCROSSNAME)' cycleclean compiler CYCLELEVEL=3 endif endif From 3487e6a2bedfd27da42c8cb4ff515b19760cd0bd Mon Sep 17 00:00:00 2001 From: marco Date: Sun, 3 Sep 2017 12:26:27 +0000 Subject: [PATCH 3/3] copied to fixes git-svn-id: branches/fixes_3_0@37120 - --- .gitattributes | 1 + rtl/gba/rtl.cfg | 27 +++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 rtl/gba/rtl.cfg diff --git a/.gitattributes b/.gitattributes index b4d16c13cc..235770e720 100644 --- a/.gitattributes +++ b/.gitattributes @@ -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 diff --git a/rtl/gba/rtl.cfg b/rtl/gba/rtl.cfg new file mode 100644 index 0000000000..d41af3d63c --- /dev/null +++ b/rtl/gba/rtl.cfg @@ -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 \ No newline at end of file