about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2014-10-09 01:11:14 +0000
committerJoseph Myers <joseph@codesourcery.com>2014-10-09 01:11:14 +0000
commit5deeb190146967ac05828b1fa6821182668356aa (patch)
treeb93a2f347106900abaf61dd5336da05829d73db9
parent454ac701e3639bfcb8919706319a685341536eda (diff)
downloadglibc-5deeb190146967ac05828b1fa6821182668356aa.tar.gz
glibc-5deeb190146967ac05828b1fa6821182668356aa.tar.xz
glibc-5deeb190146967ac05828b1fa6821182668356aa.zip
Remove stray *_internal aliases (bug 14132).
This patch removes some stray (unused) *_internal aliases, and
function prototypes with no corresponding definitions at all, at least
some of which were missed in previous INTDEF / INTUSE removal.

Not removed in this patch: __canonicalize_directory_name_internal,
noticed in the course of preparing this patch, isn't an alias, but an
actual function in sysdeps/mach/hurd/getcwd.c - apparently unused,
however.

Tested for x86_64 that installed stripped shared libraries are
unchanged by this patch.

	[BZ #14132]
	* include/wctype.h [!_ISOMAC] (__iswalpha_l_internal): Remove
	declaration.
	[!_ISOMAC] (__iswdigit_l_internal): Likewise.
	[!_ISOMAC] (__iswspace_l_internal): Likewise.
	[!_ISOMAC] (__iswxdigit_l_internal): Likewise.
	[!_ISOMAC] (__iswctype_internal): Likewise.
	* stdio-common/siglist.c (_sys_siglist_internal): Remove alias.
	* sysdeps/unix/syscalls.list (chown): Remove __chown_internal
	alias.
	(fcntl): Remove __fcntl_internal alias.
	* sysdeps/unix/sysv/linux/hppa/syscalls.list (connect): Remove
	__connect_internal alias.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (connect):
	Likewise.
-rw-r--r--ChangeLog16
-rw-r--r--include/wctype.h9
-rw-r--r--stdio-common/siglist.c1
-rw-r--r--sysdeps/unix/syscalls.list4
-rw-r--r--sysdeps/unix/sysv/linux/hppa/syscalls.list2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list2
6 files changed, 20 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 29a4113dfe..898ca847a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2014-10-09  Joseph Myers  <joseph@codesourcery.com>
 
+	[BZ #14132]
+	* include/wctype.h [!_ISOMAC] (__iswalpha_l_internal): Remove
+	declaration.
+	[!_ISOMAC] (__iswdigit_l_internal): Likewise.
+	[!_ISOMAC] (__iswspace_l_internal): Likewise.
+	[!_ISOMAC] (__iswxdigit_l_internal): Likewise.
+	[!_ISOMAC] (__iswctype_internal): Likewise.
+	* stdio-common/siglist.c (_sys_siglist_internal): Remove alias.
+	* sysdeps/unix/syscalls.list (chown): Remove __chown_internal
+	alias.
+	(fcntl): Remove __fcntl_internal alias.
+	* sysdeps/unix/sysv/linux/hppa/syscalls.list (connect): Remove
+	__connect_internal alias.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (connect):
+	Likewise.
+
 	* soft-fp/soft-fp.h (FP_DENORM_ZERO): New macro.
 	* soft-fp/op-common.h (_FP_UNPACK_CANONICAL): Check
 	FP_DENORM_ZERO.
diff --git a/include/wctype.h b/include/wctype.h
index a2ee9ff880..676c04358b 100644
--- a/include/wctype.h
+++ b/include/wctype.h
@@ -40,17 +40,8 @@ libc_hidden_proto (towupper)
 
 #ifndef _ISOMAC
 /* Internal interfaces.  */
-extern int __iswalpha_l_internal (wint_t __wc, __locale_t __locale)
-     attribute_hidden;
-extern int __iswdigit_l_internal (wint_t __wc, __locale_t __locale)
-     attribute_hidden;
-extern int __iswspace_l_internal (wint_t __wc, __locale_t __locale)
-     attribute_hidden;
-extern int __iswxdigit_l_internal (wint_t __wc, __locale_t __locale)
-     attribute_hidden;
 extern int __iswspace (wint_t __wc);
 extern int __iswctype (wint_t __wc, wctype_t __desc);
-extern int __iswctype_internal (wint_t __wc, wctype_t __desc) attribute_hidden;
 extern wctype_t __wctype (const char *__property);
 extern wctrans_t __wctrans (const char *__property);
 extern wint_t __towctrans (wint_t __wc, wctrans_t __desc);
diff --git a/stdio-common/siglist.c b/stdio-common/siglist.c
index 1f8d693de5..712169b1dd 100644
--- a/stdio-common/siglist.c
+++ b/stdio-common/siglist.c
@@ -26,7 +26,6 @@ const char *const _sys_siglist[NSIG] =
 #include <siglist.h>
 #undef init_sig
 };
-strong_alias (_sys_siglist, _sys_siglist_internal)
 
 
 const char *const _sys_sigabbrev[NSIG] =
diff --git a/sysdeps/unix/syscalls.list b/sysdeps/unix/syscalls.list
index 46205825ca..b3358bd933 100644
--- a/sysdeps/unix/syscalls.list
+++ b/sysdeps/unix/syscalls.list
@@ -7,7 +7,7 @@ adjtime		-	adjtime		i:pp	__adjtime	adjtime
 bind		-	bind		i:ipi	__bind		bind
 chdir		-	chdir		i:s	__chdir		chdir
 chmod		-	chmod		i:si	__chmod		chmod
-chown		-	chown		i:sii	__chown		__chown_internal chown
+chown		-	chown		i:sii	__chown		chown
 chroot		-	chroot		i:s	chroot
 close		-	close		Ci:i	__libc_close	__close close
 connect		-	connect		Ci:ipi	__libc_connect	__connect connect
@@ -17,7 +17,7 @@ dup3		-	dup3		i:iii	__dup3		dup3
 fchdir		-	fchdir		i:i	__fchdir	fchdir
 fchmod		-	fchmod		i:ii	__fchmod	fchmod
 fchown		-	fchown		i:iii	__fchown	fchown
-fcntl		-	fcntl		Ci:iiF	__libc_fcntl	__fcntl __fcntl_internal fcntl
+fcntl		-	fcntl		Ci:iiF	__libc_fcntl	__fcntl fcntl
 fstatfs		-	fstatfs		i:ip	__fstatfs	fstatfs
 fsync		-	fsync		Ci:i	__libc_fsync	fsync
 ftruncate	-	ftruncate	i:ii	__ftruncate	ftruncate
diff --git a/sysdeps/unix/sysv/linux/hppa/syscalls.list b/sysdeps/unix/sysv/linux/hppa/syscalls.list
index ae462edfe7..2cb8d027c3 100644
--- a/sysdeps/unix/sysv/linux/hppa/syscalls.list
+++ b/sysdeps/unix/sysv/linux/hppa/syscalls.list
@@ -17,7 +17,7 @@ semctl		-	semctl		i:iiii	__semctl	semctl
 # proper socket implementations:
 accept		-	accept		Ci:iBN	__libc_accept	__accept accept
 bind		-	bind		i:ipi	__bind		bind
-connect		-	connect		Ci:ipi	__libc_connect	__connect_internal __connect connect
+connect		-	connect		Ci:ipi	__libc_connect	__connect connect
 getpeername	-	getpeername	i:ipp	__getpeername	getpeername
 getsockname	-	getsockname	i:ipp	__getsockname	getsockname
 getsockopt	-	getsockopt	i:iiiBN	__getsockopt	getsockopt
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
index ca2953c6b9..3d1c1daac9 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list
@@ -4,7 +4,7 @@
 select		-	select		C:5	__select	select
 accept		-	accept		C:3	__libc_accept	__accept accept
 bind		-	bind		3	__bind		bind
-connect		-	connect		C:3	__libc_connect	__connect_internal __connect connect
+connect		-	connect		C:3	__libc_connect	__connect connect
 getpeername	-	getpeername	3	__getpeername	getpeername
 getsockname	-	getsockname	3	__getsockname	getsockname
 getsockopt	-	getsockopt	5	__getsockopt	getsockopt