Explorar o código

Fix gcc options for mips CPU

Pierre Muller %!s(int64=3) %!d(string=hai) anos
pai
achega
6bded28a10
Modificáronse 2 ficheiros con 205 adicións e 169 borrados
  1. 187 168
      utils/fpcm/fpcmake.inc
  2. 18 1
      utils/fpcm/fpcmake.ini

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 187 - 168
utils/fpcm/fpcmake.inc


+ 18 - 1
utils/fpcm/fpcmake.ini

@@ -876,8 +876,23 @@ ifeq ($(BINUTILSPREFIX),)
 GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
 # gcc mips seems not to recognize -m32/-m64
-ifneq ($(filter $(FPCFPMAKE_CPU_OPT),mips mipsel),)
+ifneq ($(filter $(CPU_TARGET),mips64 mipsel64),)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -mabi=64 -print-libgcc-file-name`)
+else
+CROSSGCCOPT=-mabi=64
+endif
+else
+# gcc mips seems not to recognize -m32/-m64
+ifneq ($(filter $(CPU_TARGET),mips mipsel),)
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -mabi=32 -print-libgcc-file-name`)
+else
 CROSSGCCOPT=-mabi=32
+endif
+else
+ifeq ($(BINUTILSPREFIX),)
+GCCLIBDIR:=$(shell dirname `gcc -m32 -print-libgcc-file-name`)
 else
 CROSSGCCOPT=-m32
 endif
@@ -885,6 +900,8 @@ endif
 endif
 endif
 endif
+endif
+endif
 
 # Check if FPCFPMAKE compiler is same target as FPC
 ifdef FPCFPMAKE

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio