[zorg] r266094 - Removed not used mergeFunctions.

[Galina Kistanova via llvm-commits]

Author: gkistanova
Date: Tue Apr 12 12:51:08 2016
New Revision: 266094

URL: http://llvm.org/viewvc/llvm-project?rev=266094&view=rev
Log:
Removed not used mergeFunctions.

Modified:
    zorg/trunk/zorg/buildbot/builders/ClangBuilder.py

Modified: zorg/trunk/zorg/buildbot/builders/ClangBuilder.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/zorg/buildbot/builders/ClangBuilder.py?rev=266094&r1=266093&r2=266094&view=diff
==============================================================================
--- zorg/trunk/zorg/buildbot/builders/ClangBuilder.py (original)
+++ zorg/trunk/zorg/buildbot/builders/ClangBuilder.py Tue Apr 12 12:51:08 2016
@@ -42,7 +42,6 @@ def getClangBuildFactory(
             run_gdb=False,
             run_modern_gdb=False,
             run_gcc=False,
-            merge_functions=False,
             cmake=None,
             modules=False):
     assert not modules or (cmake and useTwoStage), \
@@ -138,23 +137,6 @@ def getClangBuildFactory(
                           defaultBranch='trunk',
                           workdir='%s/projects/compiler-rt' % llvm_srcdir))
 
-    # Revert and apply patch mergeFunctions in required
-    if merge_functions:
-        f.addStep(ShellCommand(name="revert_patch_MergeFunctions",
-                               command=["svn", "-R", "revert", '.'],
-                               haltOnFailure=True,
-                               description=["revert patch MergeFunctions"],
-                               workdir='%s/tools/clang' % llvm_srcdir,
-                               env=merged_env))
-
-    if merge_functions:
-        f.addStep(ShellCommand(name="patch_MergeFunctions",
-                               command=["patch", "-Np0", "-i", '../../utils/Misc/mergefunctions.clang.svn.patch'],
-                               haltOnFailure=True,
-                               description=["patch MergeFunctions"],
-                               workdir='%s/tools/clang' % llvm_srcdir,
-                               env=merged_env))
-
     # Clean up llvm (stage 1); unless in-dir.
     if clean and llvm_srcdir != llvm_1_objdir:
         f.addStep(ShellCommand(name="rm-llvm.obj.stage1",