Skip to contentSkip to conversation

package/uclibc: bump to version 1.0.32

PATCH Superseded Waldemar Brodkorb 2 participants 2 messages Oct 15, 2019 – Oct 16, 2019

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/uclibc: bump to version 1.0.32

Remove all patches, since they were already applied upstream.

---
 ...1-statfs.h-sync-generic-header-with-glibc.patch | 169 --------------------
 .../0002-xtensa-add-custom-bits-poll.h.patch       |  93 -----------
 ...3-preadv-pwritev-fix-offset-argument-type.patch |  71 ---------
 .../uclibc/0004-sparc-remove-asm-constraint.patch  |  40 -----
 ...-PowerPC-sync-with-termios-fix-from-glibc.patch | 172 ---------------------
 package/uclibc/uclibc.hash                         |   4 +-
 package/uclibc/uclibc.mk                           |   2 +-
 7 files changed, 3 insertions(+), 548 deletions(-)
 delete mode 100644 package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch
 delete mode 100644 package/uclibc/0002-xtensa-add-custom-bits-poll.h.patch
 delete mode 100644 package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch
 delete mode 100644 package/uclibc/0004-sparc-remove-asm-constraint.patch
 delete mode 100644 package/uclibc/0005-PowerPC-sync-with-termios-fix-from-glibc.patch
