Remove uClibc version selection: always use uClibc-ng

Hello,

Since April 2015, the uClibc-ng has done very regular releases of the uClibc C library, and is the de-facto active replacement of the now defunct uClibc project.

uClibc 0.9.33 is going to be 4 years old in the coming months, and we already need 50+ patches to make it somewhat usable.

It is therefore time to simply offer uClibc-ng as our only supported uClibc version, and remove the options of using uClibc 0.9.33 and uClibc-snapshot. To achieve this, this patch series:

- Removes references to the BR2_UCLIBC_VERSION_SNAPSHOT option from various packages: libunwind, lttng-babeltrace, mongrel2, vlc and samba4. The dependencies of those packages are updated, and will now allow in many cases to build such packages with uClibc-ng, and sometimes with musl when possible.

- Removes the uClibc 0.9.33 and uClibc snapshot options.

- Removes the support for version selection in the uclibc package.

Changes since v1:

- Rebased on top of master.

- Re-enable libunwind on mips64 and mips64el, as noticed by Romain Naour.

- Fix typos in the lttng-babeltrace commit log and add Tested-by and Reviewed-by tags from Romain Naour.

- Added Tested-by / Reviewed-by from Romain Naour on the vlc patch.

- Explain in the commit log why samba4 can still not be enabled on
musl: due to the native RPC dependency.

- Note that as suggested by Arnout Vandecappelle, legacy handling is not added. Users having selected uClibc 0.9.33 or uClibc snapshot in their configuration will automatically be moved to use uClibc-ng, which is actually what we want, and is anyway what happens when we bump other packages.

Best regards,

Thomas

Thomas Petazzoni (8):
libunwind: fix C library dependency
lttng-babeltrace: make available for all C libraries
mongrel2: allow using uClibc but only on certain architectures
vlc: remove dependency on C library
samba4: remove dependency on specific C libraries
uclibc: remove 0.9.33 version
uclibc: remove support for the snapshot version
uclibc: remove version selection

 package/libunwind/Config.in                        |   31 +-
 package/lttng-babeltrace/Config.in                 |    6 +-
 package/mongrel2/Config.in                         |   22 +-
 package/samba4/Config.in                           |    7 +-
 .../0001-bits-time.h-sync-with-glibc-2.16.patch    |   37 -
 .../uclibc/0.9.33.2/0003-Add-dup3-syscall.patch    |   54 -
 ...deps-add-__kernel_long-and-__kernel_ulong.patch |  381 ------
 ...estore-stack-pointer-just-after-return-fr.patch |   42 -
 ...e.S-Add-missing-IT-instruction-for-Thumb2.patch |   29 -
 ...8-arm-move-check-for-BX-to-its-own-header.patch |  257 ----
 .../0.9.33.2/0009-mips64-fix-n64-interp.patch      |   51 -
 ...0010-Rules.mak-fix-breakage-from-603af30d.patch |   31 -
 ...11-libc-add-non-standard-execvpe-function.patch |  163 ---
 .../0012-libc-stdlib-add-mkostemp-helpers.patch    |  155 ---
 ...ventfd-Implement-eventfd2-and-fix-eventfd.patch |   64 -
 .../uclibc/0.9.33.2/0015-add-posix_madvise.c.patch |   61 -
 ...ptl-sh-fix-race-condition-in-lll_wait_tid.patch |   38 -
 ...d-SIGCANCEL-to-the-list-of-blocked-signal.patch |   37 -
 ...18-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch |   52 -
 ...nclude-elf.h-update-for-ELFOSABI_-changes.patch |   34 -
 ...0020-update-ptrace.h-to-latest-from-glibc.patch |  113 --
 ...x-authnone_marshal-in-multithreading-cont.patch |  128 --
 ...t-__syscall_error-callers-to-use-a0-for-a.patch |   57 -
 ...-instead-of-v0-for-__syscall_error-argume.patch |   63 -
 ...se-.arm-mode-for-resolver-unconditionally.patch |   29 -
 ...s-getpid-behave-similar-to-the-common-one.patch |   53 -
 ...yscalls.h-allow-immediate-values-as-6th-s.patch |   33 -
 .../0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch |   57 -
 .../0029-inet-rpc-fix-build-in-NPTL-case.patch     |   58 -
 ...plement-assignment-allocation-m-character.patch |  190 ---
 ...map-sys_mmap2-do-unsigned-shift-of-offset.patch |   35 -
 .../0.9.33.2/0033-rpmatch-backport-function.patch  |   78 --
 .../0.9.33.2/0034-statfs-support-f_frsize.patch    |  189 ---
 ...5-socket.h-pull-socket_type.h-from-eglibc.patch | 1374 --------------------
 package/uclibc/0.9.33.2/0036-mount.h-update.patch  |   91 --
 ...n_bits_syscall_h-do-not-leave-undefined-S.patch |   38 -
 ...38-libc-sysdeps-sync-bits-in.h-with-glibc.patch |  117 --
 ...-reuse-free-slots-at-the-end-of-exit-func.patch |   43 -
 ...ame-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch |  200 ---
 .../0.9.33.2/0041-libc-add-posix_fallocate.patch   |  337 -----
 ...-fix-overflow-checking-in-int_add_no_wrap.patch |   44 -
 ...Add-missing-SYMBOL_PREFIX-to-symbol-names.patch |   86 --
 ...inet-do-not-filter-responses-in-res_query.patch |   46 -
 ...-Remove-pragma-weak-for-undeclared-symbol.patch |   39 -
 ...tting-the-nameserver-from-_res-state-afte.patch |   34 -
 ...-use-fputws_unlocked-S-F-instead-of-fputw.patch |   30 -
 ...48-Fix-a-problem-with-scanning-wide-chars.patch |   66 -
 ...agileness-in-dlopen-do_dlopen-wrapper-wor.patch |   66 -
 ...lopen-implementation-from-statically-link.patch |   60 -
 ...ce-fix-backtrace-for-statically-linked-ap.patch |  168 ---
 ...libubacktrace-fix-build-due-to-some-typos.patch |   39 -
 ...plicitly-include-uClibc_page.h-to-make-PA.patch |   30 -
 ...se-new-bits-scheme-for-arch-specific-flag.patch |  284 ----
 ...5-siginfo_h-add-a-missing-function-member.patch |   66 -
 ...-_NSIG-to-128-not-129.-This-matches-glibc.patch |   43 -
 ...EV_PAD_SIZE-takes-__WORDSIZE-into-account.patch |   70 -
 ...atus.h-correctly-interpret-status-0x007f-.patch |   54 -
 ...58-test-tls-fix-build-with-newer-binutils.patch |   37 -
 .../0.9.33.2/0059-test-cater-for-config.patch      |   81 --
 .../0.9.33.2/0060-test-Fix-math-c-dependency.patch |   30 -
 .../0.9.33.2/0061-fix-sparc-networking.patch       |   39 -
 ...ibdl-Also-include-dl-tls.h-for-for-SHARED.patch |   58 -
 ...nptl-remove-duplicate-vfork-in-libpthread.patch |  691 ----------
 ...erpc-update-ptrace.h-to-latest-from-glibc.patch |  134 --
 ...parc-update-ptrace.h-to-latest-from-glibc.patch |  151 ---
 ...clude-__iconv_codesets-into-iconv-utility.patch |   79 --
 .../0066-mips-rename-siginfo-_timer-members.patch  |  157 ---
 ...-guard-tcb-offsets.h-include-with-RESET_P.patch |   31 -
 ...t-implementations-conditional-compilation.patch |   58 -
 .../0069-Add-missing-C99-float-ld-wrappers.patch   |  870 -------------
 ...-honor-NO_LONG_DOUBLE-in-ldouble_wrappers.patch |   89 --
 .../0.9.33.2/0071-Fix-libgcc_s_resume-issue.patch  |   56 -
 package/uclibc/Config.in                           |   67 +-
 package/uclibc/uClibc-0.9.33.config                |  277 ----
 package/uclibc/uClibc-snapshot.config              |   41 -
 package/uclibc/uclibc.hash                         |    6 -
 package/uclibc/uclibc.mk                           |   17 +-
 package/vlc/Config.in                              |    8 +-
 78 files changed, 52 insertions(+), 8985 deletions(-)
 delete mode 100644 package/uclibc/0.9.33.2/0001-bits-time.h-sync-with-glibc-2.16.patch
 delete mode 100644 package/uclibc/0.9.33.2/0003-Add-dup3-syscall.patch
 delete mode 100644 package/uclibc/0.9.33.2/0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
 delete mode 100644 package/uclibc/0.9.33.2/0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch
 delete mode 100644 package/uclibc/0.9.33.2/0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch
 delete mode 100644 package/uclibc/0.9.33.2/0008-arm-move-check-for-BX-to-its-own-header.patch
 delete mode 100644 package/uclibc/0.9.33.2/0009-mips64-fix-n64-interp.patch
 delete mode 100644 package/uclibc/0.9.33.2/0010-Rules.mak-fix-breakage-from-603af30d.patch
 delete mode 100644 package/uclibc/0.9.33.2/0011-libc-add-non-standard-execvpe-function.patch
 delete mode 100644 package/uclibc/0.9.33.2/0012-libc-stdlib-add-mkostemp-helpers.patch
 delete mode 100644 package/uclibc/0.9.33.2/0013-eventfd-Implement-eventfd2-and-fix-eventfd.patch
 delete mode 100644 package/uclibc/0.9.33.2/0015-add-posix_madvise.c.patch
 delete mode 100644 package/uclibc/0.9.33.2/0016-nptl-sh-fix-race-condition-in-lll_wait_tid.patch
 delete mode 100644 package/uclibc/0.9.33.2/0017-librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal.patch
 delete mode 100644 package/uclibc/0.9.33.2/0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch
 delete mode 100644 package/uclibc/0.9.33.2/0019-include-elf.h-update-for-ELFOSABI_-changes.patch
 delete mode 100644 package/uclibc/0.9.33.2/0020-update-ptrace.h-to-latest-from-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0022-inet-rpc-fix-authnone_marshal-in-multithreading-cont.patch
 delete mode 100644 package/uclibc/0.9.33.2/0023-MIPS-Convert-__syscall_error-callers-to-use-a0-for-a.patch
 delete mode 100644 package/uclibc/0.9.33.2/0024-MIPS-Use-a0-instead-of-v0-for-__syscall_error-argume.patch
 delete mode 100644 package/uclibc/0.9.33.2/0025-ldso-use-.arm-mode-for-resolver-unconditionally.patch
 delete mode 100644 package/uclibc/0.9.33.2/0026-make-NPTL-s-getpid-behave-similar-to-the-common-one.patch
 delete mode 100644 package/uclibc/0.9.33.2/0027-i386-bits-syscalls.h-allow-immediate-values-as-6th-s.patch
 delete mode 100644 package/uclibc/0.9.33.2/0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch
 delete mode 100644 package/uclibc/0.9.33.2/0029-inet-rpc-fix-build-in-NPTL-case.patch
 delete mode 100644 package/uclibc/0.9.33.2/0030-stdio-implement-assignment-allocation-m-character.patch
 delete mode 100644 package/uclibc/0.9.33.2/0031-mmap-sys_mmap2-do-unsigned-shift-of-offset.patch
 delete mode 100644 package/uclibc/0.9.33.2/0033-rpmatch-backport-function.patch
 delete mode 100644 package/uclibc/0.9.33.2/0034-statfs-support-f_frsize.patch
 delete mode 100644 package/uclibc/0.9.33.2/0035-socket.h-pull-socket_type.h-from-eglibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0036-mount.h-update.patch
 delete mode 100644 package/uclibc/0.9.33.2/0037-buildsys-gen_bits_syscall_h-do-not-leave-undefined-S.patch
 delete mode 100644 package/uclibc/0.9.33.2/0038-libc-sysdeps-sync-bits-in.h-with-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0039-libc-atexit-reuse-free-slots-at-the-end-of-exit-func.patch
 delete mode 100644 package/uclibc/0.9.33.2/0040-mman-rename-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch
 delete mode 100644 package/uclibc/0.9.33.2/0041-libc-add-posix_fallocate.patch
 delete mode 100644 package/uclibc/0.9.33.2/0042-nice-fix-overflow-checking-in-int_add_no_wrap.patch
 delete mode 100644 package/uclibc/0.9.33.2/0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch
 delete mode 100644 package/uclibc/0.9.33.2/0044-inet-do-not-filter-responses-in-res_query.patch
 delete mode 100644 package/uclibc/0.9.33.2/0045-Remove-pragma-weak-for-undeclared-symbol.patch
 delete mode 100644 package/uclibc/0.9.33.2/0046-inet-fix-getting-the-nameserver-from-_res-state-afte.patch
 delete mode 100644 package/uclibc/0.9.33.2/0047-_vfprintf.c-use-fputws_unlocked-S-F-instead-of-fputw.patch
 delete mode 100644 package/uclibc/0.9.33.2/0048-Fix-a-problem-with-scanning-wide-chars.patch
 delete mode 100644 package/uclibc/0.9.33.2/0049-Fix-some-fragileness-in-dlopen-do_dlopen-wrapper-wor.patch
 delete mode 100644 package/uclibc/0.9.33.2/0050-libdl-fix-dlopen-implementation-from-statically-link.patch
 delete mode 100644 package/uclibc/0.9.33.2/0051-libubacktrace-fix-backtrace-for-statically-linked-ap.patch
 delete mode 100644 package/uclibc/0.9.33.2/0052-libubacktrace-fix-build-due-to-some-typos.patch
 delete mode 100644 package/uclibc/0.9.33.2/0053-libc-elf-explicitly-include-uClibc_page.h-to-make-PA.patch
 delete mode 100644 package/uclibc/0.9.33.2/0055-Use-new-bits-scheme-for-arch-specific-flag.patch
 delete mode 100644 package/uclibc/0.9.33.2/0055-siginfo_h-add-a-missing-function-member.patch
 delete mode 100644 package/uclibc/0.9.33.2/0056-MIPS-set-_NSIG-to-128-not-129.-This-matches-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0056-siginfo_h-__SIGEV_PAD_SIZE-takes-__WORDSIZE-into-account.patch
 delete mode 100644 package/uclibc/0.9.33.2/0057-bits-waitstatus.h-correctly-interpret-status-0x007f-.patch
 delete mode 100644 package/uclibc/0.9.33.2/0058-test-tls-fix-build-with-newer-binutils.patch
 delete mode 100644 package/uclibc/0.9.33.2/0059-test-cater-for-config.patch
 delete mode 100644 package/uclibc/0.9.33.2/0060-test-Fix-math-c-dependency.patch
 delete mode 100644 package/uclibc/0.9.33.2/0061-fix-sparc-networking.patch
 delete mode 100644 package/uclibc/0.9.33.2/0062-ldso-libdl-Also-include-dl-tls.h-for-for-SHARED.patch
 delete mode 100644 package/uclibc/0.9.33.2/0062-nptl-remove-duplicate-vfork-in-libpthread.patch
 delete mode 100644 package/uclibc/0.9.33.2/0063-powerpc-update-ptrace.h-to-latest-from-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0064-sparc-update-ptrace.h-to-latest-from-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0065-Do-not-include-__iconv_codesets-into-iconv-utility.patch
 delete mode 100644 package/uclibc/0.9.33.2/0066-mips-rename-siginfo-_timer-members.patch
 delete mode 100644 package/uclibc/0.9.33.2/0067-sparc-clone.S-guard-tcb-offsets.h-include-with-RESET_P.patch
 delete mode 100644 package/uclibc/0.9.33.2/0068-Fix-getopt-implementations-conditional-compilation.patch
 delete mode 100644 package/uclibc/0.9.33.2/0069-Add-missing-C99-float-ld-wrappers.patch
 delete mode 100644 package/uclibc/0.9.33.2/0070-libm-honor-NO_LONG_DOUBLE-in-ldouble_wrappers.patch
 delete mode 100644 package/uclibc/0.9.33.2/0071-Fix-libgcc_s_resume-issue.patch
 delete mode 100644 package/uclibc/uClibc-0.9.33.config
 delete mode 100644 package/uclibc/uClibc-snapshot.config

