2
0
Эх сурвалжийг харах

+ some MIPS64 stuff added to the Makefiles

florian 3 жил өмнө
parent
commit
b2eaa4e701

+ 24 - 3
compiler/Makefile

@@ -405,6 +405,12 @@ endif
 ifdef MIPSEL
 ifdef MIPSEL
 PPC_TARGET=mipsel
 PPC_TARGET=mipsel
 endif
 endif
+ifdef MIPS64
+PPC_TARGET=mips64
+endif
+ifdef MIPS64EL
+PPC_TARGET=mips64el
+endif
 ifdef AVR
 ifdef AVR
 PPC_TARGET=avr
 PPC_TARGET=avr
 endif
 endif
@@ -535,6 +541,12 @@ endif
 ifeq ($(CPC_TARGET),mipsel)
 ifeq ($(CPC_TARGET),mipsel)
 CPUSUF=mipsel
 CPUSUF=mipsel
 endif
 endif
+ifeq ($(CPC_TARGET),mips64)
+CPUSUF=mips64
+endif
+ifeq ($(CPC_TARGET),mips64el)
+CPUSUF=mips64el
+endif
 ifeq ($(CPC_TARGET),avr)
 ifeq ($(CPC_TARGET),avr)
 CPUSUF=avr
 CPUSUF=avr
 ALLOW_WARNINGS=1
 ALLOW_WARNINGS=1
@@ -640,9 +652,18 @@ endif
 ifeq ($(PPC_TARGET),armeb)
 ifeq ($(PPC_TARGET),armeb)
 override LOCALOPT+=-Fuarmgen
 override LOCALOPT+=-Fuarmgen
 endif
 endif
+ifeq ($(PPC_TARGET),mips)
+override LOCALOPT+=-Fumips
+endif
 ifeq ($(PPC_TARGET),mipsel)
 ifeq ($(PPC_TARGET),mipsel)
 override LOCALOPT+=-Fumips
 override LOCALOPT+=-Fumips
 endif
 endif
+ifeq ($(PPC_TARGET),mips64)
+override LOCALOPT+=-Fumips
+endif
+ifeq ($(PPC_TARGET),mips64el)
+override LOCALOPT+=-Fumips
+endif
 ifeq ($(PPC_TARGET),jvm)
 ifeq ($(PPC_TARGET),jvm)
 override LOCALOPT+=-Fujvm
 override LOCALOPT+=-Fujvm
 endif
 endif
@@ -4886,8 +4907,8 @@ endif
 ifdef TEMPWPONAME2PREFIX
 ifdef TEMPWPONAME2PREFIX
 	$(MAKE) g$(TEMPWPONAME2) COMPILERTEMPNAME=$(TEMPWPONAME2)
 	$(MAKE) g$(TEMPWPONAME2) COMPILERTEMPNAME=$(TEMPWPONAME2)
 endif
 endif
-PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
-PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
+PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel mips64 mips64el avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
+PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel mips64 mips64el avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
 INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 .PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
 .PHONY: $(PPC_TARGETS) $(INSTALL_TARGETS)$(SYMLINKINSTALL_TARGETS)
@@ -5184,7 +5205,7 @@ ifeq ($(findstring -dFPC_SOFT_FPUX80,$(LOCALOPT)),)
 ifeq ($(OS_SOURCE),win64)
 ifeq ($(OS_SOURCE),win64)
   EXCLUDE_80BIT_TARGETS=1
   EXCLUDE_80BIT_TARGETS=1
 endif
 endif
-ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc powerpc64 sparc sparc64 riscv32 riscv64 xtensa),)
+ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel mips64 mips64el powerpc powerpc64 sparc sparc64 riscv32 riscv64 xtensa),)
   EXCLUDE_80BIT_TARGETS=1
   EXCLUDE_80BIT_TARGETS=1
 endif
 endif
 endif
 endif

+ 30 - 3
compiler/Makefile.fpc

@@ -98,6 +98,12 @@ endif
 ifdef MIPSEL
 ifdef MIPSEL
 PPC_TARGET=mipsel
 PPC_TARGET=mipsel
 endif
 endif
+ifdef MIPS64
+PPC_TARGET=mips64
+endif
+ifdef MIPS64EL
+PPC_TARGET=mips64el
+endif
 ifdef AVR
 ifdef AVR
 PPC_TARGET=avr
 PPC_TARGET=avr
 endif
 endif
