Bypass Perl modules in build system

This change fixes the bug: https://llvm.org/bugs/show_bug.cgi?id=25975
by bypassing the perl module files which try to deduce system information.
These perl modules files don't offer useful information and are from the 
original build system. They can be removed after this change.


git-svn-id: https://llvm.org/svn/llvm-project/openmp/trunk@258843 91177308-0d34-0410-b5e6-96231b3b80d8

4 files changed, 16 insertions, 9 deletions

diff --git a/runtime/tools/check-depends.pl b/runtime/tools/check-depends.pl
index 02a7ddd..48e312a 100755
--- a/runtime/tools/check-depends.pl
+++ b/runtime/tools/check-depends.pl
@@ -18,9 +18,10 @@ use FindBin;
 use lib "$FindBin::Bin/lib";
 
 use tools;
-use Platform ":vars";
 
 our $VERSION = "0.005";
+my $target_os;
+my $target_arch;
 
 # --------------------------------------------------------------------------------------------------
 # Ouput parse error.
@@ -331,7 +332,8 @@ my $expected;
 my $bare;
 Getopt::Long::Configure( "permute" );
 get_options(
-    Platform::target_options(),
+    "os=s"       => \$target_os,
+    "arch=s"     => \$target_arch,
     "bare"       => \$bare,
     "expected=s" => \$expected,
 );
diff --git a/runtime/tools/check-execstack.pl b/runtime/tools/check-execstack.pl
index 43c2bb2..cf24742 100755
--- a/runtime/tools/check-execstack.pl
+++ b/runtime/tools/check-execstack.pl
@@ -18,9 +18,9 @@ use FindBin;
 use lib "$FindBin::Bin/lib";
 
 use tools;
-use Platform ":vars";
 
 our $VERSION = "0.002";
+my $target_arch;
 
 sub execstack($) {
     my ( $file ) = @_;
@@ -56,7 +56,7 @@ sub execstack($) {
 }; # sub execstack
 
 get_options(
-    Platform::target_options(),
+    "arch=s" => \$target_arch,
 );
 
 foreach my $file ( @ARGV ) {
diff --git a/runtime/tools/check-instruction-set.pl b/runtime/tools/check-instruction-set.pl
index b77e207..b505e48 100755
--- a/runtime/tools/check-instruction-set.pl
+++ b/runtime/tools/check-instruction-set.pl
@@ -17,10 +17,12 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/lib";
 
-use Platform ":vars";
 use tools;
 
 our $VERSION = "0.004";
+my $target_os;
+my $target_arch;
+my $target_mic_arch;
 
 my $hex = qr{[0-9a-f]}i;    # hex digit.
 
@@ -182,17 +184,20 @@ sub check_file($;$$) {
 my $max_instructions;
 my $show_instructions;
 get_options(
+    "os=s"               => \$target_os,
+    "arch=s"             => \$target_arch,
+    "mic-arch=s"         => \$target_mic_arch,
     "max-instructions=i" => \$max_instructions,
     "show-instructions!" => \$show_instructions,
-    Platform::target_options(),
 );
+my $target_platform = $target_os . "_" . $target_arch;
 if ( "$target_os" eq "lin" and "$target_mic_arch" eq "knf" ) {
     $mic_bad_re = qr{^(?:pause|[slm]fence|scatter|gather|cmpxchg16b|clevict[12])}i;
 } else {
     $mic_bad_re = qr{^(?:pause|[slm]fence|scatter|gather|cmov|cmpxchg16b|clevict[12])}i;
 };
 if ( 0 ) {
-} elsif ( $target_os eq "lin" and $target_arch eq "mic" ) {
+} elsif ( $target_platform eq "lin_mic" ) {
     *bad_instr = \*bad_mic_instr;
     *bad_fmt   = \*bad_mic_fmt;
 } elsif ( $target_platform eq "lin_32" ) {
diff --git a/runtime/tools/message-converter.pl b/runtime/tools/message-converter.pl
index f4f4b99..e22c928 100755
--- a/runtime/tools/message-converter.pl
+++ b/runtime/tools/message-converter.pl
@@ -21,11 +21,11 @@ use FindBin;
 use lib "$FindBin::Bin/lib";
 
 use tools;
-use Platform ":vars";
 
 our $VERSION = "0.04";
 my $escape      = qr{%};
 my $placeholder = qr{(\d)\$(s|l?[du])};
+my $target_os;
 
 my $sections =
     {
@@ -467,7 +467,7 @@ my $message_file;
 my $id;
 my $prefix = "";
 get_options(
-    Platform::target_options(),
+    "os=s"             => \$target_os,
     "enum-file=s"      => \$enum_file,
     "signature-file=s" => \$signature_file,
     "default-file=s"   => \$default_file,