Make "print" and "compile print" support -OPT options

[deliverable/binutils-gdb.git] / gdb / compile / compile-c-support.c

diff --git a/gdb/compile/compile-c-support.c b/gdb/compile/compile-c-support.c
index 5c700bbac260bef9570491c78cec3b294e01d167..d1947da6570bc655f578e3eb87d98d462dd5ede0 100644 (file)
--- a/gdb/compile/compile-c-support.c
+++ b/gdb/compile/compile-c-support.c
@@ -1,6 +1,6 @@
 /* C/C++ language support for compilation.
 
-   Copyright (C) 2014-2018 Free Software Foundation, Inc.
+   Copyright (C) 2014-2019 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -270,11 +270,11 @@ generate_register_struct (struct ui_file *stream, struct gdbarch *gdbarch,
 
              default:
                fprintf_unfiltered (stream,
-                                   "  unsigned char %s[%d]"
+                                   "  unsigned char %s[%s]"
                                    " __attribute__((__aligned__("
                                    "__BIGGEST_ALIGNMENT__)))",
                                    regname.c_str (),
-                                   TYPE_LENGTH (regtype));
+                                   pulongest (TYPE_LENGTH (regtype)));
              }
            fputs_unfiltered (";\n", stream);
          }
@@ -572,7 +572,7 @@ public:
           register struct before the function body.  This requires a
           temporary stream.  */
        gdb::unique_xmalloc_ptr<unsigned char> registers_used
-         = generate_c_for_variable_locations (m_instance, var_stream, m_arch,
+         = generate_c_for_variable_locations (m_instance, &var_stream, m_arch,
                                               expr_block, expr_pc);
 
        buf.puts ("typedef unsigned int"