From: Samuel Thibault <samuel.thibault@ens-lyon.org>
To: libc-alpha@sourceware.org
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Subject: [PATCH] hurd: Fix early rtld access to errno
Date: Sun, 18 Mar 2018 01:53:00 -0000 [thread overview]
Message-ID: <20180318015332.9759-1-samuel.thibault@ens-lyon.org> (raw)
* sysdeps/generic/dl-sysdep.h (RTLD_EXTERN_ERRNO): Define macro to 0.
* sysdeps/mach/hurd/i386/dl-sysdep.h: Include <dl-sysdep.h>.
[IS_IN(rtld)] (RTLD_EXTERN_ERRNO): Define macro to 1.
[!IS_IN(rtld)] (RTLD_EXTERN_ERRNO): Define macro to 0.
* include/errno.h [IS_IN(rtld) && !defined RTLD_EXTERN_ERRNO]: Error
out.
[!IS_IN(rtld)] (RTLD_EXTERN_ERRNO): Define to 0.
[RTLD_EXTERN_ERRNO]: Do not use TLS access to errno.
---
include/errno.h | 6 +++++-
sysdeps/generic/dl-sysdep.h | 8 ++++++++
sysdeps/mach/hurd/i386/dl-sysdep.h | 27 +++++++++++++++++++++++++++
3 files changed, 40 insertions(+), 1 deletion(-)
create mode 100644 sysdeps/mach/hurd/i386/dl-sysdep.h
diff --git a/include/errno.h b/include/errno.h
index 3c3d2288c8..792f974518 100644
--- a/include/errno.h
+++ b/include/errno.h
@@ -7,8 +7,12 @@
# ifndef RTLD_PRIVATE_ERRNO
# error "dl-sysdep.h must define RTLD_PRIVATE_ERRNO!"
# endif
+# ifndef RTLD_EXTERN_ERRNO
+# error "dl-sysdep.h must define RTLD_EXTERN_ERRNO!"
+# endif
# else
# define RTLD_PRIVATE_ERRNO 0
+# define RTLD_EXTERN_ERRNO 0
# endif
# if RTLD_PRIVATE_ERRNO
@@ -20,7 +24,7 @@
# define errno rtld_errno
extern int rtld_errno attribute_hidden;
-# elif IS_IN_LIB
+# elif IS_IN_LIB && !RTLD_EXTERN_ERRNO
# include <tls.h>
diff --git a/sysdeps/generic/dl-sysdep.h b/sysdeps/generic/dl-sysdep.h
index 2cb8565b5b..d787f142e9 100644
--- a/sysdeps/generic/dl-sysdep.h
+++ b/sysdeps/generic/dl-sysdep.h
@@ -32,3 +32,11 @@
#else
# define RTLD_PRIVATE_ERRNO 0
#endif
+
+/* This macro must be defined to either 0 or 1.
+
+ If 1, then ld.so will use the external errno access through
+ __errno_location(). This may be needed if early TLS access to
+ errno can not work. */
+
+#define RTLD_EXTERN_ERRNO 0
diff --git a/sysdeps/mach/hurd/i386/dl-sysdep.h b/sysdeps/mach/hurd/i386/dl-sysdep.h
new file mode 100644
index 0000000000..1533753a49
--- /dev/null
+++ b/sysdeps/mach/hurd/i386/dl-sysdep.h
@@ -0,0 +1,27 @@
+/* System-specific settings for dynamic linker code. Hurd version.
+ Copyright (C) 2002-2018 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include_next <dl-sysdep.h>
+
+/* TLS access can not work early in ld.so. */
+
+#if IS_IN (rtld)
+# define RTLD_EXTERN_ERRNO 1
+#else
+# define RTLD_EXTERN_ERRNO 0
+#endif
--
2.16.2
next reply other threads:[~2018-03-18 1:53 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-18 1:53 Samuel Thibault [this message]
2018-03-18 2:07 ` Samuel Thibault
2018-03-19 9:22 ` Florian Weimer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180318015332.9759-1-samuel.thibault@ens-lyon.org \
--to=samuel.thibault@ens-lyon.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).