* Move ppudump.pp to a sub-folder as preparation for adding JSON output units.

git-svn-id: trunk@24298 -

.gitattributes

@@ -690,7 +690,7 @@ compiler/utils/mkx86reg.pp svneol=native#text/plain
 compiler/utils/msg2inc.pp svneol=native#text/plain
 compiler/utils/msgdif.pp svneol=native#text/plain
 compiler/utils/msgused.pl svneol=native#text/plain
-compiler/utils/ppudump.pp svneol=native#text/plain
+compiler/utils/ppudump/ppudump.pp svneol=native#text/plain
 compiler/utils/ppufiles.pp svneol=native#text/plain
 compiler/utils/ppumove.pp svneol=native#text/plain
 compiler/utils/samplecfg svneol=native#text/plain

compiler/utils/Makefile

@@ -1,10 +1,10 @@
 #
-# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013/01/16]
+# Don't edit, this file is generated by FPCMake Version 2.0.0 [2013-03-25 rev 23995]
 #
 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 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 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 jvm-java jvm-android
 BSDs = freebsd netbsd openbsd darwin
-UNIXs = linux $(BSDs) solaris qnx haiku aix 
+UNIXs = linux $(BSDs) solaris qnx haiku aix
 LIMIT83fs = go32v2 os2 emx watcom
 OSNeedsComspecToRunBatch = go32v2 watcom
 FORCE:
@@ -268,6 +268,19 @@ ifdef CROSSCOMPILE
 ifndef DARWIN2DARWIN
 ifneq ($(CPU_TARGET),jvm)
 BINUTILSPREFIX=$(CPU_TARGET)-$(OS_TARGET)-
+ifeq ($(OS_TARGET),android)
+ifeq ($(CPU_TARGET),arm)
+BINUTILSPREFIX=arm-linux-androideabi-
+else
+ifeq ($(CPU_TARGET),i386)
+BINUTILSPREFIX=i686-linux-android-
+else
+ifeq ($(CPU_TARGET),mips)
+BINUTILSPREFIX=mipsel-linux-android-
+endif
+endif
+endif
+endif
 endif
 endif
 endif
@@ -1769,7 +1782,11 @@ AS=$(ASPROG)
 LD=$(LDPROG)
 RC=$(RCPROG)
 AR=$(ARPROG)
+ifdef inUnix
+PPAS=./ppas$(SRCBATCHEXT)
+else
 PPAS=ppas$(SRCBATCHEXT)
+endif
 ifdef inUnix
 LDCONFIG=ldconfig
 else
@@ -2585,7 +2602,7 @@ REG_EXES=$(subst .pp,$(EXEEXT),$(REG_SOURCES))
 ifndef NOCPUDEF
 ppu$(PPUEXT): ../ppu.pas
 	$(MAKE) ppu$(PPUEXT) NOCPUDEF=1
-ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
+ppudump$(EXEEXT): ppudump/ppudump.pp ppu$(PPUEXT)
 	$(MAKE) ppudump$(EXEEXT) NOCPUDEF=1
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
 	$(MAKE) ppufiles$(EXEEXT) NOCPUDEF=1
@@ -2594,8 +2611,8 @@ ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)
 else
 ppu$(PPUEXT): ../ppu.pas
 	$(COMPILER) ../ppu.pas -Fu../generic -dGENERIC_CPU -Fi..
-ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
-	$(COMPILER) ppudump.pp -Fu../generic -dGENERIC_CPU -Fi..
+ppudump$(EXEEXT): ppudump/ppudump.pp ppu$(PPUEXT)
+	$(COMPILER) ppudump/ppudump.pp -Fu../generic -dGENERIC_CPU -Fi..
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
 	$(COMPILER) ppufiles.pp -Fu../generic -dGENERIC_CPU -Fi..
 ppumove$(EXEEXT): ppumove.pp ppu$(PPUEXT)

compiler/utils/Makefile.fpc

@@ -41,7 +41,7 @@ ifndef NOCPUDEF
 ppu$(PPUEXT): ../ppu.pas
 	$(MAKE) ppu$(PPUEXT) NOCPUDEF=1
 
-ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
+ppudump$(EXEEXT): ppudump/ppudump.pp ppu$(PPUEXT)
 	$(MAKE) ppudump$(EXEEXT) NOCPUDEF=1
 
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
@@ -54,8 +54,8 @@ else
 ppu$(PPUEXT): ../ppu.pas
         $(COMPILER) ../ppu.pas -Fu../generic -dGENERIC_CPU -Fi..
 
-ppudump$(EXEEXT): ppudump.pp ppu$(PPUEXT)
-        $(COMPILER) ppudump.pp -Fu../generic -dGENERIC_CPU -Fi..
+ppudump$(EXEEXT): ppudump/ppudump.pp ppu$(PPUEXT)
+        $(COMPILER) ppudump/ppudump.pp -Fu../generic -dGENERIC_CPU -Fi..
 
 ppufiles$(EXEEXT): ppufiles.pp ppu$(PPUEXT)
         $(COMPILER) ppufiles.pp -Fu../generic -dGENERIC_CPU -Fi..