svn commit: r309162 - in vendor/lld/dist: ELF test/ELF

Dimitry Andric dim at FreeBSD.org
Fri Nov 25 19:14:26 UTC 2016


Author: dim
Date: Fri Nov 25 19:14:25 2016
New Revision: 309162
URL: https://svnweb.freebsd.org/changeset/base/309162

Log:
  Vendor import of lld release_39 branch r287912:
  https://llvm.org/svn/llvm-project/lld/branches/release_39@287912

Modified:
  vendor/lld/dist/ELF/InputFiles.cpp
  vendor/lld/dist/test/ELF/as-needed-no-reloc.s
  vendor/lld/dist/test/ELF/shared.s

Modified: vendor/lld/dist/ELF/InputFiles.cpp
==============================================================================
--- vendor/lld/dist/ELF/InputFiles.cpp	Fri Nov 25 19:13:34 2016	(r309161)
+++ vendor/lld/dist/ELF/InputFiles.cpp	Fri Nov 25 19:14:25 2016	(r309162)
@@ -18,6 +18,7 @@
 #include "llvm/CodeGen/Analysis.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"
+#include "llvm/Support/Path.h"
 #include "llvm/Support/raw_ostream.h"
 
 using namespace llvm;
@@ -459,7 +460,7 @@ template <class ELFT> void SharedFile<EL
   }
 
   this->initStringTable();
-  SoName = this->getName();
+  SoName = sys::path::filename(this->getName());
 
   if (!DynamicSec)
     return;

Modified: vendor/lld/dist/test/ELF/as-needed-no-reloc.s
==============================================================================
--- vendor/lld/dist/test/ELF/as-needed-no-reloc.s	Fri Nov 25 19:13:34 2016	(r309161)
+++ vendor/lld/dist/test/ELF/as-needed-no-reloc.s	Fri Nov 25 19:14:25 2016	(r309162)
@@ -16,7 +16,7 @@
 # CHECK-NEXT: Other: 0
 # CHECK-NEXT: Section: Undefined
 
-# CHECK: NEEDED SharedLibrary ({{.*}}2.so)
+# CHECK: NEEDED SharedLibrary (as-needed-no-reloc{{.*}}2.so)
 
         .globl _start
 _start:

Modified: vendor/lld/dist/test/ELF/shared.s
==============================================================================
--- vendor/lld/dist/test/ELF/shared.s	Fri Nov 25 19:13:34 2016	(r309161)
+++ vendor/lld/dist/test/ELF/shared.s	Fri Nov 25 19:14:25 2016	(r309162)
@@ -119,7 +119,6 @@
 // CHECK-NEXT:   EntrySize: 8
 // CHECK-NEXT:   SectionData (
 // CHECK:        )
-// CHECK-NEXT: }
 
 // CHECK:      Name: .symtab
 // CHECK-NEXT: Type: SHT_SYMTAB


More information about the svn-src-all mailing list