diff -r 8f3c59225a5c -r 7638e35cabc6 make/windows/makefiles/sa.make --- a/make/windows/makefiles/sa.make Thu Aug 15 21:33:37 2013 +0100 +++ b/make/windows/makefiles/sa.make Mon Aug 19 17:47:21 2013 +0200 @@ -107,6 +107,9 @@ !if "$(ENABLE_FULL_DEBUG_SYMBOLS)" == "1" SA_LFLAGS = $(SA_LFLAGS) -map -debug !endif +!if "$(BUILDARCH)" == "i486" +SA_LFLAGS = $(SAFESEH_FLAG) $(SA_LFLAGS) +!endif # Note that we do not keep sawindbj.obj around as it would then # get included in the dumpbin command in build_vm_def.sh