diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-11-11 20:58:19 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-11-11 20:58:19 +0100 |
| commit | 12f79e597feb33e0321c49f7bc2f2ad2ff904b02 (patch) | |
| tree | c9af81c873351f3e31c4ecf2801236f3607a274c | |
| parent | 657f251c550d7248711ac5611c2be0d9e23aa417 (diff) | |
| parent | 7badf754cbe7882b2ff0ffea05e027820bd716f6 (diff) | |
Merge remote-tracking branch 'origin/upstream'
| -rw-r--r-- | extra/Configs/Config.in | 6 | ||||
| -rw-r--r-- | extra/Configs/Config.in.arch | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/statfs.c | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index f89f0cbf1..2dbd45540 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -1040,9 +1040,9 @@ config UCLIBC_LINUX_SPECIFIC ppoll(), readahead(), reboot(), remap_file_pages(), sched_getaffinity(), sched_setaffinity(), sendfile(), setfsgid(), setfsuid(), setresgid(), setresuid(), - splice(), vmsplice(), tee(), signalfd(), swapoff(), swapon(), - sync_file_range(), _sysctl(), sysinfo(), timerfd_*(), vhangup(), - umount(), umount2() + splice(), vmsplice(), tee(), signalfd(), statfs(), + swapoff(), swapon(), sync_file_range(), _sysctl(), + sysinfo(), timerfd_*(), vhangup(), umount(), umount2() config UCLIBC_HAS_GNU_ERROR bool "Support GNU extensions for error-reporting" diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch index 2338e3cb3..68e03bf9e 100644 --- a/extra/Configs/Config.in.arch +++ b/extra/Configs/Config.in.arch @@ -191,7 +191,7 @@ config UCLIBC_HAS_FENV config UCLIBC_HAS_LONG_DOUBLE_MATH bool "Enable long double support" depends on DO_C99_MATH - depends on TARGET_i386 || TARGET_m68k || TARGET_sparc || TARGET_x86_64 || TARGET_powerpc || TARGET_sh || TARGET_microblaze + depends on TARGET_i386 || TARGET_m68k || TARGET_sparc || TARGET_x86_64 || TARGET_powerpc || TARGET_sh || TARGET_microblaze || TARGET_xtensa default y help If you want the uClibc math library to contain the full set of C99 diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c index aae4738ea..3dfeb0b2c 100644 --- a/libc/sysdeps/linux/common/statfs.c +++ b/libc/sysdeps/linux/common/statfs.c @@ -34,6 +34,7 @@ int __libc_statfs(const char *path, struct statfs *buf) # if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__ /* statfs is used by NPTL, so it must exported in case */ weak_alias(__libc_statfs, statfs) +libc_hidden_def(statfs) # endif /* For systems which have both, prefer the old one */ @@ -45,7 +46,7 @@ _syscall2(int, __libc_statfs, const char *, path, struct statfs *, buf) # if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__ /* statfs is used by NPTL, so it must exported in case */ weak_alias(__libc_statfs, statfs) +libc_hidden_def(statfs) # endif #endif -libc_hidden_def(statfs) |