2000-09-05 Michael Snyder <msnyder@cleaver.cygnus.com>

        * sol-thread.c (ps_pdmodel): Protect with an ifdef.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 2f56452babaa97a424948a25860c8969d00aeb3b..3575217f8021b714e83ee93930f34a12674ec18f 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2000-09-05  Michael Snyder  <msnyder@cleaver.cygnus.com>
+
+       * sol-thread.c (ps_pdmodel): Protect with an ifdef.
+
 Mon Sep  4 16:21:31 2000  Andrew Cagney  <cagney@amy.cygnus.com>
 
        * gdbarch.sh: Use printf instead of echo.

diff --git a/gdb/sol-thread.c b/gdb/sol-thread.c
index dc90979d15c4888d96edb6bf95458ad8d5213900..156c15285cc3daf2c7c7bfb8ccd34d852cf27a85 100644 (file)
--- a/gdb/sol-thread.c
+++ b/gdb/sol-thread.c
@@ -452,8 +452,12 @@ static void
 sol_thread_attach (char *args, int from_tty)
 {
   procfs_ops.to_attach (args, from_tty);
-  /* Must get symbols from solibs before libthread_db can run! */
-  SOLIB_ADD ((char *) 0, from_tty, (struct target_ops *) 0);
+
+  if (auto_solib_add)
+    {
+      /* Must get symbols from solibs before libthread_db can run! */
+      SOLIB_ADD ((char *) 0, from_tty, (struct target_ops *) 0);
+    }
   if (sol_thread_active)
     {
       printf_filtered ("sol-thread active.\n");
@@ -1309,6 +1313,7 @@ ps_lsetfpregs (gdb_ps_prochandle_t ph, lwpid_t lwpid,
   return PS_OK;
 }
 
+#ifdef PR_MODEL_LP64
 /* Identify process as 32-bit or 64-bit.
    At the moment I'm using bfd to do this.
    There might be a more solaris-specific (eg. procfs) method,
@@ -1327,6 +1332,7 @@ ps_pdmodel (gdb_ps_prochandle_t ph, int *data_model)
 
   return PS_OK;
 }
+#endif /* PR_MODEL_LP64 */
 
 #ifdef TM_I386SOL2_H