Commit 66a24ab8 authored by Richard Levitte's avatar Richard Levitte
Browse files

Add build file support for generic symbol exports with DSOs 



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

Configurations/common.tmpl

+8 −1
Original line number Diff line number Diff line
@@ -78,6 +78,7 @@ 
             if ref $unified_info{generate}->{$src} eq "";

         my $script = $unified_info{generate}->{$src}->[0];

         $OUT .= generatesrc(src => $src,

                             product => $bin,

                             generator => $unified_info{generate}->{$src},

                             generator_incs => $unified_info{includes}->{$script},

                             generator_deps => $unified_info{depends}->{$script},
@@ -159,7 +160,13 @@ 
                     deps => [ resolvedepends($lib) ],

                     installed => is_installed($lib));

     foreach (@{$unified_info{shared_sources}->{$lib}}) {

         # If this is somehow a compiled object, take care of it that way

         # Otherwise, it might simply be generated

         if (defined $unified_info{sources}->{$_}) {

             doobj($_, $lib, intent => "dso", installed => is_installed($lib));

         } else {

             dogenerate($_, undef, $lib, intent => "dso");

         }

     }

     $cache{$lib} = 1;

 }

Configurations/descrip.mms.tmpl

+17 −11
Original line number Diff line number Diff line
@@ -758,9 +758,12 @@ reconfigure reconf : 
      if ($args{src} =~ /\.ld$/) {

          (my $target = $args{src}) =~ s/\.ld$/.OPT/;

          my $mkdef = sourcefile('util', 'mkdef.pl');

          my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION)' : '';

          my $ord_name =

              $args{generator}->[1] || basename($args{product}, '.EXE');

          return <<"EOF";

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

	\$(PERL) $mkdef --ordinals $args{generator}->[0] --name $args{generator}->[1] "--OS" "VMS" > $target

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

	\$(PERL) $mkdef$ord_ver --ordinals $args{generator}->[0] --name $ord_name "--OS" "VMS" > $target

