mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-01-18 12:24:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

* descriptors.cc: Include "options.h".

Browse Source 
(FD_CLOEXEC, O_CLOEXEC): Define if not defined.
	(Descriptors::open): Always use O_CLOEXEC when opening a new
	descriptor.  If we have a plugin, and O_CLOEXEC was not defined,
	then set FD_CLOEXEC.
This commit is contained in:
Ian Lance Taylor 2009-03-17 17:09:44 +00:00
parent a89e647837
commit e85b18e10c
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gold/ChangeLog
View File

@ -1,5 +1,11 @@
2009-03-17 Ian Lance Taylor <iant@google.com>
* descriptors.cc: Include "options.h".
(FD_CLOEXEC, O_CLOEXEC): Define if not defined.
(Descriptors::open): Always use O_CLOEXEC when opening a new
descriptor. If we have a plugin, and O_CLOEXEC was not defined,
then set FD_CLOEXEC.
* sparc.cc (class Target_sparc): Add has_got_section.
(Target_sparc::Scan::global): If we see _GLOBAL_OFFSET_TABLE_,
make sure we have a GOT section.

54
gold/descriptors.cc
View File

@ -28,9 +28,20 @@
#include <unistd.h>
#include "parameters.h"
#include "options.h"
#include "gold-threads.h"
#include "descriptors.h"
// Very old systems may not define FD_CLOEXEC.
#ifndef FD_CLOEXEC
#define FD_CLOEXEC 1
#endif
// O_CLOEXEC is only available on newer systems.
#ifndef O_CLOEXEC
#define O_CLOEXEC 0
#endif
namespace gold
{
@ -87,6 +98,10 @@ Descriptors::open(int descriptor, const char* name, int flags, int mode)
while (true)
{
// We always want to set the close-on-exec flag; we don't
// require callers to pass it.
flags |= O_CLOEXEC;
int new_descriptor = ::open(name, flags, mode);
if (new_descriptor < 0
&& errno != ENFILE
@ -109,24 +124,35 @@ Descriptors::open(int descriptor, const char* name, int flags, int mode)
if (new_descriptor >= 0)
{
Hold_optional_lock hl(this->lock_);
// If we have any plugins, we really do need to set the
// close-on-exec flag, even if O_CLOEXEC is not defined.
// FIXME: In some cases O_CLOEXEC may be defined in the
// header file but not supported by the kernel.
// Unfortunately there doesn't seem to be any obvious way to
// detect that, as unknown flags passed to open are ignored.
if (O_CLOEXEC == 0 && parameters->options().has_plugins())
fcntl(new_descriptor, F_SETFD, FD_CLOEXEC);
if (static_cast<size_t>(new_descriptor)
>= this->open_descriptors_.size())
this->open_descriptors_.resize(new_descriptor + 64);
{
Hold_optional_lock hl(this->lock_);
Open_descriptor* pod = &this->open_descriptors_[new_descriptor];
pod->name = name;
pod->stack_next = -1;
pod->inuse = true;
pod->is_write = (flags & O_ACCMODE) != O_RDONLY;
pod->is_on_stack = false;
if (static_cast<size_t>(new_descriptor)
>= this->open_descriptors_.size())
this->open_descriptors_.resize(new_descriptor + 64);
++this->current_;
if (this->current_ >= this->limit_)
this->close_some_descriptor();
Open_descriptor* pod = &this->open_descriptors_[new_descriptor];
pod->name = name;
pod->stack_next = -1;
pod->inuse = true;
pod->is_write = (flags & O_ACCMODE) != O_RDONLY;
pod->is_on_stack = false;
return new_descriptor;
++this->current_;
if (this->current_ >= this->limit_)
this->close_some_descriptor();
return new_descriptor;
}
}
// We ran out of file descriptors.