Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

tools/ci: try to fix local ci by pulling random changes from upstream #165

Merged
merged 11 commits into from
Sep 25, 2023
Merged

tools/ci: try to fix local ci by pulling random changes from upstream #165

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9a83c3a
tools/ci: ensure removing python and openssl related commands
pkarashchenko Aug 29, 2023
4d34201
tools/ci: Unify the version print: command xxx --version
xiaoxiang781216 Sep 13, 2023
01a6a48
tools/ci: Fix "flock: Command not found" on macOS
xiaoxiang781216 Sep 13, 2023
f1a08de
tools: Use GCC 13.2 from xPack for risc-v
no1wudi Sep 18, 2023
05ef2f2
tools: Switch riscv GCC to 12.3
no1wudi Sep 19, 2023
a0cceee
cibuild.sh: Using GCC from xPack for riscv
no1wudi Sep 19, 2023
77280f0
rv32m1: Fix compile error
no1wudi Sep 20, 2023
42ab3f2
espressif: Force cast param in libc stubs
no1wudi Sep 20, 2023
ebb99cd
boards/riscv: Fix module linker target
no1wudi Sep 20, 2023
05966c2
boards/riscv: Add -melf64lriscv to 64bit USER_LDFLAGS/LDELFFLAGS
xiaoxiang781216 Aug 22, 2023
d232b45
arch/riscv: Move -mcmodel=medany from Make.defs to Toolchain.defs
xiaoxiang781216 Aug 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions arch/risc-v/src/common/Toolchain.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,12 +133,17 @@ endif

ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)

# Generic GNU RVG toolchain
# Generic GNU RVG toolchain, prefer to use riscv-none-elf-gcc from xPack
# if CROSSDEV is not defined.

ifeq ($(CONFIG_RISCV_TOOLCHAIN_GNU_RV32),y)
CROSSDEV ?= riscv32-unknown-elf-
ifeq ($(shell riscv-none-elf-gcc --version > /dev/null 2>&1; echo $$?), 0)
CROSSDEV ?= riscv-none-elf-
else
CROSSDEV ?= riscv64-unknown-elf-
ifeq ($(CONFIG_RISCV_TOOLCHAIN_GNU_RV32),y)
CROSSDEV ?= riscv32-unknown-elf-
else
CROSSDEV ?= riscv64-unknown-elf-
endif
endif

# Detect cpu ISA support flags
Expand Down Expand Up @@ -178,12 +183,14 @@ ifeq ($(CONFIG_RISCV_TOOLCHAIN),GNU_RVG)
ARCHTYPE = rv64
ARCHABITYPE = lp64
LLVM_ARCHTYPE := riscv64
# https://www.sifive.com/blog/all-aboard-part-4-risc-v-code-models
ARCHCPUFLAGS = -mcmodel=medany
endif

# Construct arch flags

ARCHCPUEXTFLAGS = i$(ARCHRVISAM)$(ARCHRVISAA)$(ARCHRVISAF)$(ARCHRVISAD)$(ARCHRVISAC)$(ARCHRVISAZ)
ARCHCPUFLAGS = -march=$(ARCHTYPE)$(ARCHCPUEXTFLAGS)
ARCHCPUFLAGS += -march=$(ARCHTYPE)$(ARCHCPUEXTFLAGS)

# Construct arch abi flags

Expand Down
20 changes: 10 additions & 10 deletions arch/risc-v/src/espressif/esp_libc_stubs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,52 +243,52 @@ void _lock_release_recursive(_lock_t *lock)
#if ESP_ROM_HAS_RETARGETABLE_LOCKING
void __retarget_lock_init(_LOCK_T *lock)
{
_lock_init(lock);
_lock_init((_lock_t *)lock);
}

void __retarget_lock_init_recursive(_LOCK_T *lock)
{
_lock_init_recursive(lock);
_lock_init_recursive((_lock_t *)lock);
}

