From ca3ff068bd2dc993cbb85b613ec75ff412035abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D9=85=D9=87=D8=AF=D9=8A=20=D8=B4=D9=8A=D9=86=D9=88=D9=86?= =?UTF-8?q?=20=28Mehdi=20Chinoune=29?= Date: Sun, 9 Oct 2022 08:03:50 +0100 Subject: [PATCH] riscv64-unknown-elf-newlib: enable clang64 --- mingw-w64-riscv64-unknown-elf-newlib/PKGBUILD | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/mingw-w64-riscv64-unknown-elf-newlib/PKGBUILD b/mingw-w64-riscv64-unknown-elf-newlib/PKGBUILD index 005ffa2ad6..7111bd5d83 100644 --- a/mingw-w64-riscv64-unknown-elf-newlib/PKGBUILD +++ b/mingw-w64-riscv64-unknown-elf-newlib/PKGBUILD @@ -2,6 +2,9 @@ # Based on mingw-w64-arm-none-eabi-newlib _bootstrap=0 +if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then + _bootstrap=1 +fi _realname=newlib _target=riscv64-unknown-elf @@ -13,13 +16,17 @@ pkgver=4.2.0.20211231 pkgrel=2 pkgdesc='GNU Tools for RISC-V Embedded Processors - Newlib (mingw-w64)' arch=('any') -mingw_arch=('mingw32' 'mingw64' 'ucrt64') +mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64') url="https://sourceware.org/newlib/" license=('Various') groups=("${MINGW_PACKAGE_PREFIX}-${_target}-toolchain") depends=("${MINGW_PACKAGE_PREFIX}-${_target}-binutils") makedepends=("${MINGW_PACKAGE_PREFIX}-autotools" "${MINGW_PACKAGE_PREFIX}-cc" + "${MINGW_PACKAGE_PREFIX}-gmp" + "${MINGW_PACKAGE_PREFIX}-mpc" + "${MINGW_PACKAGE_PREFIX}-mpfr" + "${MINGW_PACKAGE_PREFIX}-isl" $( (( _bootstrap )) || echo "${MINGW_PACKAGE_PREFIX}-${_target}-gcc")) options=('staticlibs' '!strip' '!emptydirs') source=( @@ -54,6 +61,11 @@ _build_gcc() { cp -a ${MINGW_PREFIX}/${_target} ${srcdir}/gcc-${_gccver}/gcc-install-${MSYSTEM} + if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then + CFLAGS+=" -Wno-int-conversion -Wno-array-bounds -Wno-mismatched-tags" + CXXFLAGS+=" -Wno-int-conversion -Wno-array-bounds -Wno-mismatched-tags" + fi + local _GCC_LDFLAGS="${LDFLAGS} -Wl,--disable-dynamicbase" if [ "${CARCH}" = 'x86_64' ]; then _GCC_LDFLAGS+=",--image-base=0x400000" @@ -83,7 +95,6 @@ _build_gcc() { --without-headers \ --with-libelf \ --with-newlib \ - --enable-multilib \ --with-host-libstdcxx="-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \ --with-sysroot=${MINGW_PREFIX} \ --with-build-sysroot=${srcdir}/gcc-${_gccver}/gcc-install-${MSYSTEM} \