From: Christian Biesinger <cbiesinger@google.com>
Date: Wed, 18 Dec 2019 23:50:33 +0000 (-0600)
Subject: Cast the log10 argument to double to disambiguate it
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1cd4a20a27c430fdd0db8d5b154e9c7860e440f5;p=binutils-gdb.git

Cast the log10 argument to double to disambiguate it

On Solaris 11 with gcc 5.5.0 (gcc211 on the compile farm), math.h has a
using std::log10; directive. This is unfortunate because std::log10 has
overloads for float/double/long double. To disambiguate this call,
cast the argument to double to fix the build.

gdb/ChangeLog:

2019-12-19  Christian Biesinger  <cbiesinger@google.com>

	* tui/tui-source.c (tui_source_window::set_contents): Cast argument of
	log10 to double to fix Solaris 11 with gcc 5.5.

Change-Id: I6c0c52e9c172b529c899a435d430e5916aeef69f
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e0da79eda81..8595b6eafce 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-19  Christian Biesinger  <cbiesinger@google.com>
+
+	* tui/tui-source.c (tui_source_window::set_contents): Cast argument of
+	log10 to double to fix Solaris 11 with gcc 5.5.
+
 2019-12-19  Christian Biesinger  <cbiesinger@google.com>
 
 	* fbsd-tdep.c (fbsd_info_proc_files_entry): Rename local var
diff --git a/gdb/tui/tui-source.c b/gdb/tui/tui-source.c
index 32877d7bc87..6c3425fb895 100644
--- a/gdb/tui/tui-source.c
+++ b/gdb/tui/tui-source.c
@@ -85,7 +85,9 @@ tui_source_window::set_contents (struct gdbarch *arch,
 	  int digits = 0;
 	  if (compact_source)
 	    {
-	      double l = log10 (offsets->size ());
+	      /* Solaris 11+gcc 5.5 has ambiguous overloads of log10, so we
+	         cast to double to get the right one.  */
+	      double l = log10 ((double) offsets->size ());
 	      digits = 1 + (int) l;
 	    }