From 240c052705249d64a68462f9e7c64c526a32e3d3 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Sun, 9 Dec 2018 22:15:02 +1100 Subject: Reindent lib/target.exp. --- lib/target.exp | 122 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/lib/target.exp b/lib/target.exp index d550a07..2620e30 100644 --- a/lib/target.exp +++ b/lib/target.exp @@ -135,62 +135,62 @@ proc prune_warnings { text } { regsub -all "(^|\n)(/usr/(ucb|bin)/ld.*without exceptions was\[^\n\]+\n?)" $text "\\1" text } if {[ishost "hppa*-*-hpux*"]} { - # Ignore the compiler's warnings about PA incompatibility. - regsub -all "(^|\n)\[^\n\]*PA 2.0 object file \[^\n\]* was detected. The linked output may not run on a PA 1.x system." $text "" text - - regsub -all "(^|\n)\[^\n\]*PA 2.0 object file \[^\n\]* was detected. The linked output may not run on a PA 1.x system." $text "" text - - # And the linker's +vcompatwarnings verbage. - regsub -all "(^|\n)\[^\n\]*Linker features were used that may not be supported\[^\n\]*.\[^\n\]*." $text "" text - - # Ignore these warnings, which the HP aCC compiler seems to - # generate on HP-UX 10.30 and 11.0. (Something is probably - # wrong with some system headers, but still...) - # - # This particular warning always is given with a line of warning - # text, followed by a source line, followed by a line with "^^^" - # underlining an offending symbol name. Here we slurp up the - # warning text and the next two lines, assuming that they are - # the source line and underline chars. - # - regsub -all "Warning .*The linkage directive is ignored for an object or function declared static..\[^\n\]*.\[^\n\]*." $text "" text - - # Ignore these warnings, which I often see from the ANSI C - # compiler installed on HP-UX 11.0 machines. (Something is - # probably wrong with an installation, or perhaps NLS isn't - # quite healthy yet on 11.0. In either case, it's easier to - # "fix" this nit here, than it is to track down & fix the - # root cause.) - # - # This particular warning always is given with a line of warning - # text, followed by line that says "Using internal messages". - # - regsub -all "Warning: Unable to open pxdb message catalog.*" $text "" text - regsub -all ".* Using internal messages.*" $text "" text - - # Another form of the "unable to find message catalog" warning. - # - regsub -all "cpp: warning .*Possibly incorrect message catalog." $text "" text - - # Another odd warning on 11.0. - # - regsub -all "aCC .assigner.: Warning .*Could not find library for -l.*" $text "" text - - # Oh heck, just keep adding 'em here... - # - regsub -all "aCC .assigner.: Warning .*Could not satisfy instantiation request for \[^\n\]* contained in\[^\n\]*\n\t/lib/pa20_64/lib\[a-zA-Z0-9\]*.sl" $text "" text - - # Remove the lines that are output by the HP F77 compiler to - # indicate the functions that are being compiled. - upvar compiler_type compiler_type - if { [info exists compiler_type] && $compiler_type eq "f77" } { - regsub -all "\[ \ta-zA-Z_0-9\./\]*:\[\r\n\]+" $text "" text - } - - # Ignore the warnings about unknown options - regsub -all ".*warning \[0-9\]+: Unknown option.*ignored.*" $text "" text - - } + # Ignore the compiler's warnings about PA incompatibility. + regsub -all "(^|\n)\[^\n\]*PA 2.0 object file \[^\n\]* was detected. The linked output may not run on a PA 1.x system." $text "" text + + regsub -all "(^|\n)\[^\n\]*PA 2.0 object file \[^\n\]* was detected. The linked output may not run on a PA 1.x system." $text "" text + + # And the linker's +vcompatwarnings verbage. + regsub -all "(^|\n)\[^\n\]*Linker features were used that may not be supported\[^\n\]*.\[^\n\]*." $text "" text + + # Ignore these warnings, which the HP aCC compiler seems to + # generate on HP-UX 10.30 and 11.0. (Something is probably + # wrong with some system headers, but still...) + # + # This particular warning always is given with a line of warning + # text, followed by a source line, followed by a line with "^^^" + # underlining an offending symbol name. Here we slurp up the + # warning text and the next two lines, assuming that they are + # the source line and underline chars. + # + regsub -all "Warning .*The linkage directive is ignored for an object or function declared static..\[^\n\]*.\[^\n\]*." $text "" text + + # Ignore these warnings, which I often see from the ANSI C + # compiler installed on HP-UX 11.0 machines. (Something is + # probably wrong with an installation, or perhaps NLS isn't + # quite healthy yet on 11.0. In either case, it's easier to + # "fix" this nit here, than it is to track down & fix the + # root cause.) + # + # This particular warning always is given with a line of warning + # text, followed by line that says "Using internal messages". + # + regsub -all "Warning: Unable to open pxdb message catalog.*" $text "" text + regsub -all ".* Using internal messages.*" $text "" text + + # Another form of the "unable to find message catalog" warning. + # + regsub -all "cpp: warning .*Possibly incorrect message catalog." $text "" text + + # Another odd warning on 11.0. + # + regsub -all "aCC .assigner.: Warning .*Could not find library for -l.*" $text "" text + + # Oh heck, just keep adding 'em here... + # + regsub -all "aCC .assigner.: Warning .*Could not satisfy instantiation request for \[^\n\]* contained in\[^\n\]*\n\t/lib/pa20_64/lib\[a-zA-Z0-9\]*.sl" $text "" text + + # Remove the lines that are output by the HP F77 compiler to + # indicate the functions that are being compiled. + upvar compiler_type compiler_type + if { [info exists compiler_type] && $compiler_type eq "f77" } { + regsub -all "\[ \ta-zA-Z_0-9\./\]*:\[\r\n\]+" $text "" text + } + + # Ignore the warnings about unknown options + regsub -all ".*warning \[0-9\]+: Unknown option.*ignored.*" $text "" text + + } # Ignore these. regsub -all "(^|\n)\[^\n\]*linker input file unused since linking not done" $text "" text @@ -255,9 +255,9 @@ proc prune_warnings { text } { regsub -all "(^|\n)(ld(|32|64): Giving up.*Use -wall\[^\n\]*\n?)+" $text "\\1" text # Or the NetBSD ones. - regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: this program uses \[^\n\]*)" $text "\\1" text - regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: reference to compatibility \[^\n\]*)" $text "\\1" text - regsub -all "(^|\n)(\[^\n\]*:\[0-9\]+: warning: \[^\n\]* possibly used unsafely, use \[^\n\]*\n?)" $text "\\1" text + regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: this program uses \[^\n\]*)" $text "\\1" text + regsub -all "(^|\n)(\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*warning: reference to compatibility \[^\n\]*)" $text "\\1" text + regsub -all "(^|\n)(\[^\n\]*:\[0-9\]+: warning: \[^\n\]* possibly used unsafely, use \[^\n\]*\n?)" $text "\\1" text regsub -all "(^|\n)(\[^\n\]*: warning: reference to compatibility glob\[^\n\]*\n?)" $text "\\1" text # Or the OpenBSD ones. @@ -266,10 +266,10 @@ proc prune_warnings { text } { # GNU ld warns about functions marked as dangerous in GNU libc. regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is dangerous\[^\n\]*" $text "" text - regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*the use of \[^\n\]* is dangerous, better use \[^\n\]*" $text "" text + regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*the use of \[^\n\]* is dangerous, better use \[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*is dangerous\[^\n\]*" $text "" text - # Libgloss libnosys defines functions that warn when linked in + # Libgloss libnosys defines functions that warn when linked in regsub -all "(^|\n)\[^\n\]*: In function\[^\n\]*\n\[^\n\]\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text regsub -all "(^|\n)\[^\n\]*is not implemented and will always fail\[^\n\]*" $text "" text -- cgit v1.1