diff options
Diffstat (limited to 'misc/pascal')
-rw-r--r-- | misc/pascal/ChangeLog | 10 | ||||
-rw-r--r-- | misc/pascal/include/pdefs.h | 2 | ||||
-rw-r--r-- | misc/pascal/nuttx/Makefile | 23 | ||||
-rw-r--r-- | misc/pascal/nuttx/keywords.h | 11 |
4 files changed, 36 insertions, 10 deletions
diff --git a/misc/pascal/ChangeLog b/misc/pascal/ChangeLog index 5b7e5916b..5ab7cbdfd 100644 --- a/misc/pascal/ChangeLog +++ b/misc/pascal/ChangeLog @@ -2,6 +2,12 @@ pascal-0.1.0 2008-01-07 Gregory Nutt <spudmonkey@racsa.co.cr> * Initial release -pascal-0.1.1 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> +pascal-0.1.1 2008-02-01 Gregory Nutt <spudmonkey@racsa.co.cr> + + * Correct some errors in the NuttX installation logic + +pascal-0.1.2 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + + * Add logic to build and link with the ZDS-II toolchain + use with the z16f. - * Correct some errors in the NuttX installation logic
\ No newline at end of file diff --git a/misc/pascal/include/pdefs.h b/misc/pascal/include/pdefs.h index 15879dca2..fb5d18b55 100644 --- a/misc/pascal/include/pdefs.h +++ b/misc/pascal/include/pdefs.h @@ -42,7 +42,7 @@ ***********************************************************************/
#include <stdio.h> /* for FILE */
-#include <config.h>
+#include "config.h"
/***********************************************************************
* Definitions
diff --git a/misc/pascal/nuttx/Makefile b/misc/pascal/nuttx/Makefile index f04055db3..92491d4c8 100644 --- a/misc/pascal/nuttx/Makefile +++ b/misc/pascal/nuttx/Makefile @@ -35,7 +35,14 @@ -include $(TOPDIR)/Make.defs -CFLAGS += -Iinclude -Iinsn/include +COMPILER = ${shell basename $(CC)} +ifeq ($(COMPILER),zneocc.exe) +USRINCLUDES = -usrinc:'.;$(WTOPDIR)\pcode\include;$(WTOPDIR)\pcode\insn\include' +else +USRINCLUDES = -I$(TOPDIR)/pcode/include -I$(TOPDIR)/pcode/insn/include +endif +INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) +CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) include insn/prun/Make.defs include libpoff/Make.defs @@ -57,20 +64,28 @@ VPATH = insn/prun:libpoff:libpas all: $(BIN) $(AOBJS): %$(OBJEXT): %.S +ifeq ($(COMPILER),zneocc.exe) + $(call ASSEMBLE, `cygpath -w $<`, $@) +else $(call ASSEMBLE, $<, $@) +endif $(COBJS): %$(OBJEXT): %.c +ifeq ($(COMPILER),zneocc.exe) + $(call COMPILE, `cygpath -w $<`, $@) +else $(call COMPILE, $<, $@) +endif $(BIN): $(OBJS) - ( for obj in $(OBJS) ; do \ + @( for obj in $(OBJS) ; do \ $(call ARCHIVE, $@, $${obj}); \ done ; ) .depend: Makefile $(SRCS) - $(MKDEP) --dep-path . --dep-path insn/prun --dep-path libpoff --dep-path libpas \ + @$(MKDEP) --dep-path . --dep-path insn/prun --dep-path libpoff --dep-path libpas \ $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - touch $@ + @touch $@ depend: .depend diff --git a/misc/pascal/nuttx/keywords.h b/misc/pascal/nuttx/keywords.h index a4316da9e..2ebfcd8f6 100644 --- a/misc/pascal/nuttx/keywords.h +++ b/misc/pascal/nuttx/keywords.h @@ -41,6 +41,7 @@ *************************************************************/
#include <nuttx/config.h>
+#include <nuttx/compiler.h>
#include <sys/types.h>
#include <debug.h>
@@ -52,12 +53,16 @@ # define CONFIG_DEBUG 0
#endif
-#define DEBUG(stream, format, arg...) dbg(format, ##arg)
-
#ifndef CONFIG_TRACE
# define CONFIG_TRACE 0
#endif
-#define TRACE(stream, format, arg...) dbg(format, ##arg)
+#ifdef CONFIG_CPP_HAVE_VARARGS
+# define DEBUG(stream, format, arg...) dbg(format, ##arg)
+# define TRACE(stream, format, arg...) dbg(format, ##arg)
+#else
+# define DEBUG dbg
+# define TRACE dbg
+#endif
#endif /* __KEYWORDS_H */
|