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.

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

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

Merged
merged 11 commits into from
Sep 25, 2023

Commits on Sep 22, 2023

  1. tools/ci: ensure removing python and openssl related commands

    Signed-off-by: Petro Karashchenko <[email protected]>
    pkarashchenko authored and pussuw committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    9a83c3a View commit details
    Browse the repository at this point in the history
  2. tools/ci: Unify the version print: command xxx --version

    Signed-off-by: Xiang Xiao <[email protected]>
    xiaoxiang781216 authored and pussuw committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    4d34201 View commit details
    Browse the repository at this point in the history
  3. tools/ci: Fix "flock: Command not found" on macOS

    Signed-off-by: Xiang Xiao <[email protected]>
    xiaoxiang781216 authored and pussuw committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    01a6a48 View commit details
    Browse the repository at this point in the history
  4. tools: Use GCC 13.2 from xPack for risc-v

    no1wudi authored and pussuw committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    f1a08de View commit details
    Browse the repository at this point in the history
  5. tools: Switch riscv GCC to 12.3

    GCC13 have compatibility issue with libcxx (need libcxx 17+).
    
    Please refer to: llvm/llvm-project#62396
    
    Signed-off-by: Huang Qi <[email protected]>
    no1wudi authored and pussuw committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    05ef2f2 View commit details
    Browse the repository at this point in the history
  6. cibuild.sh: Using GCC from xPack for riscv

    Signed-off-by: Huang Qi <[email protected]>
    no1wudi authored and pussuw committed Sep 22, 2023
    Configuration menu
    Copy the full SHA
    a0cceee View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. rv32m1: Fix compile error

    Follow other risc-v based chips, and fix:
    ```
    chip/rv32m1_irq.c: In function 'up_irqinitialize':
    Error: chip/rv32m1_irq.c:98:3: error: array subscript -2048 is outside array bounds of 'uint8_t[2147483647]' {aka 'unsigned char[2147483647]'} [-Werror=array-bounds]
       98 |   riscv_stack_color(g_intstacktop - intstack_size, intstack_size);
          |   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
    In file included from /github/workspace/sources/nuttx/arch/risc-v/src/common/riscv_internal.h:40,
                     from chip/rv32m1_irq.c:36:
    /github/workspace/sources/nuttx/arch/risc-v/src/common/riscv_common_memorymap.h:72:16: note: at offset -2048 into object 'g_intstacktop' of size [0, 2147483647]
       72 | EXTERN uint8_t g_intstacktop[];   /* Initial top of interrupt stack */
          |                ^~~~~~~~~~~~~
    cc1: all warnings being treated as errors
    ```
    
    Signed-off-by: Huang Qi <[email protected]>
    no1wudi authored and pussuw committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    77280f0 View commit details
    Browse the repository at this point in the history
  2. espressif: Force cast param in libc stubs

    Fix:
    ```
    chip/esp_libc_stubs.c: In function '__retarget_lock_init':
    Error: chip/esp_libc_stubs.c:246:14: error: passing argument 1 of '_lock_init' from incompatible pointer type [-Werror=incompatible-pointer-types]
      246 |   _lock_init(lock);
          |              ^~~~
          |              |
          |              struct __lock **
    chip/esp_libc_stubs.c:181:26: note: expected 'int *' but argument is of type 'struct __lock **'
      181 | void _lock_init(_lock_t *lock)
          |                          ^
    chip/esp_libc_stubs.c: In function '__retarget_lock_init_recursive':
    Error: chip/esp_libc_stubs.c:251:24: error: passing argument 1 of '_lock_init_recursive' from incompatible pointer type [-Werror=incompatible-pointer-types]
      251 |   _lock_init_recursive(lock);
          |                        ^~~~
          |                        |
          |                        struct __lock **
    chip/esp_libc_stubs.c:187:36: note: expected 'int *' but argument is of type 'struct __lock **'
      187 | void _lock_init_recursive(_lock_t *lock)
          |                                    ^
    chip/esp_libc_stubs.c: In function '__retarget_lock_close':
    Error: chip/esp_libc_stubs.c:256:15: error: passing argument 1 of '_lock_close' from incompatible pointer type [-Werror=incompatible-pointer-types]
      256 |   _lock_close(&lock);
          |               ^~~~~
          |               |
          |               struct __lock **
    chip/esp_libc_stubs.c:193:27: note: expected 'int *' but argument is of type 'struct __lock **'
      193 | void _lock_close(_lock_t *lock)
    ```
    
    Signed-off-by: Huang Qi <[email protected]>
    no1wudi authored and pussuw committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    42ab3f2 View commit details
    Browse the repository at this point in the history
  3. boards/riscv: Fix module linker target

    Fix:
    ```
    riscv-none-elf-ld: sotest.o: ABI is incompatible with that of the selected emulation:
      target emulation `elf64-littleriscv' does not match `elf32-littleriscv'
    riscv-none-elf-ld: failed to merge target specific data of file sotest.o
    ```
    
    Signed-off-by: Huang Qi <[email protected]>
    no1wudi authored and pussuw committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    ebb99cd View commit details
    Browse the repository at this point in the history
  4. boards/riscv: Add -melf64lriscv to 64bit USER_LDFLAGS/LDELFFLAGS

    Signed-off-by: Xiang Xiao <[email protected]>
    xiaoxiang781216 authored and pussuw committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    05966c2 View commit details
    Browse the repository at this point in the history
  5. arch/riscv: Move -mcmodel=medany from Make.defs to Toolchain.defs

    to avoid the code duplication
    
    Signed-off-by: Xiang Xiao <[email protected]>
    xiaoxiang781216 authored and pussuw committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    d232b45 View commit details
    Browse the repository at this point in the history