Browse Source

pass -D__I8086_SMARTLINK_SECTIONS__ to nasm if FPCOPT contains -dTEST_I8086_SMARTLINK_SECTIONS

git-svn-id: trunk@39726 -
pierre 7 years ago
parent
commit
b219fa9023
2 changed files with 19 additions and 12 deletions
  1. 9 6
      rtl/msdos/Makefile
  2. 10 6
      rtl/msdos/Makefile.fpc

+ 9 - 6
rtl/msdos/Makefile

@@ -2855,24 +2855,27 @@ SYSINCDEPS=$(addprefix $(INC)/,$(SYSINCNAMES))
 include $(PROCINC)/makefile.cpu
 include $(PROCINC)/makefile.cpu
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSCPUDEPS=$(addprefix $(PROCINC)/,$(CPUINCNAMES))
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
+ifneq ($(findstring -dTEST_I8086_SMARTLINK_SECTIONS,$(FPCOPT)),)
+override NASM_OPT+=-D__I8086_SMARTLINK_SECTIONS__
+endif
 prt0s$(OEXT) : prt0s.asm prt0comn.asm
 prt0s$(OEXT) : prt0s.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0s$(OEXT) prt0s.asm
+	$(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0s$(OEXT) prt0s.asm
 prt0t$(OEXT) : prt0t.asm prt0comn.asm
 prt0t$(OEXT) : prt0t.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0t$(OEXT) prt0t.asm
+	$(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0t$(OEXT) prt0t.asm
 prt0m$(OEXT) : prt0m.asm prt0comn.asm
 prt0m$(OEXT) : prt0m.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0m$(OEXT) prt0m.asm
+	$(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0m$(OEXT) prt0m.asm
 prt0c$(OEXT) : prt0c.asm prt0comn.asm
 prt0c$(OEXT) : prt0c.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0c$(OEXT) prt0c.asm
+	$(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0c$(OEXT) prt0c.asm
 prt0l$(OEXT) : prt0l.asm prt0comn.asm
 prt0l$(OEXT) : prt0l.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0l$(OEXT) prt0l.asm
+	$(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0l$(OEXT) prt0l.asm
 prt0h$(OEXT) : prt0h.asm prt0comn.asm
 prt0h$(OEXT) : prt0h.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-	$(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0h$(OEXT) prt0h.asm
+	$(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0h$(OEXT) prt0h.asm
 system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc
 system$(PPUEXT) : system.pp $(SYSDEPS) $(INC)/tnyheaph.inc $(INC)/tinyheap.inc registers.inc
 	$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
 	$(COMPILER) $(FPC_SYSTEM_OPT) -Us -Sg system.pp
 	$(EXECPPAS)
 	$(EXECPPAS)

+ 10 - 6
rtl/msdos/Makefile.fpc

@@ -68,24 +68,28 @@ SYSDEPS=$(SYSINCDEPS) $(SYSCPUDEPS)
 #
 #
 # Loaders
 # Loaders
 #
 #
+ifneq ($(findstring -dTEST_I8086_SMARTLINK_SECTIONS,$(FPCOPT)),)
+override NASM_OPT+=-D__I8086_SMARTLINK_SECTIONS__
+endif
+
 prt0s$(OEXT) : prt0s.asm prt0comn.asm
 prt0s$(OEXT) : prt0s.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-        $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0s$(OEXT) prt0s.asm
+        $(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0s$(OEXT) prt0s.asm
 prt0t$(OEXT) : prt0t.asm prt0comn.asm
 prt0t$(OEXT) : prt0t.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-        $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0t$(OEXT) prt0t.asm
+        $(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0t$(OEXT) prt0t.asm
 prt0m$(OEXT) : prt0m.asm prt0comn.asm
 prt0m$(OEXT) : prt0m.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-        $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0m$(OEXT) prt0m.asm
+        $(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0m$(OEXT) prt0m.asm
 prt0c$(OEXT) : prt0c.asm prt0comn.asm
 prt0c$(OEXT) : prt0c.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-        $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0c$(OEXT) prt0c.asm
+        $(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0c$(OEXT) prt0c.asm
 prt0l$(OEXT) : prt0l.asm prt0comn.asm
 prt0l$(OEXT) : prt0l.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-        $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0l$(OEXT) prt0l.asm
+        $(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0l$(OEXT) prt0l.asm
 prt0h$(OEXT) : prt0h.asm prt0comn.asm
 prt0h$(OEXT) : prt0h.asm prt0comn.asm
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
 	$(MAKE) $(COMPILER_UNITTARGETDIR)
-        $(NASM) -f obj -o $(UNITTARGETDIRPREFIX)prt0h$(OEXT) prt0h.asm
+        $(NASM) $(NASM_OPT) -f obj -o $(UNITTARGETDIRPREFIX)prt0h$(OEXT) prt0h.asm
 #
 #
 # System Units (System, Objpas, Strings)
 # System Units (System, Objpas, Strings)
 #
 #