[llvm-commits] CVS: llvm/lib/Linker/Linker.cpp

[Chris Lattner]

Changes in directory llvm/lib/Linker:

Linker.cpp updated: 1.10 -> 1.11
---
Log message:

Remove a redundant syscall.


---
Diffs of the changes:  (+20 -24)

 Linker.cpp |   44 ++++++++++++++++++++------------------------
 1 files changed, 20 insertions(+), 24 deletions(-)


Index: llvm/lib/Linker/Linker.cpp
diff -u llvm/lib/Linker/Linker.cpp:1.10 llvm/lib/Linker/Linker.cpp:1.11
--- llvm/lib/Linker/Linker.cpp:1.10	Tue Jan 17 16:01:57 2006
+++ llvm/lib/Linker/Linker.cpp	Fri Jul 28 17:52:11 2006
@@ -119,31 +119,27 @@
 
   sys::Path FullPath(Directory);
 
-  // Make sure the directory actually is a directory in the file system.
-  if (FullPath.isDirectory())
-  {
-    // Try the libX.a form
-    FullPath.appendComponent("lib" + Name);
-    FullPath.appendSuffix("a");
-    if (FullPath.isArchive())
-      return FullPath;
-
-    // Try the libX.bca form
-    FullPath.eraseSuffix();
-    FullPath.appendSuffix("bca");
-    if (FullPath.isArchive())
-      return FullPath;
+  // Try the libX.a form
+  FullPath.appendComponent("lib" + Name);
+  FullPath.appendSuffix("a");
+  if (FullPath.isArchive())
+    return FullPath;
+
+  // Try the libX.bca form
+  FullPath.eraseSuffix();
+  FullPath.appendSuffix("bca");
+  if (FullPath.isArchive())
+    return FullPath;
+
+  // Try the libX.so (or .dylib) form
+  FullPath.eraseSuffix();
+  FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
+  if (FullPath.isDynamicLibrary())  // Native shared library?
+    return FullPath;
+  if (FullPath.isBytecodeFile())    // .so file containing bytecode?
+    return FullPath;
 
-    // Try the libX.so (or .dylib) form
-    FullPath.eraseSuffix();
-    FullPath.appendSuffix(&(LTDL_SHLIB_EXT[1]));
-    if (FullPath.isDynamicLibrary())  // Native shared library?
-      return FullPath;
-    if (FullPath.isBytecodeFile())    // .so file containing bytecode?
-      return FullPath;
-
-    // Not found .. fall through
-  }
+  // Not found .. fall through
 
   // Indicate that the library was not found in the directory.
   FullPath.clear();