Merge from head

2 files changed, 66 insertions, 114 deletions

diff --git a/usr.bin/clang/tblgen/Makefile b/usr.bin/clang/tblgen/Makefile
index 7cae5da..f06150e 100644
--- a/usr.bin/clang/tblgen/Makefile
+++ b/usr.bin/clang/tblgen/Makefile
@@ -8,6 +8,7 @@ SRCDIR=	utils/TableGen
 SRCS=	AsmMatcherEmitter.cpp \
 	AsmWriterEmitter.cpp \
 	AsmWriterInst.cpp \
+	CTagsEmitter.cpp \
 	CallingConvEmitter.cpp \
 	CodeEmitterGen.cpp \
 	CodeGenDAGPatterns.cpp \
@@ -23,11 +24,11 @@ SRCS=	AsmMatcherEmitter.cpp \
 	DAGISelMatcherOpt.cpp \
 	DFAPacketizerEmitter.cpp \
 	DisassemblerEmitter.cpp \
-	EDEmitter.cpp \
 	FastISelEmitter.cpp \
 	FixedLenDecoderEmitter.cpp \
 	InstrInfoEmitter.cpp \
 	IntrinsicEmitter.cpp \
+	OptParserEmitter.cpp \
 	PseudoLoweringEmitter.cpp \
 	RegisterInfoEmitter.cpp \
 	SetTheory.cpp \
@@ -37,7 +38,6 @@ SRCS=	AsmMatcherEmitter.cpp \
 	X86DisassemblerTables.cpp \
 	X86ModRMFilters.cpp \
 	X86RecognizableInstr.cpp
-LLVM_REQUIRES_EH=
 
 LIBDEPS=llvmtablegen \
 	llvmsupport
diff --git a/usr.bin/clang/tblgen/tblgen.1 b/usr.bin/clang/tblgen/tblgen.1
index d6d127e..b0d0697 100644
--- a/usr.bin/clang/tblgen/tblgen.1
+++ b/usr.bin/clang/tblgen/tblgen.1
@@ -1,5 +1,5 @@
 .\" $FreeBSD$
-.TH "TBLGEN" "1" "2012-08-16" "3.2" "LLVM"
+.TH "TBLGEN" "1" "2013-04-11" "3.3" "LLVM"
 .SH NAME
 tblgen \- Target Description To C++ Code Generator
 .
@@ -36,188 +36,140 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 \fBtblgen\fP [\fIoptions\fP] [\fIfilename\fP]
 .SH DESCRIPTION
 .sp
-\fBtblgen\fP translates from target description (.td) files into C++ code that can
-be included in the definition of an LLVM target library. Most users of LLVM will
-not need to use this program. It is only for assisting with writing an LLVM
-target backend.
+\fBtblgen\fP translates from target description (\fB.td\fP) files into C++
+code that can be included in the definition of an LLVM target library.  Most
+users of LLVM will not need to use this program.  It is only for assisting with
+writing an LLVM target backend.
 .sp
 The input and output of \fBtblgen\fP is beyond the scope of this short
-introduction. Please see the \fICodeGeneration\fP page in the LLVM documentation.
+introduction.  Please see \fB../TableGenFundamentals\fP.
 .sp
-The \fIfilename\fP argument specifies the name of a Target Description (.td) file
-to read as input.
+The \fIfilename\fP argument specifies the name of a Target Description (\fB.td\fP)
+file to read as input.
 .SH OPTIONS
-.sp
-\fB\-help\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-help
 Print a summary of command line options.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-o\fP \fIfilename\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify the output file name.  If \fIfilename\fP is \fB\-\fP, then \fBtblgen\fP
-sends its output to standard output.
+.TP
+.B \-o filename
+Specify the output file name.  If \fBfilename\fP is \fB\-\fP, then
+\fBtblgen\fP sends its output to standard output.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-I\fP \fIdirectory\fP
 .INDENT 0.0
-.INDENT 3.5
-Specify where to find other target description files for inclusion. The
-\fIdirectory\fP value should be a full or partial path to a directory that contains
-target description files.
-.UNINDENT
+.TP
+.B \-I directory
+Specify where to find other target description files for inclusion.  The
+\fBdirectory\fP value should be a full or partial path to a directory that
+contains target description files.
 .UNINDENT
-.sp
-\fB\-asmparsernum\fP \fIN\fP
 .INDENT 0.0
-.INDENT 3.5
-Make \-gen\-asm\-parser emit assembly writer number \fIN\fP.
-.UNINDENT
+.TP
+.B \-asmparsernum N
+Make \-gen\-asm\-parser emit assembly writer number \fBN\fP.
 .UNINDENT
-.sp
-\fB\-asmwriternum\fP \fIN\fP
 .INDENT 0.0
-.INDENT 3.5
-Make \-gen\-asm\-writer emit assembly writer number \fIN\fP.
+.TP
+.B \-asmwriternum N
+Make \-gen\-asm\-writer emit assembly writer number \fBN\fP.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-class\fP \fIclass Name\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-class className
 Print the enumeration list for this class.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-print\-records\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-print\-records
 Print all records to standard output (default).
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-print\-enums\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-print\-enums
 Print enumeration values for a class.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-print\-sets\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-print\-sets
 Print expanded sets for testing DAG exprs.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-emitter\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-emitter
 Generate machine code emitter.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-register\-info\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-register\-info
 Generate registers and register classes info.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-instr\-info\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-instr\-info
 Generate instruction descriptions.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-asm\-writer\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-asm\-writer
 Generate the assembly writer.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-disassembler\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-disassembler
 Generate disassembler.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-pseudo\-lowering\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-pseudo\-lowering
 Generate pseudo instruction lowering.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-dag\-isel\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-dag\-isel
 Generate a DAG (Directed Acycle Graph) instruction selector.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-asm\-matcher\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-asm\-matcher
 Generate assembly instruction matcher.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-dfa\-packetizer\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-dfa\-packetizer
 Generate DFA Packetizer for VLIW targets.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-fast\-isel\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-fast\-isel
 Generate a "fast" instruction selector.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-subtarget\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-subtarget
 Generate subtarget enumerations.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-intrinsic\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-intrinsic
 Generate intrinsic information.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-tgt\-intrinsic\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-tgt\-intrinsic
 Generate target intrinsic information.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-gen\-enhanced\-disassembly\-info\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-gen\-enhanced\-disassembly\-info
 Generate enhanced disassembly info.
 .UNINDENT
-.UNINDENT
-.sp
-\fB\-version\fP
 .INDENT 0.0
-.INDENT 3.5
+.TP
+.B \-version
 Show the version number of this program.
 .UNINDENT
-.UNINDENT
 .SH EXIT STATUS
 .sp
 If \fBtblgen\fP succeeds, it will exit with 0.  Otherwise, if an error
@@ -225,6 +177,6 @@ occurs, it will exit with a non\-zero value.
 .SH AUTHOR
 Maintained by The LLVM Team (http://llvm.org/).
 .SH COPYRIGHT
-2012, LLVM Project
+2003-2013, LLVM Project
 .\" Generated by docutils manpage writer.
 .