diff options
| author | Ian Lance Taylor <ian@airs.com> | 2008-07-25 04:25:49 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@airs.com> | 2008-07-25 04:25:49 +0000 |
| commit | 2a00e4fb8e170de97cb80a0140ba4d42a8ffd42f (patch) | |
| tree | bd6483e0ea6e9704286a6ff02d732a79c29e91cf /gold/output.cc | |
| parent | e2df110677592d7b096d7ea9a20d695b49555037 (diff) | |
| download | binutils-2a00e4fb8e170de97cb80a0140ba4d42a8ffd42f.zip binutils-2a00e4fb8e170de97cb80a0140ba4d42a8ffd42f.tar.gz binutils-2a00e4fb8e170de97cb80a0140ba4d42a8ffd42f.tar.bz2 | |
PR 5990
* descriptors.cc: New file.
* descriptors.h: New file.
* gold-threads.h (class Hold_optional_lock): New class.
* fileread.cc: Include "descriptors.h".
(File_read::~File_read): Release descriptor rather than closing
it.
(File_read::open) [file]: Call open_descriptor rather than open.
Set is_descriptor_opened_.
(File_read::open) [memory]: Assert that descriptor is not open.
(File_read::reopen_descriptor): New function.
(File_read::release): Release descriptor.
(File_read::do_read): Make non-const. Reopen descriptor.
(File_read::read): Make non-const.
(File_read::make_view): Reopen descriptor.
(File_read::do_readv): Likewise.
* fileread.h (class File_read): Add is_descriptor_opened_ field.
Update declarations.
* layout.cc: Include "descriptors.h".
(Layout::create_build_id): Use open_descriptor rather than open.
* output.cc: Include "descriptors.h".
(Output_file::open): Use open_descriptor rather than open.
* archive.cc (Archive::const_iterator): Change Archive to be
non-const.
(Archive::begin, Archive::end): Make non-const.
(Archive::count_members): Likewise.
* archive.h (class Archive): Update declarations.
* object.h (Object::read): Make non-const.
* Makefile.am (CCFILES): Add descriptors.cc.
(HFILES): Add descriptors.h.
* Makefile.in: Rebuild.
Diffstat (limited to 'gold/output.cc')
| -rw-r--r-- | gold/output.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gold/output.cc b/gold/output.cc index a24ee5f..145fca1 100644 --- a/gold/output.cc +++ b/gold/output.cc @@ -37,6 +37,7 @@ #include "symtab.h" #include "reloc.h" #include "merge.h" +#include "descriptors.h" #include "output.h" // Some BSD systems still use MAP_ANON instead of MAP_ANONYMOUS @@ -3321,7 +3322,8 @@ Output_file::open(off_t file_size) unlink_if_ordinary(this->name_); int mode = parameters->options().relocatable() ? 0666 : 0777; - int o = ::open(this->name_, O_RDWR | O_CREAT | O_TRUNC, mode); + int o = open_descriptor(-1, this->name_, O_RDWR | O_CREAT | O_TRUNC, + mode); if (o < 0) gold_fatal(_("%s: open: %s"), this->name_, strerror(errno)); this->o_ = o; |