2.6.4

The libunwind package currently dependency on glibc *or* uclibc snapshot. However, we are going to remove the support for uclibc snapshot, and uClibc-ng has equivalent functionality as uclibc snapshot. Moreover, musl is also capable of building libunwind for certain architectures.

Therefore, this commit reworks the architecture dependencies of libunwind, to make it available on all architectures for which it is supported, depending on the capabilities of the different C libraries, and the implementation of libunwind on each architecture.

On some architectures, libunwind uses the C library *context() functions, which are not provided by musl at all, and not provided by uClibc on all architectures. But on some other architectures, libunwind does not use the C library *context() functions, which explains why it can be built with musl on such architectures.

---
 package/libunwind/Config.in | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

index 85cb472..593172f 100644
@@ -1,15 +1,32 @@
+# libunwind is only available for a certain subset of the
+# architectures (as visible in the list of architectures supported
+# with the glibc C library below).
+#
+# In addition to this, on some architectures libunwind requires the
+# *context() function from the C library, which are only available on
+# certain architectures in uClibc, and not available at all on
+# musl. But on some other architectures, libunwind works without using
+# the *context() functions, which allows it to be built with musl.
+config BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
+	bool
+	default y if BR2_TOOLCHAIN_USES_GLIBC && \
+		(BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
+		 BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64)
+	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
+		(BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \
+		 BR2_mips64 || BR2_mips64el || BR2_x86_64)
+	default y if BR2_TOOLCHAIN_USES_MUSL && \
+		(BR2_arm || BR2_armeb || BR2_i386 || BR2_x86_64)
+
 config BR2_PACKAGE_LIBUNWIND
 	bool "libunwind"
 	depends on BR2_TOOLCHAIN_HAS_THREADS
-	depends on (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC) # {g,s}etcontext
-	depends on BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
-		BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64
+	depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
 	help
 	  C API to determine the call-chain of a program.
 
 	  http://www.nongnu.org/libunwind/index.html
 
-comment "libunwind needs a uclibc snapshot or (e)glibc toolchain w/ threads"
-	depends on BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_mips64 || \
-		BR2_mips64el || BR2_powerpc || BR2_sh || BR2_sh64 || BR2_i386 || BR2_x86_64
-	depends on !BR2_TOOLCHAIN_HAS_THREADS || !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC)
+comment "libunwind needs a toolchain w/ threads"
+	depends on BR2_PACKAGE_LIBUNWIND_ARCH_SUPPORTS
+	depends on !BR2_TOOLCHAIN_HAS_THREADS

2.6.4

Committed, thanks.

Bye, Peter Korsgaard

Due to posix_fallocate() being unavailable in uClibc 0.9.33, lttng-babeltrace was marked as available only for uClibc snapshot in glibc. However:

- lttng-babeltrace builds fine with musl
- lttng-babeltrace builds fine with uClibc-ng
- we're going to get rid of uClibc 0.9.33 support
- the only toolchain left with an old uClibc version is the Blackfin Analog Devices toolchain, and lttng-babeltrace cannot be enabled on non-MMU platforms

Conclusion: we can enable lttng-babeltrace on all C libraries, and no longer require any condition. This commit adjusts the lttng-babeltrace package accordingly.

---
 package/lttng-babeltrace/Config.in | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

index 633ea3d..d362779 100644
@@ -7,7 +7,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 	depends on BR2_USE_WCHAR # libglib2, util-linux
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
 	depends on BR2_USE_MMU # libglib2
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC # posix_fallocate
 	help
 	  The Babeltrace project provides trace read and write
 	  libraries, as well as a trace converter application. Plugins

