Emit a warning when -z relro is unsupported

[deliverable/binutils-gdb.git] / sim / m32c / trace.c

diff --git a/sim/m32c/trace.c b/sim/m32c/trace.c
index 64084edb3d8788b39e5569277dce4f70ce6ef196..df28159422685c79e69f37291b3a6598ac1108b2 100644 (file)
--- a/sim/m32c/trace.c
+++ b/sim/m32c/trace.c
@@ -1,6 +1,6 @@
 /* trace.c --- tracing output for the M32C simulator.
 
 /* trace.c --- tracing output for the M32C simulator.
 

-Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc.
+Copyright (C) 2005-2020 Free Software Foundation, Inc.

 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.
 Contributed by Red Hat, Inc.
 
 This file is part of the GNU simulators.


@@ -34,6 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 #include "cpu.h"
 #include "mem.h"
 #include "load.h"
 #include "cpu.h"
 #include "mem.h"
 #include "load.h"

+#include "trace.h"

 
 static int
 sim_dis_read (bfd_vma memaddr, bfd_byte * ptr, unsigned int length,
 
 static int
 sim_dis_read (bfd_vma memaddr, bfd_byte * ptr, unsigned int length,


@@ -128,6 +129,7 @@ load_file_and_line (const char *filename, int lineno)
       int i;
       struct stat s;
       const char *found_filename, *slash;
       int i;
       struct stat s;
       const char *found_filename, *slash;

+      FILE *file;

 
       found_filename = filename;
       while (1)
 
       found_filename = filename;
       while (1)


@@ -145,7 +147,7 @@ load_file_and_line (const char *filename, int lineno)
       files = f;
       f->filename = strdup (filename);
       f->data = (char *) malloc (s.st_size + 2);
       files = f;
       f->filename = strdup (filename);
       f->data = (char *) malloc (s.st_size + 2);

-      FILE *file = fopen (found_filename, "rb");
+      file = fopen (found_filename, "rb");

       fread (f->data, 1, s.st_size, file);
       f->data[s.st_size] = 0;
       fclose (file);
       fread (f->data, 1, s.st_size, file);
       f->data[s.st_size] = 0;
       fclose (file);


@@ -174,7 +176,7 @@ load_file_and_line (const char *filename, int lineno)
 }
 
 void
 }
 
 void

-sim_disasm_one ()
+sim_disasm_one (void)

 {
   static int initted = 0;
   static asymbol **symtab = 0;
 {
   static int initted = 0;
   static asymbol **symtab = 0;


@@ -229,7 +231,7 @@ sim_disasm_one ()
          if (s->flags & SEC_CODE || code_section == 0)
            {
              code_section = s;
          if (s->flags & SEC_CODE || code_section == 0)
            {
              code_section = s;

-             code_base = bfd_section_lma (current_bfd, s);
+             code_base = bfd_section_lma (s);

              break;
            }
        }
              break;
            }
        }