summaryrefslogtreecommitdiff
path: root/pkg/binutils/patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkg/binutils/patch')
-rw-r--r--pkg/binutils/patch/0001-libiberty-Implement-pex_unix_exec_child-using-posix_.patch40
-rw-r--r--pkg/binutils/patch/0003-Avoid-void-pointer-arithmetic.patch27
-rw-r--r--pkg/binutils/patch/0003-Remove-support-for-long-double-in-error-formatter.patch (renamed from pkg/binutils/patch/0004-Remove-support-for-long-double-in-error-formatter.patch)16
-rw-r--r--pkg/binutils/patch/0004-bfd-Remove-return-with-expression-in-void-function.patch34
4 files changed, 62 insertions, 55 deletions
diff --git a/pkg/binutils/patch/0001-libiberty-Implement-pex_unix_exec_child-using-posix_.patch b/pkg/binutils/patch/0001-libiberty-Implement-pex_unix_exec_child-using-posix_.patch
index 6378c88e..6c9f5764 100644
--- a/pkg/binutils/patch/0001-libiberty-Implement-pex_unix_exec_child-using-posix_.patch
+++ b/pkg/binutils/patch/0001-libiberty-Implement-pex_unix_exec_child-using-posix_.patch
@@ -1,4 +1,4 @@
-From 662b185803a405b9c945e7e2de9766723f6a7ad7 Mon Sep 17 00:00:00 2001
+From 33fd36d26892e893d4c58ccbe826445a76262c68 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Wed, 17 Apr 2019 16:44:05 -0700
Subject: [PATCH] libiberty: Implement pex_unix_exec_child using posix_spawn
@@ -11,7 +11,7 @@ Subject: [PATCH] libiberty: Implement pex_unix_exec_child using posix_spawn
4 files changed, 110 insertions(+), 11 deletions(-)
diff --git a/libiberty/config.in b/libiberty/config.in
-index f7052b5d95..ce79a9e77f 100644
+index f7052b5d958..ce79a9e77f2 100644
--- a/libiberty/config.in
+++ b/libiberty/config.in
@@ -198,6 +198,9 @@
@@ -35,10 +35,10 @@ index f7052b5d95..ce79a9e77f 100644
#undef HAVE_STDINT_H
diff --git a/libiberty/configure b/libiberty/configure
-index b6af9baf21..139955e68a 100755
+index e09ddd91e58..a5591fac95d 100755
--- a/libiberty/configure
+++ b/libiberty/configure
-@@ -5481,7 +5481,7 @@ host_makefile_frag=${frag}
+@@ -5651,7 +5651,7 @@ host_makefile_frag=${frag}
# It's OK to check for header files. Although the compiler may not be
# able to link anything, it had better be able to at least compile
# something.
@@ -47,20 +47,20 @@ index b6af9baf21..139955e68a 100755
do :
as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
ac_fn_c_check_header_preproc "$LINENO" "$ac_header" "$as_ac_Header"
-@@ -5990,9 +5990,9 @@ funcs="$funcs setproctitle"
+@@ -6160,9 +6160,9 @@ funcs="$funcs setproctitle"
vars="sys_errlist sys_nerr sys_siglist"
checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
- getsysinfo gettimeofday on_exit pipe2 psignal pstat_getdynamic pstat_getstatic \
-- realpath setrlimit sbrk spawnve spawnvpe strerror strsignal sysconf sysctl \
+- realpath setrlimit spawnve spawnvpe strerror strsignal sysconf sysctl \
- sysmp table times wait3 wait4"
+ getsysinfo gettimeofday on_exit pipe2 posix_spawn psignal pstat_getdynamic \
-+ pstat_getstatic realpath setrlimit sbrk spawnve spawnvpe strerror strsignal \
++ pstat_getstatic realpath setrlimit spawnve spawnvpe strerror strsignal \
+ sysconf sysctl sysmp table times wait3 wait4"
- # These are neither executed nor required, but they help keep
- # autoheader happy without adding a bunch of text to acconfig.h.
-@@ -6006,7 +6006,7 @@ if test "x" = "y"; then
+ # Darwin has sbrk, but it is deprecated and that produces build-time warnings
+ # so do not check for it.
+@@ -6183,7 +6183,7 @@ if test "x" = "y"; then
index insque \
memchr memcmp memcpy memmem memmove memset mkstemps \
on_exit \
@@ -70,10 +70,10 @@ index b6af9baf21..139955e68a 100755
sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
stpcpy stpncpy strcasecmp strchr strdup \
diff --git a/libiberty/configure.ac b/libiberty/configure.ac
-index ad95296397..442c714319 100644
+index f59f35e1f20..134576ea3af 100644
--- a/libiberty/configure.ac
+++ b/libiberty/configure.ac
-@@ -271,7 +271,7 @@ AC_SUBST_FILE(host_makefile_frag)
+@@ -288,7 +288,7 @@ AC_SUBST_FILE(host_makefile_frag)
# It's OK to check for header files. Although the compiler may not be
# able to link anything, it had better be able to at least compile
# something.
@@ -82,20 +82,20 @@ index ad95296397..442c714319 100644
AC_HEADER_SYS_WAIT
AC_HEADER_TIME
-@@ -394,9 +394,9 @@ funcs="$funcs setproctitle"
+@@ -411,9 +411,9 @@ funcs="$funcs setproctitle"
vars="sys_errlist sys_nerr sys_siglist"
checkfuncs="__fsetlocking canonicalize_file_name dup3 getrlimit getrusage \
- getsysinfo gettimeofday on_exit pipe2 psignal pstat_getdynamic pstat_getstatic \
-- realpath setrlimit sbrk spawnve spawnvpe strerror strsignal sysconf sysctl \
+- realpath setrlimit spawnve spawnvpe strerror strsignal sysconf sysctl \
- sysmp table times wait3 wait4"
+ getsysinfo gettimeofday on_exit pipe2 posix_spawn psignal pstat_getdynamic \
-+ pstat_getstatic realpath setrlimit sbrk spawnve spawnvpe strerror strsignal \
++ pstat_getstatic realpath setrlimit spawnve spawnvpe strerror strsignal \
+ sysconf sysctl sysmp table times wait3 wait4"
- # These are neither executed nor required, but they help keep
- # autoheader happy without adding a bunch of text to acconfig.h.
-@@ -410,7 +410,7 @@ if test "x" = "y"; then
+ # Darwin has sbrk, but it is deprecated and that produces build-time warnings
+ # so do not check for it.
+@@ -434,7 +434,7 @@ if test "x" = "y"; then
index insque \
memchr memcmp memcpy memmem memmove memset mkstemps \
on_exit \
@@ -105,7 +105,7 @@ index ad95296397..442c714319 100644
sbrk setenv setproctitle setrlimit sigsetmask snprintf spawnve spawnvpe \
stpcpy stpncpy strcasecmp strchr strdup \
diff --git a/libiberty/pex-unix.c b/libiberty/pex-unix.c
-index 8da2fdcf84..c1c93be12b 100644
+index 850d344ba58..ba3a6d5d38f 100644
--- a/libiberty/pex-unix.c
+++ b/libiberty/pex-unix.c
@@ -58,6 +58,9 @@ extern int errno;
@@ -218,5 +218,5 @@ index 8da2fdcf84..c1c93be12b 100644
/* Subroutine of pex_unix_exec_child. Move OLD_FD to a new file descriptor
--
-2.30.0
+2.34.1
diff --git a/pkg/binutils/patch/0003-Avoid-void-pointer-arithmetic.patch b/pkg/binutils/patch/0003-Avoid-void-pointer-arithmetic.patch
deleted file mode 100644
index 5b3dd3a1..00000000
--- a/pkg/binutils/patch/0003-Avoid-void-pointer-arithmetic.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 412191da499f4f96dd9138a2868b16947b8d8f70 Mon Sep 17 00:00:00 2001
-From: Michael Forney <mforney@mforney.org>
-Date: Mon, 19 Jul 2021 10:31:05 -0700
-Subject: [PATCH] Avoid void pointer arithmetic
-
-This is not strictly allowed in ISO C, which requires the pointed-to
-type to be a complete object type.
----
- bfd/peicode.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/bfd/peicode.h b/bfd/peicode.h
-index c84b135e1eb..41955975cdc 100644
---- a/bfd/peicode.h
-+++ b/bfd/peicode.h
-@@ -1474,7 +1474,7 @@ pe_bfd_object_p (bfd * abfd)
- if (opt_hdr_size != 0)
- {
- bfd_size_type amt = opt_hdr_size;
-- void * opthdr;
-+ bfd_byte * opthdr;
-
- /* PR 17521 file: 230-131433-0.004. */
- if (amt < sizeof (PEAOUTHDR))
---
-2.32.0
-
diff --git a/pkg/binutils/patch/0004-Remove-support-for-long-double-in-error-formatter.patch b/pkg/binutils/patch/0003-Remove-support-for-long-double-in-error-formatter.patch
index c6d3f738..4d5aa822 100644
--- a/pkg/binutils/patch/0004-Remove-support-for-long-double-in-error-formatter.patch
+++ b/pkg/binutils/patch/0003-Remove-support-for-long-double-in-error-formatter.patch
@@ -1,4 +1,4 @@
-From 0051e56e6ba95eb552f70720f4b09b485a937115 Mon Sep 17 00:00:00 2001
+From dab3e5da03770ba254c95d0c1d8c9f029dd57257 Mon Sep 17 00:00:00 2001
From: Michael Forney <mforney@mforney.org>
Date: Mon, 6 Sep 2021 18:51:05 -0700
Subject: [PATCH] Remove support for long double in error formatter
@@ -10,10 +10,10 @@ supporting it in the formatter.
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/bfd/bfd.c b/bfd/bfd.c
-index 0952aaea19c..9c29a77edc0 100644
+index a2f294da983..3e59057d07a 100644
--- a/bfd/bfd.c
+++ b/bfd/bfd.c
-@@ -868,7 +868,6 @@ union _bfd_doprnt_args
+@@ -871,7 +871,6 @@ union _bfd_doprnt_args
long l;
long long ll;
double d;
@@ -21,7 +21,7 @@ index 0952aaea19c..9c29a77edc0 100644
void *p;
enum
{
-@@ -877,7 +876,6 @@ union _bfd_doprnt_args
+@@ -880,7 +879,6 @@ union _bfd_doprnt_args
Long,
LongLong,
Double,
@@ -29,7 +29,7 @@ index 0952aaea19c..9c29a77edc0 100644
Ptr
} type;
};
-@@ -1063,7 +1061,7 @@ _bfd_doprnt (FILE *stream, const char *format, union _bfd_doprnt_args *args)
+@@ -1066,7 +1064,7 @@ _bfd_doprnt (FILE *stream, const char *format, union _bfd_doprnt_args *args)
if (wide_width == 0)
PRINT_TYPE (double, d);
else
@@ -38,7 +38,7 @@ index 0952aaea19c..9c29a77edc0 100644
}
break;
case 's':
-@@ -1280,7 +1278,7 @@ _bfd_doprnt_scan (const char *format, union _bfd_doprnt_args *args)
+@@ -1283,7 +1281,7 @@ _bfd_doprnt_scan (const char *format, union _bfd_doprnt_args *args)
if (wide_width == 0)
arg_type = Double;
else
@@ -47,7 +47,7 @@ index 0952aaea19c..9c29a77edc0 100644
}
break;
case 's':
-@@ -1331,9 +1329,6 @@ error_handler_internal (const char *fmt, va_list ap)
+@@ -1334,9 +1332,6 @@ error_handler_internal (const char *fmt, va_list ap)
case Double:
args[i].d = va_arg (ap, double);
break;
@@ -58,5 +58,5 @@ index 0952aaea19c..9c29a77edc0 100644
args[i].p = va_arg (ap, void *);
break;
--
-2.32.0
+2.34.1
diff --git a/pkg/binutils/patch/0004-bfd-Remove-return-with-expression-in-void-function.patch b/pkg/binutils/patch/0004-bfd-Remove-return-with-expression-in-void-function.patch
new file mode 100644
index 00000000..4cdc0e59
--- /dev/null
+++ b/pkg/binutils/patch/0004-bfd-Remove-return-with-expression-in-void-function.patch
@@ -0,0 +1,34 @@
+From b0508ec3e6134825199ba6ff3d8effd369428117 Mon Sep 17 00:00:00 2001
+From: Michael Forney <mforney@mforney.org>
+Date: Thu, 10 Feb 2022 14:51:52 -0800
+Subject: [PATCH] bfd: Remove return with expression in void function
+
+This is not allowed in ISO C (C11 6.8.6.4p1):
+
+> A return statement with an expression shall not appear in a
+> function whose return type is void.
+
+2022-02-10 Michael Forney <mforney@mforney.org>
+
+ * bfd.c (bfd_set_gp_value): Remove return with expression
+ in void function.
+---
+ bfd/bfd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bfd/bfd.c b/bfd/bfd.c
+index 3e59057d07a..80c9e425754 100644
+--- a/bfd/bfd.c
++++ b/bfd/bfd.c
+@@ -1871,7 +1871,7 @@ DESCRIPTION
+ void
+ bfd_set_gp_value (bfd *abfd, bfd_vma v)
+ {
+- return _bfd_set_gp_value (abfd, v);
++ _bfd_set_gp_value (abfd, v);
+ }
+
+ /*
+--
+2.34.1
+