From 382ac54e58f3f1e3e3d9ebeed88fbd57d75a0cf1 Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Mon, 15 Nov 2004 19:31:27 +0000
Subject: [PATCH]   * fixed Makefile targets for cross compilers

---
 compiler/Makefile     | 64 ++++++++++++++++++-------------------------
 compiler/Makefile.fpc | 40 +++++++++------------------
 2 files changed, 40 insertions(+), 64 deletions(-)

diff --git a/compiler/Makefile b/compiler/Makefile
index b6a9831641..263363a7bd 100644
--- a/compiler/Makefile
+++ b/compiler/Makefile
@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/10/30]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/11/08]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom morphos netwlibc
@@ -222,7 +222,7 @@ PACKAGESDIR:=$(wildcard $(FPCDIR) $(FPCDIR)/packages/base $(FPCDIR)/packages/ext
 override PACKAGE_NAME=compiler
 override PACKAGE_VERSION=1.9.4
 unexport FPC_VERSION FPC_COMPILERINFO
-CYCLETARGETS=i386 powerpc sparc arm
+CYCLETARGETS=i386 powerpc sparc arm x86_64
 ifdef ALPHA
 PPC_TARGET=alpha
 endif
@@ -250,7 +250,7 @@ endif
 ifndef PPC_OS
 PPC_OS=$(OS_TARGET)
 endif
-CPU_UNITDIR=.
+CPU_UNITDIR=$(PPC_TARGET)
 UTILSDIR=../utils
 COMPILERSOURCEDIR=$(PPC_TARGET) systems
 COMPILERUTILSDIR=utils
@@ -305,16 +305,16 @@ ifeq ($(PPC_TARGET),i386)
 override LOCALDEF+=-Fux86
 endif
 ifeq ($(PPC_TARGET),x86_64)
-override LOCALDEF+=-Fux86 -dNOOPT
+override LOCALDEF+=-Fux86
 endif
 ifeq ($(PPC_TARGET),powerpc)
-override LOCALDEF+=-dNOOPT
+override LOCALDEF+=
 endif
 ifeq ($(PPC_TARGET),m68k)
 override LOCALDEF+=-dNOOPT
 endif
 ifeq ($(PPC_TARGET),sparc)
-override LOCALDEF+=-dNOOPT
+override LOCALDEF+=
 endif
 ifeq ($(PPC_TARGET),m68k)
 ifeq ($(OS_TARGET),amiga)
@@ -345,7 +345,7 @@ override TARGET_PROGRAMS+=pp
 override INSTALL_FPCPACKAGE=y
 override COMPILER_INCLUDEDIR+=$(PPC_TARGET)
 override COMPILER_UNITDIR+=$(COMPILERSOURCEDIR)
-override COMPILER_TARGETDIR+=$(CPU_UNITDIR)
+override COMPILER_TARGETDIR+=.
 override COMPILER_UNITTARGETDIR+=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 ifdef REQUIRE_UNITSDIR
 override UNITSDIR+=$(REQUIRE_UNITSDIR)
@@ -844,7 +844,7 @@ ECHO:=$(strip $(wildcard $(addsuffix /gecho$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
 ECHO:=$(strip $(wildcard $(addsuffix /echo$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ECHO),)
-ECHO= __missing_command__
+ECHO= __missing_command_ECHO
 else
 ECHO:=$(firstword $(ECHO))
 endif
@@ -858,7 +858,7 @@ DATE:=$(strip $(wildcard $(addsuffix /gdate$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
 DATE:=$(strip $(wildcard $(addsuffix /date$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DATE),)
-DATE= __missing_command__
+DATE= __missing_command_DATE
 else
 DATE:=$(firstword $(DATE))
 endif
@@ -872,7 +872,7 @@ GINSTALL:=$(strip $(wildcard $(addsuffix /ginstall$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(GINSTALL),)
 GINSTALL:=$(strip $(wildcard $(addsuffix /install$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(GINSTALL),)
-GINSTALL= __missing_command__
+GINSTALL= __missing_command_GINSTALL
 else
 GINSTALL:=$(firstword $(GINSTALL))
 endif
@@ -884,7 +884,7 @@ export GINSTALL
 ifndef CPPROG
 CPPROG:=$(strip $(wildcard $(addsuffix /cp$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(CPPROG),)
-CPPROG= __missing_command__
+CPPROG= __missing_command_CPPROG
 else
 CPPROG:=$(firstword $(CPPROG))
 endif
@@ -893,7 +893,7 @@ export CPPROG
 ifndef RMPROG
 RMPROG:=$(strip $(wildcard $(addsuffix /rm$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(RMPROG),)
-RMPROG= __missing_command__
+RMPROG= __missing_command_RMPROG
 else
 RMPROG:=$(firstword $(RMPROG))
 endif
@@ -902,7 +902,7 @@ export RMPROG
 ifndef MVPROG
 MVPROG:=$(strip $(wildcard $(addsuffix /mv$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(MVPROG),)
-MVPROG= __missing_command__
+MVPROG= __missing_command_MVPROG
 else
 MVPROG:=$(firstword $(MVPROG))
 endif
@@ -913,7 +913,7 @@ MKDIRPROG:=$(strip $(wildcard $(addsuffix /gmkdir$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(MKDIRPROG),)
 MKDIRPROG:=$(strip $(wildcard $(addsuffix /mkdir$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(MKDIRPROG),)
-MKDIRPROG= __missing_command__
+MKDIRPROG= __missing_command_MKDIRPROG
 else
 MKDIRPROG:=$(firstword $(MKDIRPROG))
 endif
@@ -968,7 +968,7 @@ export ECHOREDIR COPY COPYTREE MOVE DEL DELTREE INSTALL INSTALLEXE MKDIR
 ifndef PPUMOVE
 PPUMOVE:=$(strip $(wildcard $(addsuffix /ppumove$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(PPUMOVE),)
-PPUMOVE= __missing_command__
+PPUMOVE= __missing_command_PPUMOVE
 else
 PPUMOVE:=$(firstword $(PPUMOVE))
 endif
@@ -977,7 +977,7 @@ export PPUMOVE
 ifndef FPCMAKE
 FPCMAKE:=$(strip $(wildcard $(addsuffix /fpcmake$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(FPCMAKE),)
-FPCMAKE= __missing_command__
+FPCMAKE= __missing_command_FPCMAKE
 else
 FPCMAKE:=$(firstword $(FPCMAKE))
 endif
@@ -986,7 +986,7 @@ export FPCMAKE
 ifndef ZIPPROG
 ZIPPROG:=$(strip $(wildcard $(addsuffix /zip$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(ZIPPROG),)
-ZIPPROG= __missing_command__
+ZIPPROG= __missing_command_ZIPPROG
 else
 ZIPPROG:=$(firstword $(ZIPPROG))
 endif
@@ -995,7 +995,7 @@ export ZIPPROG
 ifndef TARPROG
 TARPROG:=$(strip $(wildcard $(addsuffix /tar$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(TARPROG),)
-TARPROG= __missing_command__
+TARPROG= __missing_command_TARPROG
 else
 TARPROG:=$(firstword $(TARPROG))
 endif
@@ -1830,7 +1830,7 @@ endif
 ifndef DIFF
 DIFF:=$(strip $(wildcard $(addsuffix /diff$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(DIFF),)
-DIFF= __missing_command__
+DIFF= __missing_command_DIFF
 else
 DIFF:=$(firstword $(DIFF))
 endif
@@ -1839,7 +1839,7 @@ export DIFF
 ifndef CMP
 CMP:=$(strip $(wildcard $(addsuffix /cmp$(SRCEXEEXT),$(SEARCHPATH))))
 ifeq ($(CMP),)
-CMP= __missing_command__
+CMP= __missing_command_CMP
 else
 CMP:=$(firstword $(CMP))
 endif
@@ -1882,21 +1882,10 @@ TEMPNAME2=ppc2$(EXEEXT)
 TEMPNAME3=ppc3$(EXEEXT)
 MAKEDEP=ppdep$(EXEEXT)
 MSG2INC=./msg2inc$(EXEEXT)
-.PHONY: alpha i386 m68k powerpc sparc arm
-alpha:
-	$(MAKE) PPC_TARGET=alpha CPU_UNITDIR=alpha all
-i386:
-	$(MAKE) PPC_TARGET=i386 CPU_UNITDIR=i386 all
-m68k:
-	$(MAKE) PPC_TARGET=m68k CPU_UNITDIR=m68k all
-powerpc:
-	$(MAKE) PPC_TARGET=powerpc CPU_UNITDIR=powerpc all
-sparc:
-	$(MAKE) PPC_TARGET=sparc CPU_UNITDIR=sparc all
-arm:
-	$(MAKE) PPC_TARGET=arm CPU_UNITDIR=arm all
-x86_64:
-	$(MAKE) PPC_TARGET=x86_64 CPU_UNITDIR=x86_64 all
+PPC_TARGETS=alpha i386 m68k powerpc sparc arm x86_64
+.PHONY: $(PPC_TARGETS)
+$(PPC_TARGETS):
+	$(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all
 .PHONY: all compiler echotime ppuclean execlean clean distclean
 all: compiler $(addsuffix _all,$(TARGET_DIRS))
 compiler: $(COMPILER_UNITTARGETDIR) $(COMPILER_TARGETDIR) $(EXENAME)
@@ -1925,12 +1914,13 @@ tempclean:
 execlean :
 	-$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
 $(addsuffix _clean,$(CYCLETARGETS)):
+	-$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
 	-$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
 	-$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
 cycleclean: cleanall
 	-$(DEL) $(EXENAME)
-clean: tempclean execlean cleanall $(addsuffix _clean,$(TARGET_DIRS))
-distclean: tempclean execlean cleanall $(addsuffix _distclean,$(TARGET_DIRS))
+clean: tempclean execlean cleanall $(addsuffix _clean,$(PPC_TARGET)) $(addsuffix _clean,$(TARGET_DIRS))
+distclean: tempclean execlean cleanall $(addsuffix _clean,$(CYCLETARGETS)) $(addsuffix _distclean,$(TARGET_DIRS))
 $(MAKEDEP): $(UTILSDIR)/ppdep.pp
 	$(COMPILER) $(UTILSDIR)/ppdep.pp
 	$(COPY) $(UTILSDIR)/$(MAKEDEP) $(MAKEDEP)
diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc
index 081a77673b..89d38fcf72 100644
--- a/compiler/Makefile.fpc
+++ b/compiler/Makefile.fpc
@@ -11,7 +11,7 @@ programs=pp
 dirs=utils
 
 [compiler]
-targetdir=$(CPU_UNITDIR)
+targetdir=.
 unittargetdir=$(CPU_UNITDIR)/units/$(FULL_TARGET)
 unitdir=$(COMPILERSOURCEDIR)
 includedir=$(PPC_TARGET)
@@ -32,7 +32,7 @@ fpcdir=..
 unexport FPC_VERSION FPC_COMPILERINFO
 
 # Which platforms are ready for inclusion in the cycle
-CYCLETARGETS=i386 powerpc sparc arm
+CYCLETARGETS=i386 powerpc sparc arm x86_64
 
 # Allow ALPHA, POWERPC, M68K, I386 defines for target cpu
 ifdef ALPHA
@@ -70,7 +70,7 @@ PPC_OS=$(OS_TARGET)
 endif
 
 # Where to place the unit files.
-CPU_UNITDIR=.
+CPU_UNITDIR=$(PPC_TARGET)
 
 # RTL
 UTILSDIR=../utils
@@ -157,12 +157,12 @@ endif
 
 # x86_64 specific
 ifeq ($(PPC_TARGET),x86_64)
-override LOCALDEF+=-Fux86 -dNOOPT
+override LOCALDEF+=-Fux86
 endif
 
 # PowerPC specific
 ifeq ($(PPC_TARGET),powerpc)
-override LOCALDEF+=-dNOOPT
+override LOCALDEF+=
 endif
 
 # m68k specific
@@ -172,7 +172,7 @@ endif
 
 # Sparc specific
 ifeq ($(PPC_TARGET),sparc)
-override LOCALDEF+=-dNOOPT
+override LOCALDEF+=
 endif
 
 # m68k specific with low stack
@@ -243,28 +243,13 @@ MSG2INC=./msg2inc$(EXEEXT)
 # CPU targets
 #####################################################################
 
-.PHONY: alpha i386 m68k powerpc sparc arm
+PPC_TARGETS=alpha i386 m68k powerpc sparc arm x86_64
 
-alpha:
-        $(MAKE) PPC_TARGET=alpha CPU_UNITDIR=alpha all
+.PHONY: $(PPC_TARGETS)
 
-i386:
-        $(MAKE) PPC_TARGET=i386 CPU_UNITDIR=i386 all
+$(PPC_TARGETS):
+        $(MAKE) PPC_TARGET=$@ CPU_UNITDIR=$@ all
 
-m68k:
-        $(MAKE) PPC_TARGET=m68k CPU_UNITDIR=m68k all
-
-powerpc:
-        $(MAKE) PPC_TARGET=powerpc CPU_UNITDIR=powerpc all
-
-sparc:
-        $(MAKE) PPC_TARGET=sparc CPU_UNITDIR=sparc all
-
-arm:
-        $(MAKE) PPC_TARGET=arm CPU_UNITDIR=arm all
-
-x86_64:
-        $(MAKE) PPC_TARGET=x86_64 CPU_UNITDIR=x86_64 all
 
 #####################################################################
 # Default makefile
@@ -308,15 +293,16 @@ execlean :
         -$(DEL) ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcsparc$(EXEEXT) $(EXENAME)
 
 $(addsuffix _clean,$(CYCLETARGETS)):
+        -$(DELTREE) $(addprefix $(subst _clean,,$@),/units)
         -$(DEL) $(addprefix $(subst _clean,,$@)/,*$(OEXT) *$(PPUEXT) *$(RSTEXT) *$(ASMEXT) *$(STATICLIBEXT) *$(SHAREDLIBEXT) *$(PPLEXT))
         -$(DEL) $(addprefix $(subst _clean,,$@)/,ppc386$(EXEEXT) ppcaxp$(EXEEXT) ppc68k$(EXEEXT) ppcx64$(EXEEXT) ppcppc$(EXEEXT) ppcppc$(EXEEXT) $(EXENAME))
 
 cycleclean: cleanall
         -$(DEL) $(EXENAME)
 
-clean: tempclean execlean cleanall $(addsuffix _clean,$(TARGET_DIRS))
+clean: tempclean execlean cleanall $(addsuffix _clean,$(PPC_TARGET)) $(addsuffix _clean,$(TARGET_DIRS))
 
-distclean: tempclean execlean cleanall $(addsuffix _distclean,$(TARGET_DIRS))
+distclean: tempclean execlean cleanall $(addsuffix _clean,$(CYCLETARGETS)) $(addsuffix _distclean,$(TARGET_DIRS))
 
 
 #####################################################################