Signed-off-by: Pawel Zalewski pzalewski@thegoodpenguin.co.uk --- ...ative_13.0.bb => llvm-morello-native_14.0.bb} | 0 .../llvm/llvm-morello-runtime-native.bb | 5 +++++ .../recipes-devtools/llvm/llvm-morello.inc | 4 ++-- ...llvm-morello_13.0.bb => llvm-morello_14.0.bb} | 16 ++++++++-------- 4 files changed, 15 insertions(+), 10 deletions(-) rename meta-morello-toolchain/recipes-devtools/llvm/{llvm-morello-native_13.0.bb => llvm-morello-native_14.0.bb} (100%) rename meta-morello-toolchain/recipes-devtools/llvm/{llvm-morello_13.0.bb => llvm-morello_14.0.bb} (79%)
diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_13.0.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_14.0.bb similarity index 100% rename from meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_13.0.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-native_14.0.bb diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb index 7202ae4..1add426 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello-runtime-native.bb @@ -45,6 +45,8 @@ do_install() {
export CFLAGS=""
+ local llvmversion=$(${CC} --version) + local resourcedir=$(${CC} -print-resource-dir) local destdir="${resourcedir}/lib/${LIB_TRIPLE}" local builddir="${B_COMPILERRT}/${ARCH_TRIPLE}" @@ -54,6 +56,9 @@ do_install() { install -d ${destdir} mkdir -p ${builddir}
+ echo "${llvmversion}" + echo "${resourcedir}" + local ccflags="--target=${target} ${ARCH_FLAGS} -nostdinc -isystem ${sysroot}/include" ${CC} ${ccflags} -c ${S_CRT}/crtbegin.c -o ${destdir}/clang_rt.crtbegin.o ${CC} ${ccflags} -c ${S_CRT}/crtend.c -o ${destdir}/clang_rt.crtend.o diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc index 7cb013a..751b529 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello.inc @@ -8,9 +8,9 @@ OUTPUTS_NAME = "llvm-morello" DEPENDS = "zlib-native ninja-native ${COMPILER}-native"
SRC_URI = "git://git.morello-project.org/morello/llvm-project;protocol=https;branch=${SRCBRANCH}" -SRCREV = "45b95b9c3afe4c049e73c499bfe4708372171fa0" +SRCREV = "ae1b1aad04c1c579db8c09d1049dc0553821fbc2"
-SRCBRANCH = "morello/release-1.7" +SRCBRANCH = "morello/release-1.8" LIC_FILES_CHKSUM = "file://LICENSE.TXT;md5=8a15a0759ef07f2682d2ba4b893c9afe"
S = "${WORKDIR}/git/llvm" diff --git a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_14.0.bb similarity index 79% rename from meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb rename to meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_14.0.bb index 17d6fcc..d966931 100644 --- a/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_13.0.bb +++ b/meta-morello-toolchain/recipes-devtools/llvm/llvm-morello_14.0.bb @@ -7,22 +7,22 @@ LICENSE = "Apache-2.0-with-LLVM-exception"
RPROVIDES:${PN} = "llvm-morello" RDEPENDS:${PN} = "zlib" -SRCBRANCH = "morello/linux-aarch64-release-1.7" +SRCBRANCH = "morello/linux-aarch64-release-1.8"
-SRC_URI = "https://git.morello-project.org/morello/llvm-project-releases/-/archive/%24%..." +SRC_URI = "https://git.morello-project.org/morello/llvm-project-releases/-/archive/%24%..."
-SRC_URI[md5sum] = "65230ec5b9aec087afb863092e24990c" -LIC_FILES_CHKSUM = "file://include/llvm/Support/LICENSE.TXT;md5=986c03435151a0086b8aaac964939cdd" +SRC_URI[sha256sum] = "ea43c6e72eb00c516223ec7f318cdd17a461eae4a27250b3da74cdf0e390390c" +LIC_FILES_CHKSUM = "file://include/llvm/Support/LICENSE.TXT;md5=2524adb3fbc86d9bb9443d92f4b63013"
-S = "${WORKDIR}/llvm-project-releases-morello-linux-aarch64-release-1.7" +S = "${WORKDIR}/llvm-project-releases-morello-linux-aarch64-release-1.8"
FILES:${PN} += "${bindir}" FILES:${PN} += "${libdir} ${libdir}/clang" FILES:${PN} += "${includedir}"
-FILES:${PN}-staticdev += "${libdir}/*.a ${libdir}/clang/13.0.0/lib/linux/*.a \ - ${libdir}/clang/13.0.0/lib/aarch64-unknown-linux-musl_purecap/*.a \ - ${libdir}/clang/13.0.0/lib/aarch64-unknown-linux-gnu/*.a \ +FILES:${PN}-staticdev += "${libdir}/*.a ${libdir}/clang/14.0.0/lib/linux/*.a \ + ${libdir}/clang/14.0.0/lib/aarch64-unknown-linux-musl_purecap/*.a \ + ${libdir}/clang/14.0.0/lib/aarch64-unknown-linux-gnu/*.a \ " FILES:${PN}-dev += "\ ${datadir} \