diff options
| author | Ian Lance Taylor <iant@google.com> | 2006-11-06 22:46:08 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <iant@google.com> | 2006-11-06 22:46:08 +0000 |
| commit | f6ce93d6e999d1a0c450c5e71c5b3468e6217f0a (patch) | |
| tree | 945ecd482d35d1c2a590645ef3d5f41fb83dcc4b /gold/fileread.cc | |
| parent | 8d9455b422d98d97f090923445aa2680e6882f20 (diff) | |
| download | fsf-binutils-gdb-f6ce93d6e999d1a0c450c5e71c5b3468e6217f0a.zip fsf-binutils-gdb-f6ce93d6e999d1a0c450c5e71c5b3468e6217f0a.tar.gz fsf-binutils-gdb-f6ce93d6e999d1a0c450c5e71c5b3468e6217f0a.tar.bz2 | |
Split Object into Dynobj and Relobj, incorporate elfcpp swapping changes.
Diffstat (limited to 'gold/fileread.cc')
| -rw-r--r-- | gold/fileread.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/gold/fileread.cc b/gold/fileread.cc index 00971a7..43c69b3 100644 --- a/gold/fileread.cc +++ b/gold/fileread.cc @@ -314,9 +314,13 @@ Input_file::open(const General_options& options, const Dirsearch& dirpath) std::string n1("lib"); n1 += this->input_argument_.name(); std::string n2; - if (!options.is_static()) - n2 = n1 + ".so"; - n1 += ".a"; + if (options.is_static()) + n1 += ".a"; + else + { + n2 = n1 + ".a"; + n1 += ".so"; + } name = dirpath.find(n1, n2); if (name.empty()) { |