svn commit: r231919 - in stable/9: contrib/llvm/tools/bugpoint
contrib/llvm/tools/llc contrib/llvm/tools/lli
contrib/llvm/tools/llvm-ar contrib/llvm/tools/llvm-as
contrib/llvm/tools/llvm-bcanalyzer...
Dimitry Andric
dim at FreeBSD.org
Sun Feb 19 23:35:56 UTC 2012
Author: dim
Date: Sun Feb 19 23:35:56 2012
New Revision: 231919
URL: http://svn.freebsd.org/changeset/base/231919
Log:
MFC r231057:
Add a WITH_CLANG_EXTRAS option for src.conf(5), disabled by default,
that builds the following additional llvm/clang tools:
- bugpoint
- llc
- lli
- llvm-ar
- llvm-as
- llvm-bcanalyzer
- llvm-diff
- llvm-dis
- llvm-extract
- llvm-ld
- llvm-link
- llvm-mc
- llvm-nm
- llvm-objdump
- llvm-prof
- llvm-ranlib
- llvm-rtdyld
- llvm-stub
- macho-dump
- opt
These tools are mainly useful for people that want to manipulate llvm
bitcode (.bc) and llvm assembly language (.ll) files, or want to tinker
with llvm and clang themselves.
Added:
stable/9/contrib/llvm/tools/bugpoint/
- copied from r231057, head/contrib/llvm/tools/bugpoint/
stable/9/contrib/llvm/tools/llc/
- copied from r231057, head/contrib/llvm/tools/llc/
stable/9/contrib/llvm/tools/lli/
- copied from r231057, head/contrib/llvm/tools/lli/
stable/9/contrib/llvm/tools/llvm-ar/
- copied from r231057, head/contrib/llvm/tools/llvm-ar/
stable/9/contrib/llvm/tools/llvm-as/
- copied from r231057, head/contrib/llvm/tools/llvm-as/
stable/9/contrib/llvm/tools/llvm-bcanalyzer/
- copied from r231057, head/contrib/llvm/tools/llvm-bcanalyzer/
stable/9/contrib/llvm/tools/llvm-diff/
- copied from r231057, head/contrib/llvm/tools/llvm-diff/
stable/9/contrib/llvm/tools/llvm-dis/
- copied from r231057, head/contrib/llvm/tools/llvm-dis/
stable/9/contrib/llvm/tools/llvm-extract/
- copied from r231057, head/contrib/llvm/tools/llvm-extract/
stable/9/contrib/llvm/tools/llvm-ld/
- copied from r231057, head/contrib/llvm/tools/llvm-ld/
stable/9/contrib/llvm/tools/llvm-link/
- copied from r231057, head/contrib/llvm/tools/llvm-link/
stable/9/contrib/llvm/tools/llvm-mc/
- copied from r231057, head/contrib/llvm/tools/llvm-mc/
stable/9/contrib/llvm/tools/llvm-nm/
- copied from r231057, head/contrib/llvm/tools/llvm-nm/
stable/9/contrib/llvm/tools/llvm-objdump/
- copied from r231057, head/contrib/llvm/tools/llvm-objdump/
stable/9/contrib/llvm/tools/llvm-prof/
- copied from r231057, head/contrib/llvm/tools/llvm-prof/
stable/9/contrib/llvm/tools/llvm-ranlib/
- copied from r231057, head/contrib/llvm/tools/llvm-ranlib/
stable/9/contrib/llvm/tools/llvm-rtdyld/
- copied from r231057, head/contrib/llvm/tools/llvm-rtdyld/
stable/9/contrib/llvm/tools/llvm-stub/
- copied from r231057, head/contrib/llvm/tools/llvm-stub/
stable/9/contrib/llvm/tools/macho-dump/
- copied from r231057, head/contrib/llvm/tools/macho-dump/
stable/9/contrib/llvm/tools/opt/
- copied from r231057, head/contrib/llvm/tools/opt/
stable/9/lib/clang/libllvmarchive/
- copied from r231057, head/lib/clang/libllvmarchive/
stable/9/lib/clang/libllvmdebuginfo/
- copied from r231057, head/lib/clang/libllvmdebuginfo/
stable/9/lib/clang/libllvmexecutionengine/
- copied from r231057, head/lib/clang/libllvmexecutionengine/
stable/9/lib/clang/libllvminterpreter/
- copied from r231057, head/lib/clang/libllvminterpreter/
stable/9/lib/clang/libllvmjit/
- copied from r231057, head/lib/clang/libllvmjit/
stable/9/lib/clang/libllvmlinker/
- copied from r231057, head/lib/clang/libllvmlinker/
stable/9/lib/clang/libllvmmcdisassembler/
- copied from r231057, head/lib/clang/libllvmmcdisassembler/
stable/9/lib/clang/libllvmmcjit/
- copied from r231057, head/lib/clang/libllvmmcjit/
stable/9/lib/clang/libllvmobject/
- copied from r231057, head/lib/clang/libllvmobject/
stable/9/lib/clang/libllvmruntimedyld/
- copied from r231057, head/lib/clang/libllvmruntimedyld/
stable/9/tools/build/options/WITH_CLANG_EXTRAS
- copied unchanged from r231057, head/tools/build/options/WITH_CLANG_EXTRAS
stable/9/usr.bin/clang/bugpoint/
- copied from r231057, head/usr.bin/clang/bugpoint/
stable/9/usr.bin/clang/llc/
- copied from r231057, head/usr.bin/clang/llc/
stable/9/usr.bin/clang/lli/
- copied from r231057, head/usr.bin/clang/lli/
stable/9/usr.bin/clang/llvm-ar/
- copied from r231057, head/usr.bin/clang/llvm-ar/
stable/9/usr.bin/clang/llvm-as/
- copied from r231057, head/usr.bin/clang/llvm-as/
stable/9/usr.bin/clang/llvm-bcanalyzer/
- copied from r231057, head/usr.bin/clang/llvm-bcanalyzer/
stable/9/usr.bin/clang/llvm-diff/
- copied from r231057, head/usr.bin/clang/llvm-diff/
stable/9/usr.bin/clang/llvm-dis/
- copied from r231057, head/usr.bin/clang/llvm-dis/
stable/9/usr.bin/clang/llvm-extract/
- copied from r231057, head/usr.bin/clang/llvm-extract/
stable/9/usr.bin/clang/llvm-ld/
- copied from r231057, head/usr.bin/clang/llvm-ld/
stable/9/usr.bin/clang/llvm-link/
- copied from r231057, head/usr.bin/clang/llvm-link/
stable/9/usr.bin/clang/llvm-mc/
- copied from r231057, head/usr.bin/clang/llvm-mc/
stable/9/usr.bin/clang/llvm-nm/
- copied from r231057, head/usr.bin/clang/llvm-nm/
stable/9/usr.bin/clang/llvm-objdump/
- copied from r231057, head/usr.bin/clang/llvm-objdump/
stable/9/usr.bin/clang/llvm-prof/
- copied from r231057, head/usr.bin/clang/llvm-prof/
stable/9/usr.bin/clang/llvm-ranlib/
- copied from r231057, head/usr.bin/clang/llvm-ranlib/
stable/9/usr.bin/clang/llvm-rtdyld/
- copied from r231057, head/usr.bin/clang/llvm-rtdyld/
stable/9/usr.bin/clang/llvm-stub/
- copied from r231057, head/usr.bin/clang/llvm-stub/
stable/9/usr.bin/clang/macho-dump/
- copied from r231057, head/usr.bin/clang/macho-dump/
stable/9/usr.bin/clang/opt/
- copied from r231057, head/usr.bin/clang/opt/
Modified:
stable/9/lib/clang/Makefile
stable/9/lib/clang/libllvmanalysis/Makefile
stable/9/lib/clang/libllvmipa/Makefile
stable/9/lib/clang/libllvmipo/Makefile
stable/9/lib/clang/libllvmmc/Makefile
stable/9/lib/clang/libllvmscalaropts/Makefile
stable/9/lib/clang/libllvmsupport/Makefile
stable/9/lib/clang/libllvmtransformutils/Makefile
stable/9/lib/clang/libllvmx86disassembler/Makefile
stable/9/share/man/man5/src.conf.5
stable/9/share/mk/bsd.own.mk
stable/9/tools/build/mk/OptionalObsoleteFiles.inc
stable/9/usr.bin/clang/Makefile
Directory Properties:
stable/9/contrib/llvm/ (props changed)
stable/9/lib/clang/ (props changed)
stable/9/share/man/man5/ (props changed)
stable/9/share/mk/ (props changed)
stable/9/tools/ (props changed)
stable/9/tools/build/options/ (props changed)
stable/9/usr.bin/clang/ (props changed)
Modified: stable/9/lib/clang/Makefile
==============================================================================
--- stable/9/lib/clang/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
.if !make(install)
SUBDIR= libclanganalysis \
libclangarcmigrate \
@@ -60,6 +62,19 @@ SUBDIR= libclanganalysis \
libllvmx86info \
libllvmx86instprinter \
libllvmx86utils
+
+.if ${MK_CLANG_EXTRAS} != "no"
+SUBDIR+=libllvmarchive \
+ libllvmdebuginfo \
+ libllvmexecutionengine \
+ libllvminterpreter \
+ libllvmjit \
+ libllvmlinker \
+ libllvmmcdisassembler \
+ libllvmmcjit \
+ libllvmobject \
+ libllvmruntimedyld
+.endif
.endif
SUBDIR+= include
Modified: stable/9/lib/clang/libllvmanalysis/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmanalysis/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmanalysis/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmanalysis
SRCDIR= lib/Analysis
@@ -55,6 +57,14 @@ SRCS= AliasAnalysis.cpp \
TypeBasedAliasAnalysis.cpp \
ValueTracking.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= BlockFrequencyInfo.cpp \
+ LibCallSemantics.cpp \
+ PathNumbering.cpp \
+ PathProfileInfo.cpp \
+ PathProfileVerifier.cpp
+.endif
+
TGHDRS= Intrinsics
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmipa/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmipa/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmipa/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmipa
SRCDIR= lib/Analysis/IPA
@@ -8,6 +10,10 @@ SRCS= CallGraph.cpp \
FindUsedTypes.cpp \
GlobalsModRef.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= IPA.cpp
+.endif
+
TGHDRS= Intrinsics
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmipo/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmipo/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmipo/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmipo
SRCDIR= lib/Transforms/IPO
@@ -23,6 +25,10 @@ SRCS= ArgumentPromotion.cpp \
StripDeadPrototypes.cpp \
StripSymbols.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= IPO.cpp
+.endif
+
TGHDRS= Intrinsics
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmmc/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmmc/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmmc/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmmc
SRCDIR= lib/MC
@@ -43,4 +45,8 @@ SRCS= ELFObjectWriter.cpp \
WinCOFFObjectWriter.cpp \
WinCOFFStreamer.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= MCDisassembler.cpp
+.endif
+
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmscalaropts/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmscalaropts/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmscalaropts/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmscalaropts
SRCDIR= lib/Transforms/Scalar
@@ -31,6 +33,13 @@ SRCS= ADCE.cpp \
Sink.cpp \
TailRecursionElimination.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= LoopInstSimplify.cpp \
+ LowerAtomic.cpp \
+ Reg2Mem.cpp \
+ Scalar.cpp
+.endif
+
TGHDRS= Intrinsics
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmsupport/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmsupport/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmsupport/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmsupport
SRCDIR= lib/Support
@@ -67,4 +69,14 @@ SRCS= APFloat.cpp \
system_error.cpp
LLVM_REQUIRES_RTTI=
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= BlockFrequency.cpp \
+ BranchProbability.cpp \
+ DataExtractor.cpp \
+ Disassembler.cpp \
+ FileUtilities.cpp \
+ MemoryObject.cpp \
+ SystemUtils.cpp
+.endif
+
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmtransformutils/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmtransformutils/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmtransformutils/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,7 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmtransformutils
SRCDIR= lib/Transforms/Utils
@@ -29,6 +31,11 @@ SRCS= AddrModeMatcher.cpp \
UnifyFunctionExitNodes.cpp \
ValueMapper.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= SimplifyInstructions.cpp \
+ Utils.cpp
+.endif
+
TGHDRS= Intrinsics
.include "../clang.lib.mk"
Modified: stable/9/lib/clang/libllvmx86disassembler/Makefile
==============================================================================
--- stable/9/lib/clang/libllvmx86disassembler/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/lib/clang/libllvmx86disassembler/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,11 +1,17 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
LIB= llvmx86disassembler
SRCDIR= lib/Target/X86/Disassembler
INCDIR= lib/Target/X86
SRCS= X86Disassembler.cpp
+.if ${MK_CLANG_EXTRAS} != "no"
+SRCS+= X86DisassemblerDecoder.c
+.endif
+
TGHDRS= X86GenDisassemblerTables \
X86GenEDInfo \
X86GenInstrInfo \
Modified: stable/9/share/man/man5/src.conf.5
==============================================================================
--- stable/9/share/man/man5/src.conf.5 Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/share/man/man5/src.conf.5 Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: head/tools/build/options/makeman 221733 2011-05-10 13:01:11Z ru
.\" $FreeBSD$
-.Dd June 17, 2011
+.Dd February 6, 2012
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -266,12 +266,21 @@ Set to not build the Clang C/C++ compile
.Pp
It is a default setting on
arm/arm, arm/armeb, ia64/ia64, mips/mipsel, mips/mipseb, mips/mips64el, mips/mips64eb, mips/mipsn32eb, powerpc/powerpc64 and sparc64/sparc64.
+When set, it also enforces the following options:
+.Pp
+.Bl -item -compact
+.It
+.Va WITHOUT_CLANG_EXTRAS
+.El
.It Va WITH_CLANG
.\" from FreeBSD: head/tools/build/options/WITH_CLANG 221730 2011-05-10 11:14:40Z ru
Set to build the Clang C/C++ compiler.
.Pp
It is a default setting on
amd64/amd64, i386/i386, pc98/i386 and powerpc/powerpc.
+.It Va WITH_CLANG_EXTRAS
+.\" from FreeBSD: head/tools/build/options/WITH_CLANG_EXTRAS 231057 2012-02-05 23:56:22Z dim
+Set to build additional clang and llvm tools, such as bugpoint.
.It Va WITHOUT_CPP
.\" from FreeBSD: head/tools/build/options/WITHOUT_CPP 156932 2006-03-21 07:50:50Z ru
Set to not build
Modified: stable/9/share/mk/bsd.own.mk
==============================================================================
--- stable/9/share/mk/bsd.own.mk Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/share/mk/bsd.own.mk Sun Feb 19 23:35:56 2012 (r231919)
@@ -413,6 +413,7 @@ __DEFAULT_NO_OPTIONS = \
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+ CLANG_EXTRAS \
HESIOD \
ICONV \
IDEA \
@@ -516,6 +517,10 @@ MK_SOURCELESS_UCODE:= no
MK_ZFS:= no
.endif
+.if ${MK_CLANG} == "no"
+MK_CLANG_EXTRAS:= no
+.endif
+
.if ${MK_CRYPT} == "no"
MK_OPENSSL:= no
MK_OPENSSH:= no
Modified: stable/9/tools/build/mk/OptionalObsoleteFiles.inc
==============================================================================
--- stable/9/tools/build/mk/OptionalObsoleteFiles.inc Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/tools/build/mk/OptionalObsoleteFiles.inc Sun Feb 19 23:35:56 2012 (r231919)
@@ -671,6 +671,44 @@ OLD_FILES+=usr/share/man/man1/clang-cpp.
OLD_FILES+=usr/share/man/man1/tblgen.1.gz
.endif
+.if ${MK_CLANG_EXTRAS} == no
+OLD_FILES+=usr/bin/bugpoint
+OLD_FILES+=usr/bin/llc
+OLD_FILES+=usr/bin/lli
+OLD_FILES+=usr/bin/llvm-ar
+OLD_FILES+=usr/bin/llvm-as
+OLD_FILES+=usr/bin/llvm-bcanalyzer
+OLD_FILES+=usr/bin/llvm-diff
+OLD_FILES+=usr/bin/llvm-dis
+OLD_FILES+=usr/bin/llvm-extract
+OLD_FILES+=usr/bin/llvm-ld
+OLD_FILES+=usr/bin/llvm-link
+OLD_FILES+=usr/bin/llvm-mc
+OLD_FILES+=usr/bin/llvm-nm
+OLD_FILES+=usr/bin/llvm-objdump
+OLD_FILES+=usr/bin/llvm-prof
+OLD_FILES+=usr/bin/llvm-ranlib
+OLD_FILES+=usr/bin/llvm-rtdyld
+OLD_FILES+=usr/bin/llvm-stub
+OLD_FILES+=usr/bin/macho-dump
+OLD_FILES+=usr/bin/opt
+OLD_FILES+=usr/share/man/man1/bugpoint.1.gz
+OLD_FILES+=usr/share/man/man1/llc.1.gz
+OLD_FILES+=usr/share/man/man1/lli.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-ar.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-as.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-bcanalyzer.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-diff.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-dis.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-extract.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-ld.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-link.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-nm.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-prof.1.gz
+OLD_FILES+=usr/share/man/man1/llvm-ranlib.1.gz
+OLD_FILES+=usr/share/man/man1/opt.1.gz
+.endif
+
.if ${MK_CPP} == no
OLD_FILES+=usr/bin/cpp
OLD_FILES+=usr/share/man/man1/cpp.1.gz
Copied: stable/9/tools/build/options/WITH_CLANG_EXTRAS (from r231057, head/tools/build/options/WITH_CLANG_EXTRAS)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ stable/9/tools/build/options/WITH_CLANG_EXTRAS Sun Feb 19 23:35:56 2012 (r231919, copy of r231057, head/tools/build/options/WITH_CLANG_EXTRAS)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Set to build additional clang and llvm tools, such as bugpoint.
Modified: stable/9/usr.bin/clang/Makefile
==============================================================================
--- stable/9/usr.bin/clang/Makefile Sun Feb 19 22:44:14 2012 (r231918)
+++ stable/9/usr.bin/clang/Makefile Sun Feb 19 23:35:56 2012 (r231919)
@@ -1,5 +1,30 @@
# $FreeBSD$
+.include <bsd.own.mk>
+
SUBDIR= clang clang-tblgen tblgen
+.if ${MK_CLANG_EXTRAS} != "no"
+SUBDIR+=bugpoint \
+ llc \
+ lli \
+ llvm-ar \
+ llvm-as \
+ llvm-bcanalyzer \
+ llvm-diff \
+ llvm-dis \
+ llvm-extract \
+ llvm-ld \
+ llvm-link \
+ llvm-mc \
+ llvm-nm \
+ llvm-objdump \
+ llvm-prof \
+ llvm-ranlib \
+ llvm-rtdyld \
+ llvm-stub \
+ macho-dump \
+ opt
+.endif
+
.include <bsd.subdir.mk>
More information about the svn-src-stable-9
mailing list