package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch deleted +0 -169
deleted file mode 100644
index b8753ed..0000000
@@ -1,169 +0,0 @@
-From 8a73a967e18c55199785bae0f22dc94d9b2f8985 Mon Sep 17 00:00:00 2001
-From: Waldemar Brodkorb <[email protected]>
-Date: Tue, 27 Nov 2018 15:41:37 +0100
-Subject: [PATCH] statfs.h: sync generic header with glibc
-
-Fix issues with aarch64 and df with mismatching header between kernel
-and libc.
-
-Signed-off-by: Waldemar Brodkorb <[email protected]>
----
- .../linux/common-generic/bits/statfs.h        | 84 +++++++++----------
- libc/sysdeps/linux/common/fstatfs.c           |  9 --
- libc/sysdeps/linux/common/statfs.c            | 10 ---
- 3 files changed, 40 insertions(+), 63 deletions(-)
-
-diff --git a/libc/sysdeps/linux/common-generic/bits/statfs.h b/libc/sysdeps/linux/common-generic/bits/statfs.h
-index a2767b49a..23519a57e 100644
---- a/libc/sysdeps/linux/common-generic/bits/statfs.h
-+++ b/libc/sysdeps/linux/common-generic/bits/statfs.h
-@@ -11,65 +11,61 @@
- #include <endian.h>
- #include <bits/align64bit.h>
- #include <bits/types.h>
-+#include <bits/wordsize.h>
- 
-+/* 64-bit libc uses the kernel's 'struct statfs', accessed via the
-+   statfs() syscall; 32-bit libc uses the kernel's 'struct statfs64'
-+   and accesses it via the statfs64() syscall.  All the various
-+   APIs offered by libc use the kernel shape for their struct statfs
-+   structure; the only difference is that 32-bit programs not
-+   using __USE_FILE_OFFSET64 only see the low 32 bits of some
-+   of the fields (the __fsblkcnt_t and __fsfilcnt_t fields).  */
-+
-+#if defined __USE_FILE_OFFSET64
-+# define __field64(type, type64, name) type64 name
-+#elif __WORDSIZE == 64
-+# define __field64(type, type64, name) type name
-+#elif __BYTE_ORDER == __LITTLE_ENDIAN
-+# define __field64(type, type64, name) \
-+  type name __attribute__((__aligned__ (__alignof__ (type64)))); int __##name##_pad
-+#else
-+# define __field64(type, type64, name) \
-+  int __##name##_pad __attribute__((__aligned__ (__alignof__ (type64)))); type name
-+#endif
- 
- struct statfs
-   {
--    __U32_TYPE f_type;
--    __U32_TYPE f_bsize;
--#ifndef __USE_FILE_OFFSET64
--# if __BYTE_ORDER == __LITTLE_ENDIAN
--    __U32_TYPE f_blocks;
--    __U32_TYPE __pad1;
--    __U32_TYPE f_bfree;
--    __U32_TYPE __pad2;
--    __U32_TYPE f_bavail;
--    __U32_TYPE __pad3;
--    __U32_TYPE f_files;
--    __U32_TYPE __pad4;
--    __U32_TYPE f_ffree;
--    __U32_TYPE __pad5;
--# else
--    __U32_TYPE __pad1;
--    __U32_TYPE f_blocks;
--    __U32_TYPE __pad2;
--    __U32_TYPE f_bfree;
--    __U32_TYPE __pad3;
--    __U32_TYPE f_bavail;
--    __U32_TYPE __pad4;
--    __U32_TYPE f_files;
--    __U32_TYPE __pad5;
--    __U32_TYPE f_ffree;
--# endif /* __LITTLE_ENDIAN */
--#else
--    __U64_TYPE f_blocks;
--    __U64_TYPE f_bfree;
--    __U64_TYPE f_bavail;
--    __U64_TYPE f_files;
--    __U64_TYPE f_ffree;
--#endif /* __USE_FILE_OFFSET64 */
-+    __SWORD_TYPE f_type;
-+    __SWORD_TYPE f_bsize;
-+    __field64(__fsblkcnt_t, __fsblkcnt64_t, f_blocks);
-+    __field64(__fsblkcnt_t, __fsblkcnt64_t, f_bfree);
-+    __field64(__fsblkcnt_t, __fsblkcnt64_t, f_bavail);
-+    __field64(__fsfilcnt_t, __fsfilcnt64_t, f_files);
-+    __field64(__fsfilcnt_t, __fsfilcnt64_t, f_ffree);
-     __fsid_t f_fsid;
--    __U32_TYPE f_namelen;
--    __U32_TYPE f_frsize;
--    __U32_TYPE f_flags;
--    __U32_TYPE f_spare[4];
--  } __ARCH_64BIT_ALIGNMENT__;
-+    __SWORD_TYPE f_namelen;
-+    __SWORD_TYPE f_frsize;
-+    __SWORD_TYPE f_flags;
-+    __SWORD_TYPE f_spare[4];
-+  };
-+
-+#undef __field64
- 
- #ifdef __USE_LARGEFILE64
- struct statfs64
-   {
--    __U32_TYPE f_type;
--    __U32_TYPE f_bsize;
-+    __SWORD_TYPE f_type;
-+    __SWORD_TYPE f_bsize;
-     __U64_TYPE f_blocks;
-     __U64_TYPE f_bfree;
-     __U64_TYPE f_bavail;
-     __U64_TYPE f_files;
-     __U64_TYPE f_ffree;
-     __fsid_t f_fsid;
--    __U32_TYPE f_namelen;
--    __U32_TYPE f_frsize;
--    __U32_TYPE f_flags;
--    __U32_TYPE f_spare[4];
-+    __SWORD_TYPE f_namelen;
-+    __SWORD_TYPE f_frsize;
-+    __SWORD_TYPE f_flags;
-+    __SWORD_TYPE f_spare[4];
-   };
- #endif
- 
-diff --git a/libc/sysdeps/linux/common/fstatfs.c b/libc/sysdeps/linux/common/fstatfs.c
-index fcb0820eb..0b2709ce3 100644
---- a/libc/sysdeps/linux/common/fstatfs.c
-+++ b/libc/sysdeps/linux/common/fstatfs.c
-@@ -30,15 +30,6 @@ _syscall2(int, __libc_fstatfs, int, fd, struct statfs *, buf)
- int __libc_fstatfs (int __fildes, struct statfs *__buf)
- {
- 	int err = INLINE_SYSCALL(fstatfs64, 3, __fildes, sizeof(*__buf), __buf);
--
--	if (err == 0) {
--		/* Did we overflow? */
--		if (__buf->__pad1 || __buf->__pad2 || __buf->__pad3 ||
--		    __buf->__pad4 || __buf->__pad5) {
--			__set_errno(EOVERFLOW);
--			return -1;
--		}
--	}
- 	return err;
- };
- /* Redefined fstatfs because we need it for backwards compatibility */
-diff --git a/libc/sysdeps/linux/common/statfs.c b/libc/sysdeps/linux/common/statfs.c
-index ab9ec0e56..2990ff3e2 100644
---- a/libc/sysdeps/linux/common/statfs.c
-+++ b/libc/sysdeps/linux/common/statfs.c
-@@ -18,16 +18,6 @@ extern __typeof(statfs) __libc_statfs attribute_hidden;
- int __libc_statfs(const char *path, struct statfs *buf)
- {
- 	int err = INLINE_SYSCALL(statfs64, 3, path, sizeof(*buf), buf);
--
--	if (err == 0) {
--		/* Did we overflow? */
--		if (buf->__pad1 || buf->__pad2 || buf->__pad3 ||
--		    buf->__pad4 || buf->__pad5) {
--			__set_errno(EOVERFLOW);
--			return -1;
--		}
--	}
--
- 	return err;
- }
- # if defined __UCLIBC_LINUX_SPECIFIC__ || defined __UCLIBC_HAS_THREADS_NATIVE__
--- 
-2.19.1
-
package/uclibc/0002-xtensa-add-custom-bits-poll.h.patch deleted +0 -93

93 lines not on this page · raw message

package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch deleted +0 -71

71 lines not on this page · raw message

