From a8f36d65670d840ae43036f38efb3b0bb800a259 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Sun, 1 Oct 2017 10:32:08 -0600
Subject: [PATCH] z80 Make.defs:  Fixes dependency generation with newest SDCC
 compiler.

---
 configs/xtrs/scripts/Make.defs   | 12 ++++++++----
 configs/z80sim/scripts/Make.defs | 12 ++++++++----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/configs/xtrs/scripts/Make.defs b/configs/xtrs/scripts/Make.defs
index 3abc379e746..b61a8b3b65c 100644
--- a/configs/xtrs/scripts/Make.defs
+++ b/configs/xtrs/scripts/Make.defs
@@ -81,7 +81,7 @@ AFLAGS = -x -a -l -o -s -g
 SDCCLIB = z80.lib
 
 ASMEXT = .asm
-OBJEXT = .o
+OBJEXT = .rel
 LIBEXT = .lib
 EXEEXT = .cmd
 
@@ -130,7 +130,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 
   # Windows-native host tools
 
-  MKDEP = $(TOPDIR)\tools\mkdeps.exe --winnative
+  MKDEP = $(TOPDIR)\tools\mkdeps$(HOSTEXEEXT) --winnative
 
   # Use NTFS links or directory copies
 
@@ -150,9 +150,13 @@ else
   HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
   HOSTLDFLAGS =
 
-  # This is the tool to use for dependencies (i.e., none)
+  # This is the tool to use for dependencies
 
-  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
+  ifeq ($(WINTOOL),y)
+    MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
+  else
+    MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  endif
 
   # SDCC for Linux, OSX, or Cygwin understands symbolic links.  Windows SDCC
   # running under Cygwin does not
diff --git a/configs/z80sim/scripts/Make.defs b/configs/z80sim/scripts/Make.defs
index 712ea14cfe7..d0b46bd008f 100644
--- a/configs/z80sim/scripts/Make.defs
+++ b/configs/z80sim/scripts/Make.defs
@@ -81,7 +81,7 @@ AFLAGS = -x -a -l -o -s -g
 SDCCLIB = z80.lib
 
 ASMEXT = .asm
-OBJEXT = .o
+OBJEXT = .rel
 LIBEXT = .lib
 EXEEXT = .hex
 
@@ -130,7 +130,7 @@ ifeq ($(CONFIG_WINDOWS_NATIVE),y)
 
   # Windows-native host tools
 
-  MKDEP = $(TOPDIR)\tools\mkdeps.exe --winnative
+  MKDEP = $(TOPDIR)\tools\mkdeps$(HOSTEXEEXT) --winnative
 
   # Use NTFS links or directory copies
 
@@ -150,9 +150,13 @@ else
   HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
   HOSTLDFLAGS =
 
-  # This is the tool to use for dependencies (i.e., none)
+  # This is the tool to use for dependencies
 
-  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
+  ifeq ($(WINTOOL),y)
+    MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkwindeps.sh
+  else
+    MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
+  endif
 
   # SDCC for Linux, OSX, or Cygwin understands symbolic links.  Windows SDCC
   # running under Cygwin does not