From 7803a302bf6d59dc39245071e069fff8267b815e Mon Sep 17 00:00:00 2001 From: florian Date: Sat, 14 May 2011 17:44:49 +0000 Subject: [PATCH] + added avr to full cycle git-svn-id: trunk@17458 - --- compiler/Makefile | 71 ++++++++++++++++++++++++++++++++++++------- compiler/Makefile.fpc | 2 +- 2 files changed, 61 insertions(+), 12 deletions(-) diff --git a/compiler/Makefile b/compiler/Makefile index 58a636baf3..4106499ac0 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -1,8 +1,8 @@ # -# Don't edit, this file is generated by FPCMake Version 2.0.0 [2010/10/20] +# Don't edit, this file is generated by FPCMake Version 2.0.0 [2011/04/24] # 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 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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris 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 avr-embedded armeb-linux armeb-embedded mipsel-linux +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 sparc-linux sparc-netbsd sparc-solaris sparc-embedded x86_64-linux x86_64-freebsd x86_64-solaris 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 avr-embedded armeb-linux armeb-embedded mipsel-linux BSDs = freebsd netbsd openbsd darwin UNIXs = linux $(BSDs) solaris qnx haiku LIMIT83fs = go32v2 os2 emx watcom @@ -107,23 +107,42 @@ FPC=$(PP) endif endif ifndef FPC +DETERMINE_NATIVE_COMPILER=1 +else +ifdef CROSSCOMPILE +ifndef FPCFPMAKE +DETERMINE_NATIVE_COMPILER=1 +endif +endif +endif +ifdef DETERMINE_NATIVE_COMPILER FPCPROG:=$(strip $(wildcard $(addsuffix /fpc$(SRCEXEEXT),$(SEARCHPATH)))) ifneq ($(FPCPROG),) FPCPROG:=$(firstword $(FPCPROG)) ifneq ($(CPU_TARGET),) -FPC:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) +FPCNATIVE:=$(shell $(FPCPROG) -P$(CPU_TARGET) -PB) else -FPC:=$(shell $(FPCPROG) -PB) +FPCNATIVE:=$(shell $(FPCPROG) -PB) endif -ifneq ($(findstring Error,$(FPC)),) -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +ifneq ($(findstring Error,$(FPCNATIVE)),) +override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) else -ifeq ($(strip $(wildcard $(FPC))),) -FPC:=$(firstword $(FPCPROG)) +ifeq ($(strip $(wildcard $(FPCNATIVE))),) +FPCNATIVE:=$(firstword $(FPCPROG)) endif endif else -override FPC=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +override FPCNATIVE=$(firstword $(strip $(wildcard $(addsuffix /ppc386$(SRCEXEEXT),$(SEARCHPATH))))) +endif +endif +ifndef FPC +FPC=$(FPCNATIVE) +endif +ifndef FPCFPMAKE +ifdef CROSSOMPILE +FPCFPMAKE=$(FPCNATIVE) +else +FPCFPMAKE=$(FPC) endif endif override FPC:=$(subst $(SRCEXEEXT),,$(FPC)) @@ -141,7 +160,7 @@ endif ifndef FPC_VERSION FPC_VERSION:=$(word 1,$(FPC_COMPILERINFO)) endif -export FPC FPC_VERSION FPC_COMPILERINFO +export FPC FPCFPMAKE FPC_VERSION FPC_COMPILERINFO unexport CHECKDEPEND ALLDEPENDENCIES ifndef CPU_TARGET ifdef CPU_TARGET_DEFAULT @@ -267,7 +286,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages $(FPCDIR)/packages/base $(F override PACKAGE_NAME=compiler override PACKAGE_VERSION=2.5.1 unexport FPC_VERSION FPC_COMPILERINFO -CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips +CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr ALLTARGETS=$(CYCLETARGETS) ifdef ALPHA PPC_TARGET=alpha @@ -527,6 +546,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_DIRS+=utils endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_DIRS+=utils +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_DIRS+=utils endif @@ -713,6 +735,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override TARGET_PROGRAMS+=pp endif +ifeq ($(FULL_TARGET),powerpc-wii) +override TARGET_PROGRAMS+=pp +endif ifeq ($(FULL_TARGET),sparc-linux) override TARGET_PROGRAMS+=pp endif @@ -900,6 +925,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_INCLUDEDIR+=$(CPC_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_INCLUDEDIR+=$(CPC_TARGET) endif @@ -1086,6 +1114,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR) endif @@ -1272,6 +1303,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_TARGETDIR+=. endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_TARGETDIR+=. +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_TARGETDIR+=. endif @@ -1458,6 +1492,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif +ifeq ($(FULL_TARGET),powerpc-wii) +override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) +endif ifeq ($(FULL_TARGET),sparc-linux) override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET) endif @@ -1879,6 +1916,11 @@ ifeq ($(OS_TARGET),NativeNT) SHAREDLIBEXT=.dll SHORTSUFFIX=nativent endif +ifeq ($(OS_TARGET),wii) +EXEEXT=.dol +SHAREDLIBEXT=.so +SHORTSUFFIX=wii +endif else ifeq ($(OS_TARGET),go32v1) PPUEXT=.pp1 @@ -2415,6 +2457,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) REQUIRE_PACKAGES_RTL=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +REQUIRE_PACKAGES_RTL=1 +endif ifeq ($(FULL_TARGET),sparc-linux) REQUIRE_PACKAGES_RTL=1 endif @@ -3012,6 +3057,7 @@ fpc_baseinfo: @$(ECHO) Full Target.. $(FULL_TARGET) @$(ECHO) SourceSuffix. $(SOURCESUFFIX) @$(ECHO) TargetSuffix. $(TARGETSUFFIX) + @$(ECHO) FPC fpmake... $(FPCFPMAKE) @$(ECHO) @$(ECHO) == Directory info == @$(ECHO) @@ -3210,6 +3256,9 @@ endif ifeq ($(FULL_TARGET),powerpc-embedded) TARGET_DIRS_UTILS=1 endif +ifeq ($(FULL_TARGET),powerpc-wii) +TARGET_DIRS_UTILS=1 +endif ifeq ($(FULL_TARGET),sparc-linux) TARGET_DIRS_UTILS=1 endif diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index 6363069f54..11fe49e508 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -32,7 +32,7 @@ fpcdir=.. unexport FPC_VERSION FPC_COMPILERINFO # Which platforms are ready for inclusion in the cycle -CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips +CYCLETARGETS=i386 powerpc sparc arm x86_64 powerpc64 m68k armeb mipsel mips avr # All supported targets used for clean ALLTARGETS=$(CYCLETARGETS)