Run patches thru `manage-packages -P`

This refreshes the line numbers, removes any fuzz (which would make any
future forward ports easier) and standardizes the patch/file headers
(which makes them easier to read).

Signed-off-by: Alexey Neyman <stilor@att.net>

6 files changed, 22 insertions, 58 deletions

diff --git a/packages/picolibc/1.4.7/0001-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch b/packages/picolibc/1.4.7/0000-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch
index 0bedf41d..4b3ecbdf 100644
--- a/packages/picolibc/1.4.7/0001-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch
+++ b/packages/picolibc/1.4.7/0000-tinystdio-Make-ungetc-buffer-type-purely-architectur.patch
@@ -19,13 +19,11 @@ supported by C++.
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- newlib/libc/tinystdio/exchange.c      |  2 +-
- newlib/libc/tinystdio/stdio.h         | 39 +++++++++++----------------
- newlib/libc/tinystdio/stdio_private.h | 24 ++++++++++++-----
+ newlib/libc/tinystdio/exchange.c      |    2 -
+ newlib/libc/tinystdio/stdio.h         |   39 +++++++++++++---------------------
+ newlib/libc/tinystdio/stdio_private.h |   24 ++++++++++++++------
  3 files changed, 34 insertions(+), 31 deletions(-)
 
-diff --git a/newlib/libc/tinystdio/exchange.c b/newlib/libc/tinystdio/exchange.c
-index 1272ae36e..e8c785f8a 100644
 --- a/newlib/libc/tinystdio/exchange.c
 +++ b/newlib/libc/tinystdio/exchange.c
 @@ -39,7 +39,7 @@
@@ -37,8 +35,6 @@ index 1272ae36e..e8c785f8a 100644
  {
  	return __non_atomic_exchange_ungetc(p, v);
  }
-diff --git a/newlib/libc/tinystdio/stdio.h b/newlib/libc/tinystdio/stdio.h
-index 1e36f73e9..8bc0f8843 100644
 --- a/newlib/libc/tinystdio/stdio.h
 +++ b/newlib/libc/tinystdio/stdio.h
 @@ -224,38 +224,31 @@
@@ -96,11 +92,9 @@ index 1e36f73e9..8bc0f8843 100644
  	uint8_t	flags;		/* flags, see below */
  #define __SRD	0x0001		/* OK to read */
  #define __SWR	0x0002		/* OK to write */
-diff --git a/newlib/libc/tinystdio/stdio_private.h b/newlib/libc/tinystdio/stdio_private.h
-index b8ec66864..1a8b77dc9 100644
 --- a/newlib/libc/tinystdio/stdio_private.h
 +++ b/newlib/libc/tinystdio/stdio_private.h
-@@ -141,7 +141,7 @@ float
+@@ -141,7 +141,7 @@
  __atof_engine(uint32_t m10, int e10);
  
  static inline uint16_t
@@ -109,7 +103,7 @@ index b8ec66864..1a8b77dc9 100644
  {
  	__ungetc_t e = *p;
  	*p = v;
-@@ -159,28 +159,38 @@ __non_atomic_compare_exchange_ungetc(__ungetc_t *p, __ungetc_t d, __ungetc_t v)
+@@ -159,28 +159,38 @@
  
  #ifdef ATOMIC_UNGETC
  
@@ -154,6 +148,3 @@ index b8ec66864..1a8b77dc9 100644
  
  #endif /* PICOLIBC_HAVE_SYNC_COMPARE_AND_SWAP */
  
--- 
-2.29.1
-
diff --git a/packages/picolibc/1.4.7/0002-Add-ARM-exception-information-to-link-rules.patch b/packages/picolibc/1.4.7/0001-Add-ARM-exception-information-to-link-rules.patch
index 7fd254d5..233eafa1 100644
--- a/packages/picolibc/1.4.7/0002-Add-ARM-exception-information-to-link-rules.patch
+++ b/packages/picolibc/1.4.7/0001-Add-ARM-exception-information-to-link-rules.patch
@@ -7,14 +7,12 @@ Place any ARM exeception information in ROM for C++ support.
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- picolibc.ld | 10 ++++++++++
+ picolibc.ld |   10 ++++++++++
  1 file changed, 10 insertions(+)
 
-diff --git a/picolibc.ld b/picolibc.ld
-index 6d14b396f..ff60fe3a3 100644
 --- a/picolibc.ld
 +++ b/picolibc.ld
-@@ -94,6 +94,16 @@ SECTIONS
+@@ -94,6 +94,16 @@
  		*(.got .got.*)
  	} >flash AT>flash :text
  