package/uclibc/0004-sparc-remove-asm-constraint.patch deleted +0 -40
deleted file mode 100644
index 2fbe8cd..0000000
@@ -1,40 +0,0 @@
-From 75a1a2a9fec8a310a18ff7d63ead95f3a0d1b11b Mon Sep 17 00:00:00 2001
-From: Romain Naour <[email protected]>
-Date: Fri, 24 May 2019 12:42:04 +0200
-Subject: [PATCH] sparc: remove asm constraint
-
-uClibc-ng don't build with gcc 9.1 [1] due to a new check that
-"catch illegal asm constraint usage" [2].
-gcc 9.1 print this error:
-"invalid hard register usage between earlyclobber operand and input operand"
-The asm constraint is present in uClibc since it support sparc (back in 2002)[3].
-Note: There is no such constraint is Glibc counterpart code [4].
-[1] https://gitlab.com/kubu93/toolchains-builder/-/jobs/205435757
-[2] https://github.com/gcc-mirror/gcc/commit/b782636f28f5c378897c238081d28d7a4a6ca578
-[3] https://cgit.uclibc-ng.org/cgi/cgit/uclibc-ng.git/commit/?id=3b6d086531102b6d09ce852feb1e370d5dca3ce9
-[4]
-+https://sourceware.org/git/?p=glibc.git;a=blob;f=sysdeps/unix/sysv/linux/sparc/sysdep.h;h=981b2a26b7a91093f821c97876
-+e55bc4be2d9f8a;hb=HEAD
-
-(cherry picked from commit c2eaf6c30d930b65a8bcf5f912ef8873a6f4eb20)
-Signed-off-by: Romain Naour <[email protected]>
----
- libc/sysdeps/linux/sparc/bits/syscalls.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libc/sysdeps/linux/sparc/bits/syscalls.h b/libc/sysdeps/linux/sparc/bits/syscalls.h
-index 75af7a157..28edc0568 100644
---- a/libc/sysdeps/linux/sparc/bits/syscalls.h
-+++ b/libc/sysdeps/linux/sparc/bits/syscalls.h
-@@ -33,7 +33,7 @@
-             register long __g1 __asm__("g1") = sys_num;     \
-             LOAD_ARGS_##nr(args)                            \
-             __asm__ __volatile__( __SYSCALL_STRING          \
--                : "=r" (__res), "=&r" (__o0)                \
-+                : "=r" (__res), "=r" (__o0)                \
-                 : "1" (__o0) ASM_ARGS_##nr, "r" (__g1)     \
-                 : __SYSCALL_CLOBBERS );                                   \
-         }                                                   \
--- 
-2.21.0
-
package/uclibc/0005-PowerPC-sync-with-termios-fix-from-glibc.patch deleted +0 -172

172 lines not on this page · raw message

package/uclibc/uclibc.hash +2 -2
index d1cbdb6..c1f161f 100644
@@ -1,4 +1,4 @@
-# From https://downloads.uclibc-ng.org/releases/1.0.31/uClibc-ng-1.0.31.tar.xz.sha256
-sha256  2215d7377118434d1697fd575f10d7a6be3f29e460d6b0e1ee9f6f5306288060  uClibc-ng-1.0.31.tar.xz
+# From https://downloads.uclibc-ng.org/releases/1.0.32/uClibc-ng-1.0.32.tar.xz.sha256
+sha256  891b5e4573855e4c11e51d3a518f89a82e490d9aa73280c05ce3e4d7e739a370  uClibc-ng-1.0.32.tar.xz
 # Locally calculated
 sha256  6095e9ffa777dd22839f7801aa845b31c9ed07f3d6bf8a26dc5d2dec8ccc0ef3  COPYING.LIB
package/uclibc/uclibc.mk +1 -1
index b9ed8b9..2af666c 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-UCLIBC_VERSION = 1.0.31
+UCLIBC_VERSION = 1.0.32
 UCLIBC_SOURCE = uClibc-ng-$(UCLIBC_VERSION).tar.xz
 UCLIBC_SITE = https://downloads.uclibc-ng.org/releases/$(UCLIBC_VERSION)
 UCLIBC_LICENSE = LGPL-2.1+
Signature · 1 line
2.1.4
#1 lore raw

PATCH 1/1 package/uclibc: bump to version 1.0.32

Quoted 17 lines · On Tue, 15 Oct 2019 19:02:18 +0200 Waldemar Brodkorb <[email protected]> wrote:

Remove all patches, since they were already applied upstream.

---
 ...1-statfs.h-sync-generic-header-with-glibc.patch | 169 --------------------
 .../0002-xtensa-add-custom-bits-poll.h.patch       |  93 -----------
 ...3-preadv-pwritev-fix-offset-argument-type.patch |  71 ---------
 .../uclibc/0004-sparc-remove-asm-constraint.patch  |  40 -----
 ...-PowerPC-sync-with-termios-fix-from-glibc.patch | 172 ---------------------
 package/uclibc/uclibc.hash                         |   4 +-
 package/uclibc/uclibc.mk                           |   2 +-
 7 files changed, 3 insertions(+), 548 deletions(-)
 delete mode 100644 package/uclibc/0001-statfs.h-sync-generic-header-with-glibc.patch
 delete mode 100644 package/uclibc/0002-xtensa-add-custom-bits-poll.h.patch
 delete mode 100644 package/uclibc/0003-preadv-pwritev-fix-offset-argument-type.patch
 delete mode 100644 package/uclibc/0004-sparc-remove-asm-constraint.patch
 delete mode 100644 package/uclibc/0005-PowerPC-sync-with-termios-fix-from-glibc.patch

Applied to master, thanks. Glad to see a new uClibc release!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com