You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2020/09/05 13:25:42 UTC
[incubator-nuttx] branch master updated (18b47f9 -> 515ad1c)
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git.
from 18b47f9 arch/sim: Add the pthread_cond_* API to the nuttx-names.in list
new 9e69b87 Added KDEFINE (__KERNEL__) to EXTRAFLAGS for libboard.
new 77b32a7 Removed -w option from MKEXPORT_ARGS.
new 515ad1c Added KDEFINE (__KERNEL__) to EXTRAFLAGS for libboard, for other architectures.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
arch/arm/src/Makefile | 2 +-
arch/avr/src/Makefile | 2 +-
arch/hc/src/Makefile | 2 +-
arch/mips/src/Makefile | 2 +-
arch/misoc/src/Makefile | 2 +-
arch/or1k/src/Makefile | 2 +-
arch/renesas/src/Makefile | 2 +-
arch/risc-v/src/Makefile | 2 +-
arch/sim/src/Makefile | 2 +-
arch/x86/src/Makefile | 2 +-
arch/x86_64/src/Makefile | 2 +-
arch/xtensa/src/Makefile | 2 +-
arch/z16/src/Makefile | 2 +-
arch/z80/src/Makefile.sdccl | 2 +-
arch/z80/src/Makefile.sdccw | 2 +-
arch/z80/src/Makefile.zdsiil | 2 +-
arch/z80/src/Makefile.zdsiiw | 2 +-
tools/Makefile.unix | 2 +-
tools/Makefile.win | 2 +-
19 files changed, 19 insertions(+), 19 deletions(-)
[incubator-nuttx] 02/03: Removed -w option from MKEXPORT_ARGS.
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 77b32a721d3a5791de5c3e2465ea51b41dbde7ce
Author: Johannes Schock <jo...@nivus.com>
AuthorDate: Fri Sep 4 17:33:45 2020 +0200
Removed -w option from MKEXPORT_ARGS.
---
tools/Makefile.unix | 2 +-
tools/Makefile.win | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile.unix b/tools/Makefile.unix
index 6f0e00c..10284dc 100644
--- a/tools/Makefile.unix
+++ b/tools/Makefile.unix
@@ -117,7 +117,7 @@ LINKLIBS = $(patsubst staging/%,%,$(NUTTXLIBS))
# Export tool definitions
MKEXPORT= tools/mkexport.sh
-MKEXPORT_ARGS = -w$(CONFIG_CYGWIN_WINTOOL) -t "$(TOPDIR)" -b "$(BOARD_DIR)"
+MKEXPORT_ARGS = -t "$(TOPDIR)" -b "$(BOARD_DIR)"
ifneq ($(CONFIG_BUILD_FLAT),y)
MKEXPORT_ARGS += -u
diff --git a/tools/Makefile.win b/tools/Makefile.win
index 4c55deb..38eb3f1 100644
--- a/tools/Makefile.win
+++ b/tools/Makefile.win
@@ -102,7 +102,7 @@ LINKLIBS = $(patsubst staging\\%,%,$(NUTTXLIBS))
# Export tool definitions
MKEXPORT = tools\mkexport.bat
-MKEXPORT_ARGS = -w$(CONFIG_CYGWIN_WINTOOL) -t "$(TOPDIR)"
+MKEXPORT_ARGS = -t "$(TOPDIR)"
ifneq ($(CONFIG_BUILD_FLAT),y)
MKEXPORT_ARGS += -u
[incubator-nuttx] 03/03: Added KDEFINE (__KERNEL__) to EXTRAFLAGS
for libboard, for other architectures.
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 515ad1c388195a97fa4c0ca77ab921ff6c2ef821
Author: Johannes Schock <jo...@nivus.com>
AuthorDate: Sat Sep 5 14:14:18 2020 +0200
Added KDEFINE (__KERNEL__) to EXTRAFLAGS for libboard, for other architectures.
---
arch/avr/src/Makefile | 2 +-
arch/hc/src/Makefile | 2 +-
arch/mips/src/Makefile | 2 +-
arch/misoc/src/Makefile | 2 +-
arch/or1k/src/Makefile | 2 +-
arch/renesas/src/Makefile | 2 +-
arch/risc-v/src/Makefile | 2 +-
arch/sim/src/Makefile | 2 +-
arch/x86/src/Makefile | 2 +-
arch/x86_64/src/Makefile | 2 +-
arch/xtensa/src/Makefile | 2 +-
arch/z16/src/Makefile | 2 +-
arch/z80/src/Makefile.sdccl | 2 +-
arch/z80/src/Makefile.sdccw | 2 +-
arch/z80/src/Makefile.zdsiil | 2 +-
arch/z80/src/Makefile.zdsiiw | 2 +-
16 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/avr/src/Makefile b/arch/avr/src/Makefile
index 05890e2..607f3e0 100644
--- a/arch/avr/src/Makefile
+++ b/arch/avr/src/Makefile
@@ -115,7 +115,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx"
diff --git a/arch/hc/src/Makefile b/arch/hc/src/Makefile
index 0712eee..8266d25 100644
--- a/arch/hc/src/Makefile
+++ b/arch/hc/src/Makefile
@@ -130,7 +130,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
$(Q) echo "LD: nuttx"
diff --git a/arch/mips/src/Makefile b/arch/mips/src/Makefile
index 8b0df88..6aa11bd 100644
--- a/arch/mips/src/Makefile
+++ b/arch/mips/src/Makefile
@@ -113,7 +113,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx"
diff --git a/arch/misoc/src/Makefile b/arch/misoc/src/Makefile
index e81fe39..d3d3bbb 100644
--- a/arch/misoc/src/Makefile
+++ b/arch/misoc/src/Makefile
@@ -117,7 +117,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
$(Q) $(LD) --entry=__start $(LDFLAGS) $(LIBPATHS) $(EXTRA_LIBPATHS) \
diff --git a/arch/or1k/src/Makefile b/arch/or1k/src/Makefile
index cf774eb..461ab8f 100644
--- a/arch/or1k/src/Makefile
+++ b/arch/or1k/src/Makefile
@@ -152,7 +152,7 @@ $(KBIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board$(DELIM)libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT)
$(Q) echo "LD: nuttx"
diff --git a/arch/renesas/src/Makefile b/arch/renesas/src/Makefile
index 7bf8c5f..8a495e0 100644
--- a/arch/renesas/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -124,7 +124,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx"
diff --git a/arch/risc-v/src/Makefile b/arch/risc-v/src/Makefile
index dd43dc3..6824471 100644
--- a/arch/risc-v/src/Makefile
+++ b/arch/risc-v/src/Makefile
@@ -155,7 +155,7 @@ $(KBIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
$(Q) echo "LD: nuttx"
diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile
index 9df182d..f1257e3 100644
--- a/arch/sim/src/Makefile
+++ b/arch/sim/src/Makefile
@@ -278,7 +278,7 @@ libarch$(LIBEXT): $(NUTTXOBJS)
# that are not hardware-related.
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
# A partially linked object containing only NuttX code (no interface to host OS)
# Change the names of most symbols that conflict with libc symbols.
diff --git a/arch/x86/src/Makefile b/arch/x86/src/Makefile
index 31ab9e5..b6363bb 100644
--- a/arch/x86/src/Makefile
+++ b/arch/x86/src/Makefile
@@ -128,7 +128,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board/libboard$(LIBEXT)
@echo "LD: nuttx$(EXEEXT)"
diff --git a/arch/x86_64/src/Makefile b/arch/x86_64/src/Makefile
index 65bc341..97000b4 100644
--- a/arch/x86_64/src/Makefile
+++ b/arch/x86_64/src/Makefile
@@ -123,7 +123,7 @@ $(KBIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): board/libboard$(LIBEXT)
@echo "LD: nuttx$(EXEEXT)"
diff --git a/arch/xtensa/src/Makefile b/arch/xtensa/src/Makefile
index fd6111c..ac9de8f 100644
--- a/arch/xtensa/src/Makefile
+++ b/arch/xtensa/src/Makefile
@@ -114,7 +114,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(STARTUP_OBJS) board/libboard$(LIBEXT)
@echo "LD: nuttx"
diff --git a/arch/z16/src/Makefile b/arch/z16/src/Makefile
index 669d322..5d8476f 100644
--- a/arch/z16/src/Makefile
+++ b/arch/z16/src/Makefile
@@ -79,7 +79,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
ifeq ($(COMPILER),zneocc.exe)
nuttx.linkcmd: $(LINKCMDTEMPLATE)
diff --git a/arch/z80/src/Makefile.sdccl b/arch/z80/src/Makefile.sdccl
index ea8c3f8..2211b3f 100644
--- a/arch/z80/src/Makefile.sdccl
+++ b/arch/z80/src/Makefile.sdccl
@@ -149,7 +149,7 @@ libarch$(LIBEXT): asm_mem.h $(OBJS)
# This builds the libboard library in the board/ subdirectory
board/libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
# This target builds the final executable
diff --git a/arch/z80/src/Makefile.sdccw b/arch/z80/src/Makefile.sdccw
index f7f0141..76151f1 100644
--- a/arch/z80/src/Makefile.sdccw
+++ b/arch/z80/src/Makefile.sdccw
@@ -149,7 +149,7 @@ libarch$(LIBEXT): asm_mem.h $(OBJS)
# This builds the libboard library in the board\ subdirectory
board\libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
# This target builds the final executable
diff --git a/arch/z80/src/Makefile.zdsiil b/arch/z80/src/Makefile.zdsiil
index cf190c7..d82f4b3 100644
--- a/arch/z80/src/Makefile.zdsiil
+++ b/arch/z80/src/Makefile.zdsiil
@@ -101,7 +101,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board$(DELIM)libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS=""$(KDEFINE) $(EXTRAFLAGS)"
nuttx.linkcmd: $(LINKCMDTEMPLATE)
$(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
diff --git a/arch/z80/src/Makefile.zdsiiw b/arch/z80/src/Makefile.zdsiiw
index 4dcfec7..7aadf21 100644
--- a/arch/z80/src/Makefile.zdsiiw
+++ b/arch/z80/src/Makefile.zdsiiw
@@ -92,7 +92,7 @@ libarch$(LIBEXT): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board$(DELIM)libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx.linkcmd: $(LINKCMDTEMPLATE)
$(Q) cp -f $(LINKCMDTEMPLATE) nuttx.linkcmd
[incubator-nuttx] 01/03: Added KDEFINE (__KERNEL__) to EXTRAFLAGS
for libboard.
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 9e69b87aa3d8ec42f4192c32465d16ff087e4a03
Author: Johannes Schock <jo...@nivus.com>
AuthorDate: Fri Sep 4 17:35:01 2020 +0200
Added KDEFINE (__KERNEL__) to EXTRAFLAGS for libboard.
---
arch/arm/src/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/src/Makefile b/arch/arm/src/Makefile
index 2d7ac3f..c7f87a6 100644
--- a/arch/arm/src/Makefile
+++ b/arch/arm/src/Makefile
@@ -165,7 +165,7 @@ $(KBIN): $(OBJS)
$(call ARCHIVE, $@, $(OBJS))
board$(DELIM)libboard$(LIBEXT):
- $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(EXTRAFLAGS)"
+ $(Q) $(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRAFLAGS="$(KDEFINE) $(EXTRAFLAGS)"
nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT)
$(Q) echo "LD: nuttx"