link warnings caused by nasm modules.

[openssl.git] / crypto / perlasm / x86nasm.pl

diff --git a/crypto/perlasm/x86nasm.pl b/crypto/perlasm/x86nasm.pl
index be439f44e945b4f7f51b5b118a24c9b410d91264..c93b811e3b206f7c123e62e49399b5728ecf6539 100644 (file)
--- a/crypto/perlasm/x86nasm.pl
+++ b/crypto/perlasm/x86nasm.pl
@@ -81,7 +81,7 @@ sub get_mem
 }
 sub ::BP       { &get_mem("BYTE",@_);  }
 sub ::DWP      { &get_mem("DWORD",@_); }
-sub ::QWP      { &get_mem("QWORD",@_); }
+sub ::QWP      { &get_mem("",@_);      }
 sub ::BC       { (($::mwerks)?"":"BYTE ")."@_";  }
 sub ::DWC      { (($::mwerks)?"":"DWORD ")."@_"; }
 
@@ -155,11 +155,13 @@ ${lprfx}OPENSSL_ia32cap_init:
 ${lprfx}nocpuid:
        ret
 
-segment        .CRT\$XCU rdata align=4
+segment        .CRT\$XCU data align=4
 dd     ${lprfx}OPENSSL_ia32cap_init
 segment        .bss
 common ${under}OPENSSL_ia32cap_P 4
 ___
+       # comment out OPENSSL_ia32cap_P declarations
+       grep {s/(^extern\s+${under}OPENSSL_ia32cap_P)/\;$1/} @out;
        push (@out,$tmp);               
     }
 }