Pārlūkot izejas kodu

Merge remote-tracking branch 'origin/upstream'

Waldemar Brodkorb 11 gadi atpakaļ
vecāks
revīzija
12f79e597f

+ 3 - 3
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"

+ 1 - 1
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

+ 2 - 1
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)