Commit e4366648 authored by Richard Levitte's avatar Richard Levitte
Browse files

VMS build: better treatment of .S -> .obj compilation 



It turned out that .S files aren't to be treated as lightly as I
thought.  They need to go through a preprocessing step, which .s files
don't need to.

Corrects #7703

Reviewed-by: default avatarTim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7889)
parent 00eb879f

Configurations/descrip.mms.tmpl

+36 −16
Original line number Diff line number Diff line
@@ -844,7 +844,7 @@ EOF 


  sub src2obj {

      my %args = @_;

      my @srcs = map { (my $x = $_) =~ s/\.[sS]$/.asm/; $x

      my @srcs = map { (my $x = $_) =~ s/\.s$/.asm/; $x

                     } ( @{$args{srcs}} );

      (my $obj = $args{obj}) =~ s|\.o$||;

      my $deps = join(", -\n\t\t", @srcs, @{$args{deps}});
@@ -864,20 +864,6 @@ EOF 
      my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !";

      my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !";



      if ($srcs[0] =~ /\.asm$/) {

          my $asflags = { shlib => ' $(LIB_ASFLAGS)',

		          lib => ' $(LIB_ASFLAGS)',

		          dso => ' $(DSO_ASFLAGS)',

		          bin => ' $(BIN_ASFLAGS)' } -> {$args{intent}};

          return <<"EOF";

$obj.OBJ : $deps

        ${before}

        SET DEFAULT $forward

        \$(AS) $asflags \$(ASOUTFLAG)${objd}${objn}.OBJ $srcs

        SET DEFAULT $backward

EOF

      }



      my $cflags;

      if ($args{installed}) {

          $cflags = { shlib => '$(LIB_CFLAGS)',
@@ -895,6 +881,10 @@ EOF 
		   dso => '$(DSO_CPPFLAGS)',

		   bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};

      my $defs = join("", map { ",".$_ } @{$args{defs}});

      my $asflags = { shlib => ' $(LIB_ASFLAGS)',

		      lib => ' $(LIB_ASFLAGS)',

		      dso => ' $(DSO_ASFLAGS)',

		      bin => ' $(BIN_ASFLAGS)' } -> {$args{intent}};



      my @incs_cmds = includes({ shlib => '$(LIB_INCLUDES)',

                                 lib => '$(LIB_INCLUDES)',
@@ -907,6 +897,36 @@ EOF 
                               } @{$args{incs}});

      my $incs_on = join("\n\t\@ ", @{$incs_cmds[0]}) || '!';

      my $incs_off = join("\n\t\@ ", @{$incs_cmds[1]}) || '!';



      if ($srcs[0] =~ /\.asm$/) {

          return <<"EOF";

$obj.OBJ : $deps

        ${before}

        SET DEFAULT $forward

        \$(AS) $asflags \$(ASOUTFLAG)${objd}${objn}.OBJ $srcs

        SET DEFAULT $backward

        ${after}

        - PURGE $obj.OBJ

EOF

      } elsif ($srcs[0] =~ /.S$/) {

         return <<"EOF";

$obj.OBJ : $deps

        ${before}

        SET DEFAULT $forward

        \@ $incs_on

        \@ extradefines = "$defs"

        PIPE \$(CPP) ${cflags} $srcs | -

             \$(PERL) -ne "/^#(\\s*line)?\\s*[0-9]+\\s+""/ or print" -

             > ${objd}${objn}.asm

        \@ DELETE/SYMBOL/LOCAL extradefines

        \@ $incs_off

        SET DEFAULT $backward

        ${after}

        \$(AS) $asflags \$(ASOUTFLAG)$obj.OBJ $obj.asm

        - PURGE $obj.OBJ

EOF

      }



      my $depbuild = $disabled{makedepend} ? ""

          : " /MMS=(FILE=${objd}${objn}.D,TARGET=$obj.OBJ)";