@@ -262,6 +268,12 @@ endif
 ifeq ($(CPC_TARGET),mipsel)
 ifeq ($(CPC_TARGET),mipsel)
 CPUSUF=mipsel
 CPUSUF=mipsel
 endif
 endif
+ifeq ($(CPC_TARGET),mips64)
+CPUSUF=mips64
+endif
+ifeq ($(CPC_TARGET),mips64el)
+CPUSUF=mips64el
+endif
 ifeq ($(CPC_TARGET),avr)
 ifeq ($(CPC_TARGET),avr)
 CPUSUF=avr
 CPUSUF=avr
 ALLOW_WARNINGS=1
 ALLOW_WARNINGS=1
@@ -406,11 +418,26 @@ ifeq ($(PPC_TARGET),armeb)
 override LOCALOPT+=-Fuarmgen
 override LOCALOPT+=-Fuarmgen
 endif
 endif
 
 
+# mips specific
+ifeq ($(PPC_TARGET),mips)
+override LOCALOPT+=-Fumips
+endif
+
 # mipsel specific
 # mipsel specific
 ifeq ($(PPC_TARGET),mipsel)
 ifeq ($(PPC_TARGET),mipsel)
 override LOCALOPT+=-Fumips
 override LOCALOPT+=-Fumips
 endif
 endif
 
 
+# mips64 specific
+ifeq ($(PPC_TARGET),mips64)
+override LOCALOPT+=-Fumips
+endif
+
+# mips64el specific
+ifeq ($(PPC_TARGET),mips64el)
+override LOCALOPT+=-Fumips
+endif
+
 # jvm specific
 # jvm specific
 ifeq ($(PPC_TARGET),jvm)
 ifeq ($(PPC_TARGET),jvm)
 override LOCALOPT+=-Fujvm
 override LOCALOPT+=-Fujvm
@@ -644,8 +671,8 @@ endif
 # cpu targets
 # cpu targets
 #####################################################################
 #####################################################################
 
 
-PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
-PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
+PPC_TARGETS=i386 m68k powerpc sparc arm armeb x86_64 powerpc64 mips mipsel mips64 mips64el avr jvm i8086 aarch64 sparc64 riscv32 riscv64 xtensa z80 wasm32
+PPC_SUFFIXES=386 68k ppc sparc arm armeb x64 ppc64 mips mipsel mips64 mips64el avr jvm 8086 a64 sparc64 rv32 rv64 xtensa z80 wasm32
 INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 INSTALL_TARGETS=$(addsuffix _exe_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 SYMLINKINSTALL_TARGETS=$(addsuffix _symlink_install,$(sort $(CYCLETARGETS) $(PPC_TARGETS)))
 
 
@@ -1084,7 +1111,7 @@ ifeq ($(OS_SOURCE),win64)
   EXCLUDE_80BIT_TARGETS=1
   EXCLUDE_80BIT_TARGETS=1
 endif
 endif
 
 
-ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel powerpc powerpc64 sparc sparc64 riscv32 riscv64 xtensa),)
+ifneq ($(findstring $(CPU_SOURCE),aarch64 arm avr jvm m68k mips mipsel mips64 mips64el powerpc powerpc64 sparc sparc64 riscv32 riscv64 xtensa),)
   EXCLUDE_80BIT_TARGETS=1
   EXCLUDE_80BIT_TARGETS=1
 endif
 endif
 endif
 endif

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 171 - 170
utils/fpcm/fpcmake.inc


+ 1 - 1
utils/fpcm/fpcmake.ini

@@ -1543,7 +1543,7 @@ endif
 # create always pic'ed code on x86_64, mips and mipsel
 # create always pic'ed code on x86_64, mips and mipsel
 # on unix-like systems
 # on unix-like systems
 ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
 ifneq ($(filter $(OS_TARGET),dragonfly freebsd openbsd netbsd linux solaris),)
-ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel riscv64 powerpc64),)
+ifneq ($(filter $(CPU_TARGET),x86_64 mips mipsel mips64 mips64el riscv64 powerpc64),)
 override FPCOPT+=-Cg
 override FPCOPT+=-Cg
 endif
 endif
 endif
 endif

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно