diff options
| author | px4dev <px4@purgatory.org> | 2013-01-11 02:14:43 -0800 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2013-01-11 02:14:43 -0800 |
| commit | f127495caa2d45a1b1fff3be7a9d3756259d23e2 (patch) | |
| tree | 91daf599eae326f2207d0fbd9ede34b51eca1812 /nuttx/mm | |
| parent | 48c5d63319be3b8da7c4cd598d2a31dceae842a7 (diff) | |
| download | px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.gz px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.tar.bz2 px4-firmware-f127495caa2d45a1b1fff3be7a9d3756259d23e2.zip | |
Manually fixup merge botches via direct comparison with NuttX r5447.
Diffstat (limited to 'nuttx/mm')
| -rw-r--r-- | nuttx/mm/Makefile | 17 | ||||
| -rw-r--r-- | nuttx/mm/Makefile.test | 18 | ||||
| -rw-r--r-- | nuttx/mm/mm_initialize.c | 6 |
3 files changed, 22 insertions, 19 deletions
diff --git a/nuttx/mm/Makefile b/nuttx/mm/Makefile index 0ccf5a09a..da41f9f57 100644 --- a/nuttx/mm/Makefile +++ b/nuttx/mm/Makefile @@ -37,8 +37,8 @@ ASRCS = CSRCS = mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \ - mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \ - mm_memalign.c mm_free.c mm_mallinfo.c + mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \ + mm_memalign.c mm_free.c mm_mallinfo.c ifeq ($(CONFIG_GRAN),y) CSRCS += mm_graninit.c mm_granalloc.c mm_granfree.c mm_grancritical.c @@ -61,21 +61,20 @@ $(COBJS): %$(OBJEXT): %.c $(call COMPILE, $<, $@) $(BIN): $(OBJS) - @( for obj in $(OBJS) ; do \ - $(call ARCHIVE, $@, $${obj}); \ - done ; ) + $(call ARCHIVE, $@, $(OBJS)) .depend: Makefile $(SRCS) - @$(MKDEP) $(CC) -- $(CFLAGS) -- $(SRCS) >Make.dep - @touch $@ + $(Q) $(MKDEP) "$(CC)" -- $(CFLAGS) -- $(SRCS) >Make.dep + $(Q) touch $@ depend: .depend clean: - @rm -f $(BIN) *~ .*.swp + $(call DELFILE, $(BIN)) $(call CLEAN) distclean: clean - @rm -f Make.dep .depend + $(call DELFILE, Make.dep) + $(call DELFILE, .depend) -include Make.dep diff --git a/nuttx/mm/Makefile.test b/nuttx/mm/Makefile.test index 63cab910e..2ae9dcb88 100644 --- a/nuttx/mm/Makefile.test +++ b/nuttx/mm/Makefile.test @@ -33,12 +33,14 @@ # ############################################################################ -SRCS = mm_test.c mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \ +-include $(TOPDIR)/Make.defs + +SRCS = mm_test.c mm_initialize.c mm_sem.c mm_addfreechunk.c mm_size2ndx.c mm_shrinkchunk.c \ mm_malloc.c mm_zalloc.c mm_calloc.c mm_realloc.c \ mm_memalign.c mm_free.c mm_mallinfo.c -OBJS = $(SRCS:.c=.o1) +OBJS = $(SRCS:.c=.o1) -LIBS = -lpthread -lc +LIBS = -lpthread -lc CC = gcc LD = gcc @@ -48,17 +50,19 @@ WARNIGNS = -Wall -Wstrict-prototypes -Wshadow CFLAGS = -g $(DEFINES) LDFLAGS = -BIN = ../mm_test +BIN = ..$(DELIM)mm_test all: $(BIN) $(OBJS): %.o1: %.c @echo "Compiling $<" - $(CC) -c $(CFLAGS) $< -o $@ + $(Q) $(CC) -c $(CFLAGS) $< -o $@ $(BIN): $(OBJS) @echo "Linking {$(OBJS)} to produce $@" - $(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ + $(Q) $(LD) $(LDFLAGS) $(OBJS) $(LIBS) -o $@ clean: - @rm -f $(BIN) *.o1 *~ + $(call DELFILE, $(BIN)) + $(call DELFILE, *.o1) + $(call CLEAN) diff --git a/nuttx/mm/mm_initialize.c b/nuttx/mm/mm_initialize.c index 3a21d1759..a7f64cfaf 100644 --- a/nuttx/mm/mm_initialize.c +++ b/nuttx/mm/mm_initialize.c @@ -95,9 +95,9 @@ void mm_initialize(FAR void *heapstart, size_t heapsize) mlldbg("Heap: start=%p size=%u\n", heapstart, heapsize); - /* The following two lines have cause problems for some ZiLog compilers - * in the past. Life is easier if we just the suppress them for those - * tools. + /* The following two lines have cause problems for some older ZiLog + * compilers in the past (but not the more recent). Life is easier if we + * just the suppress them altogther for those tools. */ #ifndef __ZILOG__ |