Make the literal argument to pow a double, not an integer

Since pow takes doubles, pass 2.0 instead of 2 to pow ().

Conveniently, this fixes the ambiguous call to pow on Solaris 11
with gcc 5.5 (gcc211 on the compile farm), which has a "using std::pow"
directive in a system header, which brings in float/double/long double
overloads.  Fixes the build on Solaris with enable-targets=all.

gdb/ChangeLog:

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

	* score-tdep.c (score7_analyze_prologue): Pass 2.0 instead of
	2 to pow ().

Change-Id: Ib18e7e4749ddcbff0727b72a31198f8cb84d1993

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 8595b6eafcea98628b6dc3a94fec103e2fb865de..60930a790f97cb3424e0b035535fe12abb4416e9 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-12-19  Christian Biesinger  <cbiesinger@google.com>
+
+       * score-tdep.c (score7_analyze_prologue): Pass 2.0 instead of
+       2 to pow ().
+

 2019-12-19  Christian Biesinger  <cbiesinger@google.com>
 
        * tui/tui-source.c (tui_source_window::set_contents): Cast argument of
 2019-12-19  Christian Biesinger  <cbiesinger@google.com>
 
        * tui/tui-source.c (tui_source_window::set_contents): Cast argument of

diff --git a/gdb/score-tdep.c b/gdb/score-tdep.c
index 5ca763c40f42735bbe402c57c76f7744e09ce2ec..b8abe3d890a09bec8da845b6f74c247f8fa34c9c 100644 (file)
--- a/gdb/score-tdep.c
+++ b/gdb/score-tdep.c
@@ -918,13 +918,15 @@ score7_analyze_prologue (CORE_ADDR startaddr, CORE_ADDR pc,
                    && G_FLD (inst->v, 2, 0) == 0x0)
             {
               /* subei! r0, n */
                    && G_FLD (inst->v, 2, 0) == 0x0)
             {
               /* subei! r0, n */

-              sp_offset += (int) pow (2, G_FLD (inst->v, 6, 3));
+              sp_offset += (int) pow (2.0, G_FLD (inst->v, 6, 3));

             }
           else if (G_FLD (inst->v, 14, 7) == 0xc0
                    && G_FLD (inst->v, 2, 0) == 0x0)
             {
               /* addei! r0, n */
             }
           else if (G_FLD (inst->v, 14, 7) == 0xc0
                    && G_FLD (inst->v, 2, 0) == 0x0)
             {
               /* addei! r0, n */

-              sp_offset -= (int) pow (2, G_FLD (inst->v, 6, 3));
+             /* Solaris 11+gcc 5.5 has ambiguous overloads of pow, so we
+                pass 2.0 instead of 2 to get the right one.  */
+              sp_offset -= (int) pow (2.0, G_FLD (inst->v, 6, 3));

             }
         }
       else
             }
         }
       else