Merge pull request #1674 from stilor/master

Updates to make `ct-ng build-all` pass

4 files changed, 13 insertions, 27 deletions

diff --git a/packages/glibc/2.35/0000-typedef-caddr.patch b/packages/glibc/2.35/0000-typedef-caddr.patch
index 451884c..a328da1 100644
--- a/packages/glibc/2.35/0000-typedef-caddr.patch
+++ b/packages/glibc/2.35/0000-typedef-caddr.patch
@@ -4,7 +4,7 @@
 
 --- a/posix/sys/types.h
 +++ b/posix/sys/types.h
-@@ -112,7 +112,10 @@ typedef __ssize_t ssize_t;
+@@ -112,7 +112,10 @@
  #ifdef	__USE_MISC
  # ifndef __daddr_t_defined
  typedef __daddr_t daddr_t;
diff --git a/packages/glibc/2.35/0001-Add-ARC700-support.patch b/packages/glibc/2.35/0001-Add-ARC700-support.patch
index 23c94a7..54729d8 100644
--- a/packages/glibc/2.35/0001-Add-ARC700-support.patch
+++ b/packages/glibc/2.35/0001-Add-ARC700-support.patch
@@ -11,16 +11,14 @@ pieces. I looked at uClibc-ng and a patch by Synopsis for glibc.
 Signed-off-by: Rosen Penev <rosenp@gmail.com>
 Signed-off-by: Alexey Brodkin <abrodkin@synopsys.com>
 ---
- sysdeps/arc/atomic-machine.h          | 4 ++++
- sysdeps/unix/sysv/linux/arc/syscall.S | 5 +++++
- sysdeps/unix/sysv/linux/arc/sysdep.h  | 8 ++++++++
+ sysdeps/arc/atomic-machine.h          |    4 ++++
+ sysdeps/unix/sysv/linux/arc/syscall.S |    5 +++++
+ sysdeps/unix/sysv/linux/arc/sysdep.h  |    8 ++++++++
  3 files changed, 17 insertions(+)
 
-diff --git a/sysdeps/arc/atomic-machine.h b/sysdeps/arc/atomic-machine.h
-index 1c8638bb44..bde66ae137 100644
 --- a/sysdeps/arc/atomic-machine.h
 +++ b/sysdeps/arc/atomic-machine.h
-@@ -64,6 +64,10 @@ typedef uintmax_t uatomic_max_t;
+@@ -52,6 +52,10 @@
    __atomic_val_bysize (__arch_compare_and_exchange_val, int,		\
  		       mem, new, old, __ATOMIC_ACQUIRE)
  
@@ -31,11 +29,9 @@ index 1c8638bb44..bde66ae137 100644
 +#endif
  
  #endif /* _ARC_BITS_ATOMIC_H */
-diff --git a/sysdeps/unix/sysv/linux/arc/syscall.S b/sysdeps/unix/sysv/linux/arc/syscall.S
-index 6227dbf499..0609dbeeba 100644
 --- a/sysdeps/unix/sysv/linux/arc/syscall.S
 +++ b/sysdeps/unix/sysv/linux/arc/syscall.S
-@@ -24,8 +24,13 @@ ENTRY (syscall)
+@@ -24,8 +24,13 @@
  	mov_s	r1, r2
  	mov_s	r2, r3
  	mov_s	r3, r4
@@ -49,11 +45,9 @@ index 6227dbf499..0609dbeeba 100644
  
  	ARC_TRAP_INSN
  	brhi	r0, -4096, L (call_syscall_err)
-diff --git a/sysdeps/unix/sysv/linux/arc/sysdep.h b/sysdeps/unix/sysv/linux/arc/sysdep.h
-index 8465a2f623..3faff27b1c 100644
 --- a/sysdeps/unix/sysv/linux/arc/sysdep.h
 +++ b/sysdeps/unix/sysv/linux/arc/sysdep.h
