Merge pull request #3 in PROCESSOR-SDK/ibl from PRSDK-5675 to master

[keystone-rtos/ibl.git] / src / make / c64x / makedefs.mk

diff --git a/src/make/c64x/makedefs.mk b/src/make/c64x/makedefs.mk
index cbfda230b31e0cdb3c49927e81970391fb055d34..9fbb1d07ca81eaea8a98d68705f36268dddce33a 100644 (file)
--- a/src/make/c64x/makedefs.mk
+++ b/src/make/c64x/makedefs.mk
@@ -15,13 +15,12 @@ else
  MEXT=le
 endif
 
-CC          = $(TOOLSC6X)/cgtools/bin/cl6x
-AS          = $(TOOLSC6X)/cgtools/bin/cl6x
-LD          = $(TOOLSC6X)/cgtools/bin/cl6x -z
-ARIN        = $(TOOLSC6X)/cgtools/bin/ar6x -rq
-AROUT       = $(TOOLSC6X)/cgtools/bin/ar6x -xq 
-HEX6X          = $(TOOLSC6X)/cgtools/bin/hex6x
-CDBTOOL     = $(COMSPEC) /c $(TOOLSBIOSCDBC6X)\gconfgen
+CC          = cl6x
+AS          = cl6x
+LD          = cl6x -z
+ARIN        = ar6x -rq
+AROUT       = ar6x -xq 
+HEX6X      = hex6x
 MAKEDEP     = $(MAKEDEPPATH)
 MAKEDEP_OPT = -q
 COBJEXT     = $(MEXT).oc
@@ -42,7 +41,8 @@ ifeq ($(OS),Linux)
     DIRSEP=/
     PATHSEP=:
 else
-    DIRSEP=$(subst /,\,/)
+#DIRSEP=$(subst /,\,/)
+    DIRSEP=/
     PATHSEP=;
 endif
 
@@ -51,12 +51,13 @@ endif
 CPUFLAGS   = -mv6400+
 
 ifeq ($(ENDIAN),big)
-  ALLFARLIB       = $(TOOLSC6XDOS)/cgtools/lib/rts64pluse.lib
+  ALLFARLIB       = $(TOOLSC6XDOS)/lib/rts64pluse.lib
 else
-  ALLFARLIB       = $(TOOLSC6XDOS)/cgtools/lib/rts64plus.lib
+  ALLFARLIB       = $(TOOLSC6XDOS)/lib/rts64plus.lib
 endif
 
-RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))
+#RTLIBS     = $(subst /,$(DIRSEP),$(ALLFARLIB))
+RTLIBS     = $(subst \,/,$(ALLFARLIB))
 
 # Common compilation flags
 # -c     : disable linker
@@ -76,9 +77,11 @@ ifneq ($(UTIL),yes)
  ifeq ($(DEBUG),yes)
   CFLAGS  = -c -k -mi200 -ml3 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
  else
-  CFLAGS  = -c -k -mi200 -ml0 -ms3 -o3 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
+# Always compile with -o2 as -o3 can possibly break endian neutral code */
+  CFLAGS  = -c -k -mi200 -ml0 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
  endif
 else
+# Always compile with -o2 as -o3 can possibly break endian neutral code */
  CFLAGS  = -c -k -mi200 -ml3 -ms3 -o2 -pm -pds1111 -pds827 -pds824 -pds837 -pds1037 -pds195 -pds97 -pden -pdr $(CPUFLAGS)
 endif
 
@@ -112,16 +115,15 @@ ifeq ($(ENDIAN),big)
  AFLAGS+= -me
 endif
 
+PPDEP_FLAGS  = -ppd=$(patsubst %.$(CDEPEXT),%.$(CDEPEXT)_TMP,$@)
+
 # Include files for standard (non siu) modules.  Also used by linker to find
 # library files.
-FSTDINC  =$(TOOLSC6XDOS)/cgtools/include;$(TOOLSC6XDOS)/cgtools/lib
-FSTDINC +=;$(TOOLSC6XDOS)/rtdx/include;$(TOOLSC6XDOS)/rtdx/lib
-FSTDINC +=;$(TOOLSBIOSC6XDOS)/bios/include;$(TOOLSBIOSC6XDOS)/bios/lib
-FSTDINC +=;$(TOOLSBIOSC6XDOS)/xdais/include;;$(TOOLSBIOSC6XDOS)/xdais/src/api
+FSTDINC  =$(TOOLSC6XDOS)/include;$(TOOLSC6XDOS)/lib
 STDINC =$(subst /,$(DIRSEP),$(FSTDINC))
 
 # Include files for ASM in standard (non siu) modules
-STDAINC =$(subst /,$(DIRSEP),$(TOOLSBIOSC6XDOS)/bios/include;$(GGROOT)/misc/$(CPUDIR))
+STDAINC =$(subst /,$(DIRSEP),$(GGROOT)/misc/$(CPUDIR))
 
 # Include files for this platform.  Change this for test code.
 PLATINC =$(subst /,$(DIRSEP),$(GGROOT)/hw/$(CPUDIR);$(ECODIR)/gg/$(CPUDIR);$(ECODIR)/$(CPUDIR))