* descriptors.cc (set_close_on_exec): New function.
(Descriptors::open): Use set_close_on_exec. * output.cc (S_ISLNK): Define if not defined.
This commit is contained in:
parent
94a3fc8b83
commit
d0a9ace301
|
@ -1,3 +1,9 @@
|
||||||
|
2011-04-22 Vladimir Simonov <sv@sw.ru>
|
||||||
|
|
||||||
|
* descriptors.cc (set_close_on_exec): New function.
|
||||||
|
(Descriptors::open): Use set_close_on_exec.
|
||||||
|
* output.cc (S_ISLNK): Define if not defined.
|
||||||
|
|
||||||
2011-04-22 Cary Coutant <ccoutant@google.com>
|
2011-04-22 Cary Coutant <ccoutant@google.com>
|
||||||
|
|
||||||
* incremental.cc (Sized_incremental_binary::setup_readers): Allocate
|
* incremental.cc (Sized_incremental_binary::setup_readers): Allocate
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// descriptors.cc -- manage file descriptors for gold
|
// descriptors.cc -- manage file descriptors for gold
|
||||||
|
|
||||||
// Copyright 2008, 2009 Free Software Foundation, Inc.
|
// Copyright 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
|
||||||
// Written by Ian Lance Taylor <iant@google.com>.
|
// Written by Ian Lance Taylor <iant@google.com>.
|
||||||
|
|
||||||
// This file is part of gold.
|
// This file is part of gold.
|
||||||
|
@ -34,15 +34,24 @@
|
||||||
#include "descriptors.h"
|
#include "descriptors.h"
|
||||||
#include "binary-io.h"
|
#include "binary-io.h"
|
||||||
|
|
||||||
|
// O_CLOEXEC is only available on newer systems.
|
||||||
|
#ifndef O_CLOEXEC
|
||||||
|
#define O_CLOEXEC 0
|
||||||
|
#endif
|
||||||
|
|
||||||
// Very old systems may not define FD_CLOEXEC.
|
// Very old systems may not define FD_CLOEXEC.
|
||||||
#ifndef FD_CLOEXEC
|
#ifndef FD_CLOEXEC
|
||||||
#define FD_CLOEXEC 1
|
#define FD_CLOEXEC 1
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// O_CLOEXEC is only available on newer systems.
|
static inline void
|
||||||
#ifndef O_CLOEXEC
|
set_close_on_exec(int fd)
|
||||||
#define O_CLOEXEC 0
|
{
|
||||||
|
// Mingw does not define F_SETFD.
|
||||||
|
#ifdef F_SETFD
|
||||||
|
fcntl(fd, F_SETFD, FD_CLOEXEC);
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
namespace gold
|
namespace gold
|
||||||
{
|
{
|
||||||
|
@ -133,7 +142,7 @@ Descriptors::open(int descriptor, const char* name, int flags, int mode)
|
||||||
if (O_CLOEXEC == 0
|
if (O_CLOEXEC == 0
|
||||||
&& parameters->options_valid()
|
&& parameters->options_valid()
|
||||||
&& parameters->options().has_plugins())
|
&& parameters->options().has_plugins())
|
||||||
fcntl(new_descriptor, F_SETFD, FD_CLOEXEC);
|
set_close_on_exec(new_descriptor);
|
||||||
|
|
||||||
{
|
{
|
||||||
Hold_optional_lock hl(this->lock_);
|
Hold_optional_lock hl(this->lock_);
|
||||||
|
|
|
@ -121,6 +121,11 @@ posix_fallocate(int o, off_t offset, off_t len)
|
||||||
}
|
}
|
||||||
#endif // !defined(HAVE_POSIX_FALLOCATE)
|
#endif // !defined(HAVE_POSIX_FALLOCATE)
|
||||||
|
|
||||||
|
// Mingw does not have S_ISLNK.
|
||||||
|
#ifndef S_ISLNK
|
||||||
|
# define S_ISLNK(mode) 0
|
||||||
|
#endif
|
||||||
|
|
||||||
namespace gold
|
namespace gold
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue