Remove __libc_creat function name.

glibc has lots of __libc_* function names that no longer serve any
purpose (are not used for any calls or exported at a public symbol
version).  This patch removes __libc_creat.  It has the effect of
creat becoming a strong symbol instead of a weak symbol in various
cases, but that's fine; in shared libraries it doesn't matter at all,
while for static linking the only other symbol sometimes defined in
the same object is creat64, and whenever creat64 is a reserved name so
is creat.

Other such cases of unnecessary __libc_* symbols are expected to be
dealt with in separate patches over time.

Tested for x86_64 (testsuite, and that the disassembly of installed
shared libraries is unchanged by the patch).

	* include/fcntl.h (__libc_creat): Remove declaration.
	* io/creat.c (__libc_creat): Rename to creat.
	(creat): Do not define as alias.
	* sysdeps/unix/sysv/linux/alpha/creat.c (creat64): Define as alias
	of creat instead of __libc_creat.
	* sysdeps/unix/sysv/linux/generic/creat.c (__libc_creat): Rename
	to creat.
	(creat): Do not define as alias.
	[__WORDSIZE == 64] (creat64): Define as alias of creat instead of
	__libc_creat.
	* sysdeps/unix/sysv/linux/syscalls.list (creat): Do not define
	__libc_creat name.
	* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (creat):
	Likewise.
This commit is contained in:
Joseph Myers 2014-10-30 19:44:31 +00:00
parent 0c6891a003
commit d4e157aaae
7 changed files with 23 additions and 9 deletions

View File

@ -1,3 +1,20 @@
2014-10-30 Joseph Myers <joseph@codesourcery.com>
* include/fcntl.h (__libc_creat): Remove declaration.
* io/creat.c (__libc_creat): Rename to creat.
(creat): Do not define as alias.
* sysdeps/unix/sysv/linux/alpha/creat.c (creat64): Define as alias
of creat instead of __libc_creat.
* sysdeps/unix/sysv/linux/generic/creat.c (__libc_creat): Rename
to creat.
(creat): Do not define as alias.
[__WORDSIZE == 64] (creat64): Define as alias of creat instead of
__libc_creat.
* sysdeps/unix/sysv/linux/syscalls.list (creat): Do not define
__libc_creat name.
* sysdeps/unix/sysv/linux/wordsize-64/syscalls.list (creat):
Likewise.
2014-10-29 Carlos O'Donell <carlos@redhat.com>
* manual/llio.texi: Add comments discussing why write() may be

View File

@ -8,7 +8,6 @@ libc_hidden_proto (__open64)
extern int __libc_open64 (const char *file, int oflag, ...);
extern int __libc_open (const char *file, int oflag, ...);
libc_hidden_proto (__libc_open)
extern int __libc_creat (const char *file, mode_t mode);
extern int __libc_fcntl (int fd, int cmd, ...);
#ifndef NO_CANCELLATION
extern int __fcntl_nocancel (int fd, int cmd, ...) attribute_hidden;

View File

@ -23,13 +23,12 @@
/* Create FILE with protections MODE. */
int
__libc_creat (file, mode)
creat (file, mode)
const char *file;
mode_t mode;
{
return __open (file, O_WRONLY|O_CREAT|O_TRUNC, mode);
}
weak_alias (__libc_creat, creat)
/* __open handles cancellation. */
LIBC_CANCEL_HANDLED ();

View File

@ -5,4 +5,4 @@
could have overridden that with a create64.c, but we might as well do
the right thing and set up creat64 as an alias. */
#include <io/creat.c>
weak_alias(__libc_creat, creat64)
weak_alias(creat, creat64)

View File

@ -24,15 +24,14 @@
/* Create FILE with protections MODE. */
int
__libc_creat (const char *file, mode_t mode)
creat (const char *file, mode_t mode)
{
return __open (file, O_WRONLY | O_CREAT | O_TRUNC, mode);
}
weak_alias (__libc_creat, creat)
/* __open handles cancellation. */
LIBC_CANCEL_HANDLED ();
#if __WORDSIZE == 64
weak_alias (__libc_creat, creat64)
weak_alias (creat, creat64)
#endif

View File

@ -6,7 +6,7 @@ bdflush EXTRA bdflush i:ii bdflush
capget EXTRA capget i:pp capget
capset EXTRA capset i:pp capset
clock_adjtime EXTRA clock_adjtime i:ip clock_adjtime
creat - creat Ci:si __libc_creat creat
creat - creat Ci:si creat
create_module EXTRA create_module 3 create_module
delete_module EXTRA delete_module 3 delete_module
epoll_create EXTRA epoll_create i:i epoll_create

View File

@ -15,7 +15,7 @@ setrlimit - setrlimit i:ip __setrlimit setrlimit setrlimit64
readahead - readahead i:iii __readahead readahead
sendfile - sendfile i:iipi sendfile sendfile64
sync_file_range - sync_file_range Ci:iiii sync_file_range
creat - creat Ci:si __libc_creat creat creat64
creat - creat Ci:si creat creat64
open - open Ci:siv __libc_open __open open __open64 open64
prlimit EXTRA prlimit64 i:iipp prlimit prlimit64