Changeset 364 for asp3_tinet_ecnl_arm/trunk/asp3_dcre/Debug/Makefile

Timestamp:

Feb 1, 2019, 9:57:09 PM (5 years ago)

Author:

coas-nagasima

Message:

TINETとSocket APIなどを更新

File:

• asp3_tinet_ecnl_arm/trunk/asp3_dcre/Debug/Makefile (modified) (10 diffs)

asp3_tinet_ecnl_arm/trunk/asp3_dcre/Debug/Makefile

@@ -56 +56 @@
 SRCLANG = c
 ifeq ($(SRCLANG),c)
-        LIBS = -lmusl
+        LIBS = $(SRCDIR)/../musl-1.1.18/Debug/libmusl.a
 endif
 ifeq ($(SRCLANG),c++)
         USE_CXX = true
-        CXXLIBS = -lstdc++ -lmusl
+        CXXLIBS = -lstdc++ $(SRCDIR)/../musl-1.1.18/Debug/libmusl.a
         CXXRTS = cxxrt.o newlibrt.o
 endif
@@ -150 +150 @@
 endif
 
+TINETDIR = 
+
 #
 #  mbedサービスの定義
@@ -171 +173 @@
 CDEFS := $(CDEFS) 
 INCLUDES := -I. -I$(SRCDIR)/include $(INCLUDES) -I$(SRCDIR)
-LDFLAGS := $(LDFLAGS) -Wl,-Map=$(OBJNAME).map,--cref -L$(SRCDIR)/../musl-1.1.18/Debug
+LDFLAGS := $(LDFLAGS) -L.
 LIBS := $(LIBS) $(CXXLIBS)
 CFLAGS = $(COPTS) $(CDEFS) $(INCLUDES)
@@ -192 +194 @@
 endif
 APPL_COBJS := $(APPL_COBJS) log_output.o vasyslog.o t_perror.o strerror.o time.o
-APPL_CFLAGS := $(APPL_CFLAGS)
+APPL_CFLAGS := $(APPL_CFLAGS) -nostdinc
 ifdef APPLDIRS
         INCLUDES := $(INCLUDES) $(foreach dir,$(APPLDIRS),-I$(dir))
 endif
 
-TINETDIR = 
 ifdef TINETDIR
         #
@@ -335 +336 @@
 vpath %.cfg $(APPL_DIRS)
 vpath %.cdl $(APPL_DIRS)
+vpath %.bin $(APPL_DIRS)
 
 #
@@ -341 +343 @@
 KERNEL_LIB_OBJS = $(KERNEL_ASMOBJS) $(KERNEL_COBJS) $(KERNEL_LCOBJS)
 SYSSVC_OBJS = $(SYSSVC_ASMOBJS) $(SYSSVC_COBJS) $(HIDDEN_OBJS)
-APPL_OBJS = $(APPL_ASMOBJS) $(APPL_COBJS) $(APPL_CXXOBJS)
+APPL_OBJS = $(APPL_ASMOBJS) $(APPL_COBJS) $(APPL_CXXOBJS) $(APPL_BINOBJS)
 ALL_OBJS = $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
                                                                                         $(END_OBJS) $(HIDDEN_OBJS)
@@ -387 +389 @@
 $(CFG1_OUT): $(START_OBJS) cfg1_out.o $(CFG_DMY) $(END_OBJS) $(HIDDEN_OBJS)
         $(LINK) $(CFLAGS) $(LDFLAGS) $(CFG1_OUT_LDFLAGS) -o $(CFG1_OUT) \
-                                                $(START_OBJS) cfg1_out.o $(CFG_DMY) $(END_OBJS)
+                                                $(START_OBJS) cfg1_out.o $(CFG_DMY) $(END_OBJS) $(HIDDEN_OBJS)
 
 cfg1_out.syms: $(CFG1_OUT)
@@ -416 +418 @@
 
 #
+#  並列makeのための依存関係の定義
+#
+$(APPL_OBJS) $(filter-out $(CFG_DMY), $(SYSSVC_OBJS)): | kernel_cfg.timestamp
+$(APPL_ASMOBJS) $(filter-out $(CFG_DMY), $(SYSSVC_ASMOBJS)) $(KERNEL_ASMOBJS) $(CFG_ASMOBJS): \
+                                                                                                                | offset.timestamp
+
+#
 #  特別な依存関係の定義
 #
@@ -424 +433 @@
 #
 $(OBJFILE): $(ALL_OBJS) $(LIBS_DEP)
-        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) \
+        $(LINK) $(CFLAGS) $(LDFLAGS) $(OBJ_LDFLAGS) -o $(OBJFILE) -Wl,-Map=$(OBJNAME).map,--cref \
                         $(START_OBJS) $(APPL_OBJS) $(SYSSVC_OBJS) $(CFG_OBJS) \
-                        $(ALL_LIBS) $(END_OBJS)
+                        -Wl,--start-group $(ALL_LIBS) -Wl,--end-group $(END_OBJS)
 
 #
@@ -597 +606 @@
         $(CC) -c -MD -MP -MF $(DEPDIR)/$*.d $(CFLAGS) $(APPL_CFLAGS) $<
 
+$(APPL_BINOBJS): %.o: %.bin
+        $(OBJCOPY) -B arm -I binary -O elf32-littlearm --rename-section .data=.rodata $< $*.o
+
 #
 #  デフォルトコンパイルルールを上書き