@@ -28,7 +27,6 @@ config BR2_PACKAGE_LTTNG_BABELTRACE
 
 	  http://www.efficios.com/babeltrace
 
-comment "lttng-babeltrace needs a uclibc snapshot or (e)glib toolchain w/ wchar, threads"
+comment "lttng-babeltrace needs a toolchain w/ wchar, threads"
 	depends on BR2_USE_MMU
-	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS \
-		|| !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_TOOLCHAIN_USES_GLIBC)
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS

2.6.4

s/in/and/

Committed with that fixed, thanks.

Bye, Peter Korsgaard

mongrel2 uses the {get,make,swap}context functions:

- With glibc, no problem, they are available on all supported architectures

- With uClibc, they are available only on a subset of the architectures. Until now, only BR2_UCLIBC_VERSION_SNAPSHOT configurations were allowed to select mongrel2, but we are going to get rid of the uClibc snapshot version, and uClibc-ng is as capable as the uClibc snapshot. However, only certain architectures have the *context() functions.

- With musl, there is no *context() support.

Since this dependency is quite complicated, we introduce a BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS hidden boolean to encode which C libraries are supported.

Also, listing the supported uClibc architectures would be too long in the comment, so we simply indicate that the package needs uClibc or glibc.

---
 package/mongrel2/Config.in | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

index 1c7b495..49dd6fd 100644
@@ -1,10 +1,16 @@
-comment "mongrel2 needs a toolchain w/ C++, threads, wchar, dynamic library"
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
-		BR2_TOOLCHAIN_USES_GLIBC || \
-		BR2_arm
+# mongrel2 uses {get,make,swap}context() functions, which are
+# available in glibc for all architectures and in uClibc only for a
+# subset of the architectures
+config BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
+	bool
+	default y if BR2_TOOLCHAIN_USES_GLIBC
+	default y if BR2_TOOLCHAIN_USES_UCLIBC && \
+		(BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || BR2_x86_64)
+
+comment "mongrel2 needs a uClibc or glibc toolchain w/ C++, threads, wchar, dynamic library"
 	depends on !BR2_INSTALL_LIBSTDCPP || \
 		!BR2_TOOLCHAIN_HAS_THREADS || !BR2_USE_WCHAR || \
-		BR2_STATIC_LIBS
+		BR2_STATIC_LIBS || !BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
 
 config BR2_PACKAGE_MONGREL2
 	bool "mongrel2"

@@ -14,11 +20,7 @@ config BR2_PACKAGE_MONGREL2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # zeromq
 	depends on BR2_USE_WCHAR # zeromq -> util-linux
 	depends on !BR2_STATIC_LIBS # uses dlopen()
-	# {get,make,swap}context functions present in
-	# {e,}glibc and in uClibc's master branch. Source has arm workaround
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT || \
-		BR2_TOOLCHAIN_USES_GLIBC || \
-		BR2_arm
+	depends on BR2_PACKAGE_MONGREL2_LIBC_SUPPORTS
 	help
 	  Mongrel2 is an application, language, and network architecture
 	  agnostic web server that focuses on web applications using

2.6.4

extra space before 'the'.

Bye, Peter Korsgaard

vlc uses <spawn.h> which was not available in old uClibc versions. However, since we are removing support for uClibc 0.9.33, we can get rid of such dependency. In addition, <spawn.h> is provided by musl, and therefore VLC can be enabled with this C library.

Consequently, this commit completely removes any C library dependency for the vlc package. The only special case that needs to be handled is the Blackfin external toolchain from Analog Devices, which still uses an old uClibc version that doesn't provide <spawn.h>.

---
 package/vlc/Config.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

index 03e85c3..cad21e2 100644
@@ -5,12 +5,12 @@ endif
 
 config BR2_PACKAGE_VLC
 	bool "vlc"
-	depends on (BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) # spawn.h
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on !BR2_STATIC_LIBS
 	depends on BR2_USE_WCHAR
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
 	select BR2_PACKAGE_LIBVORBIS if BR2_PACKAGE_OPUS
 	select BR2_PACKAGE_VLC_OPENCV_BACKEND if BR2_PACKAGE_OPENCV
 	select BR2_PACKAGE_VLC_OPENCV3_BACKEND if BR2_PACKAGE_OPENCV3

@@ -32,7 +32,7 @@ config BR2_PACKAGE_VLC_OPENCV3_BACKEND
 	select BR2_PACKAGE_OPENCV3_LIB_IMGPROC
 	select BR2_PACKAGE_OPENCV3_LIB_OBJDETECT
 
-comment "vlc needs a uclibc snapshot, uclibc-ng or (e)glibc toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
-	depends on !(BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_NG || BR2_TOOLCHAIN_USES_GLIBC) \
-		|| !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
+comment "vlc needs a toolchain w/ C++, dynamic library, wchar, threads, headers >= 3.7"
+	depends on !BR2_TOOLCHAIN_EXTERNAL_BLACKFIN_UCLINUX
+	depends on !BR2_INSTALL_LIBSTDCPP || BR2_STATIC_LIBS || !BR2_USE_WCHAR \
 		|| !BR2_TOOLCHAIN_HAS_THREADS || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_7

2.6.4

vlc contains several references to fork(), so it should really just depend on BR2_USE_MMU.

Committed with that fixed, thanks.

Bye, Peter Korsgaard

samba4 relies on the $ORIGIN feature of the dynamic linker, which used to not be implemented in old uClibc versions. However:

- this feature is supported by glibc
- this feature is supported by uClibc-ng, which is the only uClibc version we are going to support
- this feature is supported by musl

Consequently, we can completely remove the dependency of samba4 on certain C libraries.

Note that despite this commit, samba4 still cannot be chosen when the musl C library is used, because samba4 requires native RPC support, which musl doesn't provide.

---
 package/samba4/Config.in | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

index 1411b08..c53adba 100644
@@ -1,6 +1,5 @@
-comment "samba4 needs an (e)glibc or uClibc-ng toolchain w/ RPC, wchar, dynamic library, threads"
-	depends on (!BR2_TOOLCHAIN_USES_GLIBC && !BR2_UCLIBC_VERSION_NG) \
-		|| !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_NATIVE_RPC \
+comment "samba4 needs a toolchain w/ RPC, wchar, dynamic library, threads"
+	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_NATIVE_RPC \
 		|| BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
 	depends on BR2_USE_MMU
 

@@ -12,8 +11,6 @@ config BR2_PACKAGE_SAMBA4
 	depends on BR2_TOOLCHAIN_HAS_NATIVE_RPC
 	depends on BR2_TOOLCHAIN_HAS_THREADS # python -> libffi
 	depends on !BR2_STATIC_LIBS # python
-	# needs $ORIGIN support
-	depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_UCLIBC_VERSION_NG
 	depends on !BR2_nios2 # binary too large, relocations don't fit
 	select BR2_PACKAGE_E2FSPROGS
 	select BR2_PACKAGE_POPT

2.6.4

The upstream project is dead, the 0.9.33 version requires tons of patches, and uclibc-ng has now successfully replaced uclibc. It is time to get rid of the 0.9.33 version.

