Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 29 Nov 2014 20:23:18 +0000 (UTC)
From:      Dimitry Andric <dim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-projects@freebsd.org
Subject:   svn commit: r275266 - projects/clang350-import/contrib/llvm/patches
Message-ID:  <201411292023.sATKNIc8091404@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: dim
Date: Sat Nov 29 20:23:18 2014
New Revision: 275266
URL: https://svnweb.freebsd.org/changeset/base/275266

Log:
  Remove bogus revision numbers from diff header lines in the existing
  llvm/clang patches.

Modified:
  projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff
  projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff
  projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff
  projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff
  projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff
  projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff
  projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff
  projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff

Modified: projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-10-llvm-r221709-debug-oom.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -24,8 +24,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: include/llvm/CodeGen/SelectionDAG.h
 ===================================================================
---- include/llvm/CodeGen/SelectionDAG.h	(revision 10)
-+++ include/llvm/CodeGen/SelectionDAG.h	(revision 11)
+--- include/llvm/CodeGen/SelectionDAG.h
++++ include/llvm/CodeGen/SelectionDAG.h
 @@ -126,6 +126,10 @@ class SDDbgInfo {
        DbgValMap[Node].push_back(V);
    }
@@ -39,8 +39,8 @@ Index: include/llvm/CodeGen/SelectionDAG
      DbgValues.clear();
 Index: lib/CodeGen/SelectionDAG/SelectionDAG.cpp
 ===================================================================
---- lib/CodeGen/SelectionDAG/SelectionDAG.cpp	(revision 10)
-+++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp	(revision 11)
+--- lib/CodeGen/SelectionDAG/SelectionDAG.cpp
++++ lib/CodeGen/SelectionDAG/SelectionDAG.cpp
 @@ -686,6 +686,15 @@ void SelectionDAG::DeleteNodeNotInCSEMaps(SDNode *
    DeallocateNode(N);
  }

Modified: projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-11-llvm-r222562-loop-rotate.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -8,8 +8,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: lib/Transforms/IPO/PassManagerBuilder.cpp
 ===================================================================
---- lib/Transforms/IPO/PassManagerBuilder.cpp	(revision 11)
-+++ lib/Transforms/IPO/PassManagerBuilder.cpp	(revision 12)
+--- lib/Transforms/IPO/PassManagerBuilder.cpp
++++ lib/Transforms/IPO/PassManagerBuilder.cpp
 @@ -195,7 +195,8 @@ void PassManagerBuilder::populateModulePassManager
      MPM.add(createTailCallEliminationPass()); // Eliminate tail calls
    MPM.add(createCFGSimplificationPass());     // Merge & remove BBs

Modified: projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-12-add-llvm-gvn-option.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -6,8 +6,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: lib/Transforms/IPO/PassManagerBuilder.cpp
 ===================================================================
---- lib/Transforms/IPO/PassManagerBuilder.cpp	(revision 12)
-+++ lib/Transforms/IPO/PassManagerBuilder.cpp	(revision 13)
+--- lib/Transforms/IPO/PassManagerBuilder.cpp
++++ lib/Transforms/IPO/PassManagerBuilder.cpp
 @@ -57,6 +57,10 @@ static cl::opt<bool> RunLoadCombine("combine-loads
                                      cl::Hidden,
                                      cl::desc("Run the load combining pass"));

Modified: projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-13-llvm-r218241-dwarf2-warning.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -15,8 +15,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: lib/MC/MCDwarf.cpp
 ===================================================================
