Re: [patch] Darwin build fix for unused prototypes

Josh Matthews
2012-03-09T15:40:46Z

[-- Attachment #1: Type: text/plain, Size: 2166 bytes --]

Thanks for the suggestions. Please commit this, as I don't have access.

gdb/ChangeLog:

* darwin-nat-info.c (_initialize_darwin_info_commands): Add
prototype.
(darwin_debug_port_info): Make static.
* darwin-nat.c (_initialize_darwin_inferior): Add prototype.
* machoread.c (_initialize_machoread): Add prototype.
* i386-darwin-nat.c (i386_darwin_dr_set, i386_darwin_dr_get)
(i386_darwin_set_control, i386_darwin_get_control)
i386_darwin_dr_set_addr, i386_darwin_get_addr)
i386_darwin_get_status, i386_darwin_get_control):
Hide these with HW_WATCHPOINT_NOT_YET_ENABLED.

Cheers,
Josh

On 9 March 2012 08:40, Joel Brobecker <brobecker@adacore.com> wrote:
> Hi Josh,
>
>> 2012-03-08  Josh Matthews  <josh@joshmatthews.net>
>>
>>         * darwin-nat-info.c: Add missing prototype for
>> _initialize_darwin_info_commands. Make darwin_debug_port_info static.
>>         * darwin-nat.c: Add missing prototype for _initialize_darwin_infereior.
>>         * i386-darwin-nat.c: Remove unused functions
>> i386_darwin_dr_set, i386_darwin_dr_get, i386_darwin_set_control,
>> i386_darwin_get_control, i386_darwin_dr_set_addr,
>> i386_darwin_get_addr, i386_darwin_get_status, i386_darwin_get_control.
>>         * machoread.c: Add missing prototype for _initialize_machoread.
>
> Before you commit, can you make sure you re-format this ChangeLog
> entry so that all the text is aligned on a tab? Also, can you use
> two spaces after each period. And finally, I noticed at least one
> typo:
>
>        _initialize_darwin_infereior
>
> I suggest:
>
>        * darwin-nat-info.c (_initialize_darwin_info_commands): Add
>        prototype.
>        (darwin_debug_port_info): Make static.
>        * darwin-nat.c (_initialize_darwin_inferior): Add prototype.
>        * machoread.c (_initialize_machoread): Add prototype.
>        * i386-darwin-nat.c (i386_darwin_dr_set, i386_darwin_dr_get)
>        (i386_darwin_set_control, i386_darwin_get_control)
>        i386_darwin_dr_set_addr, i386_darwin_get_addr)
>        i386_darwin_get_status, i386_darwin_get_control):
>        Comment these functions out.
>
> --
> Joel

[-- Attachment #2: darwin_prototypes.diff --]
[-- Type: application/octet-stream, Size: 1772 bytes --]

diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c
index 9170e14..9741538 100644
--- a/gdb/darwin-nat-info.c
+++ b/gdb/darwin-nat-info.c
@@ -301,7 +301,7 @@ info_mach_ports_command (char *args, int from_tty)
}

-void
+static void
darwin_debug_port_info (task_t task, mach_port_t port)
{
kern_return_t kret;
@@ -843,6 +843,9 @@ info_mach_exceptions_command (char *args, int from_tty)
}
}

+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_darwin_info_commands;
+
void
_initialize_darwin_info_commands (void)
{
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 0feebe3..de661a3 100644
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -2015,6 +2015,9 @@ darwin_supports_multi_process (void)
return 1;
}

+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_darwin_inferior;
+
void
_initialize_darwin_inferior (void)
{
diff --git a/gdb/i386-darwin-nat.c b/gdb/i386-darwin-nat.c
index b452f1e..ced2903 100644
--- a/gdb/i386-darwin-nat.c
+++ b/gdb/i386-darwin-nat.c
@@ -260,7 +260,7 @@ i386_darwin_store_inferior_registers (struct target_ops *ops,
}
}

-
+#ifdef HW_WATCHPOINT_NOT_YET_ENABLED
/* Support for debug registers, boosted mostly from i386-linux-nat.c. */

static void
@@ -410,6 +410,7 @@ i386_darwin_dr_get_control (void)
{
return i386_darwin_dr_get (DR_CONTROL);
}
+#endif

void
darwin_check_osabi (darwin_inferior *inf, thread_t thread)
diff --git a/gdb/machoread.c b/gdb/machoread.c
index 88ce612..8a6b500 100644
--- a/gdb/machoread.c
+++ b/gdb/machoread.c
@@ -1035,6 +1035,9 @@ static const struct sym_fns macho_sym_fns = {
&psym_functions
};

+/* -Wmissing-prototypes */
+extern initialize_file_ftype _initialize_machoread;
+
void
_initialize_machoread ()
{