From: Tristan Gingold <gingold@adacore.com>
Date: Wed, 11 Apr 2012 13:42:44 +0000 (+0000)
Subject: 2012-04-11  Tristan Gingold  <gingold@adacore.com>
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=82e0cec1e54cccf178f9b6b9d60525b69f019276;p=binutils-gdb.git

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 1d65759d129..1c2e48b243c 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+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
diff --git a/gdb/darwin-nat.c b/gdb/darwin-nat.c
index 3c5ddbef9b4..b5bf7cc8ca0 100644
--- 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);
 }