---
 .../0001-bits-time.h-sync-with-glibc-2.16.patch    |   37 -
 .../uclibc/0.9.33.2/0003-Add-dup3-syscall.patch    |   54 -
 ...deps-add-__kernel_long-and-__kernel_ulong.patch |  381 ------
 ...estore-stack-pointer-just-after-return-fr.patch |   42 -
 ...e.S-Add-missing-IT-instruction-for-Thumb2.patch |   29 -
 ...8-arm-move-check-for-BX-to-its-own-header.patch |  257 ----
 .../0.9.33.2/0009-mips64-fix-n64-interp.patch      |   51 -
 ...0010-Rules.mak-fix-breakage-from-603af30d.patch |   31 -
 ...11-libc-add-non-standard-execvpe-function.patch |  163 ---
 .../0012-libc-stdlib-add-mkostemp-helpers.patch    |  155 ---
 ...ventfd-Implement-eventfd2-and-fix-eventfd.patch |   64 -
 .../uclibc/0.9.33.2/0015-add-posix_madvise.c.patch |   61 -
 ...ptl-sh-fix-race-condition-in-lll_wait_tid.patch |   38 -
 ...d-SIGCANCEL-to-the-list-of-blocked-signal.patch |   37 -
 ...18-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch |   52 -
 ...nclude-elf.h-update-for-ELFOSABI_-changes.patch |   34 -
 ...0020-update-ptrace.h-to-latest-from-glibc.patch |  113 --
 ...x-authnone_marshal-in-multithreading-cont.patch |  128 --
 ...t-__syscall_error-callers-to-use-a0-for-a.patch |   57 -
 ...-instead-of-v0-for-__syscall_error-argume.patch |   63 -
 ...se-.arm-mode-for-resolver-unconditionally.patch |   29 -
 ...s-getpid-behave-similar-to-the-common-one.patch |   53 -
 ...yscalls.h-allow-immediate-values-as-6th-s.patch |   33 -
 .../0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch |   57 -
 .../0029-inet-rpc-fix-build-in-NPTL-case.patch     |   58 -
 ...plement-assignment-allocation-m-character.patch |  190 ---
 ...map-sys_mmap2-do-unsigned-shift-of-offset.patch |   35 -
 .../0.9.33.2/0033-rpmatch-backport-function.patch  |   78 --
 .../0.9.33.2/0034-statfs-support-f_frsize.patch    |  189 ---
 ...5-socket.h-pull-socket_type.h-from-eglibc.patch | 1374 --------------------
 package/uclibc/0.9.33.2/0036-mount.h-update.patch  |   91 --
 ...n_bits_syscall_h-do-not-leave-undefined-S.patch |   38 -
 ...38-libc-sysdeps-sync-bits-in.h-with-glibc.patch |  117 --
 ...-reuse-free-slots-at-the-end-of-exit-func.patch |   43 -
 ...ame-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch |  200 ---
 .../0.9.33.2/0041-libc-add-posix_fallocate.patch   |  337 -----
 ...-fix-overflow-checking-in-int_add_no_wrap.patch |   44 -
 ...Add-missing-SYMBOL_PREFIX-to-symbol-names.patch |   86 --
 ...inet-do-not-filter-responses-in-res_query.patch |   46 -
 ...-Remove-pragma-weak-for-undeclared-symbol.patch |   39 -
 ...tting-the-nameserver-from-_res-state-afte.patch |   34 -
 ...-use-fputws_unlocked-S-F-instead-of-fputw.patch |   30 -
 ...48-Fix-a-problem-with-scanning-wide-chars.patch |   66 -
 ...agileness-in-dlopen-do_dlopen-wrapper-wor.patch |   66 -
 ...lopen-implementation-from-statically-link.patch |   60 -
 ...ce-fix-backtrace-for-statically-linked-ap.patch |  168 ---
 ...libubacktrace-fix-build-due-to-some-typos.patch |   39 -
 ...plicitly-include-uClibc_page.h-to-make-PA.patch |   30 -
 ...se-new-bits-scheme-for-arch-specific-flag.patch |  284 ----
 ...5-siginfo_h-add-a-missing-function-member.patch |   66 -
 ...-_NSIG-to-128-not-129.-This-matches-glibc.patch |   43 -
 ...EV_PAD_SIZE-takes-__WORDSIZE-into-account.patch |   70 -
 ...atus.h-correctly-interpret-status-0x007f-.patch |   54 -
 ...58-test-tls-fix-build-with-newer-binutils.patch |   37 -
 .../0.9.33.2/0059-test-cater-for-config.patch      |   81 --
 .../0.9.33.2/0060-test-Fix-math-c-dependency.patch |   30 -
 .../0.9.33.2/0061-fix-sparc-networking.patch       |   39 -
 ...ibdl-Also-include-dl-tls.h-for-for-SHARED.patch |   58 -
 ...nptl-remove-duplicate-vfork-in-libpthread.patch |  691 ----------
 ...erpc-update-ptrace.h-to-latest-from-glibc.patch |  134 --
 ...parc-update-ptrace.h-to-latest-from-glibc.patch |  151 ---
 ...clude-__iconv_codesets-into-iconv-utility.patch |   79 --
 .../0066-mips-rename-siginfo-_timer-members.patch  |  157 ---
 ...-guard-tcb-offsets.h-include-with-RESET_P.patch |   31 -
 ...t-implementations-conditional-compilation.patch |   58 -
 .../0069-Add-missing-C99-float-ld-wrappers.patch   |  870 -------------
 ...-honor-NO_LONG_DOUBLE-in-ldouble_wrappers.patch |   89 --
 .../0.9.33.2/0071-Fix-libgcc_s_resume-issue.patch  |   56 -
 package/uclibc/Config.in                           |    9 -
 package/uclibc/uClibc-0.9.33.config                |  277 ----
 package/uclibc/uclibc.hash                         |    3 -
 package/uclibc/uclibc.mk                           |    3 -
 72 files changed, 8847 deletions(-)
 delete mode 100644 package/uclibc/0.9.33.2/0001-bits-time.h-sync-with-glibc-2.16.patch
 delete mode 100644 package/uclibc/0.9.33.2/0003-Add-dup3-syscall.patch
 delete mode 100644 package/uclibc/0.9.33.2/0004-libc-sysdeps-add-__kernel_long-and-__kernel_ulong.patch
 delete mode 100644 package/uclibc/0.9.33.2/0006-arm-clone-restore-stack-pointer-just-after-return-fr.patch
 delete mode 100644 package/uclibc/0.9.33.2/0007-arm-clone.S-Add-missing-IT-instruction-for-Thumb2.patch
 delete mode 100644 package/uclibc/0.9.33.2/0008-arm-move-check-for-BX-to-its-own-header.patch
 delete mode 100644 package/uclibc/0.9.33.2/0009-mips64-fix-n64-interp.patch
 delete mode 100644 package/uclibc/0.9.33.2/0010-Rules.mak-fix-breakage-from-603af30d.patch
 delete mode 100644 package/uclibc/0.9.33.2/0011-libc-add-non-standard-execvpe-function.patch
 delete mode 100644 package/uclibc/0.9.33.2/0012-libc-stdlib-add-mkostemp-helpers.patch
 delete mode 100644 package/uclibc/0.9.33.2/0013-eventfd-Implement-eventfd2-and-fix-eventfd.patch
 delete mode 100644 package/uclibc/0.9.33.2/0015-add-posix_madvise.c.patch
 delete mode 100644 package/uclibc/0.9.33.2/0016-nptl-sh-fix-race-condition-in-lll_wait_tid.patch
 delete mode 100644 package/uclibc/0.9.33.2/0017-librt-re-add-SIGCANCEL-to-the-list-of-blocked-signal.patch
 delete mode 100644 package/uclibc/0.9.33.2/0018-ldso-include-dlfcn.h-for-RTLD_NODELETE.patch
 delete mode 100644 package/uclibc/0.9.33.2/0019-include-elf.h-update-for-ELFOSABI_-changes.patch
 delete mode 100644 package/uclibc/0.9.33.2/0020-update-ptrace.h-to-latest-from-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0022-inet-rpc-fix-authnone_marshal-in-multithreading-cont.patch
 delete mode 100644 package/uclibc/0.9.33.2/0023-MIPS-Convert-__syscall_error-callers-to-use-a0-for-a.patch
 delete mode 100644 package/uclibc/0.9.33.2/0024-MIPS-Use-a0-instead-of-v0-for-__syscall_error-argume.patch
 delete mode 100644 package/uclibc/0.9.33.2/0025-ldso-use-.arm-mode-for-resolver-unconditionally.patch
 delete mode 100644 package/uclibc/0.9.33.2/0026-make-NPTL-s-getpid-behave-similar-to-the-common-one.patch
 delete mode 100644 package/uclibc/0.9.33.2/0027-i386-bits-syscalls.h-allow-immediate-values-as-6th-s.patch
 delete mode 100644 package/uclibc/0.9.33.2/0028-dl-fix-dlsym-lookups-with-RTLD_NEXT.patch
 delete mode 100644 package/uclibc/0.9.33.2/0029-inet-rpc-fix-build-in-NPTL-case.patch
 delete mode 100644 package/uclibc/0.9.33.2/0030-stdio-implement-assignment-allocation-m-character.patch
 delete mode 100644 package/uclibc/0.9.33.2/0031-mmap-sys_mmap2-do-unsigned-shift-of-offset.patch
 delete mode 100644 package/uclibc/0.9.33.2/0033-rpmatch-backport-function.patch
 delete mode 100644 package/uclibc/0.9.33.2/0034-statfs-support-f_frsize.patch
 delete mode 100644 package/uclibc/0.9.33.2/0035-socket.h-pull-socket_type.h-from-eglibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0036-mount.h-update.patch
 delete mode 100644 package/uclibc/0.9.33.2/0037-buildsys-gen_bits_syscall_h-do-not-leave-undefined-S.patch
 delete mode 100644 package/uclibc/0.9.33.2/0038-libc-sysdeps-sync-bits-in.h-with-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0039-libc-atexit-reuse-free-slots-at-the-end-of-exit-func.patch
 delete mode 100644 package/uclibc/0.9.33.2/0040-mman-rename-MAP_UNINITIALIZE-to-MAP_UNINITIALIZED.patch
 delete mode 100644 package/uclibc/0.9.33.2/0041-libc-add-posix_fallocate.patch
 delete mode 100644 package/uclibc/0.9.33.2/0042-nice-fix-overflow-checking-in-int_add_no_wrap.patch
 delete mode 100644 package/uclibc/0.9.33.2/0043-buildsys-Add-missing-SYMBOL_PREFIX-to-symbol-names.patch
 delete mode 100644 package/uclibc/0.9.33.2/0044-inet-do-not-filter-responses-in-res_query.patch
 delete mode 100644 package/uclibc/0.9.33.2/0045-Remove-pragma-weak-for-undeclared-symbol.patch
 delete mode 100644 package/uclibc/0.9.33.2/0046-inet-fix-getting-the-nameserver-from-_res-state-afte.patch
 delete mode 100644 package/uclibc/0.9.33.2/0047-_vfprintf.c-use-fputws_unlocked-S-F-instead-of-fputw.patch
 delete mode 100644 package/uclibc/0.9.33.2/0048-Fix-a-problem-with-scanning-wide-chars.patch
 delete mode 100644 package/uclibc/0.9.33.2/0049-Fix-some-fragileness-in-dlopen-do_dlopen-wrapper-wor.patch
 delete mode 100644 package/uclibc/0.9.33.2/0050-libdl-fix-dlopen-implementation-from-statically-link.patch
 delete mode 100644 package/uclibc/0.9.33.2/0051-libubacktrace-fix-backtrace-for-statically-linked-ap.patch
 delete mode 100644 package/uclibc/0.9.33.2/0052-libubacktrace-fix-build-due-to-some-typos.patch
 delete mode 100644 package/uclibc/0.9.33.2/0053-libc-elf-explicitly-include-uClibc_page.h-to-make-PA.patch
 delete mode 100644 package/uclibc/0.9.33.2/0055-Use-new-bits-scheme-for-arch-specific-flag.patch
 delete mode 100644 package/uclibc/0.9.33.2/0055-siginfo_h-add-a-missing-function-member.patch
 delete mode 100644 package/uclibc/0.9.33.2/0056-MIPS-set-_NSIG-to-128-not-129.-This-matches-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0056-siginfo_h-__SIGEV_PAD_SIZE-takes-__WORDSIZE-into-account.patch
 delete mode 100644 package/uclibc/0.9.33.2/0057-bits-waitstatus.h-correctly-interpret-status-0x007f-.patch
 delete mode 100644 package/uclibc/0.9.33.2/0058-test-tls-fix-build-with-newer-binutils.patch
 delete mode 100644 package/uclibc/0.9.33.2/0059-test-cater-for-config.patch
 delete mode 100644 package/uclibc/0.9.33.2/0060-test-Fix-math-c-dependency.patch
 delete mode 100644 package/uclibc/0.9.33.2/0061-fix-sparc-networking.patch
 delete mode 100644 package/uclibc/0.9.33.2/0062-ldso-libdl-Also-include-dl-tls.h-for-for-SHARED.patch
 delete mode 100644 package/uclibc/0.9.33.2/0062-nptl-remove-duplicate-vfork-in-libpthread.patch
 delete mode 100644 package/uclibc/0.9.33.2/0063-powerpc-update-ptrace.h-to-latest-from-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0064-sparc-update-ptrace.h-to-latest-from-glibc.patch
 delete mode 100644 package/uclibc/0.9.33.2/0065-Do-not-include-__iconv_codesets-into-iconv-utility.patch
 delete mode 100644 package/uclibc/0.9.33.2/0066-mips-rename-siginfo-_timer-members.patch
 delete mode 100644 package/uclibc/0.9.33.2/0067-sparc-clone.S-guard-tcb-offsets.h-include-with-RESET_P.patch
 delete mode 100644 package/uclibc/0.9.33.2/0068-Fix-getopt-implementations-conditional-compilation.patch
 delete mode 100644 package/uclibc/0.9.33.2/0069-Add-missing-C99-float-ld-wrappers.patch
 delete mode 100644 package/uclibc/0.9.33.2/0070-libm-honor-NO_LONG_DOUBLE-in-ldouble_wrappers.patch
 delete mode 100644 package/uclibc/0.9.33.2/0071-Fix-libgcc_s_resume-issue.patch
 delete mode 100644 package/uclibc/uClibc-0.9.33.config

