diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/ChangeLog | 17 | ||||
| -rwxr-xr-x | contrib/check_GNU_style.sh | 117 | ||||
| -rwxr-xr-x | contrib/compare-debug | 6 | ||||
| -rw-r--r-- | contrib/make_sunver.pl | 280 |
4 files changed, 418 insertions, 2 deletions
diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 12271531ddf..5175d512d52 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,20 @@ +2010-07-08 Eric Botcazou <ebotcazou@adacore.com> + + * make_sunver.pl: Remove extra whitespace in regexp. + +2010-07-02 Sebastian Pop <sebastian.pop@amd.com> + + * check_GNU_style.sh: New. + +2010-07-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * make_sunver.pl: New file. + +2010-07-02 Iain Sandoe <iains@gcc.gnu.org> + + * compare-debug (Darwin): Remove '-x' flag from ld-based object + stripping. Add a comment as to why we do it this way. + 2010-06-20 Alexandre Oliva <aoliva@redhat.com> * compare-debug: Drop LTO sections. diff --git a/contrib/check_GNU_style.sh b/contrib/check_GNU_style.sh new file mode 100755 index 00000000000..6396417fab7 --- /dev/null +++ b/contrib/check_GNU_style.sh @@ -0,0 +1,117 @@ +#!/bin/sh + +# Checks some of the GNU style formatting rules in a set of patches. +# Copyright (C) 2010 Free Software Foundation, Inc. +# Contributed by Sebastian Pop <sebastian.pop@amd.com> + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +usage() { + cat <<EOF +check_GNU_style.sh [patch]... + + Checks the patches for some of the GNU style formatting problems. + Please note that these checks are not always accurate, and + complete. The reference documentation of the GNU Coding Standards + can be found here: http://www.gnu.org/prep/standards_toc.html + and there are also some additional coding conventions for GCC: + http://gcc.gnu.org/codingconventions.html + +EOF + exit 1 +} + +test $# -eq 0 && usage + +tmp=check_GNU_style.tmp + +# Grep +g (){ + msg="$1" + arg="$2" + shift 2 + grep -nH '^+' $* \ + | grep -v ':+++' \ + | egrep --color=always -- "$arg" \ + > $tmp && printf "\n$msg\n" + cat $tmp +} + +# And Grep +ag (){ + msg="$1" + arg1="$2" + arg2="$3" + shift 3 + grep -nH '^+' $* \ + | grep -v ':+++' \ + | egrep --color=always -- "$arg1" \ + | egrep --color=always -- "$arg2" \ + > $tmp && printf "\n$msg\n" + cat $tmp +} + +# reVerse Grep +vg (){ + msg="$1" + varg="$2" + arg="$3" + shift 3 + grep -nH '^+' $* \ + | grep -v ':+++' \ + | egrep -v -- "$varg" \ + | egrep --color=always -- "$arg" \ + > $tmp && printf "\n$msg\n" + cat $tmp +} + +col (){ + msg="$1" + shift 1 + grep -nH '^+' $* \ + | grep -v ':+++' \ + | cut -f 2 -d '+' \ + | awk '{ if (length ($0) > 80) print $0 }' \ + > $tmp && printf "\n$msg\n" + cat $tmp +} + +col 'Lines should not exceed 80 characters.' $* + +g 'Trailing whitespace.' \ + '[[:space:]]$' $* + +g 'Space before dot.' \ + '[[:alnum:]][[:blank:]]+\.' $* + +g 'Dot, space, space, new sentence.' \ + '[[:alnum:]]\.([[:blank:]]|[[:blank:]]{3,})[[:alnum:]]' $* + +g 'Dot, space, space, end of comment.' \ + '[[:alnum:]]\.([[:blank:]]{0,1}|[[:blank:]]{3,})\*/' $* + +g 'Sentences should end with a dot. Dot, space, space, end of the comment.' \ + '[[:alnum:]][[:blank:]]*\*/' $* + +vg 'There should be exactly one space between function name and parentheses.' \ + '\#define' '[[:alnum:]]([^[:blank:]]|[[:blank:]]{2,})\(' $* + +g 'There should be no space before closing parentheses.' \ + '[[:graph:]][[:blank:]]+\)' $* + +ag 'Braces should be on a separate line.' \ + '\{' 'if[[:blank:]]\(|while[[:blank:]]\(|switch[[:blank:]]\(' $* + + diff --git a/contrib/compare-debug b/contrib/compare-debug index 820721cd971..ea68b437db0 100755 --- a/contrib/compare-debug +++ b/contrib/compare-debug @@ -59,8 +59,10 @@ trap 'rm -f "$1.$suf1" "$2.$suf2"' 0 1 2 15 case `uname -s` in Darwin) - ld -S -x -r -no_uuid "$1" -o "$1.$suf1" - ld -S -x -r -no_uuid "$2" -o "$2.$suf2" + # The strip command on darwin does not remove all debug info. + # Fortunately, we can use ld to do it instead. + ld -S -r -no_uuid "$1" -o "$1.$suf1" + ld -S -r -no_uuid "$2" -o "$2.$suf2" ;; *) cp "$1" "$1.$suf1" diff --git a/contrib/make_sunver.pl b/contrib/make_sunver.pl new file mode 100644 index 00000000000..d0875781dc6 --- /dev/null +++ b/contrib/make_sunver.pl @@ -0,0 +1,280 @@ +#!/usr/bin/perl -w + +# make_sunver.pl +# +# This script takes at least two arguments, a GNU style version script and +# a list of object and archive files, and generates a corresponding Sun +# style version script as follows: +# +# Each glob pattern, C++ mangled pattern or literal in the input script is +# matched against all global symbols in the input objects, emitting those +# that matched (or nothing if no match was found). +# A comment with the original pattern and its type is left in the output +# file to make it easy to understand the matches. +# +# It expects a 'nm' with the POSIX '-P' option, but everyone has one of +# those, right? +# It depends on the GNU version of c++filt, since it must understand the +# GNU mangling style. + +use File::Glob ':glob'; +use FileHandle; +use IPC::Open2; + +# Input version script, GNU style. +my $symvers = shift; + +########## +# Get all the symbols from the library, match them, and add them to a hash. + +my %sym_hash = (); + +# List of objects and archives to process. +my @OBJECTS = (); + +# List of shared objects to omit from processing. +my @SHAREDOBJS = (); + +# Filter out those input archives that have corresponding shared objects to +# avoid adding all symbols matched in the archive to the output map. +foreach $file (@ARGV) { + if (($so = $file) =~ s/\.a$/.so/ && -e $so) { + printf STDERR "omitted $file -> $so\n"; + push (@SHAREDOBJS, $so); + } else { + push (@OBJECTS, $file); + } +} + +# The nm command to use. +my $nm = $ENV{'NM_FOR_TARGET'} || "nm"; + +# Process each symbol. +open NM,$nm.' -P '.(join ' ',@OBJECTS).'|' or die $!; +while (<NM>) { + my $i; + chomp; + + # nm prints out stuff at the start, ignore it. + next if (/^$/); + next if (/:$/); + # Ignore register (SPARC only), undefined and local symbols. The + # symbol name is optional; Sun nm emits none for local or .bss symbols. + next if (/^([^ ]+)?[ \t]+[RUa-z][ \t]+/); + # Ignore objects without symbol table. Message goes to stdout with Sun + # nm, while GNU nm emits the corresponding message to stderr. + next if (/.* - No symbol table data/); + + # $sym is the name of the symbol. + die "unknown nm output $_" if (! /^([^ ]+)[ \t]+[A-Z][ \t]+/); + my $sym = $1; + + # Remember symbol. + $sym_hash{$sym}++; +} +close NM or die "nm error"; + +########## +# The various types of glob patterns. +# +# A glob pattern that is to be applied to the demangled name: 'cxx'. +# A glob patterns that applies directly to the name in the .o files: 'glob'. +# This pattern is ignored; used for local variables (usually just '*'): 'ign'. + +# The type of the current pattern. +my $glob = 'glob'; + +# We're currently inside `extern "C++"', which Sun ld doesn't understand. +my $in_extern = 0; + +# We're currently inside a conditional section: just skip it. +my $in_ifdef = 0; + +# The c++filt command to use. This *must* be GNU c++filt; the Sun Studio +# c++filt doesn't handle the GNU mangling style. +my $cxxfilt = $ENV{'CXXFILT'} || "c++filt"; + +# The current version name. +my $current_version = ""; + +# Was there any attempt to match a symbol to this version? +my $matches_attempted; + +# The number of versions which matched this symbol. +my $matched_symbols; + +open F,$symvers or die $!; + +# Print information about generating this file +print "# This file was generated by make_sunver.pl. DO NOT EDIT!\n"; +print "# It was generated by:\n"; +printf "# %s %s %s\n", $0, $symvers, (join ' ',@ARGV); +printf "# Omitted archives with corresponding shared libraries: %s\n", + (join ' ', @SHAREDOBJS) if $#SHAREDOBJS >= 0; +print "#\n\n"; + +while (<F>) { + # End of skipped section. + if (/^[ \t]*\#endif/) { + $in_ifdef = 0; + next; + } + + # Just skip a conditional section. + if ($in_ifdef) { next; } + + # Lines of the form '};' + if (/^([ \t]*)(\}[ \t]*;[ \t]*)$/) { + $glob = 'glob'; + if ($in_extern) { + $in_extern--; + print "$1##$2"; + } else { + print; + } + next; + } + + # Lines of the form '} SOME_VERSION_NAME_1.0;' + if (/^[ \t]*\}[ \tA-Z0-9_.a-z]+;[ \t]*$/) { + $glob = 'glob'; + # We tried to match symbols agains this version, but none matched. + # Emit dummy hidden symbol to avoid marking this version WEAK. + if ($matches_attempted && $matched_symbols == 0) { + print " hidden:\n"; + print " .force_WEAK_off_$current_version = DATA S0x0 V0x0;\n"; + } + print; next; + } + + # Special comments that look like C preprocessor conditionals. + # Just skip the contents for now. + # FIXME: Allow passing in conditionals from the command line to really + # control the skipping. + if (/^[ \t]*\#ifdef/) { + $in_ifdef = 1; + next; + } + + # Comment and blank lines + if (/^[ \t]*\#/) { print; next; } + if (/^[ \t]*$/) { print; next; } + + # Lines of the form '{' + if (/^([ \t]*){$/) { + if ($in_extern) { + print "$1##{\n"; + } else { + print; + } + next; + } + + # Lines of the form 'SOME_VERSION_NAME_1.1 {' + if (/^([A-Z0-9_.]+)[ \t]+{$/) { + # Record version name. + $current_version = $1; + # Reset match attempts, #matched symbols for this version. + $matches_attempted = 0; + $matched_symbols = 0; + print; + next; + } + + # Ignore 'global:' + if (/^[ \t]*global:$/) { print; next; } + + # After 'local:', globs should be ignored, they won't be exported. + if (/^[ \t]*local:$/) { + $glob = 'ign'; + print; + next; + } + + # After 'extern "C++"', globs are C++ patterns + if (/^([ \t]*)(extern \"C\+\+\"[ \t]*)$/) { + $in_extern++; + $glob = 'cxx'; + # Need to comment, Sun ld cannot handle this. + print "$1##$2\n"; next; + } + + # Chomp newline now we're done with passing through the input file. + chomp; + + # Catch globs. Note that '{}' is not allowed in globs by this script, + # so only '*' and '[]' are available. + if (/^([ \t]*)([^ \t;{}#]+);?[ \t]*$/) { + my $ws = $1; + my $ptn = $2; + # Turn the glob into a regex by replacing '*' with '.*'. + # Keep $ptn so we can still print the original form. + ($pattern = $ptn) =~ s/\*/\.\*/g; + + if ($glob eq 'ign') { + # We're in a local: * section; just continue. + print "$_\n"; + next; + } + + # Print the glob commented for human readers. + print "$ws##$ptn ($glob)\n"; + # We tried to match a symbol to this version. + $matches_attempted++; + + if ($glob eq 'glob') { + my %ptn_syms = (); + + # Match ptn against symbols in %sym_hash. + foreach my $sym (keys %sym_hash) { + # Maybe it matches one of the patterns based on the symbol in + # the .o file. + $ptn_syms{$sym}++ if ($sym =~ /^$pattern$/); + } + + foreach my $sym (sort keys(%ptn_syms)) { + $matched_symbols++; + print "$ws$sym;\n"; + } + } elsif ($glob eq 'cxx') { + my %dem_syms = (); + + # Verify that we're actually using GNU c++filt. Other versions + # most likely cannot handle GNU style symbol mangling. + my $cxxout = `$cxxfilt --version 2>&1`; + $cxxout =~ m/GNU/ or die "$0 requires GNU c++filt to function"; + + # Talk to c++filt through a pair of file descriptors. + # Need to start a fresh instance per pattern, otherwise the + # process grows to 500+ MB. + my $pid = open2(*FILTIN, *FILTOUT, $cxxfilt) or die $!; + + # Match ptn against symbols in %sym_hash. + foreach my $sym (keys %sym_hash) { + # No? Well, maybe its demangled form matches one of those + # patterns. + printf FILTOUT "%s\n",$sym; + my $dem = <FILTIN>; + chomp $dem; + $dem_syms{$sym}++ if ($dem =~ /^$pattern$/); + } + + close FILTOUT or die "c++filt error"; + close FILTIN or die "c++filt error"; + # Need to wait for the c++filt process to avoid lots of zombies. + waitpid $pid, 0; + + foreach my $sym (sort keys(%dem_syms)) { + $matched_symbols++; + print "$ws$sym;\n"; + } + } else { + # No? Well, then ignore it. + } + next; + } + # Important sanity check. This script can't handle lots of formats + # that GNU ld can, so be sure to error out if one is seen! + die "strange line `$_'"; +} +close F; |