Use CFLAG for LFLAGS instead of the nonexistent CFLAGS.

[openssl.git] / util / pl / unix.pl

diff --git a/util/pl/unix.pl b/util/pl/unix.pl
index 36311711c64bea6a29cfae45449fc5c19a3b150d..b8e1ff7d9e6dc89dbccdf368d5a8b25f7aa6996a 100644 (file)
--- a/util/pl/unix.pl
+++ b/util/pl/unix.pl
@@ -30,7 +30,7 @@ $ofile='-o ';
 
 # EXE linking stuff
 $link='${CC}';
-$lflags='${CFLAGS}';
+$lflags='${CFLAG}';
 $efile='-o ';
 $exep='';
 $ex_libs="";
@@ -38,7 +38,7 @@ $ex_libs="";
 # static library stuff
 $mklib='ar r';
 $mlflags='';
-$ranlib='util/ranlib.sh';
+$ranlib=&which("ranlib") or $ranlib="true";
 $plib='lib';
 $libp=".a";
 $shlibp=".a";
@@ -46,20 +46,100 @@ $lfile='';
 
 $asm='as';
 $afile='-o ';
-$bn_mulw_obj="";
-$bn_mulw_src="";
+$bn_asm_obj="";
+$bn_asm_src="";
 $des_enc_obj="";
 $des_enc_src="";
 $bf_enc_obj="";
 $bf_enc_src="";
 
+%perl1 = (
+         'md5-x86_64' => 'crypto/md5',
+         'x86_64-mont' => 'crypto/bn',
+         'x86_64-mont5' => 'crypto/bn',
+         'x86_64-gf2m' => 'crypto/bn',
+         'modexp512-x86_64' => 'crypto/bn',
+         'aes-x86_64' => 'crypto/aes',
+         'vpaes-x86_64' => 'crypto/aes',
+         'bsaes-x86_64' => 'crypto/aes',
+         'aesni-x86_64' => 'crypto/aes',
+         'aesni-sha1-x86_64' => 'crypto/aes',
+         'sha1-x86_64' => 'crypto/sha',
+         'e_padlock-x86_64' => 'engines',
+         'rc4-x86_64' => 'crypto/rc4',
+         'rc4-md5-x86_64' => 'crypto/rc4',
+         'ghash-x86_64' => 'crypto/modes',
+         );
+
+# If I were feeling more clever, these could probably be extracted
+# from makefiles.
+sub platform_perlasm_compile_target
+       {
+       local($target, $source, $bname) = @_;
+
+       for $p (keys %perl1)
+               {
+               if ($target eq "\$(OBJ_D)/$p.o")
+                       {
+                       return << "EOF";
+\$(TMP_D)/$p.s: $perl1{$p}/asm/$p.pl
+       \$(PERL) $perl1{$p}/asm/$p.pl \$(PERLASM_SCHEME) > \$@
+EOF
+                       }
+               }
+       if ($target eq '$(OBJ_D)/x86_64cpuid.o')
+               {
+               return << 'EOF';
+$(TMP_D)/x86_64cpuid.s: crypto/x86_64cpuid.pl
+       $(PERL) crypto/x86_64cpuid.pl $(PERLASM_SCHEME) > $@
+EOF
+               }
+       elsif ($target eq '$(OBJ_D)/sha256-x86_64.o')
+               {
+               return << 'EOF';
+$(TMP_D)/sha256-x86_64.s: crypto/sha/asm/sha512-x86_64.pl
+       $(PERL) crypto/sha/asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
+EOF
+               }
+       elsif ($target eq '$(OBJ_D)/sha512-x86_64.o')
+               {
+               return << 'EOF';
+$(TMP_D)/sha512-x86_64.s: crypto/sha/asm/sha512-x86_64.pl
+       $(PERL) crypto/sha/asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
+EOF
+               }
+       elsif ($target eq '$(OBJ_D)/sha512-x86_64.o')
+               {
+               return << 'EOF';
+$(TMP_D)/sha512-x86_64.s: crypto/sha/asm/sha512-x86_64.pl
+       $(PERL) crypto/sha/asm/sha512-x86_64.pl $(PERLASM_SCHEME) $@
+EOF
+               }
+
+       die $target;
+       }
+
+sub special_compile_target
+       {
+       local($target) = @_;
+
+       if ($target eq 'crypto/bn/x86_64-gcc')
+               {
+               return << "EOF";
+\$(TMP_D)/x86_64-gcc.o:        crypto/bn/asm/x86_64-gcc.c
+       \$(CC) \$(CFLAGS) -c -o \$@ crypto/bn/asm/x86_64-gcc.c
+EOF
+               }
+       return undef;
+       }
+
 sub do_lib_rule
        {
        local($obj,$target,$name,$shlib)=@_;
        local($ret,$_,$Name);
 
        $target =~ s/\//$o/g if $o ne '/';
-       $target="\$(LIB_D)$o$target";
+       $target="$target";
        ($Name=$name) =~ tr/a-z/A-Z/;
 
        $ret.="$target: \$(${Name}OBJ)\n";
@@ -80,4 +160,17 @@ sub do_link_rule
        return($ret);
        }
 
+sub which
+       {
+       my ($name)=@_;
+       my $path;
+       foreach $path (split /:/, $ENV{PATH})
+               {
+               if (-x "$path/$name")
+                       {
+                       return "$path/$name";
+                       }
+               }
+       }
+
 1;