diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-02-28 23:45:56 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2007-02-28 23:45:56 +0000 |
commit | 129dd27cc4deb042d2f88c65927adc49c338756d (patch) | |
tree | 265b6617c9f2281815f2c2120a571fb98ce7c883 /nuttx/arch/sim | |
parent | cbade4e74a17aa881e8031b6785657d7166dd819 (diff) | |
download | px4-nuttx-129dd27cc4deb042d2f88c65927adc49c338756d.tar.gz px4-nuttx-129dd27cc4deb042d2f88c65927adc49c338756d.tar.bz2 px4-nuttx-129dd27cc4deb042d2f88c65927adc49c338756d.zip |
Still working toward clean 8051 link
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@25 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/arch/sim')
-rw-r--r-- | nuttx/arch/sim/Make.defs | 3 | ||||
-rw-r--r-- | nuttx/arch/sim/defconfig | 24 | ||||
-rw-r--r-- | nuttx/arch/sim/src/Makefile | 15 |
3 files changed, 30 insertions, 12 deletions
diff --git a/nuttx/arch/sim/Make.defs b/nuttx/arch/sim/Make.defs index 3e4d0cf75..5fa97507d 100644 --- a/nuttx/arch/sim/Make.defs +++ b/nuttx/arch/sim/Make.defs @@ -41,7 +41,7 @@ else ARCHOPTIMIZATION = -O2 endif -ARCHCPUFLAGS = +ARCHCPUFLAGS = -fno-builtin ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow ARCHDEFINES = @@ -61,6 +61,7 @@ CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ OBJEXT = .o LIBEXT = .a +EXEEXT = ifeq ("${CONFIG_DEBUG}","y") LDFLAGS += -g diff --git a/nuttx/arch/sim/defconfig b/nuttx/arch/sim/defconfig index 00a8e6e59..b20319e7a 100644 --- a/nuttx/arch/sim/defconfig +++ b/nuttx/arch/sim/defconfig @@ -44,7 +44,7 @@ CONFIG_ARCH_SIM=y # # General OS setup # -# CONFIG_EXAMPLE - identifies the subdirectgory in examples +# CONFIG_EXAMPLE - identifies the subdirectory in examples # that will be used in the build # CONFIG_DEBUG - enables built-in debug options # CONFIG_DEBUG_VERBOSE - enables verbose debug output @@ -73,12 +73,30 @@ CONFIG_SCHED_INSTRUMENTATION=n CONFIG_TASK_NAME_SIZE=32 CONFIG_START_YEAR=2007 CONFIG_START_MONTH=2 -CONFIG_START_DAY=13 +CONFIG_START_DAY=27 CONFIG_JULIAN_TIME=n CONFIG_DEV_CONSOLE=y # -# Allow for artchitecture optimized implementations +# The following can be used to disable categories of +# APIs supported by the OS. If the compiler supports +# weak functions, then it should not be necessary to +# disable functions unless you want to restrict usage +# of those APIs. +# +# There are certain dependency relationships in these +# features. +# +# o mq_notify logic depends on signals to awaken tasks +# waiting for queues to become full or empty. +# o pthread_condtimedwait() depends on signals to wake +# up waiting tasks. +# +CONFIG_DISABLE_SIGNALS=n +CONFIG_DISABLE_MQUEUE=n + +# +# Allow for architecture optimized implementations # # The architecture can provide optimized versions of the # following to improve sysem performance diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index a3be44f35..5c7ed0d1f 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -51,10 +51,10 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) -EXTRA_LIBS = -lc +LDFLAGS = $(ARCHSCRIPT) +EXTRA_LIBS = -lc -LINKOBJS = +LINKOBJS = up_head$(OBJEXT) LINKLIBS = LDPATHES = $(addprefix -L$(TOPDIR)/,$(dir $(LINKLIBS))) LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS)))) @@ -64,7 +64,7 @@ all: up_head$(OBJEXT) libarch$(LIBEXT) $(AOBJS): %$(OBJEXT): %.S $(CC) -c $(CFLAGS) -D__ASSEMBLY__ $< -o $@ -$(COBJS) up_head$(OBJEXT): %$(OBJEXT): %.c +$(COBJS) $(LINKOBJS): %$(OBJEXT): %.c $(CC) -c $(CFLAGS) $< -o $@ libarch$(LIBEXT): $(OBJS) @@ -73,10 +73,9 @@ libarch$(LIBEXT): $(OBJS) { echo "$(AR) $@ $obj FAILED!" ; exit 1 ; } ; \ done ; ) -nuttx: - $(CC) $(LDFLAGS) $(LDPATHES) -o $(TOPDIR)/$@ \ - $(addprefix $(TOPDIR)/,$(LINKOBJS)) \ - -Wl,--start-group $(LDLIBS) $(EXTRA_LIBS) -Wl,--end-group +nuttx: $(LINKOBJS) + $(CC) $(LDFLAGS) $(LDPATHES) -o $(TOPDIR)/$@ $(LINKOBJS) \ + -Wl,--start-group $(LDLIBS) -Wl,--end-group $(EXTRA_LIBS) @$(NM) $(TOPDIR)/$@ | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ sort > $(TOPDIR)/System.map |