fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-28 17:43:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Manually fixup merge botches via direct comparison with NuttX r5447.

Browse Source
This commit is contained in:
px4dev
2013-01-11 02:14:43 -08:00
parent 48c5d63319
commit f127495caa
428 changed files with 13932 additions and 3888 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nuttx/mm/Makefile
+8 -9
View File
@@ -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
nuttx/mm/Makefile.test
+11 -7
View File
@@ -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)
nuttx/mm/mm_initialize.c
+3 -3
View File
@@ -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__