./trunk/gcc215/vcs_diff_compiler.patch 2025-10-23-03:47
> uname -a SunOS s11-i386.cfarm 5.11 11.4.85.201.2 i86pc i386 i86pc kernel-zone
diff --git a/compiler/Makefile b/compiler/Makefile index ff8fa844e0..0805938373 100644 --- a/compiler/Makefile +++ b/compiler/Makefile @@ -655,9 +655,6 @@ ifdef LLVM ifeq ($(findstring $(PPC_TARGET),x86_64 aarch64 arm),) $(error The $(PPC_TARGET) architecture is not (yet) supported by the FPC/LLVM code generator) endif -ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux),) -$(error The $(OS_TARGET) target OS is not (yet) supported by the FPC/LLVM code generator) -endif override LOCALOPT+=-dllvm -Fullvm endif ifeq ($(PPC_TARGET),i386) @@ -3120,6 +3117,7 @@ STATICLIBPREFIX=libp IMPORTLIBPREFIX=libimp RSTEXT=.rsj EXEDBGEXT=.dbg +ALL_EXEEXT=.exe ifeq ($(OS_TARGET),go32v1) STATICLIBPREFIX= SHORTSUFFIX=v1 @@ -3216,6 +3214,7 @@ ifeq ($(OS_TARGET),atari) EXEEXT=.ttp SHORTSUFFIX=ata endif +ALL_EXEEXT+=.ttp ifeq ($(OS_TARGET),beos) BATCHEXT=.sh EXEEXT= @@ -3242,6 +3241,7 @@ STATICLIBPREFIX= SHORTSUFFIX=nw IMPORTLIBPREFIX=imp endif +ALL_EXEEXT+=.nlm ifeq ($(OS_TARGET),netwlibc) EXEEXT=.nlm STATICLIBPREFIX= @@ -3267,6 +3267,7 @@ EXEEXT=.gba SHAREDLIBEXT=.so SHORTSUFFIX=gba endif +ALL_EXEEXT+=.gba ifeq ($(OS_TARGET),symbian) SHAREDLIBEXT=.dll SHORTSUFFIX=symbian @@ -3280,6 +3281,7 @@ EXEEXT=.dol SHAREDLIBEXT=.so SHORTSUFFIX=wii endif +ALL_EXEEXT+=.dol ifeq ($(OS_TARGET),aix) BATCHEXT=.sh EXEEXT= @@ -3322,6 +3324,7 @@ OEXT=.rel endif SHORTSUFFIX=emb endif +ALL_EXEEXT+=.bin ifeq ($(OS_TARGET),win16) STATICLIBPREFIX= STATICLIBEXT=.a @@ -3334,6 +3337,7 @@ endif ifeq ($(OS_TARGET),wasip1) EXEEXT=.wasm endif +ALL_EXEEXT+=.wasm ifeq ($(OS_TARGET),wasip1threads) EXEEXT=.wasm endif @@ -4171,6 +4175,7 @@ endif ifndef CROSSINSTALL ifneq ($(TARGET_PROGRAMS),) override EXEFILES=$(addsuffix $(EXEEXT),$(TARGET_PROGRAMS)) +override ALL_EXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(EXEFILES)))) override EXEOFILES:=$(addsuffix $(OEXT),$(TARGET_PROGRAMS)) $(addsuffix $(LTOEXT),$(TARGET_PROGRAMS))$(addprefix $(STATICLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) $(addprefix $(IMPORTLIBPREFIX),$(addsuffix $(STATICLIBEXT),$(TARGET_PROGRAMS))) override EXEDBGFILES:=$(addsuffix $(EXEDBGEXT),$(TARGET_PROGRAMS)) override ALLTARGET+=fpc_exes @@ -4431,6 +4436,7 @@ override CLEANEXEDBGFILES:=$(addprefix $(TARGETDIRPREFIX),$(CLEANEXEDBGFILES)) endif ifdef CLEAN_PROGRAMS override CLEANEXEFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEEXT), $(CLEAN_PROGRAMS))) +override ALL_CLEANEXEFILES+=$(foreach lEXEEXT,$(ALL_EXEEXT),$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(lEXEEXT), $(CLEAN_PROGRAMS)))) override CLEANEXEDBGFILES+=$(addprefix $(TARGETDIRPREFIX),$(addsuffix $(EXEDBGEXT), $(CLEAN_PROGRAMS))) endif ifdef CLEAN_UNITS @@ -4469,12 +4475,15 @@ ifdef LIB_NAME -$(DEL) $(LIB_NAME) $(LIB_FULLNAME) endif -$(DEL) $(FPCMADE) *$(FULL_TARGET).fpm Package.fpc *$(ASMEXT) - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) fpc_cleanall: $(CLEANTARGET) ifdef CLEANEXEFILES -$(DEL) $(CLEANEXEFILES) endif +ifdef ALL_CLEANEXEFILES + -$(DEL) $(ALL_CLEANEXEFILES) +endif ifdef COMPILER_UNITTARGETDIR ifdef CLEANPPUFILES -$(DEL) $(CLEANPPUFILES) @@ -4497,7 +4506,7 @@ ifneq ($(PPUEXT),.ppu) endif -$(DELTREE) *$(SMARTEXT) -$(DEL) fpcmade.* Package.fpc *.fpm - -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res + -$(DEL) $(FPCEXTFILE) $(REDIRFILE) script*.res link*.res *_script.res *_link.res symbol_order*.fpc -$(DEL) $(PPAS) *_ppas$(BATCHEXT) ppas$(BATCHEXT) ppaslink$(BATCHEXT) ifdef AOUTEXT -$(DEL) *$(AOUTEXT) diff --git a/compiler/Makefile.fpc b/compiler/Makefile.fpc index 60a62b5f87..2e15b43ca3 100644 --- a/compiler/Makefile.fpc +++ b/compiler/Makefile.fpc @@ -386,9 +386,10 @@ ifeq ($(findstring $(PPC_TARGET),x86_64 aarch64 arm),) $(error The $(PPC_TARGET) architecture is not (yet) supported by the FPC/LLVM code generator) endif -ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux openbsd),) -$(error The $(OS_TARGET) target OS is not (yet) supported by the FPC/LLVM code generator) -endif +# No need to prevent cross-OS compilation +#ifeq ($(findstring $(OS_TARGET),darwin iphonesim linux openbsd),) +#$(error The $(OS_TARGET) target OS is not (yet) supported by the FPC/LLVM code generator) +#endif override LOCALOPT+=-dllvm -Fullvm endif