You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by pk...@apache.org on 2022/05/16 08:17:15 UTC
[incubator-nuttx] branch master updated (1c977e97d2 -> 5958d3ac62)
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
from 1c977e97d2 pthread_mutexinit: fix deadcode in pthread_mutexinit
new f5dd839879 boards/arm: Remove "LDFLAGS += -g" whichi is already added by Toolchain.defs
new 5958d3ac62 risc-v: Move "LDFLAGS += -melf32lriscv" from Make.defs to Toolchain.defs
The 2 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/risc-v/src/common/Toolchain.defs | 6 ++++++
boards/arm/c5471/c5471evm/scripts/Make.defs | 8 --------
boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs | 2 --
boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs | 4 ----
boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs | 8 --------
boards/arm/lpc214x/zp214xpa/scripts/Make.defs | 8 --------
boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs | 8 --------
boards/arm/phy62xx/phy6222/src/Makefile | 2 --
boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs | 4 ----
boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs | 4 ----
boards/arm/str71x/olimex-strp711/scripts/Make.defs | 8 --------
boards/risc-v/bl602/bl602evb/scripts/Make.defs | 3 ---
boards/risc-v/c906/smartl-c906/scripts/Make.defs | 4 ----
boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs | 2 --
boards/risc-v/fe310/hifive1-revb/scripts/Make.defs | 2 --
boards/risc-v/k210/maix-bit/scripts/Make.defs | 4 ----
boards/risc-v/litex/arty_a7/scripts/Make.defs | 2 --
boards/risc-v/mpfs/icicle/scripts/Make.defs | 4 ----
boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs | 4 ----
boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs | 8 --------
boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs | 2 --
21 files changed, 6 insertions(+), 91 deletions(-)
[incubator-nuttx] 01/02: boards/arm: Remove "LDFLAGS += -g" whichi is already added by Toolchain.defs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit f5dd839879fa8921a03334cacbe26ba83acfb784
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun May 15 12:39:42 2022 +0800
boards/arm: Remove "LDFLAGS += -g" whichi is already added by Toolchain.defs
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
boards/arm/c5471/c5471evm/scripts/Make.defs | 8 --------
boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs | 2 --
boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs | 4 ----
boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs | 8 --------
boards/arm/lpc214x/zp214xpa/scripts/Make.defs | 8 --------
boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs | 8 --------
boards/arm/phy62xx/phy6222/src/Makefile | 2 --
boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs | 4 ----
boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs | 4 ----
boards/arm/str71x/olimex-strp711/scripts/Make.defs | 8 --------
10 files changed, 56 deletions(-)
diff --git a/boards/arm/c5471/c5471evm/scripts/Make.defs b/boards/arm/c5471/c5471evm/scripts/Make.defs
index 4746182828..fff70fd167 100644
--- a/boards/arm/c5471/c5471evm/scripts/Make.defs
+++ b/boards/arm/c5471/c5471evm/scripts/Make.defs
@@ -41,10 +41,6 @@ ifneq ($(CONFIG_WINDOWS_CYGWIN),y)
endif
endif
-ifeq ("${CONFIG_DEBUG_FEATURES}","y")
- ARCHOPTIMIZATION = -g
-endif
-
ifeq ($(OLDGCC),n)
ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
else
@@ -67,7 +63,3 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-no-check-sections
LDNXFLATFLAGS = -e main -s 2048
-
-ifeq ($(CONFIG_DEBUG_FEATURES),y)
- LDFLAGS += -g
-endif
diff --git a/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs
index 0349bd9430..d06b7191ad 100644
--- a/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs
+++ b/boards/arm/lc823450/lc823450-xgevk/scripts/Make.defs
@@ -55,8 +55,6 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-# File extensions
-
# Linker flags
ifeq ($(CONFIG_LC823450_SDIF_PATCH),y)
diff --git a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
index 1653da2eaa..2e02400451 100644
--- a/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
+++ b/boards/arm/lpc17xx_40xx/lx_cpu/scripts/Make.defs
@@ -65,7 +65,3 @@ CMODULEFLAGS = $(CFLAGS) -mlong-calls # --target1-abs
LDMODULEFLAGS = -r -e module_initialize
LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
-
-# File extensions
-
-# Linker flags
diff --git a/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs b/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs
index c744ffcb3f..7c0e3375d0 100644
--- a/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs
+++ b/boards/arm/lpc214x/mcu123-lpc214x/scripts/Make.defs
@@ -41,10 +41,6 @@ ifneq ($(CONFIG_WINDOWS_CYGWIN),y)
endif
endif
-ifeq ("${CONFIG_DEBUG_FEATURES}","y")
- ARCHOPTIMIZATION = -g
-endif
-
ifeq ($(OLDGCC),n)
ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
else
@@ -67,7 +63,3 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-no-check-sections
LDNXFLATFLAGS = -e main -s 2048
-
-ifeq ($(CONFIG_DEBUG_FEATURES),y)
- LDFLAGS += -g
-endif
diff --git a/boards/arm/lpc214x/zp214xpa/scripts/Make.defs b/boards/arm/lpc214x/zp214xpa/scripts/Make.defs
index cce85d1650..d8700ffbca 100644
--- a/boards/arm/lpc214x/zp214xpa/scripts/Make.defs
+++ b/boards/arm/lpc214x/zp214xpa/scripts/Make.defs
@@ -41,10 +41,6 @@ ifneq ($(CONFIG_WINDOWS_CYGWIN),y)
endif
endif
-ifeq ("${CONFIG_DEBUG_FEATURES}","y")
- ARCHOPTIMIZATION = -g
-endif
-
ifeq ($(OLDGCC),n)
ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
else
@@ -67,7 +63,3 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-no-check-sections
LDNXFLATFLAGS = -e main -s 2048
-
-ifeq ($(CONFIG_DEBUG_FEATURES),y)
- LDFLAGS += -g
-endif
diff --git a/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs b/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs
index ed19469d67..edee4d038f 100644
--- a/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs
+++ b/boards/arm/lpc2378/olimex-lpc2378/scripts/Make.defs
@@ -41,10 +41,6 @@ ifneq ($(CONFIG_WINDOWS_CYGWIN),y)
endif
endif
-ifeq ("${CONFIG_DEBUG_FEATURES}","y")
- ARCHOPTIMIZATION = -g
-endif
-
ifeq ($(OLDGCC),n)
ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
else
@@ -67,7 +63,3 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-no-check-sections
LDNXFLATFLAGS = -e main -s 2048
-
-ifeq ($(CONFIG_DEBUG_FEATURES),y)
- LDFLAGS += -g
-endif
diff --git a/boards/arm/phy62xx/phy6222/src/Makefile b/boards/arm/phy62xx/phy6222/src/Makefile
index 3db8dbe94e..38dedc9797 100644
--- a/boards/arm/phy62xx/phy6222/src/Makefile
+++ b/boards/arm/phy62xx/phy6222/src/Makefile
@@ -19,8 +19,6 @@
############################################################################
include $(TOPDIR)/Make.defs
-#ROMSYMTABLE = bb_rom_sym_m0.gdbsym
-#LDFLAGS += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(ROMSYMTABLE)
CSRCS = boot.c bringup.c
CSRCS += userleds.c
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
index 7c687472fa..8ccdd6f2d8 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kelf/Make.defs
@@ -54,7 +54,3 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
-
-# File extensions
-
-# Linker flags
diff --git a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
index 243a5ecdb6..aaf66a4cfc 100644
--- a/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
+++ b/boards/arm/stm32/olimex-stm32-p407/configs/kmodule/Make.defs
@@ -54,7 +54,3 @@ CXXELFFLAGS = $(CXXFLAGS) -mlong-calls # --target1-abs
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)libs$(DELIM)libc$(DELIM)modlib$(DELIM)gnu-elf.ld)
-
-# File extensions
-
-# Linker flags
diff --git a/boards/arm/str71x/olimex-strp711/scripts/Make.defs b/boards/arm/str71x/olimex-strp711/scripts/Make.defs
index e28e87210c..5a567b7ca8 100644
--- a/boards/arm/str71x/olimex-strp711/scripts/Make.defs
+++ b/boards/arm/str71x/olimex-strp711/scripts/Make.defs
@@ -41,10 +41,6 @@ ifneq ($(CONFIG_WINDOWS_CYGWIN),y)
endif
endif
-ifeq ("${CONFIG_DEBUG_FEATURES}","y")
- ARCHOPTIMIZATION = -g
-endif
-
ifeq ($(OLDGCC),n)
ARCHCPUFLAGS = -mcpu=arm7tdmi -mfloat-abi=soft
else
@@ -67,7 +63,3 @@ NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) \
-T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld \
-no-check-sections
LDNXFLATFLAGS = -e main -s 2048
-
-ifeq ($(CONFIG_DEBUG_FEATURES),y)
- LDFLAGS += -g
-endif
[incubator-nuttx] 02/02: risc-v: Move "LDFLAGS += -melf32lriscv" from Make.defs to Toolchain.defs
Posted by pk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
pkarashchenko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-nuttx.git
commit 5958d3ac6259d2065b6f130684ec47856f2aab63
Author: Xiang Xiao <xi...@xiaomi.com>
AuthorDate: Sun May 15 12:45:14 2022 +0800
risc-v: Move "LDFLAGS += -melf32lriscv" from Make.defs to Toolchain.defs
Signed-off-by: Xiang Xiao <xi...@xiaomi.com>
---
arch/risc-v/src/common/Toolchain.defs | 6 ++++++
boards/risc-v/bl602/bl602evb/scripts/Make.defs | 3 ---
boards/risc-v/c906/smartl-c906/scripts/Make.defs | 4 ----
boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs | 2 --
boards/risc-v/fe310/hifive1-revb/scripts/Make.defs | 2 --
boards/risc-v/k210/maix-bit/scripts/Make.defs | 4 ----
boards/risc-v/litex/arty_a7/scripts/Make.defs | 2 --
boards/risc-v/mpfs/icicle/scripts/Make.defs | 4 ----
boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs | 4 ----
boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs | 8 --------
boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs | 2 --
11 files changed, 6 insertions(+), 35 deletions(-)
diff --git a/arch/risc-v/src/common/Toolchain.defs b/arch/risc-v/src/common/Toolchain.defs
index f0b18eb447..e7d7be9144 100644
--- a/arch/risc-v/src/common/Toolchain.defs
+++ b/arch/risc-v/src/common/Toolchain.defs
@@ -81,6 +81,12 @@ ifneq ($(CONFIG_CXX_RTTI),y)
ARCHCXXFLAGS += -fno-rtti
endif
+ifeq ($(CONFIG_ARCH_RV32),y)
+LDFLAGS += -melf32lriscv
+else
+LDFLAGS += -melf64lriscv
+endif
+
# Optimization of unused sections
ifeq ($(CONFIG_DEBUG_OPT_UNUSED_SECTIONS),y)
diff --git a/boards/risc-v/bl602/bl602evb/scripts/Make.defs b/boards/risc-v/bl602/bl602evb/scripts/Make.defs
index a52b68958f..f4c6271872 100644
--- a/boards/risc-v/bl602/bl602evb/scripts/Make.defs
+++ b/boards/risc-v/bl602/bl602evb/scripts/Make.defs
@@ -52,6 +52,3 @@ CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -melf32lriscv -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-
-LDFLAGS += -melf32lriscv
-
diff --git a/boards/risc-v/c906/smartl-c906/scripts/Make.defs b/boards/risc-v/c906/smartl-c906/scripts/Make.defs
index 53bbd6f0f1..d1cba31900 100644
--- a/boards/risc-v/c906/smartl-c906/scripts/Make.defs
+++ b/boards/risc-v/c906/smartl-c906/scripts/Make.defs
@@ -59,7 +59,3 @@ CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-
-# File extensions
-
-LDFLAGS += -melf64lriscv
diff --git a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs
index 9a3d06da0c..393bda1470 100644
--- a/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs
+++ b/boards/risc-v/esp32c3/esp32c3-devkit/scripts/Make.defs
@@ -58,5 +58,3 @@ CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -melf32lriscv -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)$(DELIM)binfmt$(DELIM)libelf$(DELIM)gnu-elf.ld)
-
-LDFLAGS += -melf32lriscv
diff --git a/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs b/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs
index eb98d0ecff..37ca632cee 100644
--- a/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs
+++ b/boards/risc-v/fe310/hifive1-revb/scripts/Make.defs
@@ -38,5 +38,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-LDFLAGS += -melf32lriscv
diff --git a/boards/risc-v/k210/maix-bit/scripts/Make.defs b/boards/risc-v/k210/maix-bit/scripts/Make.defs
index ddcc05ac45..10c24c8273 100644
--- a/boards/risc-v/k210/maix-bit/scripts/Make.defs
+++ b/boards/risc-v/k210/maix-bit/scripts/Make.defs
@@ -48,7 +48,3 @@ CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-
-# File extensions
-
-LDFLAGS += -melf64lriscv
diff --git a/boards/risc-v/litex/arty_a7/scripts/Make.defs b/boards/risc-v/litex/arty_a7/scripts/Make.defs
index 54d8241ade..a1e83f5acd 100644
--- a/boards/risc-v/litex/arty_a7/scripts/Make.defs
+++ b/boards/risc-v/litex/arty_a7/scripts/Make.defs
@@ -33,5 +33,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-LDFLAGS += -melf32lriscv
diff --git a/boards/risc-v/mpfs/icicle/scripts/Make.defs b/boards/risc-v/mpfs/icicle/scripts/Make.defs
index 74175c585b..22b4cc5a11 100755
--- a/boards/risc-v/mpfs/icicle/scripts/Make.defs
+++ b/boards/risc-v/mpfs/icicle/scripts/Make.defs
@@ -78,7 +78,3 @@ CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-
-# File extensions
-
-LDFLAGS += -melf64lriscv
diff --git a/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs b/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs
index 8a4ba6cce9..d54f3ae6be 100755
--- a/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs
+++ b/boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs
@@ -59,7 +59,3 @@ CXXELFFLAGS = $(CXXFLAGS)
LDELFFLAGS = -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-
-# File extensions
-
-LDFLAGS += -melf64lriscv
diff --git a/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs b/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs
index e5e2c2940a..2de012f277 100644
--- a/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs
+++ b/boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs
@@ -55,11 +55,3 @@ endif
LDELFFLAGS += -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
-
-# File extensions
-
-ifeq ($(CONFIG_ARCH_RV32),y)
-LDFLAGS += -melf32lriscv
-else
-LDFLAGS += -melf64lriscv
-endif
diff --git a/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs b/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs
index 857feefa8b..7973b5dbd1 100644
--- a/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs
+++ b/boards/risc-v/rv32m1/rv32m1-vega/scripts/Make.defs
@@ -48,5 +48,3 @@ CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS := $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS)
AFLAGS += $(CFLAGS) -D__ASSEMBLY__
-
-LDFLAGS += -melf32lriscv