diff options
| -rw-r--r-- | ChangeLog | 21 | ||||
| -rw-r--r-- | sysdeps/arm/fclrexcpt.c | 12 | ||||
| -rw-r--r-- | sysdeps/arm/fegetenv.c | 12 | ||||
| -rw-r--r-- | sysdeps/arm/fesetenv.c | 6 | ||||
| -rw-r--r-- | sysdeps/arm/feupdateenv.c | 12 | ||||
| -rw-r--r-- | sysdeps/arm/fgetexcptflg.c | 9 | ||||
| -rw-r--r-- | sysdeps/arm/fsetexcptflg.c | 10 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/Versions | 32 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/arm/posix_fadvise64.c | 17 |
9 files changed, 32 insertions, 99 deletions
diff --git a/ChangeLog b/ChangeLog index d09f2f46b5..d419edc3d7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2014-05-14 Joseph Myers <joseph@codesourcery.com> + + * sysdeps/arm/fclrexcpt.c (__feclearexcept): Rename to + feclearexcept. Remove symbol versioning code. + * sysdeps/arm/fegetenv.c (__fegetenv): Rename to fegetenv. Remove + symbol versioning code. + * sysdeps/arm/fesetenv.c (__fesetenv): Rename to fesetenv. Remove + symbol versioning code. + * sysdeps/arm/feupdateenv.c (__feupdateenv): Rename to + feupdateenv. Remove symbol versioning code. + * sysdeps/arm/fgetexcptflg.c (__fegetexceptflag): Rename to + fegetexceptflag. Remove symbol versioning code. + * sysdeps/arm/fsetexcptflg.c (__fesetexceptflag): Rename to + fesetexceptflag. Remove symbol versioning code. + * sysdeps/unix/sysv/linux/arm/Versions (libc): Remove GLIBC_2.0, + GLIBC_2.2 and GLIBC_2.3.3 entries. Change GLIBC_2.1 to GLIBC_2.4. + * sysdeps/unix/sysv/linux/arm/posix_fadvise64.c + (__posix_fadvise64_l32): Remove prototype. + [SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3)]: Remove conditional + code. + 2014-05-13 Roland McGrath <roland@hack.frob.com> * sysdeps/unix/sysv/linux/arm/nptl/bits/pthreadtypes.h: Moved ... diff --git a/sysdeps/arm/fclrexcpt.c b/sysdeps/arm/fclrexcpt.c index 8b54114e37..72eaab98de 100644 --- a/sysdeps/arm/fclrexcpt.c +++ b/sysdeps/arm/fclrexcpt.c @@ -22,7 +22,7 @@ int -__feclearexcept (int excepts) +feclearexcept (int excepts) { if (ARM_HAVE_VFP) { @@ -47,12 +47,4 @@ __feclearexcept (int excepts) /* Unsupported, so fail unless nothing needs to be done. */ return (excepts != 0); } - -#include <shlib-compat.h> -#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) -strong_alias (__feclearexcept, __old_feclearexcept) -compat_symbol (libm, __old_feclearexcept, feclearexcept, GLIBC_2_1); -#endif - -libm_hidden_ver (__feclearexcept, feclearexcept) -versioned_symbol (libm, __feclearexcept, feclearexcept, GLIBC_2_2); +libm_hidden_def (feclearexcept) diff --git a/sysdeps/arm/fegetenv.c b/sysdeps/arm/fegetenv.c index 7003a01304..a45c1af3cf 100644 --- a/sysdeps/arm/fegetenv.c +++ b/sysdeps/arm/fegetenv.c @@ -22,7 +22,7 @@ int -__fegetenv (fenv_t *envp) +fegetenv (fenv_t *envp) { if (ARM_HAVE_VFP) { @@ -37,12 +37,4 @@ __fegetenv (fenv_t *envp) /* Unsupported, so fail. */ return 1; } - -#include <shlib-compat.h> -#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) -strong_alias (__fegetenv, __old_fegetenv) -compat_symbol (libm, __old_fegetenv, fegetenv, GLIBC_2_1); -#endif - -libm_hidden_ver (__fegetenv, fegetenv) -versioned_symbol (libm, __fegetenv, fegetenv, GLIBC_2_2); +libm_hidden_def (fegetenv) diff --git a/sysdeps/arm/fesetenv.c b/sysdeps/arm/fesetenv.c index af4f25d47d..dabb88bb67 100644 --- a/sysdeps/arm/fesetenv.c +++ b/sysdeps/arm/fesetenv.c @@ -22,7 +22,7 @@ int -__fesetenv (const fenv_t *envp) +fesetenv (const fenv_t *envp) { if (ARM_HAVE_VFP) { @@ -58,6 +58,4 @@ __fesetenv (const fenv_t *envp) return 1; } -#include <shlib-compat.h> -libm_hidden_ver (__fesetenv, fesetenv) -versioned_symbol (libm, __fesetenv, fesetenv, GLIBC_2_2); +libm_hidden_def (fesetenv) diff --git a/sysdeps/arm/feupdateenv.c b/sysdeps/arm/feupdateenv.c index 58ec5f66db..f5deb60ade 100644 --- a/sysdeps/arm/feupdateenv.c +++ b/sysdeps/arm/feupdateenv.c @@ -23,7 +23,7 @@ int -__feupdateenv (const fenv_t *envp) +feupdateenv (const fenv_t *envp) { if (ARM_HAVE_VFP) { @@ -45,12 +45,4 @@ __feupdateenv (const fenv_t *envp) /* Unsupported, so fail. */ return 1; } - -#include <shlib-compat.h> -#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) -strong_alias (__feupdateenv, __old_feupdateenv) -compat_symbol (libm, __old_feupdateenv, feupdateenv, GLIBC_2_1); -#endif - -libm_hidden_ver (__feupdateenv, feupdateenv) -versioned_symbol (libm, __feupdateenv, feupdateenv, GLIBC_2_2); +libm_hidden_def (feupdateenv) diff --git a/sysdeps/arm/fgetexcptflg.c b/sysdeps/arm/fgetexcptflg.c index 114597990a..beb43be748 100644 --- a/sysdeps/arm/fgetexcptflg.c +++ b/sysdeps/arm/fgetexcptflg.c @@ -23,7 +23,7 @@ int -__fegetexceptflag (fexcept_t *flagp, int excepts) +fegetexceptflag (fexcept_t *flagp, int excepts) { if (ARM_HAVE_VFP) { @@ -41,10 +41,3 @@ __fegetexceptflag (fexcept_t *flagp, int excepts) /* Unsupported, so fail. */ return 1; } - -#include <shlib-compat.h> -#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) -strong_alias (__fegetexceptflag, __old_fegetexceptflag) -compat_symbol (libm, __old_fegetexceptflag, fegetexceptflag, GLIBC_2_1); -#endif -versioned_symbol (libm, __fegetexceptflag, fegetexceptflag, GLIBC_2_2); diff --git a/sysdeps/arm/fsetexcptflg.c b/sysdeps/arm/fsetexcptflg.c index 0c88c0fa70..7e3d007e96 100644 --- a/sysdeps/arm/fsetexcptflg.c +++ b/sysdeps/arm/fsetexcptflg.c @@ -23,7 +23,7 @@ int -__fesetexceptflag (const fexcept_t *flagp, int excepts) +fesetexceptflag (const fexcept_t *flagp, int excepts) { if (ARM_HAVE_VFP) { @@ -46,11 +46,3 @@ __fesetexceptflag (const fexcept_t *flagp, int excepts) /* Unsupported, so fail unless nothing needs to be done. */ return (excepts != 0); } - -#include <shlib-compat.h> -#if SHLIB_COMPAT (libm, GLIBC_2_1, GLIBC_2_2) -strong_alias (__fesetexceptflag, __old_fesetexceptflag) -compat_symbol (libm, __old_fesetexceptflag, fesetexceptflag, GLIBC_2_1); -#endif - -versioned_symbol (libm, __fesetexceptflag, fesetexceptflag, GLIBC_2_2); diff --git a/sysdeps/unix/sysv/linux/arm/Versions b/sysdeps/unix/sysv/linux/arm/Versions index be3f197a32..b0e9a4c1ae 100644 --- a/sysdeps/unix/sysv/linux/arm/Versions +++ b/sysdeps/unix/sysv/linux/arm/Versions @@ -1,39 +1,9 @@ libc { - GLIBC_2.0 { - # Exception handling support functions from libgcc - __register_frame; __register_frame_table; __deregister_frame; - __frame_state_for; __register_frame_info_table; - } - GLIBC_2.1 { + GLIBC_2.4 { ioperm; iopl; inb; inw; inl; outb; outw; outl; } - GLIBC_2.2 { - # functions used in other libraries - __xstat64; __fxstat64; __lxstat64; - - # a* - alphasort64; - - # g* - glob64; - - # New rlimit interface - getrlimit; setrlimit; getrlimit64; - - # r* - readdir64; readdir64_r; - - # s* - scandir64; - - # v* - versionsort64; - } - GLIBC_2.3.3 { - posix_fadvise64; posix_fallocate64; - } GLIBC_2.11 { fallocate64; } diff --git a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c b/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c index 7c14eec8f8..fc61c79049 100644 --- a/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c +++ b/sysdeps/unix/sysv/linux/arm/posix_fadvise64.c @@ -20,7 +20,6 @@ #include <sysdep.h> int __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise); -int __posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise); /* Advice the system about the expected behaviour of the application with respect to the file associated with FD. */ @@ -36,20 +35,4 @@ __posix_fadvise64_l64 (int fd, off64_t offset, off64_t len, int advise) return 0; return INTERNAL_SYSCALL_ERRNO (ret, err); } - -#include <shlib-compat.h> - -#if SHLIB_COMPAT(libc, GLIBC_2_2, GLIBC_2_3_3) - -int -attribute_compat_text_section -__posix_fadvise64_l32 (int fd, off64_t offset, size_t len, int advise) -{ - return __posix_fadvise64_l64 (fd, offset, len, advise); -} - -versioned_symbol (libc, __posix_fadvise64_l64, posix_fadvise64, GLIBC_2_3_3); -compat_symbol (libc, __posix_fadvise64_l32, posix_fadvise64, GLIBC_2_2); -#else strong_alias (__posix_fadvise64_l64, posix_fadvise64); -#endif |