Bug 261106 - devel/llvm90: enable COMPILER_RT on riscv64
Summary: devel/llvm90: enable COMPILER_RT on riscv64
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: riscv Any
: --- Affects Only Me
Assignee: Brooks Davis
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2022-01-11 13:30 UTC by Piotr Kubaj
Modified: 2022-01-11 23:10 UTC (History)
1 user (show)

See Also:
bugzilla: maintainer-feedback? (brooks)


Attachments
patch (2.48 KB, patch)
2022-01-11 13:30 UTC, Piotr Kubaj
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Piotr Kubaj freebsd_committer 2022-01-11 13:30:58 UTC
Created attachment 230903 [details]
patch

1. COMPILER_RT builds libclang_rt.builtins-riscv64.a library, but not cfi_blacklist.txt, so _COMPILER_RT_BLACKLISTS needs to be put into amd64 and i386 cases.
2. Instead of:
.if ${ARCH}
.endif
.if {ARCH}
Do:
.if ${ARCH}
.elseif ${ARCH}
3. Remove whitespace at the end of line.
Comment 1 Brooks Davis freebsd_committer 2022-01-11 17:23:36 UTC
Looks good to me, please commit.
Comment 2 commit-hook freebsd_committer 2022-01-11 23:10:28 UTC
A commit in branch main references this bug:

URL: https://cgit.FreeBSD.org/ports/commit/?id=89ba74caeafbef6ed418cc07c392f990347095c9

commit 89ba74caeafbef6ed418cc07c392f990347095c9
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2022-01-11 23:07:43 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2022-01-11 23:07:43 +0000

    devel/llvm90: enable COMPILER_RT on riscv64

    1. COMPILER_RT builds libclang_rt.builtins-riscv64.a library, but not cfi_blacklist.txt, so _COMPILER_RT_BLACKLISTS needs to be put into amd64 and i386 cases.
    2. Instead of:
    .if ${ARCH}
    .endif
    .if {ARCH}
    Do:
    .if ${ARCH}
    .elseif ${ARCH}
    3. Remove whitespace at the end of line.

    PR:     261106
    Approved by:    brooks (maintainer)

 devel/llvm90/Makefile | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)