commit 0cf2657bc25242c097d42346d17eaae4107b1d55
author Dmitriy Ivanov <dimitry@google.com> Wed Mar 18 22:09:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Mar 18 22:09:07 2015 +0000
tree 10208ea0b8efaa151376052354e6cbd3be28a952
parent c0eaa732844a8397d40a7ec82641f709e4b47a61
parent e44fffd7f9b93b9ec9836cfc7acedf7e21107f8f

Merge "Fix library lookup for filenames with slash."

linker/linker.cpp

diff --git a/linker/linker.cpp b/linker/linker.cpp
index 15ea423..3960f9a 100644
--- a/linker/linker.cpp
+++ b/linker/linker.cpp
@@ -942,12 +942,8 @@
     int fd = TEMP_FAILURE_RETRY(open(name, O_RDONLY | O_CLOEXEC));
     if (fd != -1) {
       *file_offset = 0;
-      return fd;
     }
-    // ...but nvidia binary blobs (at least) rely on this behavior, so fall through for now.
-#if defined(__LP64__)
-    return -1;
-#endif
+    return fd;
   }
 
   // Otherwise we try LD_LIBRARY_PATH first, and fall back to the built-in well known paths.