void __retarget_lock_close(_LOCK_T lock)
{
_lock_close(&lock);
_lock_close((_lock_t *)&lock);
}

void __retarget_lock_close_recursive(_LOCK_T lock)
{
_lock_close_recursive(&lock);
_lock_close_recursive((_lock_t *)&lock);
}

void __retarget_lock_acquire(_LOCK_T lock)
{
_lock_acquire(&lock);
_lock_acquire((_lock_t *)&lock);
}

void __retarget_lock_acquire_recursive(_LOCK_T lock)
{
_lock_acquire_recursive(&lock);
_lock_acquire_recursive((_lock_t *)&lock);
}

int __retarget_lock_try_acquire(_LOCK_T lock)
{
return _lock_try_acquire(&lock);
return _lock_try_acquire((_lock_t *)&lock);
}

int __retarget_lock_try_acquire_recursive(_LOCK_T lock)
{
return _lock_try_acquire_recursive(&lock);
return _lock_try_acquire_recursive((_lock_t *)&lock);
}

void __retarget_lock_release(_LOCK_T lock)
{
_lock_release(&lock);
_lock_release((_lock_t *)&lock);
}

void __retarget_lock_release_recursive(_LOCK_T lock)
{
_lock_release_recursive(&lock);
_lock_release_recursive((_lock_t *)&lock);
}
#endif

Expand Down
2 changes: 1 addition & 1 deletion arch/risc-v/src/rv32m1/rv32m1_irq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ void up_irqinitialize(void)

#if defined(CONFIG_STACK_COLORATION) && CONFIG_ARCH_INTERRUPTSTACK > 15
size_t intstack_size = (CONFIG_ARCH_INTERRUPTSTACK & ~15);
riscv_stack_color(g_intstacktop - intstack_size, intstack_size);
riscv_stack_color(g_intstackalloc, intstack_size);
#endif

/* Clear all pending flags */
Expand Down
2 changes: 1 addition & 1 deletion boards/risc-v/c906/smartl-c906/kernel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
USER_SRECFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.srec)
USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)

USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
USER_LDFLAGS = -melf64lriscv --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
USER_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(USERLIBS))))
USER_LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

Expand Down
13 changes: 2 additions & 11 deletions boards/risc-v/c906/smartl-c906/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,8 @@ ifeq ($(CONFIG_C906_WITH_QEMU),y)
else
LDSCRIPT = ld.script
endif

ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)

# The following options are for the toolchain from T-HEAD.
# For more info ahout the T-HEAD ISA extensions, please refer to the C906 user guide.
# ARCHCPUFLAGS = -march=rv64gcxthead -mabi=lp64d -mtune=c906 -mcmodel=medany
# TODO: We are not going to enable this at this time for the CI compatibility.

ARCHCPUFLAGS += -mcmodel=medany


CFLAGS = $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
Expand All @@ -49,13 +40,13 @@ AFLAGS += $(CFLAGS) -D__ASSEMBLY__

CMODULEFLAGS = $(CFLAGS)

LDMODULEFLAGS = -r -e module_initialize
LDMODULEFLAGS = -melf64lriscv -r -e module_initialize
LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)

# ELF module definitions

CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)

LDELFFLAGS = -r -e main
LDELFFLAGS = -melf64lriscv -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
2 changes: 0 additions & 2 deletions boards/risc-v/jh7110/star64/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@ include $(TOPDIR)/arch/risc-v/src/common/Toolchain.defs

LDSCRIPT = ld.script
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)

ARCHCPUFLAGS += -mcmodel=medany
ARCHPICFLAGS = -fpic -msingle-pic-base

CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
Expand Down
2 changes: 1 addition & 1 deletion boards/risc-v/k210/maix-bit/kernel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
USER_SRECFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.srec)
USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)

USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
USER_LDFLAGS = -melf64lriscv --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
USER_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(USERLIBS))))
USER_LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

