From 196260a8c5a827e984b0777721068f56d9f50e6f Mon Sep 17 00:00:00 2001 From: patacongo Date: Sat, 7 Feb 2009 02:46:14 +0000 Subject: [PATCH] Fix compilation problems with eZ80 targets git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1473 42af7a65-404d-4744-a932-0658087f49c3 --- ChangeLog | 3 ++- Documentation/NuttX.html | 2 +- configs/ez80f910200kitg/ostest/Make.defs | 1 - examples/nettest/Makefile | 8 ++++---- examples/nettest/nettest.h | 12 ++++++++++-- .../nettest/{nettest-client.c => nettest_client.c} | 0 .../nettest/{nettest-server.c => nettest_server.c} | 0 7 files changed, 17 insertions(+), 9 deletions(-) rename examples/nettest/{nettest-client.c => nettest_client.c} (100%) rename examples/nettest/{nettest-server.c => nettest_server.c} (100%) diff --git a/ChangeLog b/ChangeLog index f8651c1112..52f03f447c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -609,5 +609,6 @@ * Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are still some build issues associated with that toolchain in use of arm-elf-objcopy -- see the TODO.txt list for details) - * Fix problems with Z16F compilation introduced with recent changes. + * Fix problems with Z16F and eZ80 compilation introduced with recent changes. + diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index d19308721b..4ae19800c9 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -1297,7 +1297,7 @@ nuttx-0.4.1 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * Updated all ARM Make.def files to work with gcc 2.4.2 (However, there are still some build issues associated with that toolchain in use of arm-elf-objcopy -- see the TODO.txt list for details) - * Fix problems with Z16F compilation introduced with recent changes. + * Fix problems with Z16F and eZ80 compilation introduced with recent changes. pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/configs/ez80f910200kitg/ostest/Make.defs b/configs/ez80f910200kitg/ostest/Make.defs index 83ae3abf8f..c7fcf2f4e6 100644 --- a/configs/ez80f910200kitg/ostest/Make.defs +++ b/configs/ez80f910200kitg/ostest/Make.defs @@ -147,7 +147,6 @@ endef define ASSEMBLE @#echo "AS: $1" - @$(AS) -c $(AFLAGS) $1 @(wfile=`cygpath -w $1`; $(AS) $(AFLAGS) $$wfile) endef diff --git a/examples/nettest/Makefile b/examples/nettest/Makefile index 0dd12ccbf4..6677f847f8 100644 --- a/examples/nettest/Makefile +++ b/examples/nettest/Makefile @@ -41,9 +41,9 @@ TARG_AOBJS = $(TARG_ASRCS:.S=$(OBJEXT)) TARG_CSRCS = nettest.c ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y) -TARG_CSRCS += nettest-server.c +TARG_CSRCS += nettest_server.c else -TARG_CSRCS += nettest-client.c +TARG_CSRCS += nettest_client.c endif TARG_COBJS = $(TARG_CSRCS:.c=$(OBJEXT)) @@ -61,9 +61,9 @@ endif HOST_SRCS = host.c ifeq ($(CONFIG_EXAMPLE_NETTEST_SERVER),y) -HOST_SRCS += nettest-client.c +HOST_SRCS += nettest_client.c else -HOST_SRCS += nettest-server.c +HOST_SRCS += nettest_server.c endif HOST_OBJS = $(HOST_SRCS:.c=.o) diff --git a/examples/nettest/nettest.h b/examples/nettest/nettest.h index db84ac495b..fafe293558 100644 --- a/examples/nettest/nettest.h +++ b/examples/nettest/nettest.h @@ -57,7 +57,11 @@ /* Used printf for debug output */ -# define message(...) printf(__VA_ARGS__) +# ifdef CONFIG_CPP_HAVE_VARARGS +# define message(...) printf(__VA_ARGS__) +# else +# define message printf +# endif /* Have SO_LINGER */ @@ -67,7 +71,11 @@ /* Used lib_rawprintf() so that there is not confusion from buffered IO */ -# define message(...) lib_rawprintf(__VA_ARGS__) +# ifdef CONFIG_CPP_HAVE_VARARGS +# define message(...) lib_rawprintf(__VA_ARGS__) +# else +# define message lib_rawprintf +# endif /* At present, uIP does only abortive disconnects */ diff --git a/examples/nettest/nettest-client.c b/examples/nettest/nettest_client.c similarity index 100% rename from examples/nettest/nettest-client.c rename to examples/nettest/nettest_client.c diff --git a/examples/nettest/nettest-server.c b/examples/nettest/nettest_server.c similarity index 100% rename from examples/nettest/nettest-server.c rename to examples/nettest/nettest_server.c