deleted file mode 100644
index d93df6d..0000000
@@ -1,37 +0,0 @@
-From bb08cd16cb0353b3d4116ca8959dbecd2e78f545 Mon Sep 17 00:00:00 2001
-From: Peter Korsgaard <[email protected]>
-Date: Tue, 3 Jul 2012 15:54:57 +0200
-Subject: [PATCH 1/8] bits/time.h: sync with glibc 2.16
-
-CLOCK_MONOTONIC_RAW is available since 2.6.28
-(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and
-CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce
-CLOCK_REALTIME_COARSE).
-
-Signed-off-by: Peter Korsgaard <[email protected]>
-Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- libc/sysdeps/linux/common/bits/time.h | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h
-index 7ed54bf..c871223 100644
---- a/libc/sysdeps/linux/common/bits/time.h
-+++ b/libc/sysdeps/linux/common/bits/time.h
-@@ -54,6 +54,12 @@
- #   define CLOCK_PROCESS_CPUTIME_ID	2
- /* Thread-specific CPU-time clock.  */
- #   define CLOCK_THREAD_CPUTIME_ID	3
-+/* Monotonic system-wide clock, not adjusted for frequency scaling.  */
-+#   define CLOCK_MONOTONIC_RAW		4
-+/* Identifier for system-wide realtime clock, updated only on ticks.  */
-+#   define CLOCK_REALTIME_COARSE	5
-+/* Monotonic system-wide clock, updated only on ticks.  */
-+#   define CLOCK_MONOTONIC_COARSE	6
- 
- /* Flag to indicate time is absolute.  */
- #   define TIMER_ABSTIME		1
--- 
-1.8.1.2
-

deleted file mode 100644
index f4097e9..0000000
@@ -1,29 +0,0 @@
-From c12211a2f1832169e31063512b3e2081e503e856 Mon Sep 17 00:00:00 2001
-From: Will Newton <[email protected]>
-Date: Tue, 2 Apr 2013 13:53:35 +0100
-Subject: [PATCH 7/8] arm/clone.S: Add missing IT instruction for Thumb2.
-
-The conditional load needs to be made part of an IT block on Thumb2
-cores.
-
-Signed-off-by: Will Newton <[email protected]>
-Signed-off-by: Thomas Petazzoni <[email protected]>
----
- libc/sysdeps/linux/arm/clone.S | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libc/sysdeps/linux/arm/clone.S b/libc/sysdeps/linux/arm/clone.S
-index e4101ba..1f7f09d 100644
---- a/libc/sysdeps/linux/arm/clone.S
-+++ b/libc/sysdeps/linux/arm/clone.S
-@@ -111,6 +111,7 @@ __clone:
- 	ldr	r4, [sp, #12]
- 	DO_CALL (clone)
- 	movs	a1, a1
-+	IT(t, ne)
- 	ldmnefd	sp!, {r4}
- 	blt	__error
- 	IT(t, ne)
--- 
-1.8.1.2
-

deleted file mode 100644
index 61ed439..0000000
@@ -1,31 +0,0 @@
-From f5017653dc63d62c94cc2884ed3a50a4f93001cd Mon Sep 17 00:00:00 2001
-From: Gustavo Zacarias <[email protected]>
-Date: Wed, 24 Jul 2013 12:28:19 -0300
-Subject: [PATCHv2] Rules.mak: fix breakage from 603af30d
-
-Removing the whitespace from findstring for 64 bit architectures has
-bad consequences since powerpc would be a match in powerpc64 and sparc
-would also be a match in sparc64.
-That doesn't make them 64 bits in reality causing general breakage.
-
-Signed-off-by: Gustavo Zacarias <[email protected]>
----
- Rules.mak | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Rules.mak b/Rules.mak
-index 889108e..be53d81 100644
---- a/Rules.mak
-+++ b/Rules.mak
-@@ -141,7 +141,7 @@ UBACKTRACE_DSO := libubacktrace.so.$(ABI_VERSION)
- 
- UCLIBC_LDSO_NAME := ld-uClibc
- ARCH_NATIVE_BIT := 32
--ifneq ($(findstring $(TARGET_ARCH),hppa64 ia64 powerpc64 s390x sparc64 x86_64),)
-+ifneq ($(findstring  $(TARGET_ARCH) , hppa64 ia64 powerpc64 s390x sparc64 x86_64 ),)
- UCLIBC_LDSO_NAME := ld64-uClibc
- ARCH_NATIVE_BIT := 64
- else
--- 
-1.8.1.5
-

deleted file mode 100644
index 097f8fc..0000000
@@ -1,61 +0,0 @@
-From 93b8ce8886e30986be31c1403b606b6367dc258a Mon Sep 17 00:00:00 2001
-From: "Peter S. Mazinger" <[email protected]>
-Date: Tue, 26 Apr 2011 23:03:44 +0200
-Subject: [PATCH] add posix_madvise.c
-
-Signed-off-by: Peter S. Mazinger <[email protected]>
-Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
-Signed-off-by: Mike Frysinger <[email protected]>
----
- libc/sysdeps/linux/common/Makefile.in     |    2 +-
- libc/sysdeps/linux/common/posix_madvise.c |   25 +++++++++++++++++++++++++
- 2 files changed, 26 insertions(+), 1 deletion(-)
- create mode 100644 libc/sysdeps/linux/common/posix_madvise.c
-
-diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
-index 3b5763c..b39082b 100644
---- a/libc/sysdeps/linux/common/Makefile.in
-+++ b/libc/sysdeps/linux/common/Makefile.in
-@@ -81,7 +81,7 @@ CSRC-$(UCLIBC_HAS_REALTIME) += clock_getres.c clock_gettime.c clock_settime.c \
- 	sched_get_priority_max.c sched_get_priority_min.c sched_getscheduler.c \
- 	sched_rr_get_interval.c sched_setparam.c sched_setscheduler.c sigqueue.c
- # clock_getcpuclockid|clock_nanosleep|mq_timedreceive|mq_timedsend|posix_fadvise|posix_fallocate|posix_madvise|posix_memalign|posix_mem_offset|posix_spawnattr_destroy|posix_spawnattr_init|posix_spawnattr_getflags|posix_spawnattr_setflags|posix_spawnattr_getpgroup|posix_spawnattr_setpgroup|posix_spawnattr_getschedparam|posix_spawnattr_setschedparam|posix_spawnattr_getschedpolicy|posix_spawnattr_setschedpolicy|posix_spawnattr_getsigdefault|posix_spawnattr_setsigdefault|posix_spawnattr_getsigmask|posix_spawnattr_setsigmask|posix_spawnattr_init|posix_spawnattr_setflags|posix_spawnattr_setpgroup|posix_spawnattr_setschedparam|posix_spawnattr_setschedpolicy|posix_spawnattr_setsigdefault|posix_spawnattr_setsigmask|posix_spawn_file_actions_addclose|posix_spawn_file_actions_addopen|posix_spawn_file_actions_adddup2|posix_spawn_file_actions_addopen|posix_spawn_file_actions_destroy|posix_spawn_file_actions_init|posix_spawn_file_actions_init|posix_spawn|posix_spawnp|posix_spawnp|posix_ty

ped_mem_
get_info|pthread_mutex_timedlock|sem_timedwait
--CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c -+CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c
- CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c
- CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c
- CSRC-$(UCLIBC_HAS_XATTR) += xattr.c
-diff --git a/libc/sysdeps/linux/common/posix_madvise.c b/libc/sysdeps/linux/common/posix_madvise.c -new file mode 100644
-index 0000000..2f95bcb
---- /dev/null
-+++ b/libc/sysdeps/linux/common/posix_madvise.c
-@@ -0,0 +1,25 @@
-+/* vi: set sw=4 ts=4: */
-+/* Licensed under the LGPL v2.1, see the file LICENSE in this tarball. */
-+
-+#include <sys/mman.h>
-+#include <sys/syscall.h>
-+
-+#if defined __NR_madvise && defined __USE_XOPEN2K && defined __UCLIBC_HAS_ADVANCED_REALTIME__ -+int posix_madvise(void *addr, size_t len, int advice)
-+{
-+ int result;
-+ /* We have one problem: the kernel's MADV_DONTNEED does not
-+ * correspond to POSIX's POSIX_MADV_DONTNEED. The former simply
-+ * discards changes made to the memory without writing it back to
-+ * disk, if this would be necessary. The POSIX behaviour does not
-+ * allow this. There is no functionality mapping for the POSIX
-+ * behaviour so far so we ignore that advice for now. */
-+ if (advice == POSIX_MADV_DONTNEED)
-+ return 0;
-+
-+ /* this part might use madvise function */
-+ INTERNAL_SYSCALL_DECL (err);
-+ result = INTERNAL_SYSCALL (madvise, err, 3, addr, len, advice);
-+ return INTERNAL_SYSCALL_ERRNO (result, err);
-+}
-+#endif
---
-1.7.10.4
-

deleted file mode 100644
index 233f2be..0000000
@@ -1,38 +0,0 @@
-From ffd9e147b120e9c2bf30ba4861860f1bc59362c5 Mon Sep 17 00:00:00 2001
-From: Stas Sergeev <[email protected]>
-Date: Thu, 14 Jun 2012 01:00:02 +0200
-Subject: [PATCH] nptl: sh: fix race condition in lll_wait_tid
-
-Make a local copy of the tid value to avoid a race condition,
-as the value could have been changed to 0, thus using a pointer
-it would have been passed to the lll_futex_wait modified.
-
-Signed-off-by: Stas Sergeev <[email protected]>
-Signed-off-by: Carmelo Amoroso <[email protected]>
-(cherry picked from commit 0dcc13bf7a61b1d0708e5dd103d5515e0ffec79a)
-
-Signed-off-by: Carmelo Amoroso <[email protected]>
----
- libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
-index d10cd61..b83d863 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.h
-@@ -396,9 +396,9 @@ extern int __lll_unlock_wake (int *__futex, int private) attribute_hidden;
- 
- #define lll_wait_tid(tid) \
-   do {									      \
--    __typeof (tid) *__tid = &(tid);					      \
--    while (*__tid != 0)							      \
--      lll_futex_wait (__tid, *__tid, LLL_SHARED);			      \
-+    __typeof (tid) __tid;						      \
-+    while ((__tid = (tid)) != 0)						      \
-+      lll_futex_wait (&(tid), __tid, LLL_SHARED);			      \
-   } while (0)
- 
- extern int __lll_timedwait_tid (int *tid, const struct timespec *abstime)
--- 
-1.7.10.4
-

deleted file mode 100644
index 9a263f8..0000000
@@ -1,37 +0,0 @@
-From fec308fdfaf9f557ef5fb17c308c48259012b825 Mon Sep 17 00:00:00 2001
-From: Filippo Arcidiacono <[email protected]>
-Date: Thu, 12 Jul 2012 09:24:39 +0200
-Subject: [PATCH] librt: re-add SIGCANCEL to the list of blocked signal in
- helper thread
-
-Indeed if the libpthread is before the libc in the library look up
-the SIGCANCEL is removed from the list of the blocked signal by
-sigfillset func, this can produce the handler not properly called.
-This commit revert what Denys modified in commit
-162cfaea20d807f0ae329efe39292a9b22593b41.
-
-Signed-off-by: Filippo Arcidiacono <[email protected]>
-Signed-off-by: Carmelo Amoroso <[email protected]>
-(cherry picked from commit cb43f2afba0633400387fa7c55dda3396517f58a)
-
-Signed-off-by: Carmelo Amoroso <[email protected]>
----
- libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
-index 4319d8d..2681961 100644
---- a/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
-+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/timer_routines.c
-@@ -175,7 +175,7 @@ __start_helper_thread (void)
-   sigset_t ss;
-   sigset_t oss;
-   sigfillset (&ss);
--  /*__sigaddset (&ss, SIGCANCEL); - already done by sigfillset */
-+  __sigaddset (&ss, SIGCANCEL);
-   INTERNAL_SYSCALL_DECL (err);
-   INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);
- 
--- 
-1.7.10.4
-

