* dll.c (UNSPECIFIED_CORE_ADDR): New macro.

	(match_dll): Use it.

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 58846392ad120923da1cd9a0fd8734f020a5e4c8..c387aa64ce6a6a9011a01ae024e0003f1b0fbba6 100644 (file)
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-16  Doug Evans  <dje@google.com>
+
+       * dll.c (UNSPECIFIED_CORE_ADDR): New macro.
+       (match_dll): Use it.
+
 2014-01-16  Markus Metzger  <markus.t.metzger@intel.com>
 
        * target.h (target_ops) <read_btrace>: Change parameters and

diff --git a/gdb/gdbserver/dll.c b/gdb/gdbserver/dll.c
index 63b2ed09fb39878bdc166d8ffc5a703b7fa1d5c8..be0e01f3bebecbaff2734433ae3810c1f8035013 100644 (file)
--- a/gdb/gdbserver/dll.c
+++ b/gdb/gdbserver/dll.c
@@ -20,6 +20,9 @@
 
 #define get_dll(inf) ((struct dll_info *)(inf))
 
+/* An "unspecified" CORE_ADDR, for match_dll.  */
+#define UNSPECIFIED_CORE_ADDR (~(CORE_ADDR) 0)
+
 struct inferior_list all_dlls;
 int dlls_changed;
 
@@ -41,7 +44,7 @@ match_dll (struct inferior_list_entry *inf, void *arg)
   struct dll_info *iter = (void *) inf;
   struct dll_info *key = arg;
 
-  if (key->base_addr != ~(CORE_ADDR) 0
+  if (key->base_addr != UNSPECIFIED_CORE_ADDR
       && iter->base_addr == key->base_addr)
     return 1;
   else if (key->name != NULL