Prechádzať zdrojové kódy

+ x86_64 support to compiler makefile

florian 23 rokov pred
rodič
commit
9e82c5e8de
2 zmenil súbory, kde vykonal 31 pridanie a 17 odobranie
  1. 12 6
      compiler/Makefile
  2. 19 11
      compiler/Makefile.fpc

+ 12 - 6
compiler/Makefile

@@ -211,6 +211,9 @@ endif
 ifdef I386
 PPC_TARGET=i386
 endif
+ifdef X86_64
+PPC_TARGET=x86_64
+endif
 ifndef PPC_TARGET
 PPC_TARGET=$(CPU_TARGET)
 endif
@@ -259,6 +262,15 @@ endif
 endif
 MSGFILE=msg/error$(FPCLANG).msg
 override LOCALDEF+=-d$(PPC_TARGET) -dGDB -dBROWSERLOG
+ifeq ($(PPC_TARGET),i386)
+override LOCALDEF+=-dSUPPORT_MMX -Fux86
+endif
+ifeq ($(PPC_TARGET),x86_64)
+override LOCALDEF+=-dSUPPORT_MMX -Fux86
+endif
+ifeq ($(PPC_TARGET),m68k)
+override LOCALDEF+=-dNoAg68kMot -dNoAg68kMpw
+endif
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
 ifeq ($(PASDOC),)
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))
@@ -268,12 +280,6 @@ PASDOC:=../projects/pasdoc/bin/pasdoc
 else
 PASDOC:=$(firstword $(PASDOC))
 endif
-ifeq ($(PPC_TARGET),i386)
-override LOCALDEF+=-dSUPPORT_MMX
-endif
-ifeq ($(PPC_TARGET),m68k)
-override LOCALDEF+=-dNoAg68kMot -dNoAg68kMpw
-endif
 override LOCALOPT+=$(LOCALDEF)
 override FPCOPT:=$(LOCALOPT)
 override TARGET_DIRS+=utils

+ 19 - 11
compiler/Makefile.fpc

@@ -42,6 +42,9 @@ endif
 ifdef I386
 PPC_TARGET=i386
 endif
+ifdef X86_64
+PPC_TARGET=x86_64
+endif
 
 # Default is to generate a compiler for the same
 # platform as CPU_TARGET (a native compiler)
@@ -123,6 +126,21 @@ MSGFILE=msg/error$(FPCLANG).msg
 # set correct defines (-d$(CPU_TARGET) is automaticly added in makefile.fpc)
 override LOCALDEF+=-d$(PPC_TARGET) -dGDB -dBROWSERLOG
 
+# i386 specific
+ifeq ($(PPC_TARGET),i386)
+override LOCALDEF+=-dSUPPORT_MMX -Fux86
+endif
+
+# x86_64 specific
+ifeq ($(PPC_TARGET),x86_64)
+override LOCALDEF+=-dSUPPORT_MMX -Fux86
+endif
+
+# m68k specific
+ifeq ($(PPC_TARGET),m68k)
+override LOCALDEF+=-dNoAg68kMot -dNoAg68kMpw
+endif
+
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc.exe,$(SEARCHPATH))))
 ifeq ($(PASDOC),)
 PASDOC:=$(strip $(wildcard $(addsuffix /pasdoc,$(SEARCHPATH))))
@@ -133,16 +151,6 @@ else
 PASDOC:=$(firstword $(PASDOC))
 endif
 
-# i386 specific
-ifeq ($(PPC_TARGET),i386)
-override LOCALDEF+=-dSUPPORT_MMX
-endif
-
-# m68k specific
-ifeq ($(PPC_TARGET),m68k)
-override LOCALDEF+=-dNoAg68kMot -dNoAg68kMpw
-endif
-
 override LOCALOPT+=$(LOCALDEF)
 
 override FPCOPT:=$(LOCALOPT)
@@ -504,4 +512,4 @@ localmake:=$(strip $(wildcard makefile.loc))
 
 ifdef localmake
 include ./$(localmake)
-endif
+endif