[PATCH] fix msvcc.sh to not pass -safeseh to ml64

[PATCH] fix msvcc.sh to not pass -safeseh to ml64

[Dan Witte]

[-- Attachment #1: Type: text/plain, Size: 98 bytes --]

Anthony,

Attached is a patch to fix Win64 builds, since ml64 doesn't like -safeseh.

Cheers,
Dan.

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: libffi-ml64-safeseh.diff --]
[-- Type: text/x-patch; name=libffi-ml64-safeseh.diff, Size: 1100 bytes --]

diff --git a/ChangeLog b/ChangeLog
index 2547ad3..7ba744c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-03  Neil Rashbrooke <neil@httl.net>
+
+	* msvcc.sh: Don't pass -safeseh to ml64 because behavior is buggy.
+
 2010-07-22  Dan Witte  <dwitte@mozilla.com>
 
 	* src/*/ffitarget.h: Make FFI_LAST_ABI one past the last valid ABI.
diff --git a/msvcc.sh b/msvcc.sh
index 551c73d..c73cb15 100755
--- a/msvcc.sh
+++ b/msvcc.sh
@@ -46,6 +46,7 @@ args="-nologo"
 md=-MD
 cl="cl"
 ml="ml"
+safeseh="-safeseh"
 output=
 
 while [ $# -gt 0 ]
@@ -63,6 +64,7 @@ do
     -m64)
       cl="cl"   # "$MSVC/x86_amd64/cl"
       ml="ml64" # "$MSVC/x86_amd64/ml64"
+      safeseh=
       shift 1
     ;;
     -O*)
@@ -164,7 +166,7 @@ if [ -n "$assembly" ]; then
     echo "$cl -nologo -EP $includes $defines $src > $ppsrc"
     "$cl" -nologo -EP $includes $defines $src > $ppsrc || exit $?
     output="$(echo $output | sed 's%/F[dpa][^ ]*%%g')"
-    args="-nologo -safeseh $single $output $ppsrc"
+    args="-nologo $safeseh $single $output $ppsrc"
 
     echo "$ml $args"
     eval "\"$ml\" $args"

Re: [PATCH] fix msvcc.sh to not pass -safeseh to ml64

[Neil Rashbrook]

Dan Witte wrote:

>+2010-08-03  Neil Rashbrooke <neil@httl.net>
>
Neil Rashbrook <neil@parkwaycc.co.uk>

Re: [PATCH] fix msvcc.sh to not pass -safeseh to ml64

[Anthony Green]

Dan Witte <dwitte@mozilla.com> writes:

> Anthony,
>
> Attached is a patch to fix Win64 builds, since ml64 doesn't like
> -safeseh.

Thanks - applied (with Neil's updated email address).

AG


>
> Cheers,
> Dan.