Minor fixes to assuage picky compilers (unsigned comparisons and

[perl5.git] / vms / gen_shrfls.pl

diff --git a/vms/gen_shrfls.pl b/vms/gen_shrfls.pl
index ef76a68..caba95c 100644 (file)
--- a/vms/gen_shrfls.pl
+++ b/vms/gen_shrfls.pl
@@ -190,7 +190,7 @@ sub scan_func {
   my($line) = @_;
 
   print "\tchecking for global routine\n" if $debug > 1;
-  if ( $line =~ /(\w+)\s+\(/ ) {
+  if ( $line =~ /(\w+)\s*\(/ ) {
     print "\troutine name is \\$1\\\n" if $debug > 1;
     if ($1 eq 'main' || $1 eq 'perl_init_ext') {
       print "\tskipped\n" if $debug > 1;
@@ -199,13 +199,6 @@ sub scan_func {
   }
 }
 
-open FUNCS, "LIBR/CROSS=SYMB LIBPERL.OLB/OUT=SYS\$OUTPUT |";
-foreach (<FUNCS>) {
-    chomp;
-    next unless /(perl_\w+)/i;
-    $fcns{uc($1)}++;
-}
-
 # Go add some right up front if we need 'em
 if ($use_mymalloc) {
   $fcns{uc('Perl_malloc')}++;
@@ -214,8 +207,6 @@ if ($use_mymalloc) {
   $fcns{uc('Perl_mfree')}++;
 }
 
-delete $fcns{PERL_DESTRUCT_LEVEL} if exists $fcns{PERL_DESTRUCT_LEVEL};
-
 $used_expectation_enum = $used_opcode_enum = 0; # avoid warnings
 if ($docc) {
   open(CPP,"${cc_cmd}/NoObj/PreProc=Sys\$Output ${dir}perl.h|")
@@ -318,21 +309,6 @@ if ($isvax) {
   print MAR "\t.title perlshr_gbl$marord\n";
 }
 
-($ver, $sub) = $] =~ /\.(\d\d\d)(\d\d)/;
-$gsmatch = ($sub >= 50) ? "equal" : "lequal";  # Force an equal match for
-                                               # dev, but be more forgiving
-                                               # for releases
-
-# Build up a major ID. Since it can only be 8 bits, we encode the version
-# number in the top four bits and use the bottom four for build options
-# that'll cause incompatibilities
-$ver *=16;
-$ver += 8 if $debugging_enabled;       # If DEBUGGING is set
-$ver += 4 if $use_threads;             # if we're threaded
-$ver += 2 if $use_mymalloc;            # if we're using perl's malloc
-
-print OPTBLD "GSMATCH=$gsmatch,$ver,$sub\n";
-
 unless ($isgcc) {
   print OPTBLD "PSECT_ATTR=\$GLOBAL_RO_VARS,PIC,NOEXE,RD,NOWRT,SHR\n";
   print OPTBLD "PSECT_ATTR=\$GLOBAL_RW_VARS,PIC,NOEXE,RD,WRT,NOSHR\n";
@@ -418,9 +394,26 @@ if ($isvax) {
 # Initial hack to permit building of compatible shareable images for a
 # given version of Perl.
 if ($ENV{PERLSHR_USE_GSMATCH}) {
-  my $major = int($] * 1000)                        & 0xFF;  # range 0..255
-  my $minor = int(($] * 1000 - $major) * 100 + 0.5) & 0xFF;  # range 0..255
-  print OPTBLD "GSMATCH=LEQUAL,$major,$minor\n";
+  if ($ENV{PERLSHR_USE_GSMATCH} eq 'INCLUDE_COMPILE_OPTIONS') {
+    # Build up a major ID. Since it can only be 8 bits, we encode the version
+    # number in the top four bits and use the bottom four for build options
+    # that'll cause incompatibilities
+    ($ver, $sub) = $] =~ /\.(\d\d\d)(\d\d)/;
+    $gsmatch = ($sub >= 50) ? "equal" : "lequal"; # Force an equal match for
+                                                 # dev, but be more forgiving
+                                                 # for releases
+
+    $ver *=16;
+    $ver += 8 if $debugging_enabled;   # If DEBUGGING is set
+    $ver += 4 if $use_threads;         # if we're threaded
+    $ver += 2 if $use_mymalloc;                # if we're using perl's malloc
+    print OPTBLD "GSMATCH=$gsmatch,$ver,$sub\n";
+  }
+  else {
+    my $major = int($] * 1000)                        & 0xFF;  # range 0..255
+    my $minor = int(($] * 1000 - $major) * 100 + 0.5) & 0xFF;  # range 0..255
+    print OPTBLD "GSMATCH=LEQUAL,$major,$minor\n";
+  }
   print OPTBLD 'CLUSTER=$$TRANSFER_VECTOR,,',
                map(",$_$objsuffix",@symfiles), "\n";
 }