deleted file mode 100644
index b3507af..0000000
@@ -1,34 +0,0 @@
-From 788d9ca73b7ed1262c83580ccc62fb3625e603c3 Mon Sep 17 00:00:00 2001
-From: Thomas Schwinge <[email protected]>
-Date: Wed, 31 Oct 2012 20:41:50 +0100
-Subject: [PATCH] include/elf.h: update for ELFOSABI_* changes.
-
-ELFOSABI_GNU replaces ELFOSABI_LINUX, the latter is kept as a compatibility
-alias, and ELFOSABI_HURD is removed.  See the table on
-<http://www.sco.com/developers/gabi/latest/ch4.eheader.html#osabi> for
-reference.
-
-Signed-off-by: Thomas Schwinge <[email protected]>
-Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
----
- include/elf.h |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/include/elf.h b/include/elf.h
-index ba3e804..470046e 100644
---- a/include/elf.h
-+++ b/include/elf.h
-@@ -148,8 +148,8 @@ typedef struct
- #define ELFOSABI_SYSV		0	/* Alias.  */
- #define ELFOSABI_HPUX		1	/* HP-UX */
- #define ELFOSABI_NETBSD		2	/* NetBSD.  */
--#define ELFOSABI_LINUX		3	/* Linux.  */
--#define ELFOSABI_HURD		4	/* GNU/Hurd */
-+#define ELFOSABI_GNU		3	/* Object uses GNU ELF extensions.  */
-+#define ELFOSABI_LINUX		ELFOSABI_GNU	/* Compatibility alias.  */
- #define ELFOSABI_SOLARIS	6	/* Sun Solaris.  */
- #define ELFOSABI_AIX		7	/* IBM AIX.  */
- #define ELFOSABI_IRIX		8	/* SGI Irix.  */
--- 
-1.7.10.4
-

deleted file mode 100644
index d33a0cd..0000000
@@ -1,29 +0,0 @@
-From 753e4e4cd9177f25981e81f82cd9fe8612a95ba6 Mon Sep 17 00:00:00 2001
-From: Bernhard Reutner-Fischer <[email protected]>
-Date: Fri, 15 Jun 2012 13:44:35 +0200
-Subject: [PATCH] ldso: use .arm mode for resolver unconditionally
-
-as per comment in the file.
-Fixes runtime with __THUMB_INTERWORK__ enabled.
-
-Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
----
- ldso/ldso/arm/resolve.S |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/ldso/ldso/arm/resolve.S b/ldso/ldso/arm/resolve.S
-index 08889d0..b0907f7 100644
---- a/ldso/ldso/arm/resolve.S
-+++ b/ldso/ldso/arm/resolve.S
-@@ -101,7 +101,7 @@
- 
-  .text
-  .align 4      @ 16 byte boundary and there are 32 bytes below (arm case)
-- #if !defined(__thumb__) || defined(__thumb2__)
-+#if 1 /*(!defined(__thumb__) || defined __THUMB_INTERWORK__) || defined(__thumb2__)*/
-  .arm
-  .globl _dl_linux_resolve
-  .type _dl_linux_resolve,%function
--- 
-1.7.10.4
-

deleted file mode 100644
index 5df42ea..0000000
@@ -1,33 +0,0 @@
-From 576983880a0ab5d27a4f530d2cef36239b617e78 Mon Sep 17 00:00:00 2001
-From: Natanael Copa <[email protected]>
-Date: Thu, 5 Jul 2012 11:55:19 +0000
-Subject: [PATCH] i386/bits/syscalls.h: allow immediate values as 6th syscall
- arg
-
-Allow use of immedate values as the 6th syscall argument. Otherwise we must
-store the arg on memory. This gives gcc more options to optimize better.
-
-This also works around an issue with posix_fallocate.
-
-Signed-off-by: Natanael Copa <[email protected]>
-Signed-off-by: Bernhard Reutner-Fischer <[email protected]>
----
- libc/sysdeps/linux/i386/bits/syscalls.h |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/i386/bits/syscalls.h b/libc/sysdeps/linux/i386/bits/syscalls.h
-index 9fb4f35..566b5ac 100644
---- a/libc/sysdeps/linux/i386/bits/syscalls.h
-+++ b/libc/sysdeps/linux/i386/bits/syscalls.h
-@@ -136,7 +136,7 @@ __asm__ (
- #define ASMFMT_5(arg1, arg2, arg3, arg4, arg5) \
- 	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5)
- #define ASMFMT_6(arg1, arg2, arg3, arg4, arg5, arg6) \
--	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5), "m" (arg6)
-+	, "a" (arg1), "c" (arg2), "d" (arg3), "S" (arg4), "D" (arg5), "g" (arg6)
- 
- #else /* !PIC */
- 
--- 
-1.7.10.4
-

deleted file mode 100644
index 475dcfd..0000000
@@ -1,35 +0,0 @@
-From 569d1423ac2b585b5cb38bee545b5e0ae2bd7f67 Mon Sep 17 00:00:00 2001
-From: James Hogan <[email protected]>
-Date: Thu, 17 May 2012 12:42:54 +0100
-Subject: [PATCH] mmap()->sys_mmap2: do unsigned shift of offset
-
-Fix the implementation of mmap based on the mmap2 system call, to
-construct pgoffset from offset with an unsigned shift rather than a
-signed (off_t) shift. The mmap2 test in the testsuite catches this case
-by mmap'ing with a large offset (with the sign bit set). The signed
-shift repeats the sign bit making the page shift way out of range. This
-is already fixed similarly in mmap64().
-
-Signed-off-by: James Hogan <[email protected]>
-Signed-off-by: Mike Frysinger <[email protected]>
----
- libc/sysdeps/linux/common/mmap.c |    3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/common/mmap.c b/libc/sysdeps/linux/common/mmap.c
-index 8995898..d53eabb 100644
---- a/libc/sysdeps/linux/common/mmap.c
-+++ b/libc/sysdeps/linux/common/mmap.c
-@@ -63,7 +63,8 @@ __ptr_t mmap(__ptr_t addr, size_t len, int prot, int flags, int fd, __off_t offs
- 		__set_errno(EINVAL);
- 		return MAP_FAILED;
- 	}
--	return __syscall_mmap2(addr, len, prot, flags, fd, offset >> MMAP2_PAGE_SHIFT);
-+	return __syscall_mmap2(addr, len, prot, flags,
-+	                       fd, ((__u_long) offset >> MMAP2_PAGE_SHIFT));
- }
- 
- libc_hidden_def(mmap)
--- 
-1.7.10.4
-

