diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-02-07 02:46:14 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2009-02-07 02:46:14 +0000 |
commit | 45fe3f79433403d54626d830d2f0932e0af57f2d (patch) | |
tree | bde80e579237686941d9bb86a3c874d45e8b38a8 | |
parent | 013721830aa3d28dcdc1002ecc680954670d35cf (diff) | |
download | px4-nuttx-45fe3f79433403d54626d830d2f0932e0af57f2d.tar.gz px4-nuttx-45fe3f79433403d54626d830d2f0932e0af57f2d.tar.bz2 px4-nuttx-45fe3f79433403d54626d830d2f0932e0af57f2d.zip |
Fix compilation problems with eZ80 targets
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@1473 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/ChangeLog | 3 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 2 | ||||
-rw-r--r-- | nuttx/configs/ez80f910200kitg/ostest/Make.defs | 1 | ||||
-rw-r--r-- | nuttx/examples/nettest/Makefile | 8 | ||||
-rw-r--r-- | nuttx/examples/nettest/nettest.h | 12 | ||||
-rw-r--r-- | nuttx/examples/nettest/nettest_client.c (renamed from nuttx/examples/nettest/nettest-client.c) | 0 | ||||
-rw-r--r-- | nuttx/examples/nettest/nettest_server.c (renamed from nuttx/examples/nettest/nettest-server.c) | 0 |
7 files changed, 17 insertions, 9 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index f8651c111..52f03f447 100644 --- a/nuttx/ChangeLog +++ b/nuttx/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/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index d19308721..4ae19800c 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/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/nuttx/configs/ez80f910200kitg/ostest/Make.defs b/nuttx/configs/ez80f910200kitg/ostest/Make.defs index 83ae3abf8..c7fcf2f4e 100644 --- a/nuttx/configs/ez80f910200kitg/ostest/Make.defs +++ b/nuttx/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/nuttx/examples/nettest/Makefile b/nuttx/examples/nettest/Makefile index 0dd12ccbf..6677f847f 100644 --- a/nuttx/examples/nettest/Makefile +++ b/nuttx/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/nuttx/examples/nettest/nettest.h b/nuttx/examples/nettest/nettest.h index db84ac495..fafe29355 100644 --- a/nuttx/examples/nettest/nettest.h +++ b/nuttx/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/nuttx/examples/nettest/nettest-client.c b/nuttx/examples/nettest/nettest_client.c index 371f4d4f8..371f4d4f8 100644 --- a/nuttx/examples/nettest/nettest-client.c +++ b/nuttx/examples/nettest/nettest_client.c diff --git a/nuttx/examples/nettest/nettest-server.c b/nuttx/examples/nettest/nettest_server.c index 6d9ccaeba..6d9ccaeba 100644 --- a/nuttx/examples/nettest/nettest-server.c +++ b/nuttx/examples/nettest/nettest_server.c |