svn commit: r554138 - in branches/2020Q4/devel/binutils: . files

[Dimitry Andric]

Author: dim (src committer)
Date: Thu Nov  5 16:18:48 2020
New Revision: 554138
URL: https://svnweb.freebsd.org/changeset/ports/554138

Log:
  MFH: r554081
  
  devel/binutils: Apply upstream patch to fix "undefined symbol:
  bswap_identity_64" and similar errors, when building devel/binutils in
  certain environments.
  
  This has been sitting in a bug for almost a year now without any action,
  which is why I am committing it now.
  
  Approved by:	ports-secteam (fluffy)
  PR:		242053

Added:
  branches/2020Q4/devel/binutils/files/patch-libctf_swap.h
     - copied unchanged from r554081, head/devel/binutils/files/patch-libctf_swap.h
Modified:
  branches/2020Q4/devel/binutils/Makefile
Directory Properties:
  branches/2020Q4/   (props changed)

Modified: branches/2020Q4/devel/binutils/Makefile
==============================================================================
--- branches/2020Q4/devel/binutils/Makefile	Thu Nov  5 16:10:19 2020	(r554137)
+++ branches/2020Q4/devel/binutils/Makefile	Thu Nov  5 16:18:48 2020	(r554138)
@@ -3,7 +3,7 @@
 
 PORTNAME=	binutils
 PORTVERSION=	2.33.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH?=	1
 CATEGORIES?=	devel
 MASTER_SITES=	SOURCEWARE/binutils/releases

Copied: branches/2020Q4/devel/binutils/files/patch-libctf_swap.h (from r554081, head/devel/binutils/files/patch-libctf_swap.h)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2020Q4/devel/binutils/files/patch-libctf_swap.h	Thu Nov  5 16:18:48 2020	(r554138, copy of r554081, head/devel/binutils/files/patch-libctf_swap.h)
@@ -0,0 +1,34 @@
+--- libctf/swap.h.orig	2019-09-09 13:19:45 UTC
++++ libctf/swap.h
+@@ -28,13 +28,13 @@
+ #else
+ 
+ /* Provide our own versions of the byteswap functions.  */
+-inline uint16_t
++static inline uint16_t
+ bswap_16 (uint16_t v)
+ {
+   return ((v >> 8) & 0xff) | ((v & 0xff) << 8);
+ }
+ 
+-inline uint32_t
++static inline uint32_t
+ bswap_32 (uint32_t v)
+ {
+   return (  ((v & 0xff000000) >> 24)
+@@ -43,13 +43,13 @@ bswap_32 (uint32_t v)
+ 	  | ((v & 0x000000ff) << 24));
+ }
+ 
+-inline uint64_t
++static inline uint64_t
+ bswap_identity_64 (uint64_t v)
+ {
+   return v;
+ }
+ 
+-inline uint64_t
++static inline uint64_t
+ bswap_64 (uint64_t v)
+ {
+   return (  ((v & 0xff00000000000000ULL) >> 56)