Merge pull request #1674 from stilor/master

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

4 files changed, 13 insertions, 22 deletions

diff --git a/packages/glibc/2.33/0000-typedef-caddr.patch b/packages/glibc/2.33/0000-typedef-caddr.patch
index 451884c..a328da1 100644
--- a/packages/glibc/2.33/0000-typedef-caddr.patch
+++ b/packages/glibc/2.33/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.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch b/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch
index 9c4b0e4..c3c13d2 100644
--- a/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch
+++ b/packages/glibc/2.33/0001-Set-version.h-RELEASE-to-stable-Bug-26700.patch
@@ -8,7 +8,7 @@ the expected "stable" by the release manager.  This is a mistake
 that leads to the build using "-g -O1" instead of "-g -O2" if
 configure was executed with "CFLAGS=" (CFLAGS set but empty).
 ---
- version.h | 2 +-
+ version.h |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 --- a/version.h
diff --git a/packages/glibc/2.33/0002-Add-ARC700-support.patch b/packages/glibc/2.33/0002-Add-ARC700-support.patch
index 23c94a7..22ae16c 100644
--- a/packages/glibc/2.33/0002-Add-ARC700-support.patch
+++ b/packages/glibc/2.33/0002-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;
+@@ -64,6 +64,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.33/chksum b/packages/glibc/2.33/chksum
index 5f6a175..ba68a74 100644
--- a/packages/glibc/2.33/chksum
+++ b/packages/glibc/2.33/chksum
@@ -1,3 +1,7 @@
+md5 glibc-2.33.tar.xz 390bbd889c7e8e8a7041564cb6b27cca
+sha1 glibc-2.33.tar.xz c33953a648e5f6373211cc9f6d9b9647d862aa45
+sha256 glibc-2.33.tar.xz 2e2556000e105dbd57f0b6b2a32ff2cf173bde4f0d85dffccfd8b7e51a0677ff
+sha512 glibc-2.33.tar.xz 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb
 md5 glibc-2.33.tar.bz2 cbdfe3c6f8b247c20ebc5531627cb5d5
 sha1 glibc-2.33.tar.bz2 065a09a1c7002faa270e448924e2c60c22f2c278
 sha256 glibc-2.33.tar.bz2 4d7aa859d9152a4b243821eb604c0f1fee14c10d6341c2b9628d454cddd0f22e
@@ -6,7 +10,3 @@ md5 glibc-2.33.tar.gz d1997e00b90cda2f901c5ba53eb955dc
 sha1 glibc-2.33.tar.gz 45c8207a1b5e462e6a148abc37ebdd0e86d2219d
 sha256 glibc-2.33.tar.gz ad7dbed6b0cde9ddc90e84856da7e2c1f976a5e791cdee947d8dbb0392fc76cf
 sha512 glibc-2.33.tar.gz 3c2e977dbf39eed09da8a56f20b6e60df26d1d203a770e8d1428f0c416a8a8bb1ac1e299233b4f3421dccac46d14fc753e5202411175448b99613f1be84f6b69
-md5 glibc-2.33.tar.xz 390bbd889c7e8e8a7041564cb6b27cca
-sha1 glibc-2.33.tar.xz c33953a648e5f6373211cc9f6d9b9647d862aa45
-sha256 glibc-2.33.tar.xz 2e2556000e105dbd57f0b6b2a32ff2cf173bde4f0d85dffccfd8b7e51a0677ff
-sha512 glibc-2.33.tar.xz 4cb5777b68b22b746cc51669e0e9282b43c83f6944e42656e6db7195ebb68f2f9260f130fdeb4e3cfc64efae4f58d96c43d388f52be1eb024ca448084684abdb