diff options
| -rw-r--r-- | .github/workflows/build.yaml | 2 | ||||
| -rw-r--r-- | .github/workflows/nightly-release.yaml | 2 | ||||
| -rw-r--r-- | .gitmodules | 2 | ||||
| -rw-r--r-- | Makefile.in | 10 | ||||
| m--------- | qemu | 0 |
5 files changed, 11 insertions, 5 deletions
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 6481c87..1139913 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-22.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] exclude: diff --git a/.github/workflows/nightly-release.yaml b/.github/workflows/nightly-release.yaml index b8449e4..011b453 100644 --- a/.github/workflows/nightly-release.yaml +++ b/.github/workflows/nightly-release.yaml @@ -48,7 +48,7 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - os: [ubuntu-18.04, ubuntu-20.04] + os: [ubuntu-20.04, ubuntu-22.04] mode: [newlib, linux, musl] target: [rv32gc-ilp32d, rv64gc-lp64d] exclude: diff --git a/.gitmodules b/.gitmodules index f786e56..a399bf6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,7 +26,7 @@ url = https://gitlab.com/qemu-project/qemu.git [submodule "musl"] path = musl - url = git://git.musl-libc.org/musl + url = https://git.musl-libc.org/git/musl branch = master [submodule "spike"] path = spike diff --git a/Makefile.in b/Makefile.in index b65d341..09c5772 100644 --- a/Makefile.in +++ b/Makefile.in @@ -254,6 +254,12 @@ else GLIBC_SRC_GIT := endif +ifeq ($(findstring $(srcdir),$(MUSL_SRCDIR)),$(srcdir)) +MUSL_SRC_GIT := $(MUSL_SRCDIR)/.git +else +MUSL_SRC_GIT := +endif + ifeq ($(findstring $(srcdir),$(QEMU_SRCDIR)),$(srcdir)) QEMU_SRC_GIT := $(QEMU_SRCDIR)/.git else @@ -744,7 +750,7 @@ stamps/build-gcc-musl-stage1: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-binutils $(MAKE) -C $(notdir $@) inhibit-libc=true install-target-libgcc mkdir -p $(dir $@) && touch $@ -stamps/build-musl-linux-headers: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 +stamps/build-musl-linux-headers: $(MUSL_SRCDIR) $(MUSL_SRC_GIT) stamps/build-gcc-musl-stage1 rm -rf $@ $(notdir $@) mkdir $(notdir $@) cd $(notdir $@) && CC="$(MUSL_CC_FOR_TARGET)" $</configure \ @@ -757,7 +763,7 @@ stamps/build-musl-linux-headers: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 $(MAKE) -C $(notdir $@) install-headers mkdir -p $(dir $@) && touch $@ -stamps/build-musl-linux: $(MUSL_SRCDIR) stamps/build-gcc-musl-stage1 +stamps/build-musl-linux: $(MUSL_SRCDIR) $(MUSL_SRC_GIT) stamps/build-gcc-musl-stage1 rm -rf $@ $(notdir $@) mkdir $(notdir $@) cd $(notdir $@) && \ diff --git a/qemu b/qemu -Subproject 823a3f11fb8f04c3c3cc0f95f968fef1bfc6534 +Subproject 621da7789083b80d6f1ff1c0fb499334007b4f5 |