Expand Down
6 changes: 2 additions & 4 deletions boards/risc-v/k210/maix-bit/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ include $(TOPDIR)/arch/risc-v/src/common/Toolchain.defs
LDSCRIPT = ld.script
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)

ARCHCPUFLAGS += -mcmodel=medany -mstrict-align

CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS := $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
Expand All @@ -38,13 +36,13 @@ AFLAGS += $(CFLAGS) -D__ASSEMBLY__

CMODULEFLAGS = $(CFLAGS)

LDMODULEFLAGS = -r -e module_initialize
LDMODULEFLAGS = -melf64lriscv -r -e module_initialize
LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)

# ELF module definitions

CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)

LDELFFLAGS = -r -e main
LDELFFLAGS = -melf64lriscv -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
2 changes: 1 addition & 1 deletion boards/risc-v/mpfs/common/kernel/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ USER_HEXFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.hex)
USER_SRECFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.srec)
USER_BINFILE += $(call CONVERT_PATH,$(TOPDIR)$(DELIM)nuttx_user.bin)

USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
USER_LDFLAGS = -melf64lriscv --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT)
USER_LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(USERLIBS))))
USER_LIBGCC = "${shell "$(CC)" $(ARCHCPUFLAGS) -print-libgcc-file-name}"

Expand Down
12 changes: 2 additions & 10 deletions boards/risc-v/mpfs/icicle/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,6 @@ ifneq ($(LDMEMORY),)
endif
ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)

# The following options are for the toolchain from T-HEAD.
# For more info ahout the T-HEAD ISA extensions, please refer to the MPFS user guide.
# ARCHCPUFLAGS = -march=rv64gcxthead -mabi=lp64d -mcmodel=medany
# TODO: We are not going to enable this at this time for the CI compatibility.

ARCHCPUFLAGS += -mcmodel=medany


CFLAGS = $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
Expand All @@ -72,13 +64,13 @@ AFLAGS += $(CFLAGS) -D__ASSEMBLY__

CMODULEFLAGS = $(CFLAGS)

LDMODULEFLAGS = -r -e module_initialize
LDMODULEFLAGS = -melf64lriscv -r -e module_initialize
LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)

# ELF module definitions

CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)

LDELFFLAGS = -r -e main
LDELFFLAGS = -melf64lriscv -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
11 changes: 1 addition & 10 deletions boards/risc-v/mpfs/m100pfsevp/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,8 @@ ifeq ($(CONFIG_MPFS_BOOTLOADER),y)
else
LDSCRIPT = ld.script
endif

ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)

# The following options are for the toolchain from T-HEAD.
# For more info ahout the T-HEAD ISA extensions, please refer to the MPFS user guide.
# ARCHCPUFLAGS = -march=rv64gcxthead -mabi=lp64d -mcmodel=medany
# TODO: We are not going to enable this at this time for the CI compatibility.

ARCHCPUFLAGS += -mcmodel=medany


CFLAGS = $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
Expand All @@ -57,5 +48,5 @@ LDMODULEFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/libs/libc/modlib/gnu-elf.ld)
CELFFLAGS = $(CFLAGS)
CXXELFFLAGS = $(CXXFLAGS)

LDELFFLAGS = -r -e main
LDELFFLAGS = -melf64lriscv -r -e main
LDELFFLAGS += -T $(call CONVERT_PATH,$(TOPDIR)/binfmt/libelf/gnu-elf.ld)
2 changes: 0 additions & 2 deletions boards/risc-v/qemu-rv/rv-virt/scripts/Make.defs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ endif
endif

ARCHSCRIPT += $(BOARD_DIR)$(DELIM)scripts$(DELIM)$(LDSCRIPT)

ARCHCPUFLAGS += -mcmodel=medany
ARCHPICFLAGS = -fpic -msingle-pic-base

CFLAGS := $(ARCHCFLAGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRAFLAGS) -pipe
Expand Down
Loading