diff options
Diffstat (limited to 'utils')
| -rwxr-xr-x | utils/GetSourceVersion | 27 | ||||
| -rw-r--r-- | utils/TableGen/AsmMatcherEmitter.cpp | 12 | ||||
| -rwxr-xr-x | utils/buildit/build_llvm | 27 | ||||
| -rw-r--r-- | utils/lit/lit/Test.py | 2 | ||||
| -rw-r--r-- | utils/llvm.grm | 1 | ||||
| -rwxr-xr-x | utils/mkpatch | 4 | ||||
| -rw-r--r-- | utils/vim/llvm.vim | 2 |
7 files changed, 51 insertions, 24 deletions
diff --git a/utils/GetSourceVersion b/utils/GetSourceVersion new file mode 100755 index 0000000..b25f2f9 --- /dev/null +++ b/utils/GetSourceVersion @@ -0,0 +1,27 @@ +#!/bin/sh + +usage() { + echo "usage: $0 <source root>" + echo " Prints the source control revision of the given source directory," + echo " the exact format of the revision string depends on the source " + echo " control system. If the source control system isn't known, the output" + echo " is empty and the exit code is 1." + exit 1 +} + +if [ $# != 1 ] || [ ! -d $1 ]; then + usage; +fi + +cd $1 +if [ -d .svn ]; then + svnversion +elif [ -d .git/svn ]; then + git svn info | grep 'Revision:' | cut -d: -f2- +elif [ -d .git ]; then + git log -1 --pretty=format:%H +else + exit 1; +fi + +exit 0 diff --git a/utils/TableGen/AsmMatcherEmitter.cpp b/utils/TableGen/AsmMatcherEmitter.cpp index 019908b..ce1521d 100644 --- a/utils/TableGen/AsmMatcherEmitter.cpp +++ b/utils/TableGen/AsmMatcherEmitter.cpp @@ -465,6 +465,10 @@ struct InstructionInfo { if (Operands.size() != RHS.Operands.size()) return false; + // Otherwise, make sure the ordering of the two instructions is unambiguous + // by checking that either (a) a token or operand kind discriminates them, + // or (b) the ordering among equivalent kinds is consistent. + // Tokens and operand kinds are unambiguous (assuming a correct target // specific parser). for (unsigned i = 0, e = Operands.size(); i != e; ++i) @@ -1386,9 +1390,7 @@ static void EmitMatchRegisterName(CodeGenTarget &Target, Record *AsmParser, "return " + utostr(i + 1) + ";")); } - OS << "unsigned " << Target.getName() - << AsmParser->getValueAsString("AsmParserClassName") - << "::MatchRegisterName(const StringRef &Name) {\n"; + OS << "static unsigned MatchRegisterName(const StringRef &Name) {\n"; EmitStringMatcher("Name", Matches, OS); @@ -1447,6 +1449,8 @@ void AsmMatcherEmitter::run(raw_ostream &OS) { // Emit the function to match a register name to number. EmitMatchRegisterName(Target, AsmParser, OS); + + OS << "#ifndef REGISTERS_ONLY\n\n"; // Generate the unified function to convert operands into an MCInst. EmitConvertToMCInst(Target, Info.Instructions, OS); @@ -1546,4 +1550,6 @@ void AsmMatcherEmitter::run(raw_ostream &OS) { OS << " return true;\n"; OS << "}\n\n"; + + OS << "#endif // REGISTERS_ONLY\n"; } diff --git a/utils/buildit/build_llvm b/utils/buildit/build_llvm index 25f6554..1fa3fdf 100755 --- a/utils/buildit/build_llvm +++ b/utils/buildit/build_llvm @@ -57,25 +57,20 @@ DARWIN_VERS=`uname -r | sed 's/\..*//'` echo DARWIN_VERS = $DARWIN_VERS if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then - DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/Developer/usr - DEST_ROOT="/Developer/Platforms/iPhoneOS.platform/Developer$DEST_ROOT" -elif [ "x$RC_ProjectName" = "xllvmCore_EmbeddedHosted" ]; then - DT_HOME=$DEST_DIR/usr - DEST_ROOT="/Developer$DEST_ROOT" + DEST_DIR="$DEST_DIR/Developer/Platforms/iPhoneOS.platform" + mkdir -p "$DEST_DIR" +fi + +DEVELOPER_DIR="${DEVELOPER_DIR-Developer}" +if [ "x$RC_ProjectName" = "xllvmCore_EmbeddedHosted" ]; then + DT_HOME="$DEST_DIR/usr" HOST_SDKROOT=$SDKROOT else - DT_HOME=$DEST_DIR/Developer/usr - DEST_ROOT="/Developer$DEST_ROOT" -fi -if [ "x$DEVELOPER_BIN" != "x" ]; then - if [ "x$RC_ProjectName" = "xllvmCore_Embedded" ]; then - DT_HOME=$DEST_DIR/Developer/Platforms/iPhoneOS.platform/$DEVELOPER_DIR/usr - else - DT_HOME=$DEST_DIR/$DEVELOPER_DIR/usr - fi - DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT" + DT_HOME="$DEST_DIR/$DEVELOPER_DIR/usr" fi +DEST_ROOT="/$DEVELOPER_DIR$DEST_ROOT" + ################################################################################ # Run the build. @@ -350,7 +345,7 @@ find $DEST_DIR -name html.tar.gz -exec rm {} \; cd $DEST_DIR mkdir -p ./usr/lib/ cd usr/lib -ln -s ../../Developer/usr/lib/libLTO.dylib ./libLTO.dylib +ln -s ../../$DEVELOPER_DIR/usr/lib/libLTO.dylib ./libLTO.dylib ################################################################################ # w00t! Done! diff --git a/utils/lit/lit/Test.py b/utils/lit/lit/Test.py index 1f6556b..db2e032 100644 --- a/utils/lit/lit/Test.py +++ b/utils/lit/lit/Test.py @@ -70,7 +70,7 @@ class Test: self.elapsed = elapsed def getFullName(self): - return self.suite.config.name + '::' + '/'.join(self.path_in_suite) + return self.suite.config.name + ' :: ' + '/'.join(self.path_in_suite) def getSourcePath(self): return self.suite.getSourcePath(self.path_in_suite) diff --git a/utils/llvm.grm b/utils/llvm.grm index 86a707a..4499d4b 100644 --- a/utils/llvm.grm +++ b/utils/llvm.grm @@ -161,7 +161,6 @@ FuncAttr ::= noreturn | signext | readnone | readonly - | inlinehint | noinline | alwaysinline | optsize diff --git a/utils/mkpatch b/utils/mkpatch index d256d98..278a241 100755 --- a/utils/mkpatch +++ b/utils/mkpatch @@ -23,8 +23,8 @@ echo "mkpatch: Generating differences on all directories" svn diff -x -u >> "$NAME".patch.raw 2>&1 \ autoconf docs utils include lib/System lib/Support lib/VMCore lib/AsmParser \ lib/Bitcode lib/Analysis lib/Transforms lib/CodeGen lib/Target \ - lib/ExecutionEngine lib/Debugger lib/Linker \ - tools test unittests runtime projects examples win32 Xcode + lib/ExecutionEngine lib/Linker \ + tools test unittests runtime projects examples Xcode echo "mkpatch: Removing cruft from the patch file" sed -e '/^[?] .*/d' -e '/^cvs diff: Diffing/d' "$NAME".patch.raw | awk '\ diff --git a/utils/vim/llvm.vim b/utils/vim/llvm.vim index 6e4a207..48a4c68 100644 --- a/utils/vim/llvm.vim +++ b/utils/vim/llvm.vim @@ -51,7 +51,7 @@ syn keyword llvmKeyword volatile fastcc coldcc cc ccc syn keyword llvmKeyword x86_stdcallcc x86_fastcallcc syn keyword llvmKeyword signext zeroext inreg sret nounwind noreturn syn keyword llvmKeyword nocapture byval nest readnone readonly noalias -syn keyword llvmKeyword inlinehint noinline alwaysinline optsize ssp sspreq +syn keyword llvmKeyword noinline alwaysinline optsize ssp sspreq syn keyword llvmKeyword noredzone noimplicitfloat naked syn keyword llvmKeyword module asm align tail to syn keyword llvmKeyword addrspace section alias sideeffect c gc |
