+ arm support in Makefiles improved

compiler/Makefile

@@ -1,5 +1,5 @@
 #
-# Don't edit, this file is generated by FPCMake Version 1.1 [2004/01/05]
+# Don't edit, this file is generated by FPCMake Version 1.1 [2004/02/07]
 #
 default: all
 MAKEFILETARGETS=linux go32v2 win32 os2 freebsd beos netbsd amiga atari sunos qnx netware openbsd wdosx palmos macos darwin emx watcom
@@ -184,11 +184,14 @@ override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
 override FPCDIR:=$(FPCDIR)/..
 ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
+override FPCDIR:=$(BASEDIR)
+ifeq ($(wildcard $(addprefix $(FPCDIR)/,rtl units)),)
 override FPCDIR=c:/pp
 endif
 endif
 endif
 endif
+endif
 ifndef CROSSDIR
 CROSSDIR:=$(FPCDIR)/cross/$(FULL_TARGET)
 endif
@@ -226,6 +229,9 @@ endif
 ifdef X86_64
 PPC_TARGET=x86_64
 endif
+ifdef X86_64
+PPC_TARGET=arm
+endif
 ifndef PPC_TARGET
 PPC_TARGET=$(CPU_TARGET)
 endif
@@ -267,6 +273,9 @@ endif
 ifeq ($(PPC_TARGET),x86_64)
 CPUSUF=x64
 endif
+ifeq ($(PPC_TARGET),arm)
+CPUSUF=arm
+endif
 NOCPUDEF=1
 ifeq ($(OS_TARGET),linux)
 ifneq ($(findstring 1.0.,$(FPC_VERSION)),)
@@ -305,6 +314,9 @@ ifeq ($(OS_TARGET),amiga)
 override LOCALDEF+=-Ct
 endif
 endif
+ifeq ($(PPC_TARGET),arm)
+override LOCALDEF+=-dNOOPT
+endif
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
 ifeq ($(PASDOC),)
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))
@@ -1031,6 +1043,11 @@ ifeq ($(CPU_TARGET),x86_64)
 REQUIRE_PACKAGES_RTL=1
 endif
 endif
+ifeq ($(OS_TARGET),linux)
+ifeq ($(CPU_TARGET),arm)
+REQUIRE_PACKAGES_RTL=1
+endif
+endif
 ifeq ($(OS_TARGET),go32v2)
 ifeq ($(CPU_TARGET),i386)
 REQUIRE_PACKAGES_RTL=1
@@ -1706,7 +1723,7 @@ TEMPNAME2=ppc2$(EXEEXT)
 TEMPNAME3=ppc3$(EXEEXT)
 MAKEDEP=ppdep$(EXEEXT)
 MSG2INC=./msg2inc$(EXEEXT)
-.PHONY: alpha i386 m68k powerpc sparc
+.PHONY: alpha i386 m68k powerpc sparc arm
 alpha:
 	$(MAKE) PPC_TARGET=alpha CPU_UNITDIR=alpha all
 i386:
@@ -1717,6 +1734,8 @@ powerpc:
 	$(MAKE) PPC_TARGET=powerpc CPU_UNITDIR=powerpc all
 sparc:
 	$(MAKE) PPC_TARGET=sparc CPU_UNITDIR=sparc all
+arm:
+	$(MAKE) PPC_TARGET=sparc CPU_UNITDIR=arm all
 .PHONY: all compiler echotime ppuclean execlean clean distclean
 all: $(EXENAME) $(addsuffix _all,$(TARGET_DIRS))
 compiler: $(EXENAME)

compiler/Makefile.fpc

@@ -51,6 +51,9 @@ endif
 ifdef X86_64
 PPC_TARGET=x86_64
 endif
+ifdef X86_64
+PPC_TARGET=arm
+endif
 
 # Default is to generate a compiler for the same
 # platform as CPU_TARGET (a native compiler)
@@ -118,6 +121,9 @@ endif
 ifeq ($(PPC_TARGET),x86_64)
 CPUSUF=x64
 endif
+ifeq ($(PPC_TARGET),arm)
+CPUSUF=arm
+endif
 
 # Do not define the default -d$(CPU_TARGET) because that
 # will conflict with our -d$(PPC_TARGET)
@@ -180,6 +186,11 @@ override LOCALDEF+=-Ct
 endif
 endif
 
+# ARM specific
+ifeq ($(PPC_TARGET),arm)
+override LOCALDEF+=-dNOOPT
+endif
+
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
 ifeq ($(PASDOC),)
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))
@@ -241,7 +252,7 @@ MSG2INC=./msg2inc$(EXEEXT)
 # CPU targets
 #####################################################################
 
-.PHONY: alpha i386 m68k powerpc sparc
+.PHONY: alpha i386 m68k powerpc sparc arm
 
 alpha:
         $(MAKE) PPC_TARGET=alpha CPU_UNITDIR=alpha all
@@ -258,6 +269,9 @@ powerpc:
 sparc:
         $(MAKE) PPC_TARGET=sparc CPU_UNITDIR=sparc all
 
+arm:
+        $(MAKE) PPC_TARGET=sparc CPU_UNITDIR=arm all
+
 #####################################################################
 # Default makefile
 #####################################################################