@@ -31,6 +29,3 @@ index 6d14b396f..ff60fe3a3 100644
  	. = ALIGN(8);
  
  	.preinit_array : {
--- 
-2.28.0
-
diff --git a/packages/picolibc/1.4.7/0003-Add-picolibc-include-directory-to-cc1plus-spec.patch b/packages/picolibc/1.4.7/0002-Add-picolibc-include-directory-to-cc1plus-spec.patch
index 885c0c7e..267e1b25 100644
--- a/packages/picolibc/1.4.7/0003-Add-picolibc-include-directory-to-cc1plus-spec.patch
+++ b/packages/picolibc/1.4.7/0002-Add-picolibc-include-directory-to-cc1plus-spec.patch
@@ -10,11 +10,9 @@ GCC-provided header directories, so use -idirafter instead of -isystem.
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- picolibc.specs.in | 2 +-
+ picolibc.specs.in |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/picolibc.specs.in b/picolibc.specs.in
-index c1f916a6f..133e65db9 100644
 --- a/picolibc.specs.in
 +++ b/picolibc.specs.in
 @@ -10,7 +10,7 @@
@@ -26,6 +24,3 @@ index c1f916a6f..133e65db9 100644
  
  *link:
  @SPECS_PRINTF@ -L@LIBDIR@/%M -L@LIBDIR@ %{!T:-Tpicolibc.ld} %(picolibc_link) --gc-sections @LINK_SPEC@
--- 
-2.28.0
-
diff --git a/packages/picolibc/1.5.1/0001-libc-Remove-include-sys-select.h-from-sys-types.h.patch b/packages/picolibc/1.5.1/0000-libc-Remove-include-sys-select.h-from-sys-types.h.patch
index 5536cd43..658d2e4b 100644
--- a/packages/picolibc/1.5.1/0001-libc-Remove-include-sys-select.h-from-sys-types.h.patch
+++ b/packages/picolibc/1.5.1/0000-libc-Remove-include-sys-select.h-from-sys-types.h.patch
@@ -10,14 +10,12 @@ sys/types.h which haven't yet been defined.
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- newlib/libc/include/sys/types.h | 1 -
+ newlib/libc/include/sys/types.h |    1 -
  1 file changed, 1 deletion(-)
 
-diff --git a/newlib/libc/include/sys/types.h b/newlib/libc/include/sys/types.h
-index ea25222c2..1a0abcb83 100644
 --- a/newlib/libc/include/sys/types.h
 +++ b/newlib/libc/include/sys/types.h
-@@ -75,7 +75,6 @@ typedef __intptr_t register_t;
+@@ -75,7 +75,6 @@
  
  #if __BSD_VISIBLE
  #include <machine/endian.h>
@@ -25,6 +23,3 @@ index ea25222c2..1a0abcb83 100644
  #  define	physadr		physadr_t
  #  define	quad		quad_t
  
--- 
-2.30.0
-
diff --git a/packages/picolibc/1.5.1/0002-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch b/packages/picolibc/1.5.1/0001-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch
index 754957e9..911788ae 100644
--- a/packages/picolibc/1.5.1/0002-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch
+++ b/packages/picolibc/1.5.1/0001-tinystdio-Fix-snprintf-buf-0-.-to-not-smash-buffer.patch
@@ -13,15 +13,13 @@ correctly.
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- newlib/libc/tinystdio/snprintf.c |  2 +-
- test/printf_scanf.c              | 31 +++++++++++++++++++++++++++++++
+ newlib/libc/tinystdio/snprintf.c |    2 +-
+ test/printf_scanf.c              |   31 +++++++++++++++++++++++++++++++
  2 files changed, 32 insertions(+), 1 deletion(-)
 
-diff --git a/newlib/libc/tinystdio/snprintf.c b/newlib/libc/tinystdio/snprintf.c
-index 52d2f84d3..1052c9338 100644
 --- a/newlib/libc/tinystdio/snprintf.c
 +++ b/newlib/libc/tinystdio/snprintf.c
-@@ -56,7 +56,7 @@ snprintf(char *s, size_t n, const char *fmt, ...)
+@@ -56,7 +56,7 @@
  	i = vfprintf(&f.file, fmt, ap);
  	va_end(ap);
  
@@ -30,11 +28,9 @@ index 52d2f84d3..1052c9338 100644
  		s[i < n ? i : n] = 0;
  
  	return i;
-diff --git a/test/printf_scanf.c b/test/printf_scanf.c
-index 2bc83e1d0..f89f46e4f 100644
 --- a/test/printf_scanf.c
 +++ b/test/printf_scanf.c
-@@ -96,6 +96,37 @@ main(int argc, char **argv)
+@@ -96,6 +96,37 @@
  		fflush(stdout);
  	}
  #endif