---- lib/MC/MCDwarf.cpp	(revision 13)
-+++ lib/MC/MCDwarf.cpp	(revision 14)
+--- lib/MC/MCDwarf.cpp
++++ lib/MC/MCDwarf.cpp
 @@ -519,7 +519,8 @@ static void EmitGenDwarfAbbrev(MCStreamer *MCOS) {
    MCOS->EmitULEB128IntValue(dwarf::DW_TAG_compile_unit);
    MCOS->EmitIntValue(dwarf::DW_CHILDREN_yes, 1);
@@ -44,8 +44,8 @@ Index: lib/MC/MCDwarf.cpp
    MCOS->SwitchSection(context.getObjectFileInfo()->getDwarfInfoSection());
 Index: lib/MC/MCParser/ELFAsmParser.cpp
 ===================================================================
---- lib/MC/MCParser/ELFAsmParser.cpp	(revision 13)
-+++ lib/MC/MCParser/ELFAsmParser.cpp	(revision 14)
+--- lib/MC/MCParser/ELFAsmParser.cpp
++++ lib/MC/MCParser/ELFAsmParser.cpp
 @@ -555,7 +555,7 @@ EndStmt:
          std::make_pair(ELFSection, std::make_pair(nullptr, nullptr)));
      if (InsertResult.second) {
@@ -57,8 +57,8 @@ Index: lib/MC/MCParser/ELFAsmParser.cpp
        getStreamer().EmitLabel(SectionStartSymbol);
 Index: test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s
 ===================================================================
---- test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s	(revision 0)
-+++ test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s	(revision 14)
+--- test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s
++++ test/MC/ARM/dwarf-asm-multiple-sections-dwarf-2.s
 @@ -0,0 +1,66 @@
 +// RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -fdebug-compilation-dir=/tmp -dwarf-version 2 2>&1 | FileCheck -check-prefix MESSAGES %s
 +// RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF %s
@@ -128,8 +128,8 @@ Index: test/MC/ARM/dwarf-asm-multiple-se
 +// RELOC-NEXT: 00000018 R_ARM_ABS32 foo
 Index: test/MC/ARM/dwarf-asm-multiple-sections.s
 ===================================================================
---- test/MC/ARM/dwarf-asm-multiple-sections.s	(revision 13)
-+++ test/MC/ARM/dwarf-asm-multiple-sections.s	(revision 14)
+--- test/MC/ARM/dwarf-asm-multiple-sections.s
++++ test/MC/ARM/dwarf-asm-multiple-sections.s
 @@ -1,7 +1,7 @@
  // RUN: llvm-mc < %s -triple=armv7-linux-gnueabi -filetype=obj -o %t -g -fdebug-compilation-dir=/tmp
  // RUN: llvm-dwarfdump %t | FileCheck -check-prefix DWARF %s

Modified: projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-14-llvm-r215352-aarch64-dyn-loader.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -17,8 +17,8 @@ Cannot display: file marked as a binary 
 svn:mime-type = application/x-object
 Index: test/tools/llvm-readobj/Inputs/relocs.py
 ===================================================================
---- test/tools/llvm-readobj/Inputs/relocs.py	(revision 14)
-+++ test/tools/llvm-readobj/Inputs/relocs.py	(revision 15)
+--- test/tools/llvm-readobj/Inputs/relocs.py
++++ test/tools/llvm-readobj/Inputs/relocs.py
 @@ -617,6 +617,8 @@ class Relocs_Elf_AArch64(Enum):
    R_AARCH64_LDST32_ABS_LO12_NC          = 0x11d
    R_AARCH64_LDST64_ABS_LO12_NC          = 0x11e
@@ -46,8 +46,8 @@ Index: test/tools/llvm-readobj/Inputs/re
    R_ARM_NONE                  = 0x00
 Index: test/tools/llvm-readobj/reloc-types.test
 ===================================================================
---- test/tools/llvm-readobj/reloc-types.test	(revision 14)
-+++ test/tools/llvm-readobj/reloc-types.test	(revision 15)
+--- test/tools/llvm-readobj/reloc-types.test
++++ test/tools/llvm-readobj/reloc-types.test
 @@ -179,6 +179,8 @@ ELF-AARCH64: Type: R_AARCH64_LDST16_ABS_LO12_NC (2
  ELF-AARCH64: Type: R_AARCH64_LDST32_ABS_LO12_NC (285)
  ELF-AARCH64: Type: R_AARCH64_LDST64_ABS_LO12_NC (286)
@@ -75,8 +75,8 @@ Index: test/tools/llvm-readobj/reloc-typ
  ELF-ARM: Type: R_ARM_PC24 (1)
 Index: include/llvm/Support/ELF.h
 ===================================================================
---- include/llvm/Support/ELF.h	(revision 14)
-+++ include/llvm/Support/ELF.h	(revision 15)
+--- include/llvm/Support/ELF.h
++++ include/llvm/Support/ELF.h
 @@ -653,6 +653,9 @@ enum {
  
    R_AARCH64_LDST128_ABS_LO12_NC         = 0x12b,
@@ -108,8 +108,8 @@ Index: include/llvm/Support/ELF.h
  // ARM Specific e_flags
 Index: lib/Object/ELF.cpp
 ===================================================================
---- lib/Object/ELF.cpp	(revision 14)
-+++ lib/Object/ELF.cpp	(revision 15)
+--- lib/Object/ELF.cpp
++++ lib/Object/ELF.cpp
 @@ -223,6 +223,8 @@ StringRef getELFRelocationTypeName(uint32_t Machin
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST32_ABS_LO12_NC);
        LLVM_ELF_SWITCH_RELOC_TYPE_NAME(R_AARCH64_LDST64_ABS_LO12_NC);

Modified: projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-15-llvm-r216571-dynamiclib-usability.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -14,8 +14,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: include/llvm/Support/DynamicLibrary.h
 ===================================================================
---- include/llvm/Support/DynamicLibrary.h	(revision 15)
-+++ include/llvm/Support/DynamicLibrary.h	(revision 16)
+--- include/llvm/Support/DynamicLibrary.h
++++ include/llvm/Support/DynamicLibrary.h
 @@ -43,10 +43,11 @@ namespace sys {
      // Opaque data used to interface with OS-specific dynamic library handling.
      void *Data;

Modified: projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-16-clang-r221900-freebsd-aarch64.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -8,8 +8,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: tools/clang/test/Driver/freebsd.c
 ===================================================================
---- tools/clang/test/Driver/freebsd.c	(revision 16)
-+++ tools/clang/test/Driver/freebsd.c	(revision 17)
+--- tools/clang/test/Driver/freebsd.c
++++ tools/clang/test/Driver/freebsd.c
 @@ -1,4 +1,12 @@
  // RUN: %clang -no-canonical-prefixes \
 +// RUN:   -target aarch64-pc-freebsd11 %s                              \
@@ -25,8 +25,8 @@ Index: tools/clang/test/Driver/freebsd.c
  // RUN:   | FileCheck --check-prefix=CHECK-PPC %s
 Index: tools/clang/test/Preprocessor/init.c
 ===================================================================
---- tools/clang/test/Preprocessor/init.c	(revision 16)
-+++ tools/clang/test/Preprocessor/init.c	(revision 17)
+--- tools/clang/test/Preprocessor/init.c
++++ tools/clang/test/Preprocessor/init.c
 @@ -802,6 +802,199 @@
  // AARCH64-NETBSD:#define __WINT_TYPE__ int
  // AARCH64-NETBSD:#define __WINT_WIDTH__ 32
@@ -229,8 +229,8 @@ Index: tools/clang/test/Preprocessor/ini
  //
 Index: tools/clang/lib/Basic/Targets.cpp
 ===================================================================
---- tools/clang/lib/Basic/Targets.cpp	(revision 16)
-+++ tools/clang/lib/Basic/Targets.cpp	(revision 17)
+--- tools/clang/lib/Basic/Targets.cpp
++++ tools/clang/lib/Basic/Targets.cpp
 @@ -6036,6 +6036,8 @@ static TargetInfo *AllocateTarget(const llvm::Trip
        return new DarwinAArch64TargetInfo(Triple);
  

Modified: projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff
==============================================================================
--- projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff	Sat Nov 29 20:18:08 2014	(r275265)
+++ projects/clang350-import/contrib/llvm/patches/patch-17-llvm-r222856-libapr-miscompile.diff	Sat Nov 29 20:23:18 2014	(r275266)
@@ -13,8 +13,8 @@ Introduced here: http://svnweb.freebsd.o
 
 Index: lib/Transforms/InstCombine/InstCombineSelect.cpp
 ===================================================================
---- lib/Transforms/InstCombine/InstCombineSelect.cpp	(revision 17)
-+++ lib/Transforms/InstCombine/InstCombineSelect.cpp	(revision 18)
+--- lib/Transforms/InstCombine/InstCombineSelect.cpp
++++ lib/Transforms/InstCombine/InstCombineSelect.cpp
 @@ -387,15 +387,7 @@ static Value *SimplifyWithOpReplaced(Value *V, Val
  /// 1. The icmp predicate is inverted
  /// 2. The select operands are reversed
@@ -60,8 +60,8 @@ Index: lib/Transforms/InstCombine/InstCo
    if (!OrOnFalseVal)
 Index: test/Transforms/InstCombine/select.ll
 ===================================================================
---- test/Transforms/InstCombine/select.ll	(revision 17)
-+++ test/Transforms/InstCombine/select.ll	(revision 18)
+--- test/Transforms/InstCombine/select.ll
++++ test/Transforms/InstCombine/select.ll
 @@ -996,111 +996,6 @@ define <2 x i32> @select_icmp_eq_and_1_0_or_vector
    ret <2 x i32> %select
  }



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411292023.sATKNIc8091404>