From 5badf9c4f01b0d3e1d2e1134b8d95d906703cc18 Mon Sep 17 00:00:00 2001 From: patacongo Date: Thu, 31 Mar 2011 04:59:29 +0000 Subject: Progress on syscall build git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3447 42af7a65-404d-4744-a932-0658087f49c3 --- nuttx/include/syscall.h | 3 +- nuttx/syscall/Makefile | 107 ++++++++++++++++++++++++++++++++++++++++ nuttx/syscall/proxies/Make.defs | 2 +- nuttx/syscall/stubs/Make.defs | 2 +- nuttx/tools/mksyscall.c | 3 +- 5 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 nuttx/syscall/Makefile diff --git a/nuttx/include/syscall.h b/nuttx/include/syscall.h index ba3a3ba89..59f888fb1 100644 --- a/nuttx/include/syscall.h +++ b/nuttx/include/syscall.h @@ -39,9 +39,10 @@ /**************************************************************************** * Included Files ****************************************************************************/ -/* This is just a wrapper around sys/syscall.h for compatibility */ +/* This is just a wrapper around sys/syscall.h and arch/syscall.h */ #include +#include /**************************************************************************** * Pre-processor Definitions diff --git a/nuttx/syscall/Makefile b/nuttx/syscall/Makefile new file mode 100644 index 000000000..a530b48ff --- /dev/null +++ b/nuttx/syscall/Makefile @@ -0,0 +1,107 @@ +############################################################################ +# syscall/Makefile +# +# Copyright (C) 2011 Gregory Nutt. All rights reserved. +# Author: Gregory Nutt +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name NuttX nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +########################################################################### + +-include $(TOPDIR)/Make.defs +include proxies/Make.defs +include stubs/Make.defs + +MKSYSCALL = "$(TOPDIR)/tools/mksyscall$(EXEEXT)" +CSVFILE = "$(TOPDIR)/syscall/syscall.csv" + +ASRCS = +AOBJS = $(ASRCS:.S=$(OBJEXT)) + +PROXY_OBJS = $(PROXY_SRCS:.c=$(OBJEXT)) +STUB_OBJS = $(STUB_SRCS:.c=$(OBJEXT)) + +CSRCS = $(PROXY_SRCS) $(STUB_SRCS) +COBJS = $(CSRCS:.c=$(OBJEXT)) + +SRCS = $(ASRCS) $(CSRCS) +OBJS = $(AOBJS) $(COBJS) + +ROOTDEPPATH = --dep-path . +PROXYDEPPATH = --dep-path stdio +STUBDEPPATH = --dep-path stdlib +VPATH = proxies:stubs + +BIN1 = libproxies$(LIBEXT) +BIN2 = libstubs$(LIBEXT) + +all: $(BIN) + +$(AOBJS): %$(OBJEXT): %.S + $(call ASSEMBLE, $<, $@) + +$(COBJS): %$(OBJEXT): %.c + $(call COMPILE, $<, $@) + +$(BIN1): $(PROXY_OBJS) + @( for obj in $(PROXY_OBJS) ; do \ + $(call ARCHIVE, $@, $${obj}); \ + done ; ) + +$(BIN2): $(STUB_OBJS) + @( for obj in $(STUB_OBJS) ; do \ + $(call ARCHIVE, $@, $${obj}); \ + done ; ) + +.depend: Makefile $(SRCS) + @$(MKDEP) $(ROOTDEPPATH) $(PROXYDEPPATH) $(STUBDEPPATH) \ + $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep + @touch $@ + +depend: .depend + +$(MKSYSCALL): + @$(MAKE) -C $(TOPDIR)/tools -f Makefile.host mksyscall + +.context: $(MKSYSCALL) + @(cd proxies; $(MKSYSCALL) -p $(CSVFILE);) + @(cd stubs; $(MKSYSCALL) -s $(CSVFILE);) + @touch $@ + +context: .context + +clean: + @rm -f $(BIN1) $(BIN2) *~ .*.swp + @rm -f proxies/*$(OBJEXT) stubs/*$(OBJEXT) + $(call CLEAN) + +distclean: clean + @rm -f Make.dep .depend .context + @rm -f proxies/*.c stubs/*.c + +-include Make.dep diff --git a/nuttx/syscall/proxies/Make.defs b/nuttx/syscall/proxies/Make.defs index 3f1c01b2c..d348bb8bf 100644 --- a/nuttx/syscall/proxies/Make.defs +++ b/nuttx/syscall/proxies/Make.defs @@ -33,4 +33,4 @@ # ############################################################################ -PROXY_SRCS := ${shell ls *.c} +PROXY_SRCS := ${shell ls proxies/*.c 2>/dev/null} diff --git a/nuttx/syscall/stubs/Make.defs b/nuttx/syscall/stubs/Make.defs index 7237ddded..6420c87d0 100644 --- a/nuttx/syscall/stubs/Make.defs +++ b/nuttx/syscall/stubs/Make.defs @@ -33,4 +33,4 @@ # ############################################################################ -STUB_SRCS := ${shell ls *.c} +STUB_SRCS := ${shell ls stubs/*.c 2>/dev/null} diff --git a/nuttx/tools/mksyscall.c b/nuttx/tools/mksyscall.c index 10eb65ac3..9a051ff51 100644 --- a/nuttx/tools/mksyscall.c +++ b/nuttx/tools/mksyscall.c @@ -227,7 +227,8 @@ static void generate_proxy(int nparms) int i; fprintf(stream, "/* Auto-generated %s proxy file -- do not edit */\n\n", g_parm[NAME_INDEX]); - fprintf(stream, "#include <%s>\n\n", g_parm[HEADER_INDEX]); + fprintf(stream, "#include <%s>\n", g_parm[HEADER_INDEX]); + fprintf(stream, "#include \n\n"); fprintf(stream, "%s %s(", g_parm[RETTYPE_INDEX], g_parm[NAME_INDEX]); -- cgit v1.2.3