Changeset 421 for ssp_armv6_m_gcc/trunk/armv6_m_gcc

Timestamp:

Mar 17, 2020, 1:51:50 PM (4 years ago)

Author:

nmir-saito

Message:

Merge branch 'rubycfg' to trunk

Location:

ssp_armv6_m_gcc/trunk

Files:

• . (modified) (1 prop)
• armv6_m_gcc/MANIFEST (modified) (2 diffs, 1 prop)
• armv6_m_gcc/Makefile.prc (modified) (3 diffs, 1 prop)
• armv6_m_gcc/arm_m.h (modified) (1 prop)
• armv6_m_gcc/prc.tf (deleted)
• armv6_m_gcc/prc_cfg1_out.h (modified) (1 prop)
• armv6_m_gcc/prc_check.tf (deleted)
• armv6_m_gcc/prc_check.trb (copied) (copied from ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/prc_check.trb )
• armv6_m_gcc/prc_config.c (modified) (1 prop)
• armv6_m_gcc/prc_config.h (modified) (1 prop)
• armv6_m_gcc/prc_def.csv (deleted)
• armv6_m_gcc/prc_insn.h (modified) (1 prop)
• armv6_m_gcc/prc_kernel.h (modified) (1 prop)
• armv6_m_gcc/prc_kernel.trb (copied) (copied from ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/prc_kernel.trb )
• armv6_m_gcc/prc_rename.def (modified) (1 prop)
• armv6_m_gcc/prc_rename.h (modified) (1 prop)
• armv6_m_gcc/prc_sil.h (modified) (1 prop)
• armv6_m_gcc/prc_stddef.h (modified) (1 prop)
• armv6_m_gcc/prc_support.S (modified) (1 prop)
• armv6_m_gcc/prc_sym.def (copied) (copied from ssp_armv6_m_gcc/branches/rubycfg/armv6_m_gcc/prc_sym.def )
• armv6_m_gcc/prc_test.h (modified) (1 prop)
• armv6_m_gcc/prc_timer.c (modified) (1 prop)
• armv6_m_gcc/prc_timer.cfg (modified) (1 prop)
• armv6_m_gcc/prc_timer.h (modified) (1 prop)
• armv6_m_gcc/prc_unrename.h (modified) (1 prop)
• armv6_m_gcc/prc_user.txt (modified) (1 prop)
• armv6_m_gcc/start.S (modified) (1 prop)

ssp_armv6_m_gcc/trunk/armv6_m_gcc/MANIFEST

@@ -5 +5 @@
 Makefile.prc
 arm_m.h
-prc.tf
 prc_cfg1_out.h
-prc_check.tf
+prc_check.trb
 prc_config.c
 prc_config.h
-prc_def.csv
 prc_insn.h
 prc_kernel.h
+prc_kernel.trb
 prc_rename.def
 prc_rename.h
@@ -18 +17 @@
 prc_stddef.h
 prc_support.S
+prc_sym.def
 prc_test.h
+prc_timer.c
 prc_timer.cfg
-prc_timer.c
 prc_timer.h
 prc_unrename.h

ssp_armv6_m_gcc/trunk/armv6_m_gcc/Makefile.prc

@@ -1 +1 @@
 #
 #  @(#) $Id: Makefile.prc 1304 2008-08-27 07:28:36Z ertl-honda $
-# 
+#
 
 #
@@ -7 +7 @@
 #
 
+PRCDIR = $(SRCDIR)/arch/$(PRC)_$(TOOL)
+
 #
 #  コンパイルオプション
 #
-INCLUDES := $(INCLUDES) -I$(SRCDIR)/arch/$(PRC)_$(TOOL)/
-LDFLAGS := -nostdlib $(LDFLAGS) 
+COPTS := $(COPTS)
 CDEFS := $(CDEFS) -DTOPPERS_LABEL_ASM
+INCLUDES := $(INCLUDES) -I$(PRCDIR)
+LDFLAGS := -nostdlib $(LDFLAGS)
 LIBS := $(LIBS)  -lgcc
 
@@ -18 +21 @@
 #  カーネルに関する定義
 #
-KERNEL_DIR := $(KERNEL_DIR) $(SRCDIR)/arch/$(PRC)_$(TOOL)
+KERNEL_DIRS := $(KERNEL_DIRS) $(PRCDIR)
 KERNEL_ASMOBJS := $(KERNEL_ASMOBJS) prc_support.o
 KERNEL_COBJS := $(KERNEL_COBJS) prc_config.o prc_timer.o
+KERNEL_CFLAGS := $(KERNEL_CFLAGS)
 
 #
 #  コンフィギュレータ関係の変数の定義
 #
-CFG_TABS := $(CFG_TABS) --cfg1-def-table $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc_def.csv
+CFG_TABS := $(CFG_TABS) --symval-table $(PRCDIR)/prc_sym.def
+CFG1_OUT_LDFLAGS := $(CFG1_OUT_LDFLAGS)
+CFG_OBJS := $(CFG_OBJS)
+CFG2_OUT := $(CFG2_OUT)
 
 #
 #  依存関係の定義
 #
-cfg1_out.c: $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc_def.csv
-kernel_cfg.timestamp: $(SRCDIR)/arch/$(PRC)_$(TOOL)/prc.tf
+cfg1_out.c: $(PRCDIR)/prc_sym.def
+kernel_cfg.timestamp: $(PRCDIR)/prc_kernel.trb
+check.timestamp: $(PRCDIR)/prc_check.trb
+
+#
+#  その他
+#
+CLEAN_FILES := $(CLEAN_FILES)
+REALCLEAN_FILES := $(REALCLEAN_FILES)