diff mbox series

package/binutils: fix an OpenRISC binutils 2.37 patch

Message ID 20211226103329.660967-1-thomas.petazzoni@bootlin.com
State Accepted
Headers show
Series package/binutils: fix an OpenRISC binutils 2.37 patch | expand

Commit Message

Thomas Petazzoni Dec. 26, 2021, 10:33 a.m. UTC
When binutils 2.37 was introduced in commit
62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add
version 2.37"), the patch
0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was
not properly updated. Indeed, between binutils 2.36 and 2.37, binutils
has switched to using the standard "bool" type, so instead of using
TRUE/FALSE, true/false must be used.

With this change, the binutils patch matches the one that was merged
upstream.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
---
 ...4-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Giulio Benetti Dec. 26, 2021, 10:49 a.m. UTC | #1
On 26/12/21 11:33, Thomas Petazzoni wrote:
> When binutils 2.37 was introduced in commit
> 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add
> version 2.37"), the patch
> 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was
> not properly updated. Indeed, between binutils 2.36 and 2.37, binutils
> has switched to using the standard "bool" type, so instead of using
> TRUE/FALSE, true/false must be used.
> 
> With this change, the binutils patch matches the one that was merged
> upstream.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Reviewed-by: Giulio Benetti <giulio.benetti@benettiengineering.com>

Best regards
Yann E. MORIN Dec. 27, 2021, 7:16 p.m. UTC | #2
Thomas, All,

On 2021-12-26 11:33 +0100, Thomas Petazzoni spake thusly:
> When binutils 2.37 was introduced in commit
> 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add
> version 2.37"), the patch
> 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was
> not properly updated. Indeed, between binutils 2.36 and 2.37, binutils
> has switched to using the standard "bool" type, so instead of using
> TRUE/FALSE, true/false must be used.
> 
> With this change, the binutils patch matches the one that was merged
> upstream.
> 
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  ...4-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
> index 779baeab63..0d18321ee1 100644
> --- a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
> +++ b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
> @@ -46,7 +46,7 @@ index 32063ab0289..67252394173 100644
>  +	      _bfd_error_handler
>  +		(_("%pB: pc-relative relocation against dynamic symbol %s"),
>  +		 input_bfd, name);
> -+	      ret_val = FALSE;
> ++	      ret_val = false;
>  +	      bfd_set_error (bfd_error_bad_value);
>  +	    }
>  +	  break;
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
Peter Korsgaard Jan. 25, 2022, 4:43 p.m. UTC | #3
>>>>> "Thomas" == Thomas Petazzoni <thomas.petazzoni@bootlin.com> writes:

 > When binutils 2.37 was introduced in commit
 > 62f0232980c8168631b29f27edf612af8109c691 ("package/binutils: add
 > version 2.37"), the patch
 > 0008-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch was
 > not properly updated. Indeed, between binutils 2.36 and 2.37, binutils
 > has switched to using the standard "bool" type, so instead of using
 > TRUE/FALSE, true/false must be used.

 > With this change, the binutils patch matches the one that was merged
 > upstream.

 > Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>

Committed to 2021.11.x, thanks.
diff mbox series

Patch

diff --git a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
index 779baeab63..0d18321ee1 100644
--- a/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
+++ b/package/binutils/2.37/0004-or1k-fix-pc-relative-relocation-against-dynamic-on-P.patch
@@ -46,7 +46,7 @@  index 32063ab0289..67252394173 100644
 +	      _bfd_error_handler
 +		(_("%pB: pc-relative relocation against dynamic symbol %s"),
 +		 input_bfd, name);
-+	      ret_val = FALSE;
++	      ret_val = false;
 +	      bfd_set_error (bfd_error_bad_value);
 +	    }
 +	  break;