Remove EDG support

Author: michael-schwarz

lib/perl5/patcher

@@ -3,12 +3,12 @@
 #
 #
 #
-# Copyright (c) 2001-2002, 
+# Copyright (c) 2001-2002,
 #  George C. Necula    <[email protected]>
 #  Scott McPeak        <[email protected]>
 #  Wes Weimer          <[email protected]>
 # All rights reserved.
-# 
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
@@ -61,19 +61,18 @@ sub printHelp {
 Patch include files
 Usage: patcher [options] args
 
-options: 
+options:
   --help       Prints this help message
   --verbose    Prints a lot of information about what is being done
-  --mode=xxx   What tool to emulate: 
+  --mode=xxx   What tool to emulate:
                 GNUCC   - GNU CC
-                EDG     - EDG front end
 
   --dest=xxx   The destination directory. Will make one if it does not exist
   --patch=xxx  Patch file (can be specified multiple times)
 
   --ufile=xxx  A user-include file to be patched (treated as \#include "xxx")
   --sfile=xxx  A system-include file to be patched (treated as \#include <xxx>)
- 
+
   --clean       Remove all files in the destination directory
   --skipmissing Skip patches for files whose original cannot be found
   --dumpversion Print the version name used for the current compiler
@@ -161,7 +160,7 @@ foreach $file (@{$option{ufile}}) {
 }
 foreach $file (@{$option{sfile}}) {
     &patchOneFile($file, 1);
-} 
+}
 
 # Now check whether we have used all the patches
 my $hadError = 0;
@@ -187,7 +186,7 @@ foreach my $patch (@patches) {
         next;
     }
     # It was not in a group and was not optional
-    if(! defined $patch->{USED}) { 
+    if(! defined $patch->{USED}) {
         $hadError = 1;
         print "Non-optional patch was not used:\n\tfrom $patch->{PATCHFILE} at $patch->{PATCHLINENO}\n";
         next;
@@ -196,12 +195,12 @@ foreach my $patch (@patches) {
 exit $hadError;
 
 
-############# SUBROUTINES 
+############# SUBROUTINES
 sub findCompilerVersion {
     $cname = "";
     $cversion = 0;
     $cname = "GNU CC";
-    open(VER, "$::cc -dumpversion $ppargs|") 
+    open(VER, "$::cc -dumpversion $ppargs|")
         || die "Cannot start $cname";
     while(<VER>) {
         # sm: had to modify this to match "egcs-2.91.66", which is
@@ -224,9 +223,6 @@ sub lineDirective {
     if($option{mode} eq "GNUCC") {
         return "#line $lineno \"$fileName\"\n";
     }
-    if($option{mode} eq "EDG") {
-        return "# $lineno \"$fileName\"\n";
-    }
     die "lineDirective: invalid mode";
 }
 
@@ -240,7 +236,7 @@ sub patchOneFile {
     open(TOPREPROC, ">$preprocfile.c") || die "Cannot open preprocessor file";
     print TOPREPROC "#include $fname1\n";
     close(TOPREPROC);
-    # Do not test for error while running the preprocessor because the 
+    # Do not test for error while running the preprocessor because the
     # error might be due to an #error directive
     my $preproccmd = "";
     if($option{mode} eq "GNUCC") {
@@ -250,7 +246,7 @@ sub patchOneFile {
 	    $preproccmd .= " 2>/dev/null";
 	}
     } else { die "Invalid --mode"; }
-    
+
     # Now scan the resulting file and get the real name of the file
     my $absname = "";
     open(PPOUT, "<$preprocfile.i") || die "Cannot find $preprocfile.i";
@@ -363,7 +359,7 @@ sub preparePatchFile {
         my $current_pattern = [];
         my @all_patterns = ();
         if($_ =~ m|^===|) {
-            if(! defined $valueflags{ateof} && 
+            if(! defined $valueflags{ateof} &&
                ! defined $valueflags{atsof}) {
                 die "A pattern is missing in $pFile";
             }
@@ -397,8 +393,8 @@ sub preparePatchFile {
         my $replacement = "";
         # If we have more than one non-optional pattern with no group
         # specified, then create a group
-        if(@all_patterns > 1 && 
-           ! defined $valueflags{group} && 
+        if(@all_patterns > 1 &&
+           ! defined $valueflags{group} &&
            ! defined $valueflags{optional}) {
             $valueflags{group} = $pFile . "_$patchStartLine";
         }
@@ -439,7 +435,7 @@ sub preparePatchFile {
         die "Cannot close patch file $pFile\n";
     print "Loaded patches from $pFile\n";
     # print Dumper(\@patches); die "Here\n";
-    
+
 }
 
 sub trimSpaces {
@@ -480,7 +476,7 @@ sub applyPatches {
         $patch->{USE} = 1;
         my $infile = $patch->{FLAGS}->{file};
         if(defined $infile && $in !~ m|$infile$|) {
-#            print "Will not use patch ", 
+#            print "Will not use patch ",
 #                  &lineDirective($patch->{PATCHFILE},$patch->{PATCHLINENO});
             $patch->{USE} = 0;
             next;
@@ -492,15 +488,15 @@ sub applyPatches {
             next;
         }
         # Disable also (for now) the patches that must be applied at EOF
-        if(defined $patch->{FLAGS}->{ateof} || 
+        if(defined $patch->{FLAGS}->{ateof} ||
            defined $patch->{FLAGS}->{atsof} ||
            defined $patch->{FLAGS}->{disabled} ) {
             $patch->{USE} = 0;
             push @eof_patches, $patch;
         }
-        
+
     }
-        
+
     open(OUT, ">$out") || die "Cannot open patch output file $out";
     open(IN, "<$in") || die "Cannot open patch input file $in";