[PATCH] Resolve Windows build issues

[Alex Kasko]

Hi,

On 11/28/2013 04:07 AM, Andrew wrote:
>
>
> ----- Original Message -----
>> * Andrew <gnu.andrew at redhat.com> [2013-11-27 14:17]:
>>> Webrev: http://cr.openjdk.java.net/~andrew/openjdk6/20131015/winmerge/
>>>
>>> This contains Alex's fix for the SA along with a fix for the merge issues
>>> in compile.make.  The latter is different to both previous versions
>>> published
>>> by Alex and, I believe, the correct version, which I obtained by diffing
>>> against
>>> the version in 7 and checking all if blocks were matched.
>>>
>>> The new patch:
>>>
>>> 1.  Moves the /SAFESEH flag into the correct section (out of the
>>> COMPILER_NAME block and
>>> into the compiler settings for VS2008, like the other instances in that
>>> file).
>>> 2.  Removes the broken if block in the VS2010 settings.
>>> 3.  Places the full if block with other linker settings further down.
>>
>> I am not familiar with windows build systems at all, but the approach
>> certainly looks correct to me. If this makes more things match upstream
>> 7u, then this is definitely a step in the right direction.
>>
>> Thanks,
>> Omair
>>
>> --
>> PGP Key: 66484681 (http://pgp.mit.edu/)
>> Fingerprint = F072 555B 0A17 3957 4E95  0056 F286 F14F 6648 4681
>>
>
> I'll wait for Alex to test before pushing.

amd64 windows build works fine. And I realised that my jdk6-windows-i586 
build stand is broken badly - some kind of virus that rewrites 
executables. So please disregard my notes about SAFESEH. I won't be able 
to test i586 build for some time (until I recreate the stand) so I think 
it is better to push compile.make changes and leave sa.make intact (with 
SAFESEH flag enabled). Sorry for the noise.

>
> The only remaining differences with 7 are some checks from another patch
> and the kernel section which is only present in 6.  The above fixes what
> were clearly issues from a bad merge (lines added in the wrong places).
>


-- 
Regards,
Alex Kasko

-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 3742 bytes
Desc: S/MIME Cryptographic Signature
Url : http://mail.openjdk.java.net/pipermail/jdk6-dev/attachments/20131129/bc3ecd06/smime.p7s