summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2013-08-23 14:32:28 +0000
committerChristopher Faylor <me@cgf.cx>2013-08-23 14:32:28 +0000
commit0d585a6e8cba126905599faf72b2de56f71ad81f (patch)
tree4b0b943ba84134043ea8e7deff601d85af957f28
parent78aaee232101e81bdb9a51d92fc44fdf7ed30607 (diff)
downloadcygnal-0d585a6e8cba126905599faf72b2de56f71ad81f.tar.gz
cygnal-0d585a6e8cba126905599faf72b2de56f71ad81f.tar.bz2
cygnal-0d585a6e8cba126905599faf72b2de56f71ad81f.zip
* child_info.h (PROC_MAGIC_GENERIC): Define differently for x86 vs. x86_64.
-rw-r--r--winsup/cygwin/ChangeLog5
-rw-r--r--winsup/cygwin/child_info.h6
2 files changed, 10 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 24622e6d8..029649eb0 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-23 Christopher Faylor <me.cygwin2013@cgf.cx>
+
+ * child_info.h (PROC_MAGIC_GENERIC): Define differently for x86 vs.
+ x86_64.
+
2013-08-23 Corinna Vinschen <corinna@vinschen.de>
* path.h (enum path_types): Drop definition of PATH_64BITEXEC.
diff --git a/winsup/cygwin/child_info.h b/winsup/cygwin/child_info.h
index 70cfd5433..d9467274f 100644
--- a/winsup/cygwin/child_info.h
+++ b/winsup/cygwin/child_info.h
@@ -30,7 +30,11 @@ enum child_status
#define OPROC_MAGIC_MASK 0xff00ff00
#define OPROC_MAGIC_GENERIC 0xaf00f000
-#define PROC_MAGIC_GENERIC 0xaf00fa00
+#ifdef __x86_64__
+#define PROC_MAGIC_GENERIC 0xaf00fa64
+#else /*!x86_64*/
+#define PROC_MAGIC_GENERIC 0xaf00fa32
+#endif
#define EXEC_MAGIC_SIZE sizeof(child_info)