diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | conform/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/fstatvfs.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/statvfs.c | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c | 4 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/wordsize-64/statvfs.c | 4 |
7 files changed, 28 insertions, 10 deletions
@@ -1,3 +1,20 @@ +2015-06-09 Joseph Myers <joseph@codesourcery.com> + + [BZ #18507] + * sysdeps/unix/sysv/linux/fstatvfs.c (fstatvfs): Rename to + __fstatvfs and define as weak alias of __fstatvfs. Use + libc_hidden_weak. + * sysdeps/unix/sysv/linux/statvfs.c (statvs): Rename to __statvfs + and define as weak alias of __statvfs. Use libc_hidden_weak. + * sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c (__fstatvfs64): + Define as alias of __fstatvfs, not fstatvfs. + (fstatvfs64): Likewise. + * sysdeps/unix/sysv/linux/wordsize-64/statvfs.c (__statvfs64): + Define as alias of __statvfs, not statvfs. + (statvfs64): Likewise. + * conform/Makefile (test-xfail-POSIX/unistd.h/linknamespace): + Remove variable. + 2015-06-09 Adhemerval Zanella <adhemerval.zanella@linaro.org> * sysdeps/unix/sysv/linux/powerpc/powerpc32/sysdep.h @@ -20,7 +20,7 @@ Version 2.22 18111, 18116, 18125, 18128, 18138, 18185, 18196, 18197, 18206, 18210, 18211, 18217, 18220, 18221, 18234, 18244, 18247, 18287, 18319, 18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434, 18444, - 18468, 18469, 18470, 18483, 18495, 18496, 18498. + 18468, 18469, 18470, 18483, 18495, 18496, 18498, 18507. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/conform/Makefile b/conform/Makefile index 943a196..12ccc64 100644 --- a/conform/Makefile +++ b/conform/Makefile @@ -361,7 +361,6 @@ test-xfail-POSIX/aio.h/linknamespace = yes test-xfail-POSIX/mqueue.h/linknamespace = yes test-xfail-POSIX/regex.h/linknamespace = yes test-xfail-POSIX/semaphore.h/linknamespace = yes -test-xfail-POSIX/unistd.h/linknamespace = yes test-xfail-UNIX98/fmtmsg.h/linknamespace = yes test-xfail-UNIX98/mqueue.h/linknamespace = yes test-xfail-UNIX98/netdb.h/linknamespace = yes diff --git a/sysdeps/unix/sysv/linux/fstatvfs.c b/sysdeps/unix/sysv/linux/fstatvfs.c index 4638526..1b61330 100644 --- a/sysdeps/unix/sysv/linux/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/fstatvfs.c @@ -26,7 +26,7 @@ extern void __internal_statvfs (const char *name, struct statvfs *buf, int -fstatvfs (int fd, struct statvfs *buf) +__fstatvfs (int fd, struct statvfs *buf) { struct statfs fsbuf; @@ -40,4 +40,5 @@ fstatvfs (int fd, struct statvfs *buf) /* We signal success if the statfs call succeeded. */ return 0; } -libc_hidden_def (fstatvfs) +weak_alias (__fstatvfs, fstatvfs) +libc_hidden_weak (fstatvfs) diff --git a/sysdeps/unix/sysv/linux/statvfs.c b/sysdeps/unix/sysv/linux/statvfs.c index 7af2fc5..e4ab62a 100644 --- a/sysdeps/unix/sysv/linux/statvfs.c +++ b/sysdeps/unix/sysv/linux/statvfs.c @@ -26,7 +26,7 @@ extern void __internal_statvfs (const char *name, struct statvfs *buf, int -statvfs (const char *file, struct statvfs *buf) +__statvfs (const char *file, struct statvfs *buf) { struct statfs fsbuf; @@ -40,4 +40,5 @@ statvfs (const char *file, struct statvfs *buf) /* We signal success if the statfs call succeeded. */ return 0; } -libc_hidden_def (statvfs) +weak_alias (__statvfs, statvfs) +libc_hidden_weak (statvfs) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c b/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c index d04bcd4..5803b6f 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/fstatvfs.c @@ -1,5 +1,5 @@ #define __fstatvfs64(file, buf) __no_fstatvfs64(file, buf) #define fstatvfs64(file, buf) no_fstatvfs64(file, buf) #include "../fstatvfs.c" -strong_alias (fstatvfs, __fstatvfs64) -weak_alias (fstatvfs, fstatvfs64) +strong_alias (__fstatvfs, __fstatvfs64) +weak_alias (__fstatvfs, fstatvfs64) diff --git a/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c b/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c index f369976..1e1c963 100644 --- a/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c +++ b/sysdeps/unix/sysv/linux/wordsize-64/statvfs.c @@ -1,5 +1,5 @@ #define __statvfs64(file, buf) __no_statvfs64(file, buf) #define statvfs64(file, buf) no_statvfs64(file, buf) #include "../statvfs.c" -strong_alias (statvfs, __statvfs64) -weak_alias (statvfs, statvfs64) +strong_alias (__statvfs, __statvfs64) +weak_alias (__statvfs, statvfs64) |