Commit 8458f1bf authored by Richard Levitte's avatar Richard Levitte
Browse files

Redo the Unix source code generator 



For assembler, we want the final target to be foo.s (lowercase s).
However, the build.info may have lines like this (note upper case S):

    GENERATE[foo.S]=foo.pl

This indicates that foo.s (lowercase s) is still to be produced, but
that producing it will take an extra step via $(CC) -E.  Therefore,
the following variants (simplified for display) can be generated:

    GENERATE[foo.S]=foo.pl  =>  foo.s: foo.pl
                                	$(PERL) $foo.pl $@.S; \
                                	$(CC) $(CFLAGS) -E -P $@.S > $@ && \
                                	rm -f $@.S

    GENERATE[foo.s]=foo.pl  =>  foo.s: foo.pl
                                	$(PERL) $foo.pl $@

    GENERATE[foo.S]=foo.m4  =>  foo.s: foo.m4
                                	m4 -B 8192 $foo.m4 > $@.S; \
                                	$(CC) $(CFLAGS) -E -P $@.S > $@ && \
                                	rm -f $@.S

    GENERATE[foo.s]=foo.m4  =>  foo.s: foo.m4
                                	m4 -B 8192 $foo.m4 > $@

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent b2d6aed4

Configurations/unix-Makefile.tmpl

+29 −20
Original line number Diff line number Diff line
@@ -828,38 +828,47 @@ $args{src}: $args{generator}->[0] 
	\$(PERL) $generator > \$@

EOF

      } else {

          if ($args{generator}->[0] =~ /\.[sS]$/) {

          if ($args{generator}->[0] =~ /\.pl$/) {

              $generator = 'CC="$(CC)" $(PERL) '.$generator;

          } elsif ($args{generator}->[0] =~ /\.m4$/) {

              $generator = 'm4 -B 8192 '.$generator.' >'

          } elsif ($args{generator}->[0] =~ /\.S$/) {

              $generator = undef;

          } else {

              die "Generator type for $args{src} unknown: $generator\n";

          }



          if (defined($generator)) {

              # If the target is named foo.S in build.info, we want to

              # end up generating foo.s in two steps.

              if ($args{src} =~ /\.S$/) {

                   (my $target = $args{src}) =~ s|\.S$|.s|;

                   return <<"EOF";

$args{src}: $args{generator}->[0]

	\$(CC) \$(CFLAGS) -E \$< > \$@

$target: $args{generator}->[0]

	( trap "rm -f \$@.S" INT; \\

	  $generator \$@.S; \\

	  \$(CC) \$(CFLAGS) -E -P \$@.S > \$@ && rm -f \$@.S )

EOF

          } elsif ($args{generator}->[0] =~ /\.pl$/) {

              }

              # Otherwise....

              return <<"EOF";

$args{src}: $args{generator}->[0]

	( trap "rm -f \$@.S" INT; \\

	  CC="\$(CC)" \$(PERL) $generator \$@.S; \\

	  if grep '^#' \$@.S >/dev/null; then \\

	      \$(CC) -E -P \$@.S > \$@ && rm -f \$@.S; \\

	  else \\

	      mv \$@.S \$@; \\

	  fi )

	$generator \$@

EOF

          } elsif ($args{generator}->[0] =~ /\.m4$/) {

          }

          return <<"EOF";

$args{src}: $args{generator}->[0]

	m4 -B 8192 $generator > \$@

	\$(CC) \$(CFLAGS) -E -P \$< > \$@

EOF

          } else {

              die "Generator type for $args{src} unknown: $args{generator}\n";

          }

      }

  }



  sub src2obj {

      my %args = @_;

      my $obj = $args{obj};

      my $srcs = join(" ", @{$args{srcs}});

      my $deps = join(" ", @{$args{srcs}}, @{$args{deps}});

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

      my $srcs = join(" ",  @srcs);

      my $deps = join(" ", @srcs, @{$args{deps}});

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

      my $ecflags = { lib => '$(SHARED_CFLAGS)',

                      dso => '$(DSO_CFLAGS)',