deleted file mode 100644
index c310725..0000000

ped_mem_
get_info|pthread_mutex_timedlock|sem_timedwait
--CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c -+CSRC-$(UCLIBC_HAS_ADVANCED_REALTIME) += posix_fadvise64.c posix_fadvise.c posix_madvise.c \
-+ posix_fallocate.c posix_fallocate64.c
- CSRC-$(UCLIBC_SUSV4_LEGACY) += utime.c
- CSRC-$(UCLIBC_HAS_EPOLL) += epoll.c
- CSRC-$(UCLIBC_HAS_XATTR) += xattr.c
-diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h -index 5665e24..13c7a63 100644
---- a/libc/sysdeps/linux/common/bits/kernel-features.h
-+++ b/libc/sysdeps/linux/common/bits/kernel-features.h
-@@ -496,6 +496,14 @@
- # define __ASSUME_PRIVATE_FUTEX 1
- #endif
-
-+/* Support for fallocate was added in 2.6.23,
-+ on s390 only after 2.6.23-rc1, on alpha only after 2.6.33-rc1. */
-+#if __LINUX_KERNEL_VERSION >= 0x020617 \

-+    && (!defined __s390__ || __LINUX_KERNEL_VERSION >= 0x020618) \
-+    && (!defined __alpha__ || __LINUX_KERNEL_VERSION >= 0x020621)

-+# define __ASSUME_FALLOCATE 1
-+#endif
-+
- /* getcpu is a syscall for x86-64 since 3.1. */
- #if defined __x86_64__ && __LINUX_KERNEL_VERSION >= 0x030100
- # define __ASSUME_GETCPU_SYSCALL 1
-diff --git a/libc/sysdeps/linux/common/posix_fallocate.c b/libc/sysdeps/linux/common/posix_fallocate.c -new file mode 100644
-index 0000000..9aaa6ce
---- /dev/null
-+++ b/libc/sysdeps/linux/common/posix_fallocate.c
-@@ -0,0 +1,43 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * posix_fallocate() for uClibc
-+ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
-+ *
-+ * Copyright (C) 2000-2006 Erik Andersen <[email protected]>
-+ *
-+ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <fcntl.h>
-+#include <bits/kernel-features.h>
-+#include <stdint.h>
-+
-+#if defined __NR_fallocate
-+int posix_fallocate(int fd, __off_t offset, __off_t len)
-+{
-+ int ret;
-+
-+# if __WORDSIZE == 32
-+ uint32_t off_low = offset;
-+ uint32_t len_low = len;
-+ /* may assert that these >>31 are 0 */
-+ uint32_t zero = 0;
-+ INTERNAL_SYSCALL_DECL(err);
-+ ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
-+ __LONG_LONG_PAIR (zero, off_low),
-+ __LONG_LONG_PAIR (zero, len_low)));
-+# elif __WORDSIZE == 64
-+ INTERNAL_SYSCALL_DECL(err);
-+ ret = (int) (INTERNAL_SYSCALL(fallocate, err, 4, fd, 0, offset, len));
-+# else
-+# error your machine is neither 32 bit or 64 bit ... it must be magical
-+#endif
-+ if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
-+ return INTERNAL_SYSCALL_ERRNO (ret, err);
-+ return 0;
-+}
-+# if defined __UCLIBC_HAS_LFS__ && __WORDSIZE == 64 -+strong_alias(posix_fallocate,posix_fallocate64)
-+# endif
-+#endif
-diff --git a/libc/sysdeps/linux/common/posix_fallocate64.c b/libc/sysdeps/linux/common/posix_fallocate64.c -new file mode 100644
-index 0000000..818d868
---- /dev/null
-+++ b/libc/sysdeps/linux/common/posix_fallocate64.c
-@@ -0,0 +1,39 @@
-+/* vi: set sw=4 ts=4: */
-+/*
-+ * posix_fallocate() for uClibc
-+ * http://www.opengroup.org/onlinepubs/9699919799/functions/posix_fallocate.html
-+ *
-+ * Copyright (C) 2000-2006 Erik Andersen <[email protected]>
-+ *
-+ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball.
-+ */
-+
-+#include <sys/syscall.h>
-+#include <fcntl.h>
-+#include <bits/kernel-features.h>
-+#include <stdint.h>
-+
-+#if defined __NR_fallocate
-+
-+# if __WORDSIZE == 64
-+/* Can use normal posix_fallocate() */
-+# elif __WORDSIZE == 32
-+int posix_fallocate64(int fd, __off64_t offset, __off64_t len)
-+{
-+ int ret;
-+ uint32_t off_low = offset & 0xffffffff;
-+ uint32_t off_high = offset >> 32;
-+ uint32_t len_low = len & 0xffffffff;
-+ uint32_t len_high = len >> 32;
-+ INTERNAL_SYSCALL_DECL(err);
-+ ret = (int) (INTERNAL_SYSCALL(fallocate, err, 6, fd, 0,
-+ __LONG_LONG_PAIR (off_high, off_low),
-+ __LONG_LONG_PAIR (len_high, len_low)));
-+ if (unlikely(INTERNAL_SYSCALL_ERROR_P (ret, err)))
-+ return INTERNAL_SYSCALL_ERRNO (ret, err);
-+ return 0;
-+}
-+# else
-+# error your machine is neither 32 bit or 64 bit ... it must be magical
-+# endif
-+#endif
-diff --git a/test/.gitignore b/test/.gitignore
-index 7234c48..ef152e9 100644
---- a/test/.gitignore
-+++ b/test/.gitignore
-@@ -305,6 +305,8 @@ unistd/getcwd
- unistd/getopt
- unistd/getopt_long
- unistd/tstgetopt
-+unistd/tst-posix_fallocate
-+unistd/tst-posix_fallocate64
- unistd/tst-preadwrite
- unistd/tst-preadwrite64
- unistd/vfork
-diff --git a/test/unistd/Makefile.in b/test/unistd/Makefile.in
-index c542f98..24b9a37 100644
---- a/test/unistd/Makefile.in
-+++ b/test/unistd/Makefile.in
-@@ -2,7 +2,10 @@
- # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
-
- ifeq ($(UCLIBC_HAS_LFS),)
--TESTS_DISABLED := tst-preadwrite64
-+TESTS_DISABLED := tst-preadwrite64 tst-posix_fallocate64
-+endif
-+ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),)
-+TESTS_DISABLED := tst-posix_fallocate
- endif
- OPTS_getopt := -abcXXX -9
- OPTS_getopt_long := --add XXX --delete YYY --verbose
-diff --git a/test/unistd/tst-posix_fallocate.c b/test/unistd/tst-posix_fallocate.c
-new file mode 100644
-index 0000000..d41c604
---- /dev/null
-+++ b/test/unistd/tst-posix_fallocate.c
-@@ -0,0 +1,127 @@
-+#include <fcntl.h>
-+#include <sys/stat.h>
-+
-+#ifndef TST_POSIX_FALLOCATE64
-+# define stat64 stat
-+# define fstat64 fstat
-+# else
-+# ifndef O_LARGEFILE
-+# error no O_LARGEFILE but you want to test with LFS enabled
-+# endif
-+#endif
-+
-+static void do_prepare (void);
-+#define PREPARE(argc, argv) do_prepare ()
-+static int do_test (void);
-+#define TEST_FUNCTION do_test ()
-+#include <test-skeleton.c>
-+
-+static int fd;
-+static void
-+do_prepare (void)
-+{
-+ fd = create_temp_file ("tst-posix_fallocate.", NULL);
-+ if (fd == -1)
-+ {
-+ printf ("cannot create temporary file: %m\n");
-+ exit (1);
-+ }
-+}
-+
-+
-+static int
-+do_test (void)
-+{
-+ struct stat64 st;
-+
-+ if (fstat64 (fd, &st) != 0)
-+ {
-+ puts ("1st fstat failed");
-+ return 1;
-+ }
-+
-+ if (st.st_size != 0)
-+ {
-+ puts ("file not created with size 0");
-+ return 1;
-+ }
-+
-+ if (posix_fallocate (fd, 512, 768) != 0)
-+ {
-+ puts ("1st posix_fallocate call failed");
-+ return 1;
-+ }
-+
-+ if (fstat64 (fd, &st) != 0)
-+ {
-+ puts ("2nd fstat failed");
-+ return 1;
-+ }
-+
-+ if (st.st_size != 512 + 768)
-+ {
-+ printf ("file size after 1st posix_fallocate call is %llu, expected %u\n",
-+ (unsigned long long int) st.st_size, 512u + 768u);
-+ return 1;
-+ }
-+
-+ if (posix_fallocate (fd, 0, 1024) != 0)
-+ {
-+ puts ("2nd posix_fallocate call failed");
-+ return 1;
-+ }
-+
-+ if (fstat64 (fd, &st) != 0)
-+ {
-+ puts ("3rd fstat failed");
-+ return 1;
-+ }
-+
-+ if (st.st_size != 512 + 768)
-+ {
-+ puts ("file size changed in 2nd posix_fallocate");
-+ return 1;
-+ }
-+
-+ if (posix_fallocate (fd, 2048, 64) != 0)
-+ {
-+ puts ("3rd posix_fallocate call failed");
-+ return 1;
-+ }
-+
-+ if (fstat64 (fd, &st) != 0)
-+ {
-+ puts ("4th fstat failed");
-+ return 1;
-+ }
-+
-+ if (st.st_size != 2048 + 64)
-+ {
-+ printf ("file size after 3rd posix_fallocate call is %llu, expected %u\n",
-+ (unsigned long long int) st.st_size, 2048u + 64u);
-+ return 1;
-+ }
-+#ifdef TST_POSIX_FALLOCATE64
-+ if (posix_fallocate64 (fd, 4097ULL, 4294967295ULL + 2ULL) != 0)
-+ {
-+ puts ("4th posix_fallocate call failed");
-+ return 1;
-+ }
-+
-+ if (fstat64 (fd, &st) != 0)
-+ {
-+ puts ("5th fstat failed");
-+ return 1;
-+ }
-+
-+ if (st.st_size != 4097ULL + 4294967295ULL + 2ULL)
-+ {
-+ printf ("file size after 4th posix_fallocate call is %llu, expected %llu\n",
-+ (unsigned long long int) st.st_size, 4097ULL + 4294967295ULL + 2ULL);
-+ return 1;
-+ }
-+#endif
-+ close (fd);
-+
-+ return 0;
-+}
-diff --git a/test/unistd/tst-posix_fallocate64.c b/test/unistd/tst-posix_fallocate64.c -new file mode 100644
-index 0000000..b1ee0ff
---- /dev/null
-+++ b/test/unistd/tst-posix_fallocate64.c
-@@ -0,0 +1,2 @@
-+#define TST_POSIX_FALLOCATE64
-+#include "tst-posix_fallocate.c"
---
-1.7.10.4
-

