From FEDORA_PATCHES Mon Sep 17 00:00:00 2001

From: Luis Machado <luis.machado@linaro.org>

Date: Wed, 11 Dec 2019 11:55:49 -0300

Subject: attribute_unused-not-diagnostics.patch

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

;; Fix unused function errors

;; (Luis Machado et al)

    commit 39f34d7b64ee76e07b82a3e57800905d249d8005

    Fix unused function error

    Attempting to build GDB in Ubuntu 16.04.6 LTS on x86_64, I ran into warnings

    that caused the build to fail:

    binutils-gdb/gdb/gdbsupport/safe-strerror.c:44:1: error: ‘char* select_strerror_r(char*, char*)’ defined but not used [-Werror=unused-function]  select_strerror_r (char *res, char *)

    The diagnostic macro DIAGNOSTIC_IGNORE_UNUSED_FUNCTION seems to expand

    correctly to its respective pragma, but this doesn't seem to have an effect on

    the warning. I tried to use the pragma explicitly and got the same result.

    ATTRIBUTE_UNUSED works fine in this case if you put it in both functions,

    which should fix warnings for both gdb and gdbserver builds.

    The compiler version is gcc (Ubuntu 5.4.0-6ubuntu1~16.04.11) 5.4.0 20160609.

    This is likely the result of PR64079 in GCC, which was fixed by commit

    9e96f1e1b9731c4e1ef4fbbbf0997319973f0537.

    To prevent other developers from attempting to use this macro, only to get

    confused by it not working as expected, it seems better to not define this

    particular macro.

    gdb/ChangeLog:

    2019-12-12  Luis Machado  <luis.machado@linaro.org>

    	* gdbsupport/safe-strerror.c: Don't include diagnostics.h.

    	(select_strerror_r): Use ATTRIBUTE_UNUSED instead of the diagnostics

    	macros.

    include/ChangeLog:

    2019-12-12  Luis Machado  <luis.machado@linaro.org>

    	* diagnostics.h (DIAGNOSTIC_IGNORE_UNUSED_FUNCTION). Remove

    	definitions.

    Change-Id: Iad6123d61d76d111e3ef8d24aa8c60112304c749

diff --git a/gdb/gdbsupport/safe-strerror.c b/gdb/gdbsupport/safe-strerror.c

--- a/gdb/gdbsupport/safe-strerror.c

+++ b/gdb/gdbsupport/safe-strerror.c

@@ -18,7 +18,6 @@

    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */

 #include "common-defs.h"

-#include "diagnostics.h"

 #include <string.h>

 /* There are two different versions of strerror_r; one is GNU-specific, the

@@ -27,27 +26,20 @@

    to solve this for us because IPA does not use Gnulib but uses this

    function.  */

-/* We only ever use one of the two overloads, so suppress the warning for

-   an unused function.  */

-DIAGNOSTIC_PUSH

-DIAGNOSTIC_IGNORE_UNUSED_FUNCTION

-

 /* Called if we have a XSI-compliant strerror_r.  */

-static char *

+ATTRIBUTE_UNUSED static char *

 select_strerror_r (int res, char *buf)

 {

   return res == 0 ? buf : nullptr;

 }

 /* Called if we have a GNU strerror_r.  */

-static char *

+ATTRIBUTE_UNUSED static char *

 select_strerror_r (char *res, char *)

 {

   return res;

 }

-DIAGNOSTIC_POP

-

 /* Implementation of safe_strerror as defined in common-utils.h.  */

 const char *

diff --git a/gdb/gdbsupport/thread-pool.c b/gdb/gdbsupport/thread-pool.c

--- a/gdb/gdbsupport/thread-pool.c

+++ b/gdb/gdbsupport/thread-pool.c

@@ -25,7 +25,6 @@

 #include "gdbsupport/alt-stack.h"

 #include "gdbsupport/block-signals.h"

 #include <algorithm>

-#include "diagnostics.h"

 /* On the off chance that we have the pthread library on a Windows

    host, but std::thread is not using it, avoid calling

@@ -40,14 +39,11 @@

 #include <pthread.h>

-DIAGNOSTIC_PUSH

-DIAGNOSTIC_IGNORE_UNUSED_FUNCTION

-

 /* Handle platform discrepancies in pthread_setname_np: macOS uses a

    single-argument form, while Linux uses a two-argument form.  This

    wrapper handles the difference.  */

-static void

+ATTRIBUTE_UNUSED static void

 set_thread_name (int (*set_name) (pthread_t, const char *), const char *name)

 {

   set_name (pthread_self (), name);

@@ -55,14 +51,12 @@ set_thread_name (int (*set_name) (pthread_t, const char *), const char *name)

 /* The macOS man page says that pthread_setname_np returns "void", but

    the headers actually declare it returning "int".  */

-static void

+ATTRIBUTE_UNUSED static void

 set_thread_name (int (*set_name) (const char *), const char *name)

 {

   set_name (name);

 }

-DIAGNOSTIC_POP

-

 #endif	/* USE_PTHREAD_SETNAME_NP */

 namespace gdb

diff --git a/include/diagnostics.h b/include/diagnostics.h

--- a/include/diagnostics.h

+++ b/include/diagnostics.h

@@ -53,8 +53,6 @@

   DIAGNOSTIC_IGNORE ("-Wdeprecated-declarations")

 # define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER \

   DIAGNOSTIC_IGNORE ("-Wdeprecated-register")

-# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \

-  DIAGNOSTIC_IGNORE ("-Wunused-function")

 # if __has_warning ("-Wenum-compare-switch")

 #  define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES \

    DIAGNOSTIC_IGNORE ("-Wenum-compare-switch")

@@ -65,9 +63,6 @@

 #elif defined (__GNUC__) /* GCC */

-# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION \

-  DIAGNOSTIC_IGNORE ("-Wunused-function")

-

 # define DIAGNOSTIC_IGNORE_STRINGOP_TRUNCATION \

   DIAGNOSTIC_IGNORE ("-Wstringop-truncation")

@@ -88,10 +83,6 @@

 # define DIAGNOSTIC_IGNORE_DEPRECATED_REGISTER

 #endif

-#ifndef DIAGNOSTIC_IGNORE_UNUSED_FUNCTION

-# define DIAGNOSTIC_IGNORE_UNUSED_FUNCTION

-#endif

-

 #ifndef DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES

 # define DIAGNOSTIC_IGNORE_SWITCH_DIFFERENT_ENUM_TYPES

 #endif