Attachment 165271 Details for Bug 206039 – patch 1: build infrastructure

[patch] patch 1: build infrastructure

llvm-libunwind-x86-arm.diff (text/plain), 1.91 KB, created by Ed Maste on 2016-01-08 18:29:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ed Maste

Created: 2016-01-08 18:29:03 UTC

Size: 1.91 KB

patch

obsolete

>commit 2da0437227bd9f628c687afcfc994d2a32c38f4c
>Author: Ed Maste <emaste@freebsd.org>
>Date:   Mon Jan 4 16:47:15 2016 -0500
>
>    Turn on LLVM_LIBUNWIND for 32- and 64-bit x86 and arm
>
>diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
>index 6a71c58..ef85574 100644
>--- a/share/mk/src.opts.mk
>+++ b/share/mk/src.opts.mk
>@@ -216,24 +216,26 @@ __TT=${MACHINE}
> .if ${COMPILER_FEATURES:Mc++11} && (${__T} == "aarch64" || \
>     ${__T} == "amd64" || ${__TT} == "arm" || ${__T} == "i386")
> # Clang is enabled, and will be installed as the default /usr/bin/cc.
>-__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
>+__DEFAULT_YES_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC \
>+    LLVM_LIBUNWIND
> __DEFAULT_NO_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
> .elif ${COMPILER_FEATURES:Mc++11} && ${__T:Mpowerpc*}
> # On powerpc, if an external compiler that supports C++11 is used as ${CC},
> # then Clang is enabled, but GCC is installed as the default /usr/bin/cc.
> __DEFAULT_YES_OPTIONS+=CLANG CLANG_FULL GCC GCC_BOOTSTRAP GNUCXX
>-__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC
>+__DEFAULT_NO_OPTIONS+=CLANG_BOOTSTRAP CLANG_IS_CC LLVM_LIBUNWIND
> .else
> # Everything else disables Clang, and uses GCC instead.
> __DEFAULT_YES_OPTIONS+=GCC GCC_BOOTSTRAP GNUCXX
>-__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC
>+__DEFAULT_NO_OPTIONS+=CLANG CLANG_BOOTSTRAP CLANG_FULL CLANG_IS_CC \
>+    LLVM_LIBUNWIND
> .endif
> # In-tree binutils/gcc are older versions without modern architecture support.
> .if ${__T} == "aarch64" || ${__T} == "riscv64"
> BROKEN_OPTIONS+=BINUTILS BINUTILS_BOOTSTRAP GCC GCC_BOOTSTRAP GDB
>-__DEFAULT_YES_OPTIONS+=ELFCOPY_AS_OBJCOPY LLVM_LIBUNWIND
>+__DEFAULT_YES_OPTIONS+=ELFCOPY_AS_OBJCOPY
> .else
>-__DEFAULT_NO_OPTIONS+=ELFCOPY_AS_OBJCOPY LLVM_LIBUNWIND
>+__DEFAULT_NO_OPTIONS+=ELFCOPY_AS_OBJCOPY
> .endif
> .if ${__T} == "riscv64"
> BROKEN_OPTIONS+=PROFILE # "sorry, unimplemented: profiler support for RISC-V"

Actions: View | Diff

Attachments on bug 206039: 165271 | 165272 | 172257