-@@ -128,7 +128,11 @@ L (call_syscall_err):			ASM_LINE_SEP	\
+@@ -128,7 +128,11 @@
      mov    r8, __NR_##syscall_name	ASM_LINE_SEP	\
      ARC_TRAP_INSN			ASM_LINE_SEP
  
@@ -65,7 +59,7 @@ index 8465a2f623..3faff27b1c 100644
  
  #else  /* !__ASSEMBLER__ */
  
-@@ -139,7 +143,11 @@ extern long int __syscall_error (long int);
+@@ -139,7 +143,11 @@
  hidden_proto (__syscall_error)
  # endif
  
@@ -77,6 +71,3 @@ index 8465a2f623..3faff27b1c 100644
  
  # undef INTERNAL_SYSCALL_NCS
  # define INTERNAL_SYSCALL_NCS(number, nr_args, args...)	\
--- 
-2.16.2
-
diff --git a/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch b/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch
index 30cd1c4..71609df 100644
--- a/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch
+++ b/packages/glibc/2.35/0002-linux-Fix-missing-__convert_scm_timestamps-BZ-28860.patch
@@ -10,11 +10,9 @@ always build it for __TIMESIZE != 64.
 It fixes build for architecture with 32 bit time_t support when
 configured with minimum kernel of 5.1.
 ---
- sysdeps/unix/sysv/linux/convert_scm_timestamps.c | 4 ++--
+ sysdeps/unix/sysv/linux/convert_scm_timestamps.c |    4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
-index 82171bf325..dfc8c2beff 100644
 --- a/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
 +++ b/sysdeps/unix/sysv/linux/convert_scm_timestamps.c
 @@ -16,9 +16,9 @@
@@ -29,6 +27,3 @@ index 82171bf325..dfc8c2beff 100644
  # include <stdint.h>
  # include <string.h>
  # include <sys/socket.h>
--- 
-2.35.1
-
diff --git a/packages/glibc/2.35/chksum b/packages/glibc/2.35/chksum
index 912eb0f..5c296ad 100644
--- a/packages/glibc/2.35/chksum
+++ b/packages/glibc/2.35/chksum
@@ -1,3 +1,7 @@
+md5 glibc-2.35.tar.xz dd571c67d85d89d7f60b854a4e207423
+sha1 glibc-2.35.tar.xz 7e2d857e427780a50133447f34dd84ab40fa4069
+sha256 glibc-2.35.tar.xz 5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e
+sha512 glibc-2.35.tar.xz e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66
 md5 glibc-2.35.tar.bz2 057173a3db5b68e281996f3bee51f221
 sha1 glibc-2.35.tar.bz2 b6136f132c31e6f37097da3118caad905e494d77
 sha256 glibc-2.35.tar.bz2 d350dda6cbd14b33ee6b9741e2c649b746c7fe64b623b7703bdda232ff3e90dc
@@ -6,7 +10,3 @@ md5 glibc-2.35.tar.gz 3c80dbf55ddeeab19eb9b93c67ebff01
 sha1 glibc-2.35.tar.gz 8429412cd99c8a179b0d82d982c69ce5a7cb18ba
 sha256 glibc-2.35.tar.gz 3e8e0c6195da8dfbd31d77c56fb8d99576fb855fafd47a9e0a895e51fd5942d4
 sha512 glibc-2.35.tar.gz 45bf782aeda508e17fd51b45cf5ad96bd1067cf96b758b5c2d5def681af713df15e75c253d9c85de047f0a1dd22cf4f2239d70ae392cdb9291092e6570734d43
-md5 glibc-2.35.tar.xz dd571c67d85d89d7f60b854a4e207423
-sha1 glibc-2.35.tar.xz 7e2d857e427780a50133447f34dd84ab40fa4069
-sha256 glibc-2.35.tar.xz 5123732f6b67ccd319305efd399971d58592122bcc2a6518a1bd2510dd0cf52e
-sha512 glibc-2.35.tar.xz e7336ce27561be5d7c217832a1136fb327e057bd8d3f92925b35c97e3e9f9e486948b5a1e03e5e4090772ef06437a074d10b82e68f17f1ad8f22077ee39e1b66