deleted file mode 100644
index 19a0647..0000000

deleted file mode 100644
index c294a46..0000000

deleted file mode 100644
index 4268350..0000000

deleted file mode 100644
index 42105cf..0000000

deleted file mode 100644
index 3197a21..0000000

deleted file mode 100644
index 04dfb1e..0000000

deleted file mode 100644
index c6ee47d..0000000

deleted file mode 100644
index 1272950..0000000

deleted file mode 100644
index a98ee68..0000000

index 1e4d892..7cbd45c 100644

index 9acb82e..0a1fdf6 100644

index c62a40f..ad5f607 100644

2.6.4

Part of the diff is not shown here. View the raw message.

The snapshot version points to the original uClibc project, which is dead. Moreover, we no longer support "snapshot" versions for any other Buildroot component, so there is no reason to keep it for uClibc.

---
 package/uclibc/Config.in              | 17 ---------------
 package/uclibc/uClibc-snapshot.config | 41 -----------------------------------
 package/uclibc/uclibc.hash            |  3 ---
 package/uclibc/uclibc.mk              |  5 +----
 4 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 package/uclibc/uClibc-snapshot.config

index 7cbd45c..452043d 100644
@@ -30,32 +30,15 @@ choice
 		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL \
 		       if !BR2_m68k && !BR2_x86_i386
 
-	config BR2_UCLIBC_VERSION_SNAPSHOT
-		bool "daily snapshot"
-		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS if !BR2_xtensa
-		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD
-		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL \
-		       if !BR2_x86_i386 && !BR2_xtensa
-		depends on !(BR2_arc || BR2_mips64 || BR2_mips64el)
-
 endchoice
 
-config BR2_USE_UCLIBC_SNAPSHOT
-	string "Date (yyyymmdd) of snapshot or 'snapshot' for latest"
-	default "snapshot"
-	depends on BR2_UCLIBC_VERSION_SNAPSHOT
-	help
-	  Use latest snapshot or one from a specific date?
-
 config BR2_UCLIBC_VERSION_STRING
 	string
 	default "1.0.11"		if BR2_UCLIBC_VERSION_NG
-	default BR2_USE_UCLIBC_SNAPSHOT	if BR2_UCLIBC_VERSION_SNAPSHOT
 
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
 	default "package/uclibc/uClibc-ng.config" if BR2_UCLIBC_VERSION_NG
-	default "package/uclibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT
 	help
 	  Some people may wish to use their own modified uClibc configuration
 	  file and will specify their config file location with this option.

index 0a1fdf6..ecc8cf9 100644
@@ -1,5 +1,2 @@
 # From http://www.uclibc-ng.org/
 sha256  2fdc6b9015f8049be0eb12a5e3e446de471fb80061115afd8d72ea582cb22b74        uClibc-ng-1.0.11.tar.xz
-
-# No hash for this git snapshot
-none  xxx  uClibc-7bf35c8b7d4a1f97174eb49f47f33946b282114c.tar.gz

index ad5f607..44b8a97 100644
@@ -9,10 +9,7 @@ UCLIBC_SOURCE ?= uClibc-$(UCLIBC_VERSION).tar.bz2
 UCLIBC_LICENSE = LGPLv2.1+
 UCLIBC_LICENSE_FILES = COPYING.LIB
 
-ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y)
-UCLIBC_SITE = http://www.uclibc.org/downloads/snapshots
-BR_NO_CHECK_HASH_FOR += $(UCLIBC_SOURCE)
-else ifeq ($(BR2_UCLIBC_VERSION_NG),y)
+ifeq ($(BR2_UCLIBC_VERSION_NG),y)
 UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 endif

2.6.4

Since we now only support uClibc-ng, remove the version selection from the uclibc package.

Note that the BR2_UCLIBC_VERSION_SUPPORTS_* hidden booleans, which were only used to allow each uClibc version to specify which thread implementation they support and on which architecture are removed. Now such architecture dependencies are directly encoded in the "Thread library implementation" choice.

---
 package/uclibc/Config.in | 41 +++++------------------------------------
 package/uclibc/uclibc.mk | 11 +++--------
 2 files changed, 8 insertions(+), 44 deletions(-)

index 452043d..16bf89c 100644
@@ -7,38 +7,9 @@ config BR2_PACKAGE_UCLIBC
 
 comment "uClibc Options"
 
-config BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS
-	bool
-
-config BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD
-	bool
-
-config BR2_UCLIBC_VERSION_SUPPORTS_NPTL
-	bool
-
-choice
-	prompt "uClibc C library Version"
-	default BR2_UCLIBC_VERSION_NG
-	help
-	  Select the version of uClibc you wish to use.
-
-	config BR2_UCLIBC_VERSION_NG
-		bool "uClibc-ng"
-		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS if BR2_m68k
-		select BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD \
-		       if BR2_m68k || BR2_arm || BR2_armeb
-		select BR2_UCLIBC_VERSION_SUPPORTS_NPTL \
-		       if !BR2_m68k && !BR2_x86_i386
-
-endchoice
-
-config BR2_UCLIBC_VERSION_STRING
-	string
-	default "1.0.11"		if BR2_UCLIBC_VERSION_NG
-
 config BR2_UCLIBC_CONFIG
 	string "uClibc configuration file to use?"
-	default "package/uclibc/uClibc-ng.config" if BR2_UCLIBC_VERSION_NG
+	default "package/uclibc/uClibc-ng.config"
 	help
 	  Some people may wish to use their own modified uClibc configuration
 	  file and will specify their config file location with this option.

@@ -76,9 +47,7 @@ config BR2_TOOLCHAIN_BUILDROOT_LOCALE
 
 choice
 	prompt "Thread library implementation"
-	default BR2_PTHREADS_NATIVE if BR2_UCLIBC_VERSION_SUPPORTS_NPTL
-	default BR2_PTHREADS_OLD if BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD
-	default BR2_PTHREADS if BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS
+	default BR2_PTHREADS_NATIVE
 	help
 	  Use this option to select the thread library implementation
 	  that should be used in your toolchain.

@@ -89,18 +58,18 @@ choice
 	config BR2_PTHREADS
 		bool "linuxthreads"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS
+		depends on BR2_m68k
 
 	config BR2_PTHREADS_OLD
 		bool "linuxthreads (stable/old)"
 		select BR2_TOOLCHAIN_HAS_THREADS
-		depends on BR2_UCLIBC_VERSION_SUPPORTS_LINUXTHREADS_OLD
+		depends on BR2_m68k || BR2_arm || BR2_armeb
 
 	config BR2_PTHREADS_NATIVE
 		bool "Native POSIX Threading (NPTL)"
 		select BR2_TOOLCHAIN_HAS_THREADS
 		select BR2_TOOLCHAIN_HAS_THREADS_NPTL
-		depends on BR2_UCLIBC_VERSION_SUPPORTS_NPTL
+		depends on !BR2_m68k && !BR2_x86_i386
 endchoice
 
 config BR2_PTHREAD_DEBUG

index 44b8a97..6b05181 100644
@@ -4,16 +4,11 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = $(call qstrip,$(BR2_UCLIBC_VERSION_STRING))
-UCLIBC_SOURCE ?= uClibc-$(UCLIBC_VERSION).tar.bz2
+UCLIBC_VERSION = 1.0.11
+UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
+UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPLv2.1+
 UCLIBC_LICENSE_FILES = COPYING.LIB
-
-ifeq ($(BR2_UCLIBC_VERSION_NG),y)
-UCLIBC_SITE = http://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
-UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
-endif
-
 UCLIBC_INSTALL_STAGING = YES
 
 # uclibc is part of the toolchain so disable the toolchain dependency

2.6.4

Hi Thomas,
Thomas Petazzoni wrote,

Just a small adjustment. The first release made @Fosdem time in February (maybe the directory time on the server was misleading):
http://uclibc-ng.org/wiki/WikiStart?action=diff&version=22

MIPS{32,64}r6 support was added in the latest release, may be we can enable it with this patch series?

best regards
Waldemar

Hello,

Ah, thanks for the info! So it's been exactly one year that uClibc-ng has done its first release. Happy birthday :-)

It would be good to enable it of course, but it's the matter of a separate patch / series. This series is solely about dropping support for uClibc versioning, keeping only uClibc-ng. I don't like to extend the scope of patch series between iterations, otherwise they never get merged because they are always changing.

Best regards,

Thomas

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Committed entire series, thanks!

Bye, Peter Korsgaard

Hello,

Wohoho, thanks! Finally the uClibc mess is getting saner! :-)

Thomas

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com