@@ -72,6 +68,3 @@ index 2bc83e1d0..f89f46e4f 100644
  	for (x = 0; x < 32; x++) {
  		unsigned int v = 0x12345678 >> x;
  		unsigned int r;
--- 
-2.30.0
-
diff --git a/packages/picolibc/1.5.1/0003-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch b/packages/picolibc/1.5.1/0002-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch
index 5e1c5a85..a3e05447 100644
--- a/packages/picolibc/1.5.1/0003-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch
+++ b/packages/picolibc/1.5.1/0002-libc-Expose-wchar-stdio-prototypes-even-for-TINY_STD.patch
@@ -8,14 +8,12 @@ aren't actually available for appplications.
 
 Signed-off-by: Keith Packard <keithp@keithp.com>
 ---
- newlib/libc/include/wchar.h | 39 +++++++++++++++++++------------------
+ newlib/libc/include/wchar.h |   39 ++++++++++++++++++++-------------------
  1 file changed, 20 insertions(+), 19 deletions(-)
 
-diff --git a/newlib/libc/include/wchar.h b/newlib/libc/include/wchar.h
-index 8a9c4b0fe..5dc3af93c 100644
 --- a/newlib/libc/include/wchar.h
 +++ b/newlib/libc/include/wchar.h
-@@ -217,8 +217,6 @@ float wcstof_l (const wchar_t *, wchar_t **, locale_t);
+@@ -217,8 +217,6 @@
  long double wcstold_l (const wchar_t *, wchar_t **, locale_t);
  #endif
  
@@ -24,7 +22,7 @@ index 8a9c4b0fe..5dc3af93c 100644
  wint_t fgetwc (__FILE *);
  wchar_t *fgetws (wchar_t *__restrict, int, __FILE *__restrict);
  wint_t fputwc (wchar_t, __FILE *);
-@@ -232,6 +230,8 @@ wint_t putwc (wchar_t, __FILE *);
+@@ -232,6 +230,8 @@
  wint_t putwchar (wchar_t);
  wint_t ungetwc (wint_t wc, __FILE *);
  
@@ -33,7 +31,7 @@ index 8a9c4b0fe..5dc3af93c 100644
  struct _reent;
  
  wint_t _fgetwc_r (struct _reent *, __FILE *);
-@@ -253,6 +253,24 @@ wint_t _putwchar_r (struct _reent *, wchar_t);
+@@ -253,6 +253,24 @@
  wint_t _putwchar_unlocked_r (struct _reent *, wchar_t);
  wint_t _ungetwc_r (struct _reent *, wint_t wc, __FILE *);
  
@@ -58,7 +56,7 @@ index 8a9c4b0fe..5dc3af93c 100644
  #if __GNU_VISIBLE
  wint_t fgetwc_unlocked (__FILE *);
  wchar_t *fgetws_unlocked (wchar_t *__restrict, int, __FILE *__restrict);
-@@ -267,7 +285,6 @@ wint_t putwchar_unlocked (wchar_t);
+@@ -267,7 +285,6 @@
  #if __POSIX_VISIBLE >= 200809
  __FILE *open_wmemstream (wchar_t **, size_t *);
  #endif
@@ -66,7 +64,7 @@ index 8a9c4b0fe..5dc3af93c 100644
  
  #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
  int	fwprintf (__FILE *__restrict, const wchar_t *__restrict, ...);
-@@ -281,13 +298,6 @@ int	vwprintf (const wchar_t *__restrict, va_list);
+@@ -281,13 +298,6 @@
  int	wprintf (const wchar_t *__restrict, ...);
  #endif
  
@@ -80,7 +78,7 @@ index 8a9c4b0fe..5dc3af93c 100644
  #if __ISO_C_VISIBLE >= 1999 || __XSI_VISIBLE >= 500
  int	fwscanf (__FILE *__restrict, const wchar_t *__restrict, ...);
  int	swscanf (const wchar_t *__restrict,
-@@ -300,13 +310,6 @@ int	vwscanf (const wchar_t *__restrict, va_list);
+@@ -300,13 +310,6 @@
  int	wscanf (const wchar_t *__restrict, ...);
  #endif
  
@@ -94,7 +92,7 @@ index 8a9c4b0fe..5dc3af93c 100644
  #define getwc(fp)	fgetwc(fp)
  #define putwc(wc,fp)	fputwc((wc), (fp))
  #define getwchar()	fgetwc(stdin)
-@@ -319,8 +322,6 @@ int	_wscanf_r (struct _reent *, const wchar_t *, ...);
+@@ -319,8 +322,6 @@
  #define putwchar_unlocked(wc)	fputwc_unlocked((wc), stdout)
  #endif
  
@@ -103,6 +101,3 @@ index 8a9c4b0fe..5dc3af93c 100644
  _END_STD_C
  
  #if __SSP_FORTIFY_LEVEL > 0
--- 
-2.30.0
-