[vbox-dev] Patches to "build fix for newer yasm" are wrong

[Knut St. Osmundsen]

Hi Sérgio,

Yasm git builds requires the change. As you found out though, yasm 
v1.2.0.0 doesn't actually need it as the change was first made some 
months later.  I've adjusted the %if on trunk, will show up in a short 
while on the public subversion repository.

Kind Regards,
  bird.

On 10/28/2013 10:04 PM, Sérgio Basto wrote:
> Hi,
> I'm VirtualBox maintainer on rpmfusion,  and I notice that 2 commits
> breaks compiling
>
> https://www.virtualbox.org/changeset/46863/vbox/trunk/src/VBox/Disassembler
> https://www.virtualbox.org/changeset/46950/vbox/trunk/src/VBox/Disassembler
>
> 46863 says:
> tstDisasm-1A.asm: Build fix for newer yasm (not sure if it's in 1.1.0 or
> 1.2.0. See:
>   https://github.com/yasm/yasm/commit/0e7f34a025dc123482055c21e40655d64c
>
> Well I use
> kmk %{_smp_mflags} KBUILD_VERBOSE=2 TOOL_YASM_AS=yasm
>
> yasm is yasm-1.2.0-4.fc19.x86_64 (rpm -q yasm)
> and still not need the patches for newer versions.
>
> I think we need check this out better.
> I have to patch it with:
> --- ./src/VBox/Disassembler/testcase/tstAsm.mac.orig    2013-10-27 22:49:12.971665505 +0000
> +++ ./src/VBox/Disassembler/testcase/tstAsm.mac 2013-10-27 22:49:17.290716021 +0000
> @@ -52,7 +52,4 @@
>    %error "TEST_BITS is missing or wrong."
>   %endif
>
> -%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2)
> - %define pmulhrwa pmulhrw
> -%endif
>
> --- ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm   2013-10-15 12:12:36.000000000 +0100
> +++ ./src/VBox/Disassembler/testcase/tstDisasm-1A.asm   2013-10-27 22:36:35.204829647 +0000
> @@ -26,9 +26,6 @@
>
>   BITS 32
>
> -%if __YASM_MAJOR__ > 1 || (__YASM_MAJOR__ == 1 && __YASM_MINOR__ >= 2)
> - %define pmulhrwa pmulhrw
> -%endif
>
>
>   BEGINCODE
>
>
> Thanks,