Fix for asm/no-asm on WIN32.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 13 Aug 2007 02:24:26 +0000 (02:24 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 13 Aug 2007 02:24:26 +0000 (02:24 +0000)
crypto/Makefile
util/mk1mf.pl

index e5b5b07..af2cac9 100644 (file)
@@ -26,6 +26,7 @@ EX_LIBS=
 CFLAGS= $(INCLUDE) $(CFLAG)
 ASFLAGS= $(INCLUDE) $(ASFLAG)
 AFLAGS=$(ASFLAGS)
 CFLAGS= $(INCLUDE) $(CFLAG)
 ASFLAGS= $(INCLUDE) $(ASFLAG)
 AFLAGS=$(ASFLAGS)
+CPUID_OBJ=mem_clr.o
 
 LIBS=
 
 
 LIBS=
 
index 1557936..b5e13c3 100755 (executable)
@@ -677,7 +677,7 @@ foreach (values %lib_nam)
                }
        if (($cpuid_asm_obj ne "") && ($_ eq "CRYPTO"))
                {
                }
        if (($cpuid_asm_obj ne "") && ($_ eq "CRYPTO"))
                {
-               $lib_obj =~ s/\s(\S*\/cversion\S*)/ $1 \$(CPUID_ASM_OBJ)/;
+               $lib_obj =~ s/\s\S*\/mem_clr\S*/ \$(CPUID_ASM_OBJ)/;
                $rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);
                }
        $defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);
                $rules.=&do_asm_rule($cpuid_asm_obj,$cpuid_asm_src);
                }
        $defs.=&do_defs(${_}."OBJ",$lib_obj,"\$(OBJ_D)",$obj);