From b0c3cac2ed0d2e3ad94dee46cbd0ab7ad1b1dabc Mon Sep 17 00:00:00 2001
From: Rafael Espindola <rafael.espindola@gmail.com>
Date: Thu, 20 Jun 2013 18:30:37 +0000
Subject: [PATCH] Use only the filename when deciding if a file is a duplicate.

Matches gnu ar behavior.

llvm-svn: 184448
---
 llvm/test/Archive/directory.ll | 2 ++
 llvm/tools/llvm-ar/llvm-ar.cpp | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/llvm/test/Archive/directory.ll b/llvm/test/Archive/directory.ll
index f88d604a23bb..297534522688 100644
--- a/llvm/test/Archive/directory.ll
+++ b/llvm/test/Archive/directory.ll
@@ -4,7 +4,9 @@
 ;RUN: rm -f %T/test.a
 ;RUN: touch %T/a-very-long-file-name
 ;RUN: llvm-ar r %T/test.a %s %T/a-very-long-file-name
+;RUN: llvm-ar r %T/test.a %T/a-very-long-file-name
 ;RUN: llvm-ar t %T/test.a | FileCheck -check-prefix=MEMBERS %s
 ;MEMBERS-NOT: /
 ;MEMBERS: a-very-long-file-name
 ;MEMBERS: directory.ll
+;MEMBERS-NOT: a-very-long-file-name
diff --git a/llvm/tools/llvm-ar/llvm-ar.cpp b/llvm/tools/llvm-ar/llvm-ar.cpp
index 941b6310804d..4c986715aec7 100644
--- a/llvm/tools/llvm-ar/llvm-ar.cpp
+++ b/llvm/tools/llvm-ar/llvm-ar.cpp
@@ -563,7 +563,7 @@ doReplaceOrInsert(std::string* ErrMsg) {
     std::set<std::string>::iterator found = remaining.end();
     for (std::set<std::string>::iterator RI = remaining.begin(),
          RE = remaining.end(); RI != RE; ++RI ) {
-      std::string compare(*RI);
+      std::string compare(sys::path::filename(*RI));
       if (TruncateNames && compare.length() > 15) {
         const char* nm = compare.c_str();
         unsigned len = compare.length();