paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 02:49:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merge of several fixes for ppudump tests used in regular tests for ppudump output.

Browse Source 
------------------------------------------------------------------------
r37206 | pierre | 2017-09-14 15:41:06 +0200 (Thu, 14 Sep 2017) | 1 line

 Fix failures in rtlppulogs
------------------------------------------------------------------------
r37208 | pierre | 2017-09-14 17:57:25 +0200 (Thu, 14 Sep 2017) | 1 line

 Use installed ppudump instead of trying to recompile it, to be able to test cross-compiled RTL units
------------------------------------------------------------------------
r37210 | pierre | 2017-09-15 13:24:06 +0200 (Fri, 15 Sep 2017) | 1 line

 Fix the RTL directory for old OSes that use OS_TARGET only for rtlppulogs rule
------------------------------------------------------------------------
r37219 | pierre | 2017-09-15 22:24:06 +0200 (Fri, 15 Sep 2017) | 1 line

 Also use in path ppudump for ppulogs rule
------------------------------------------------------------------------

git-svn-id: branches/fixes_3_0@37476 -
This commit is contained in:
pierre 2017-10-16 17:16:35 +00:00
parent 100cd63d0e
commit 6f132578cd
5 changed files with 37 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/Makefile
View File

@ -4083,7 +4083,7 @@ PPUDIR=$(COMPILER_UNITTARGETDIR)
ALLPPUDIR=$(CPU_TARGET)/units/* ALLPPUDIR=$(CPU_TARGET)/units/*
PPULIST=$(wildcard $(PPUDIR)/*.ppu) PPULIST=$(wildcard $(PPUDIR)/*.ppu)
PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST)) PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
RTLPPUDIR=../rtl/units/$(FULL_TARGET) RTLPPUDIR=../rtl/units/$(TARGETSUFFIX)
RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu) RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST)) RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
.PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump .PHONY : ppulogs cleanppulogs rtlppulogs cleanrtlppulogs testppudump
@ -4091,13 +4091,15 @@ ppulogs : $(PPULOGLIST)
rtlppulogs : $(RTLPPULOGLIST) rtlppulogs : $(RTLPPULOGLIST)
vpath %.ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) vpath %.ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
%.log-ppu : %.ppu ./utils/ppudump$(EXEEXT) %.log-ppu : %.ppu
.$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@ ppudump -VA -M $< > $@
./utils/ppudump$(EXEEXT): ./utils/ppudump$(EXEEXT):
$(MAKE) -C $(COMPILERUTILSDIR) ppudump$(EXEEXT) $(MAKE) -C $(COMPILERUTILSDIR) ppudump$(EXEEXT)
ppuinfo : ppuinfo :
echo PPU list is "$(PPULIST)" echo PPU list is "$(PPULIST)"
echo PPULOG list is "$(PPULOGLIST)" echo PPULOG list is "$(PPULOGLIST)"
echo RTLPPUDIR is "$(RTLPPUDIR)"
echo RTLPPU list is "$(RTLPPULIST)"
cleanppulogs : cleanppulogs :
-$(RMPROG) $(PPULOGLIST) -$(RMPROG) $(PPULOGLIST)
cleanrtlppulogs : cleanrtlppulogs :

9
compiler/Makefile.fpc
View File

@ -842,7 +842,7 @@ ALLPPUDIR=$(CPU_TARGET)/units/*
PPULIST=$(wildcard $(PPUDIR)/*.ppu) PPULIST=$(wildcard $(PPUDIR)/*.ppu)
PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST)) PPULOGLIST=$(subst .ppu,.log-ppu,$(PPULIST))
RTLPPUDIR=../rtl/units/$(FULL_TARGET) RTLPPUDIR=../rtl/units/$(TARGETSUFFIX)
RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu) RTLPPULIST=$(wildcard $(RTLPPUDIR)/*.ppu)
RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST)) RTLPPULOGLIST=$(subst .ppu,.log-ppu,$(RTLPPULIST))
@ -855,8 +855,9 @@ rtlppulogs : $(RTLPPULOGLIST)
vpath %.ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) vpath %.ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR) vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
%.log-ppu : %.ppu ./utils/ppudump$(EXEEXT) # Use installed ppudump
.$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@ %.log-ppu : %.ppu
ppudump -VA -M $< > $@
./utils/ppudump$(EXEEXT): ./utils/ppudump$(EXEEXT):
@ -865,6 +866,8 @@ vpath %.log-ppu $(PPUDIR) $(RTLPPUDIR) $(ALLPPUDIR)
ppuinfo : ppuinfo :
echo PPU list is "$(PPULIST)" echo PPU list is "$(PPULIST)"
echo PPULOG list is "$(PPULOGLIST)" echo PPULOG list is "$(PPULOGLIST)"
echo RTLPPUDIR is "$(RTLPPUDIR)"
echo RTLPPU list is "$(RTLPPULIST)"
cleanppulogs : cleanppulogs :
-$(RMPROG) $(PPULOGLIST) -$(RMPROG) $(PPULOGLIST)

22
compiler/utils/ppuutils/ppudump.pp
View File

@ -2644,6 +2644,7 @@ procedure readdefinitions(const s:string; ParentDef: TPpuContainerDef);
{ type tvarianttype is in symconst unit } { type tvarianttype is in symconst unit }
var var
b : byte; b : byte;
otb : byte; { object type byte, needed later }
l,j : longint; l,j : longint;
calloption : tproccalloption; calloption : tproccalloption;
procoptions : tprocoptions; procoptions : tprocoptions;
@ -3075,9 +3076,9 @@ begin
writeln([space,' Import lib/pkg : ',getstring]); writeln([space,' Import lib/pkg : ',getstring]);
write ([space,' Options : ']); write ([space,' Options : ']);
readobjectdefoptions(objdef); readobjectdefoptions(objdef);
b:=getbyte; otb:=getbyte;
write ([space,' Type : ']); write ([space,' Type : ']);
case tobjecttyp(b) of case tobjecttyp(otb) of
odt_class : writeln('class'); odt_class : writeln('class');
odt_object : writeln('object'); odt_object : writeln('object');
odt_interfacecom : writeln('interfacecom'); odt_interfacecom : writeln('interfacecom');
@ -3092,7 +3093,7 @@ begin
odt_interfacejava : writeln('Java interface'); odt_interfacejava : writeln('Java interface');
else WriteWarning('Invalid object type: ' + IntToStr(b)); else WriteWarning('Invalid object type: ' + IntToStr(b));
end; end;
case tobjecttyp(b) of case tobjecttyp(otb) of
odt_class, odt_cppclass, odt_objcclass, odt_javaclass: odt_class, odt_cppclass, odt_objcclass, odt_javaclass:
objdef.ObjType:=otClass; objdef.ObjType:=otClass;
odt_object: odt_object:
@ -3112,7 +3113,7 @@ begin
write ([space, ' Ancestor Class : ']); write ([space, ' Ancestor Class : ']);
readderef('',objdef.Ancestor); readderef('',objdef.Ancestor);
if tobjecttyp(b) in [odt_interfacecom,odt_interfacecorba,odt_dispinterface] then if tobjecttyp(otb) in [odt_interfacecom,odt_interfacecorba,odt_dispinterface] then
begin begin
{ IIDGUID } { IIDGUID }
for j:=1to 16 do for j:=1to 16 do
@ -3123,7 +3124,7 @@ begin
writeln([space,' Abstract methods : ',getlongint]); writeln([space,' Abstract methods : ',getlongint]);
if tobjecttyp(b)=odt_helper then if tobjecttyp(otb)=odt_helper then
begin begin
write([space,' Helper parent : ']); write([space,' Helper parent : ']);
readderef('',objdef.HelperParent); readderef('',objdef.HelperParent);
@ -3139,7 +3140,7 @@ begin
readvisibility; readvisibility;
end; end;
if tobjecttyp(b) in [odt_class,odt_objcclass,odt_objcprotocol,odt_javaclass,odt_interfacejava] then if tobjecttyp(otb) in [odt_class,odt_objcclass,odt_objcprotocol,odt_javaclass,odt_interfacejava] then
begin begin
l:=getlongint; l:=getlongint;
writeln([space,' Impl Intf Count : ',l]); writeln([space,' Impl Intf Count : ',l]);
@ -3159,11 +3160,8 @@ begin
Include(objdef.Options, ooCopied); Include(objdef.Options, ooCopied);
writeln(' Copy of def: '); writeln(' Copy of def: ');
readderef('',objdef.Ancestor); readderef('',objdef.Ancestor);
end; end
else
if not EndOfEntry then
HasMoreInfos;
if not(df_copied_def in current_defoptions) then
begin begin
{read the record definitions and symbols} {read the record definitions and symbols}
space:=' '+space; space:=' '+space;
@ -3171,6 +3169,8 @@ begin
readsymtable('fields',objdef); readsymtable('fields',objdef);
Delete(space,1,4); Delete(space,1,4);
end; end;
if not EndOfEntry then
HasMoreInfos;
end; end;
ibfiledef : ibfiledef :

66
packages/Makefile
View File

@ -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-04 rev 35393]
# #
default: all 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 BSDs = freebsd netbsd openbsd darwin dragonfly
UNIXs = linux $(BSDs) solaris qnx haiku aix UNIXs = linux $(BSDs) solaris qnx haiku aix
LIMIT83fs = go32v2 os2 emx watcom msdos win16 LIMIT83fs = go32v2 os2 emx watcom msdos
OSNeedsComspecToRunBatch = go32v2 watcom OSNeedsComspecToRunBatch = go32v2 watcom
FORCE: FORCE:
.PHONY: FORCE .PHONY: FORCE
@ -184,12 +184,6 @@ $(error When compiling for arm-embedded, a sub-architecture (e.g. SUBARCH=armv4t
endif endif
override FPCOPT+=-Cp$(SUBARCH) override FPCOPT+=-Cp$(SUBARCH)
endif 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 ($(FULL_TARGET),mipsel-embedded)
ifeq ($(SUBARCH),) ifeq ($(SUBARCH),)
$(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined) $(error When compiling for mipsel-embedded, a sub-architecture (e.g. SUBARCH=pic32mx) must be defined)
@ -758,21 +752,6 @@ STATICLIBPREFIX=
STATICLIBEXT=.a STATICLIBEXT=.a
SHORTSUFFIX=d16 SHORTSUFFIX=d16
endif 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)),) ifneq ($(findstring $(OS_SOURCE),$(LIMIT83fs)),)
FPCMADE=fpcmade.$(SHORTSUFFIX) FPCMADE=fpcmade.$(SHORTSUFFIX)
ZIPSUFFIX=$(SHORTSUFFIX) ZIPSUFFIX=$(SHORTSUFFIX)
@ -1187,12 +1166,6 @@ endif
ifeq ($(FULL_TARGET),x86_64-embedded) ifeq ($(FULL_TARGET),x86_64-embedded)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif 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) ifeq ($(FULL_TARGET),x86_64-dragonfly)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1223,9 +1196,6 @@ endif
ifeq ($(FULL_TARGET),arm-android) ifeq ($(FULL_TARGET),arm-android)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),arm-aros)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),powerpc64-linux) ifeq ($(FULL_TARGET),powerpc64-linux)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
@ -1265,21 +1235,9 @@ endif
ifeq ($(FULL_TARGET),jvm-android) ifeq ($(FULL_TARGET),jvm-android)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif endif
ifeq ($(FULL_TARGET),i8086-embedded)
REQUIRE_PACKAGES_RTL=1
endif
ifeq ($(FULL_TARGET),i8086-msdos) ifeq ($(FULL_TARGET),i8086-msdos)
REQUIRE_PACKAGES_RTL=1 REQUIRE_PACKAGES_RTL=1
endif 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 ifdef REQUIRE_PACKAGES_RTL
PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR)))))) PACKAGEDIR_RTL:=$(firstword $(subst /Makefile.fpc,,$(strip $(wildcard $(addsuffix /rtl/Makefile.fpc,$(PACKAGESDIR))))))
ifneq ($(PACKAGEDIR_RTL),) ifneq ($(PACKAGEDIR_RTL),)
@ -1330,7 +1288,6 @@ endif
ifeq ($(OS_SOURCE),openbsd) ifeq ($(OS_SOURCE),openbsd)
override FPCOPT+=-FD$(NEW_BINUTILS_PATH) override FPCOPT+=-FD$(NEW_BINUTILS_PATH)
override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH) override FPCMAKEOPT+=-FD$(NEW_BINUTILS_PATH)
override FPMAKE_BUILD_OPT+=-FD$(NEW_BINUTILS_PATH)
endif endif
ifndef CROSSBOOTSTRAP ifndef CROSSBOOTSTRAP
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
@ -1343,7 +1300,6 @@ endif
ifndef CROSSCOMPILE ifndef CROSSCOMPILE
ifneq ($(BINUTILSPREFIX),) ifneq ($(BINUTILSPREFIX),)
override FPCMAKEOPT+=-XP$(BINUTILSPREFIX) override FPCMAKEOPT+=-XP$(BINUTILSPREFIX)
override FPMAKE_BUILD_OPT+=-XP$(BINUTILSPREFIX)
endif endif
endif endif
ifdef UNITDIR ifdef UNITDIR
@ -1443,9 +1399,6 @@ endif
ifdef OPT ifdef OPT
override FPCOPT+=$(OPT) override FPCOPT+=$(OPT)
endif endif
ifdef FPMAKEBUILDOPT
override FPMAKE_BUILD_OPT+=$(FPMAKEBUILDOPT)
endif
ifdef FPCOPTDEF ifdef FPCOPTDEF
override FPCOPT+=$(addprefix -d,$(FPCOPTDEF)) override FPCOPT+=$(addprefix -d,$(FPCOPTDEF))
endif endif
@ -1563,10 +1516,6 @@ endif
ifdef DEBUGSYMEXT ifdef DEBUGSYMEXT
-$(DEL) *$(DEBUGSYMEXT) -$(DEL) *$(DEBUGSYMEXT)
endif endif
ifdef LOCALFPMAKEBIN
-$(DEL) $(LOCALFPMAKEBIN)
-$(DEL) $(FPMAKEBINOBJ)
endif
fpc_distclean: cleanall fpc_distclean: cleanall
.PHONY: fpc_baseinfo .PHONY: fpc_baseinfo
override INFORULES+=fpc_baseinfo override INFORULES+=fpc_baseinfo
@ -1762,21 +1711,22 @@ else
endif endif
PPULIST:=$(wildcard */units/*/*.ppu) PPULIST:=$(wildcard */units/*/*.ppu)
PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST)) PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST))
RMPPULOGLIST:=$(subst .ppu,.rm-log-ppu,$(PPULIST)) RMPPULOGLIST:=$(subst .log-ppu,.rm-log-ppu,$(wildcard $(PPULOGLIST)))
.PHONY : ppulogs cleanppulogs testppudump $(RMPPULOGLIST) .PHONY : ppulogs cleanppulogs testppudump $(RMPPULOGLIST)
ppulogs : $(PPULOGLIST) ppulogs : $(PPULOGLIST)
vpath %.ppu $(ALLPPUDIRS) vpath %.ppu $(ALLPPUDIRS)
vpath %.log-ppu $(ALLPPUDIRS) vpath %.log-ppu $(ALLPPUDIRS)
vpath %.rm-log-ppu $(ALLPPUDIRS) vpath %.rm-log-ppu $(ALLPPUDIRS)
%.log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) %.log-ppu : %.ppu
..$(PATHSEP)compiler$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@ ppudump -VA -M $< > $@
%.rm-log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) %.rm-log-ppu : %.ppu
-$(RMPROG) $< -$(RMPROG) $<
../compiler/utils/ppudump$(EXEEXT): ../compiler/utils/ppudump$(EXEEXT):
$(MAKE) -C $(COMPILERDIR)/utils ppudump$(EXEEXT) $(MAKE) -C $(COMPILERDIR)/utils ppudump$(EXEEXT)
ppuinfo : ppuinfo :
echo PPU list is "$(PPULIST)" echo PPU list is "$(PPULIST)"
echo PPULOG list is "$(PPULOGLIST)" echo PPULOG list is "$(PPULOGLIST)"
echo RMPPULOG list is "$(RMPPULOGLIST)"
cleanppulogs : $(RMPPULOGLIST) cleanppulogs : $(RMPPULOGLIST)
testppudump : testppudump :
$(MAKE) cleanppulogs ppulogs $(MAKE) cleanppulogs ppulogs

11
packages/Makefile.fpc
View File

@ -141,7 +141,8 @@ endif
PPULIST:=$(wildcard */units/*/*.ppu) PPULIST:=$(wildcard */units/*/*.ppu)
PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST)) PPULOGLIST:=$(subst .ppu,.log-ppu,$(PPULIST))
RMPPULOGLIST:=$(subst .ppu,.rm-log-ppu,$(PPULIST)) # Only remove existing log-ppu files
RMPPULOGLIST:=$(subst .log-ppu,.rm-log-ppu,$(wildcard $(PPULOGLIST)))
.PHONY : ppulogs cleanppulogs testppudump $(RMPPULOGLIST) .PHONY : ppulogs cleanppulogs testppudump $(RMPPULOGLIST)
@ -151,10 +152,11 @@ vpath %.ppu $(ALLPPUDIRS)
vpath %.log-ppu $(ALLPPUDIRS) vpath %.log-ppu $(ALLPPUDIRS)
vpath %.rm-log-ppu $(ALLPPUDIRS) vpath %.rm-log-ppu $(ALLPPUDIRS)
%.log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) # Do not try to recompile ppudump, as this does not work if trying to test cross-compiled units
..$(PATHSEP)compiler$(PATHSEP)utils$(PATHSEP)ppudump -VA -M $< > $@ %.log-ppu : %.ppu
ppudump -VA -M $< > $@
%.rm-log-ppu : %.ppu ../compiler/utils/ppudump$(EXEEXT) %.rm-log-ppu : %.ppu
-$(RMPROG) $< -$(RMPROG) $<
@ -164,6 +166,7 @@ vpath %.rm-log-ppu $(ALLPPUDIRS)
ppuinfo : ppuinfo :
echo PPU list is "$(PPULIST)" echo PPU list is "$(PPULIST)"
echo PPULOG list is "$(PPULOGLIST)" echo PPULOG list is "$(PPULOGLIST)"
echo RMPPULOG list is "$(RMPPULOGLIST)"
cleanppulogs : $(RMPPULOGLIST) cleanppulogs : $(RMPPULOGLIST)