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

devel/llvm-morello-c18n: add based on devel/llvm-morello #193

Merged
merged 3 commits into from
Feb 20, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions devel/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1497,6 +1497,7 @@
SUBDIR += llvm-cheriot
SUBDIR += llvm-devel
SUBDIR += llvm-morello
SUBDIR += llvm-morello-c18n
SUBDIR += llvm-morello-csa
SUBDIR += llvm10
SUBDIR += llvm11
Expand Down
4 changes: 2 additions & 2 deletions devel/llvm-cheri/Makefile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
PORTNAME= llvm
PORTVERSION= ${LLVM_MAJOR}.0.d${SNAPDATE}
PORTREVISION= 3
PORTREVISION= 5
CATEGORIES= devel lang
PKGNAMESUFFIX= ${LLVM_SUFFIX}

MAINTAINER= [email protected]
COMMENT?= LLVM and Clang with support for the CHERI architecture
WWW?= https://cheri-cpu.org

.if !defined(LLVM_SUFFIX) || ${LLVM_SUFFIX} == "-morello"
.if !defined(LLVM_SUFFIX) || ${LLVM_SUFFIX:M-morello*}
# XXX: really (LLVM_MAJOR < 16), but it's not defined here
LICENSE_FILE_BSD3CLAUSE=${LICENSE_DIR}/utils/unittest/googletest/LICENSE.TXT
.endif
Expand Down
5 changes: 5 additions & 0 deletions devel/llvm-cheri/files/wrapper-cheri.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,10 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then
vararg_flags="-Xclang -morello-vararg=new -Xclang -morello-bounded-memargs"
fi

# Some compiler invocations (e.g., "clang -v") don't
# consume -Xclang arguments which can lead to unused
# argument warnings so we supress them with
# --start/end-no-unused-arguments.
arch_cflags="-march=morello -mabi=purecap --start-no-unused-arguments $tls_flags $vararg_flags --end-no-unused-arguments"
arch_objdump_flags="--mattr=+morello"
else
Expand All @@ -180,6 +184,7 @@ if [ $CHERIBSD_VERSION -gt 0 ]; then
arch_cflags="-march=rv64gcxcheri -mabi=$mabi -mno-relax"
;;
esac
arch_cflags="${arch_cflags} -Wno-implicit-int -Wno-implicit-function-declaration"
fi

case $basetool in
Expand Down
25 changes: 25 additions & 0 deletions devel/llvm-morello-c18n/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# llvm-morello

LLVM_SUFFIX= -morello-c18n

COMMENT= LLVM and Clang with support the Arm Morello architecture
WWW= https://git.morello-project.org/morello/llvm-project

DISTINFO_FILE= ${.CURDIR}/distinfo
DESCR= ${.CURDIR}/pkg-descr
PLIST= ${.CURDIR}/pkg-plist

USE_GITLAB= yes
GL_SITE= https://git.morello-project.org
GL_ACCOUNT= jhb
GL_PROJECT= llvm-project
GL_TAGNAME= ${LLVM_COMMIT}

# Regularly tested targets as part of Android development
LLVM_TARGETS= AArch64;ARM;BPF;X86

OPTIONS_EXCLUDE= LIT

MASTERDIR= ${.CURDIR}/../llvm-cheri

.include "${MASTERDIR}/Makefile"
1 change: 1 addition & 0 deletions devel/llvm-morello-c18n/Makefile.COMMANDS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.include "${.CURDIR}/../llvm-cheri/Makefile.COMMANDS"
1 change: 1 addition & 0 deletions devel/llvm-morello-c18n/Makefile.MAN1SRCS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.include "${.PARSEDIR}/../llvm-cheri/Makefile.MAN1SRCS"
5 changes: 5 additions & 0 deletions devel/llvm-morello-c18n/Makefile.snapshot
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
LLVM_MAJOR= 15
LLVM_RELEASE= ${LLVM_MAJOR}.0.0
SNAPDATE= 20250219

LLVM_COMMIT= 656206c277f1bd89feb6fc0a04cf639985d26d83
3 changes: 3 additions & 0 deletions devel/llvm-morello-c18n/distinfo
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
TIMESTAMP = 1739981840
SHA256 (jhb-llvm-project-656206c277f1bd89feb6fc0a04cf639985d26d83_GL0.tar.gz) = b9868b77d5b4a1f14972c2a293f7043258ea41f350fea93636cc21f3ea0fc9d3
SIZE (jhb-llvm-project-656206c277f1bd89feb6fc0a04cf639985d26d83_GL0.tar.gz) = 171842739
6 changes: 6 additions & 0 deletions devel/llvm-morello-c18n/pkg-descr
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
The LLVM Project is a collection of modular and reusable compiler and
toolchain technologies. This version adds support for the Arm Morello
prototype architecture (CHERI ported to ARMv8-A).

This port includes Clang (a C/C++/Objective-C compiler), LLD (a linker),
and the LLVM infrastructure these are built on.
Loading