* [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
@ 2017-08-17 20:58 H.J. Lu
2017-08-18 12:55 ` Florian Weimer
0 siblings, 1 reply; 6+ messages in thread
From: H.J. Lu @ 2017-08-17 20:58 UTC (permalink / raw)
To: GNU C Library
Mark __internal_statvfs[64] with attribute_hidden to allow direct access
to them within libc.so and libc.a without using GOT nor PLT.
Tested on i686 and x86-64. OK for master?
H.J.
--
[BZ #18822]
* include/sys/statvfs.h (__internal_statvfs): New prototype.
(__internal_statvfs64): Likewise.
* sysdeps/unix/sysv/linux/fstatvfs.c (__internal_statvfs):
Removed.
* sysdeps/unix/sysv/linux/fstatvfs64.c (__internal_statvfs64):
Likewise.
* sysdeps/unix/sysv/linux/statvfs.c (__internal_statvfs):
Likewise.
* sysdeps/unix/sysv/linux/statvfs64.c (__internal_statvfs64):
Likewise.
---
include/sys/statvfs.h | 8 ++++++++
sysdeps/unix/sysv/linux/fstatvfs.c | 4 ----
sysdeps/unix/sysv/linux/fstatvfs64.c | 5 -----
sysdeps/unix/sysv/linux/statvfs.c | 4 ----
sysdeps/unix/sysv/linux/statvfs64.c | 5 -----
5 files changed, 8 insertions(+), 18 deletions(-)
diff --git a/include/sys/statvfs.h b/include/sys/statvfs.h
index fa3045386d..1a36ff6450 100644
--- a/include/sys/statvfs.h
+++ b/include/sys/statvfs.h
@@ -6,6 +6,14 @@
extern int __statvfs64 (const char *__file, struct statvfs64 *__buf);
extern int __fstatvfs64 (int __fildes, struct statvfs64 *__buf);
+extern void __internal_statvfs (const char *name, struct statvfs *buf,
+ struct statfs *fsbuf, int fd)
+ attribute_hidden;
+extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
+ struct statfs64 *fsbuf, int fd)
+ attribute_hidden;
+
+
libc_hidden_proto (statvfs)
libc_hidden_proto (fstatvfs)
#endif
diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c
index e07a5b9f3d..0a947c30db 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs.c
@@ -21,10 +21,6 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
-extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
-
int
__fstatvfs (int fd, struct statvfs *buf)
{
diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c
index 02a0d7ee42..bab3653e1b 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs64.c
@@ -23,11 +23,6 @@
#include <sys/statvfs.h>
#include <kernel-features.h>
-
-extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
- struct statfs64 *fsbuf, int fd);
-
-
/* Return information about the filesystem on which FD resides. */
int
__fstatvfs64 (int fd, struct statvfs64 *buf)
diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c
index 744336e33b..92aeb164ce 100644
--- a/sysdeps/unix/sysv/linux/statvfs.c
+++ b/sysdeps/unix/sysv/linux/statvfs.c
@@ -21,10 +21,6 @@
#include <sys/statfs.h>
#include <sys/statvfs.h>
-extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
-
int
__statvfs (const char *file, struct statvfs *buf)
{
diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c
index a89f720b38..ff4bdc61d1 100644
--- a/sysdeps/unix/sysv/linux/statvfs64.c
+++ b/sysdeps/unix/sysv/linux/statvfs64.c
@@ -24,11 +24,6 @@
#include <sys/statvfs.h>
#include <kernel-features.h>
-
-extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
- struct statfs64 *fsbuf, int fd);
-
-
/* Return information about the filesystem on which FILE resides. */
int
__statvfs64 (const char *file, struct statvfs64 *buf)
--
2.13.5
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
2017-08-17 20:58 [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822] H.J. Lu
@ 2017-08-18 12:55 ` Florian Weimer
2017-08-18 13:15 ` H.J. Lu
0 siblings, 1 reply; 6+ messages in thread
From: Florian Weimer @ 2017-08-18 12:55 UTC (permalink / raw)
To: H.J. Lu; +Cc: GNU C Library
On 08/17/2017 10:58 PM, H.J. Lu wrote:
> Mark __internal_statvfs[64] with attribute_hidden to allow direct access
> to them within libc.so and libc.a without using GOT nor PLT.
>
> Tested on i686 and x86-64. OK for master?
This is a bit odd because the include/ headers are supposed to be
generic, and the declarations you add are Linux-specific. In the past,
we would have added a Linux-specific header under
sysdeps/unix/sysv/linux for that.
I don't have a strong opinion either way.
Thanks,
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
2017-08-18 12:55 ` Florian Weimer
@ 2017-08-18 13:15 ` H.J. Lu
2017-08-18 13:19 ` Florian Weimer
0 siblings, 1 reply; 6+ messages in thread
From: H.J. Lu @ 2017-08-18 13:15 UTC (permalink / raw)
To: Florian Weimer; +Cc: GNU C Library
On Fri, Aug 18, 2017 at 5:55 AM, Florian Weimer <fweimer@redhat.com> wrote:
> On 08/17/2017 10:58 PM, H.J. Lu wrote:
>> Mark __internal_statvfs[64] with attribute_hidden to allow direct access
>> to them within libc.so and libc.a without using GOT nor PLT.
>>
>> Tested on i686 and x86-64. OK for master?
>
> This is a bit odd because the include/ headers are supposed to be
> generic, and the declarations you add are Linux-specific. In the past,
> we would have added a Linux-specific header under
> sysdeps/unix/sysv/linux for that.
>
> I don't have a strong opinion either way.
>
Header files under include override both generic and non-generic header
files. __KERNEL_STRICT_NAMES is another example.
--
H.J.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
2017-08-18 13:15 ` H.J. Lu
@ 2017-08-18 13:19 ` Florian Weimer
2017-08-18 13:25 ` Adhemerval Zanella
0 siblings, 1 reply; 6+ messages in thread
From: Florian Weimer @ 2017-08-18 13:19 UTC (permalink / raw)
To: H.J. Lu; +Cc: GNU C Library
On 08/18/2017 03:15 PM, H.J. Lu wrote:
> On Fri, Aug 18, 2017 at 5:55 AM, Florian Weimer <fweimer@redhat.com> wrote:
>> On 08/17/2017 10:58 PM, H.J. Lu wrote:
>>> Mark __internal_statvfs[64] with attribute_hidden to allow direct access
>>> to them within libc.so and libc.a without using GOT nor PLT.
>>>
>>> Tested on i686 and x86-64. OK for master?
>>
>> This is a bit odd because the include/ headers are supposed to be
>> generic, and the declarations you add are Linux-specific. In the past,
>> we would have added a Linux-specific header under
>> sysdeps/unix/sysv/linux for that.
>>
>> I don't have a strong opinion either way.
>>
>
> Header files under include override both generic and non-generic header
> files. __KERNEL_STRICT_NAMES is another example.
Right. I'm sure your patch works as intended (at least on most
architectures). It's just a matter of policy to what extent we want to
uphold the fiction that upstream glibc supports more than just Linux.
Thanks,
Florian
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
2017-08-18 13:19 ` Florian Weimer
@ 2017-08-18 13:25 ` Adhemerval Zanella
2017-08-18 15:45 ` H.J. Lu
0 siblings, 1 reply; 6+ messages in thread
From: Adhemerval Zanella @ 2017-08-18 13:25 UTC (permalink / raw)
To: libc-alpha
On 18/08/2017 10:19, Florian Weimer wrote:
> On 08/18/2017 03:15 PM, H.J. Lu wrote:
>> On Fri, Aug 18, 2017 at 5:55 AM, Florian Weimer <fweimer@redhat.com> wrote:
>>> On 08/17/2017 10:58 PM, H.J. Lu wrote:
>>>> Mark __internal_statvfs[64] with attribute_hidden to allow direct access
>>>> to them within libc.so and libc.a without using GOT nor PLT.
>>>>
>>>> Tested on i686 and x86-64. OK for master?
>>>
>>> This is a bit odd because the include/ headers are supposed to be
>>> generic, and the declarations you add are Linux-specific. In the past,
>>> we would have added a Linux-specific header under
>>> sysdeps/unix/sysv/linux for that.
>>>
>>> I don't have a strong opinion either way.
>>>
>>
>> Header files under include override both generic and non-generic header
>> files. __KERNEL_STRICT_NAMES is another example.
>
> Right. I'm sure your patch works as intended (at least on most
> architectures). It's just a matter of policy to what extent we want to
> uphold the fiction that upstream glibc supports more than just Linux.
I also think it should be on a Linux only header, mostly for organization.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
2017-08-18 13:25 ` Adhemerval Zanella
@ 2017-08-18 15:45 ` H.J. Lu
0 siblings, 0 replies; 6+ messages in thread
From: H.J. Lu @ 2017-08-18 15:45 UTC (permalink / raw)
To: Adhemerval Zanella; +Cc: GNU C Library
[-- Attachment #1: Type: text/plain, Size: 1372 bytes --]
On Fri, Aug 18, 2017 at 6:24 AM, Adhemerval Zanella
<adhemerval.zanella@linaro.org> wrote:
>
>
> On 18/08/2017 10:19, Florian Weimer wrote:
>> On 08/18/2017 03:15 PM, H.J. Lu wrote:
>>> On Fri, Aug 18, 2017 at 5:55 AM, Florian Weimer <fweimer@redhat.com> wrote:
>>>> On 08/17/2017 10:58 PM, H.J. Lu wrote:
>>>>> Mark __internal_statvfs[64] with attribute_hidden to allow direct access
>>>>> to them within libc.so and libc.a without using GOT nor PLT.
>>>>>
>>>>> Tested on i686 and x86-64. OK for master?
>>>>
>>>> This is a bit odd because the include/ headers are supposed to be
>>>> generic, and the declarations you add are Linux-specific. In the past,
>>>> we would have added a Linux-specific header under
>>>> sysdeps/unix/sysv/linux for that.
>>>>
>>>> I don't have a strong opinion either way.
>>>>
>>>
>>> Header files under include override both generic and non-generic header
>>> files. __KERNEL_STRICT_NAMES is another example.
>>
>> Right. I'm sure your patch works as intended (at least on most
>> architectures). It's just a matter of policy to what extent we want to
>> uphold the fiction that upstream glibc supports more than just Linux.
>
> I also think it should be on a Linux only header, mostly for organization.
Here is the updated patch with a new header file,
sysdeps/unix/sysv/linux/internal_statvfs.h
OK for master?
Thanks.
--
H.J.
[-- Attachment #2: 0001-Mark-__internal_statvfs-64-with-attribute_hidden-BZ-.patch --]
[-- Type: text/x-patch, Size: 5657 bytes --]
From 48388138143a01bf3031a3d0d43351f739c20ac2 Mon Sep 17 00:00:00 2001
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Thu, 17 Aug 2017 12:35:02 -0700
Subject: [PATCH] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822]
Mark __internal_statvfs[64] with attribute_hidden to allow direct access
to them within libc.so and libc.a without using GOT nor PLT.
[BZ #18822]
* sysdeps/unix/sysv/linux/fstatvfs.c: Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs): Removed.
* sysdeps/unix/sysv/linux/fstatvfs64.c Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs64): Removed.
* sysdeps/unix/sysv/linux/internal_statvfs.c: Include
"internal_statvfs.h" instead of <sys/statvfs.h>.
* sysdeps/unix/sysv/linux/internal_statvfs.h: New file.
* sysdeps/unix/sysv/linux/statvfs.c Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs): Removed.
* sysdeps/unix/sysv/linux/statvfs64.c Include "internal_statvfs.h"
instead of <sys/statvfs.h>.
(__internal_statvfs64): Removed.
---
sysdeps/unix/sysv/linux/fstatvfs.c | 6 +-----
sysdeps/unix/sysv/linux/fstatvfs64.c | 7 +------
sysdeps/unix/sysv/linux/internal_statvfs.c | 2 +-
sysdeps/unix/sysv/linux/internal_statvfs.h | 26 ++++++++++++++++++++++++++
sysdeps/unix/sysv/linux/statvfs.c | 6 +-----
sysdeps/unix/sysv/linux/statvfs64.c | 7 +------
6 files changed, 31 insertions(+), 23 deletions(-)
create mode 100644 sysdeps/unix/sysv/linux/internal_statvfs.h
diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c
index e07a5b9f3d..1b2f279291 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs.c
@@ -19,11 +19,7 @@
#include <stddef.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
-
-extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
+#include "internal_statvfs.h"
int
__fstatvfs (int fd, struct statvfs *buf)
diff --git a/sysdeps/unix/sysv/linux/fstatvfs64.c b/sysdeps/unix/sysv/linux/fstatvfs64.c
index 02a0d7ee42..c923208ea8 100644
--- a/sysdeps/unix/sysv/linux/fstatvfs64.c
+++ b/sysdeps/unix/sysv/linux/fstatvfs64.c
@@ -20,14 +20,9 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
+#include "internal_statvfs.h"
#include <kernel-features.h>
-
-extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
- struct statfs64 *fsbuf, int fd);
-
-
/* Return information about the filesystem on which FD resides. */
int
__fstatvfs64 (int fd, struct statvfs64 *buf)
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.c b/sysdeps/unix/sysv/linux/internal_statvfs.c
index 9a17ca5c17..0a8dc35e16 100644
--- a/sysdeps/unix/sysv/linux/internal_statvfs.c
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.c
@@ -26,7 +26,7 @@
#include <sys/mount.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
+#include "internal_statvfs.h"
#include "linux_fsinfo.h"
#include <kernel-features.h>
diff --git a/sysdeps/unix/sysv/linux/internal_statvfs.h b/sysdeps/unix/sysv/linux/internal_statvfs.h
new file mode 100644
index 0000000000..1762bbc6c6
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/internal_statvfs.h
@@ -0,0 +1,26 @@
+/* Internal statvfs/statvfs64 function prototypes.
+ Copyright (C) 2017 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 <sys/statvfs.h>
+
+extern void __internal_statvfs (const char *name, struct statvfs *buf,
+ struct statfs *fsbuf, int fd)
+ attribute_hidden;
+extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
+ struct statfs64 *fsbuf, int fd)
+ attribute_hidden;
diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c
index 744336e33b..1edf1acca9 100644
--- a/sysdeps/unix/sysv/linux/statvfs.c
+++ b/sysdeps/unix/sysv/linux/statvfs.c
@@ -19,11 +19,7 @@
#include <stddef.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
-
-extern void __internal_statvfs (const char *name, struct statvfs *buf,
- struct statfs *fsbuf, int fd);
-
+#include "internal_statvfs.h"
int
__statvfs (const char *file, struct statvfs *buf)
diff --git a/sysdeps/unix/sysv/linux/statvfs64.c b/sysdeps/unix/sysv/linux/statvfs64.c
index a89f720b38..005495fa20 100644
--- a/sysdeps/unix/sysv/linux/statvfs64.c
+++ b/sysdeps/unix/sysv/linux/statvfs64.c
@@ -21,14 +21,9 @@
#include <string.h>
#include <sys/stat.h>
#include <sys/statfs.h>
-#include <sys/statvfs.h>
+#include "internal_statvfs.h"
#include <kernel-features.h>
-
-extern void __internal_statvfs64 (const char *name, struct statvfs64 *buf,
- struct statfs64 *fsbuf, int fd);
-
-
/* Return information about the filesystem on which FILE resides. */
int
__statvfs64 (const char *file, struct statvfs64 *buf)
--
2.13.5
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2017-08-18 15:45 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-17 20:58 [PATCH 2/4] Mark __internal_statvfs[64] with attribute_hidden [BZ #18822] H.J. Lu
2017-08-18 12:55 ` Florian Weimer
2017-08-18 13:15 ` H.J. Lu
2017-08-18 13:19 ` Florian Weimer
2017-08-18 13:25 ` Adhemerval Zanella
2017-08-18 15:45 ` H.J. Lu
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).