From d1a98be0ea7cfc1e262ddb9b1a2611c54cd7a268 Mon Sep 17 00:00:00 2001 From: Zach van Rijn Date: Wed, 18 Sep 2024 16:56:34 -0500 Subject: Add support for target loongarch64. --- bootstrap | 32 ++++++++++++++++++++------------ setup-abuild | 2 +- 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/bootstrap b/bootstrap index ca6306a..eec1af9 100755 --- a/bootstrap +++ b/bootstrap @@ -329,17 +329,18 @@ EOF case "${1}" in # adelie gcc qemu # ------ --- ---- - aarch64) m=aarch64: ; q=aarch64 ; ;; - armv7) m=armv7l:eabihf ; q=arm ; ;; - ppc) m=powerpc: ; q=ppc ; ;; - ppc64) m=powerpc64: ; q=ppc64 ; ;; - x86_64) m=x86_64: ; q=x86_64 ; ;; - pmmx) m=i586: ; q=i386 ; ;; - - m68k) m=m68k: ; q=m68k ; ;; - mips64) m=mips64: ; q=mips64 ; ;; - riscv64) m=riscv64: ; q=riscv64 ; ;; - s390x) m=s390x: ; q=s390x ; ;; + aarch64) m=aarch64: ; q=aarch64 ; ;; + armv7) m=armv7l:eabihf ; q=arm ; ;; + ppc) m=powerpc: ; q=ppc ; ;; + ppc64) m=powerpc64: ; q=ppc64 ; ;; + x86_64) m=x86_64: ; q=x86_64 ; ;; + pmmx) m=i586: ; q=i386 ; ;; + + loongarch64) m=loongarch64: ; q=loongarch64 ; ;; + m68k) m=m68k: ; q=m68k ; ;; + mips64) m=mips64: ; q=mips64 ; ;; + riscv64) m=riscv64: ; q=riscv64 ; ;; + s390x) m=s390x: ; q=s390x ; ;; *) usage ;; esac @@ -409,7 +410,7 @@ if ! test -d "${MTOOLS}"/sys/emus/bin; then # FIXME: no hard code test -d bootstrap \ || git clone ${CHAINS}/bootstrap.git; cd bootstrap; - git checkout 320f914d93f6547e223d8efc5a59a968df3bd4ee; + git checkout e7f84548d99b30c05a78cd48f8107a15eda4aa04; ## seed rootfs # @@ -444,6 +445,9 @@ if ! test -d "${MTOOLS}"/sys/emus/bin; then # FIXME: no hard code cat >> "${MTOOLS}"/config.mak <<"EOF" # __SENTINEL__ +# must be supported by musl-cross-make +CONFIG_SUB_REV = 00b159274960 + # supported targets ifneq ($(findstring aarch64-,$(TARGET)),) GCC_CONFIG += --with-arch=armv8-a --with-abi=lp64 --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 @@ -470,6 +474,10 @@ GCC_CONFIG += --with-arch=i586 --with-tune=pentium2 --enable-cld --enable-mmx endif # experimental targets +ifneq ($(findstring loongarch64-,$(TARGET)),) +GCC_CONFIG += --with-arch=loongarch64 +endif + ifneq ($(findstring m68k-,$(TARGET)),) GCC_CONFIG += --with-arch=m68k --with-cpu=m68020 --disable-default-pie endif diff --git a/setup-abuild b/setup-abuild index e59ec41..5fc2a26 100755 --- a/setup-abuild +++ b/setup-abuild @@ -15,7 +15,7 @@ cd "${DEST}"; # this directory will already exist if correct # so that we do not have to force building static musl binaries. # nmus=musl; -vmus=1.2.3; +vmus=1.2.5; test ! -f ._${nmus}-${vmus} && \ ( test ! -d ${nmus}-${vmus} \ -- cgit v1.2.3-70-g09d2