EOF

      } elsif ($target !~ /\.[sS]$/) {

          my $target = $args{src};
@@ -925,7 +928,7 @@ EOF 
                 grep { $_ =~ m|\.o$| }

                 @{$args{objs}};

      my @defs = map { (my $x = $_) =~ s|\.ld$|.OPT|; $x }

                 grep { $_ =~ /\.ld$/ }

                 grep { $_ =~ m|\.ld$| }

                 @{$args{objs}};

      my @deps = compute_lib_depends(@{$args{deps}});

      die "More than one symbol vector" if scalar @defs > 1;
@@ -971,13 +974,16 @@ EOF 
      my $libd = dirname($lib);

      my $libn = basename($lib);

      (my $libn_nolib = $libn) =~ s/^lib//;

      my @objs = map { (my $x = $_) =~ s|\.o$|.OBJ|; $x } @{$args{objs}};

      my @objs = map { (my $x = $_) =~ s|\.o$|.OBJ|; $x }

                 grep { $_ =~ m|\.o$| }

                 @{$args{objs}};

      my @defs = map { (my $x = $_) =~ s|\.ld$|.OPT|; $x }

                 grep { $_ =~ m|\.ld$| }

                 @{$args{objs}};

      my @deps = compute_lib_depends(@{$args{deps}});

      my $deps = join(", -\n\t\t", @objs, @deps);

      my $deps = join(", -\n\t\t", @objs, @defs, @deps);

      die "More than one symbol vector" if scalar @defs > 1;

      my $shlib_target = $disabled{shared} ? "" : $target{shared_target};

      my $engine_opt = abs2rel(rel2abs(catfile($config{sourcedir},

                                               "VMS", "engine.opt")),

                               rel2abs($config{builddir}));

      # The "[]" hack is because in .OPT files, each line inherits the

      # previous line's file spec as default, so if no directory spec

      # is present in the current line and the previous line has one that
@@ -994,12 +1000,12 @@ EOF 
          || "\@ !";

      return <<"EOF"

$lib.EXE : $deps

        OPEN/WRITE/SHARE=READ OPT_FILE $lib.OPT

        TYPE $engine_opt /OUTPUT=OPT_FILE:

        OPEN/WRITE/SHARE=READ OPT_FILE $lib-components.OPT

        $write_opt1

        $write_opt2

        CLOSE OPT_FILE

        LINK \$(DSO_LDFLAGS)/SHARE=\$\@ $lib.OPT/OPT \$(DSO_EX_LIBS)

        LINK \$(DSO_LDFLAGS)/SHARE=\$\@ $defs[0]/OPT,-

		$lib-components.OPT/OPT \$(DSO_EX_LIBS)

        - PURGE $lib.EXE,$lib.OPT,$lib.MAP

EOF

        . ($config{target} =~ m|alpha| ? "" : <<"EOF"

Configurations/unix-Makefile.tmpl

+12 −5
Original line number Diff line number Diff line
@@ -1001,9 +1001,12 @@ reconfigure reconf: 
      if ($args{src} =~ /\.ld$/) {

          (my $target = $args{src}) =~ s/\.ld$/${defext}/;

          (my $mkdef_os = $target{shared_target}) =~ s|-shared$||;

          my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION)' : '';

          my $ord_name =

              $args{generator}->[1] || basename($args{product}, $dsoext);

          return <<"EOF";

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

	\$(PERL) \$(SRCDIR)/util/mkdef.pl --ordinals $args{generator}->[0] --name $args{generator}->[1] --OS $mkdef_os > $target

$target: $args{generator}->[0] $deps \$(SRCDIR)/util/mkdef.pl

	\$(PERL) \$(SRCDIR)/util/mkdef.pl$ord_ver --ordinals $args{generator}->[0]  --name $ord_name --OS $mkdef_os > $target

EOF

      } elsif ($args{src} !~ /\.[sS]$/) {

          if ($args{generator}->[0] =~ m|^.*\.in$|) {
@@ -1222,14 +1225,18 @@ EOF 
      my @objs = map { (my $x = $_) =~ s|\.o$||; "$x$objext" }

                 grep { $_ !~ m/\.ld$/ }

                 @{$args{objs}};

      my @defs = map { (my $x = $_) =~ s|\.ld$||; "$x$defext" }

                 grep { $_ =~ /\.ld$/ }

                 @{$args{objs}};

      my @deps = compute_lib_depends(@{$args{deps}});

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

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

      my $deps = join(" ", @objs, @defs, @deps);

      my $target = dso($dso);

      my $shared_def = join("", map { ' '.$target{shared_defflag}.$_ } @defs);

      return <<"EOF";

$target: $objs $deps

$target: $deps

	\$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\

		-o $target $objs \\

		-o $target$shared_def $objs \\

                $linklibs \$(DSO_EX_LIBS)

EOF

  }

Configurations/windows-makefile.tmpl

+15 −10
Original line number Diff line number Diff line
@@ -512,9 +512,12 @@ reconfigure reconf: 
          my $mkdef = abs2rel(rel2abs(catfile($config{sourcedir},

                                              "util", "mkdef.pl")),

                              rel2abs($config{builddir}));

          my $ord_ver = $args{intent} eq 'lib' ? ' --version $(VERSION)' : '';

          my $ord_name =

              $args{generator}->[1] || basename($args{product}, $dsoext);

          return <<"EOF";

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

	\$(PERL) $mkdef --ordinals $args{generator}->[0] --name $args{generator}->[1] --OS windows > $target

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

	\$(PERL) $mkdef$ord_ver --ordinals $args{generator}->[0] --name $ord_name --OS windows > $target

EOF

      } elsif ($args{src} !~ /\.[sS]$/) {

          my $target = $args{src};
@@ -670,20 +673,22 @@ EOF 
     my %args = @_;

     my $dso = $args{lib};

     my $dso_n = basename($dso);

     my @objs = map { (my $x = $_) =~ s|\.o$|$objext|; $x } @{$args{objs}};

     my @objs = map { (my $x = $_) =~ s|\.o$|$objext|; $x }

                grep { $_ =~ m/\.(?:o|res)$/ }

                @{$args{objs}};

     my @defs = map { (my $x = $_) =~ s|\.ld$|$defext|; $x }

                grep { $_ =~ /\.ld$/ }

                @{$args{objs}};

     my @deps = compute_lib_depends(@{$args{deps}});

     my $objs = join("\n", @objs);

     my $linklibs = join("", map { "$_\n" } @deps);

     my $deps = join(" ", @objs, @deps);

     my $deps = join(" ", @objs, @defs, @deps);

     my $shared_def = join("", map { " /def:$_" } @defs);

     return <<"EOF";

$dso$dsoext: $deps

	IF EXIST $dso$dsoext.manifest DEL /F /Q $dso$dsoext.manifest

	\$(LD) \$(LDFLAGS) \$(DSO_LDFLAGS) \$(LDOUTFLAG)$dso$dsoext /def:<< @<<

LIBRARY         $dso_n

EXPORTS

    bind_engine		@1

    v_check		@2

<<

	\$(LD) \$(LDFLAGS) \$(DSO_LDFLAGS) \\

		\$(LDOUTFLAG)$dso$dsoext$shared_def @<< || (DEL /Q \$(\@B).* $dso.* && EXIT 1)

$objs

$linklibs \$(DSO_EX_LIBS)

<<