2012-04-11 Tristan Gingold <gingold@adacore.com>

	PR gdb/13901
	* darwin-nat.c (darwin_execvp): Revert previous patch.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 1d65759..1c2e48b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,6 +1,11 @@
 2012-04-11  Tristan Gingold  <gingold@adacore.com>
 
        PR gdb/13901
+       * darwin-nat.c (darwin_execvp): Revert previous patch.
+
+2012-04-11  Tristan Gingold  <gingold@adacore.com>
+
+       PR gdb/13901
        * darwin-nat.c (darwin_resume_thread): Call darwin_set_sstep only
        in case of change.
 

diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 3c5ddbe..b5bf7cc 100644 (file)
--- a/gdb/darwin-nat.c
+++ b/gdb/darwin-nat.c
@@ -1529,22 +1529,6 @@ darwin_execvp (const char *file, char * const argv[], char * const env[])
       return;
     }
 
-  /* Specify the same binary preference to spawn the shell as the
-     exec binary.  This avoids spawning a 64bit shell while debugging
-     a 32bit program, which may confuse gdb.
-     Also, this slightly breaks internal layers as we suppose the binary
-     is Mach-O.  Doesn't harm in practice.  */
-  if (exec_bfd != NULL)
-    {
-      cpu_type_t pref;
-      size_t ocount;
-
-      pref = bfd_mach_o_get_data (exec_bfd)->header.cputype;
-      res = posix_spawnattr_setbinpref_np (&attr, 1, &pref, &ocount);
-      if (res != 0 || ocount != 1)
-       fprintf_unfiltered (gdb_stderr, "Cannot set posix_spawn binpref\n");
-    }
-
   posix_spawnp (NULL, argv[0], NULL, &attr, argv, env);
 }