diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-12-21 22:21:08 +1100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-12-21 22:21:08 +1100 |
| commit | c2a7dcad9f0d92d7a96e735abb8bec7b9c621536 (patch) | |
| tree | bf9b20fdd5ab07e5b0e4e0b95c6a3dbab1005cb9 /scripts | |
| parent | 373a6da165ac3012a74fd072da340eabca55d031 (diff) | |
| parent | ea67db4cdbbf7f4e74150e71da0984e25121f500 (diff) | |
| download | talos-obmc-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.tar.gz talos-obmc-linux-c2a7dcad9f0d92d7a96e735abb8bec7b9c621536.zip | |
Merge branch 'linux-2.6'
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/bloat-o-meter | 3 | ||||
| -rw-r--r-- | scripts/mkmakefile | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/scripts/bloat-o-meter b/scripts/bloat-o-meter index ce59fc2d8de4..6501a50e17f0 100755 --- a/scripts/bloat-o-meter +++ b/scripts/bloat-o-meter @@ -18,7 +18,8 @@ def getsizes(file): for l in os.popen("nm --size-sort " + file).readlines(): size, type, name = l[:-1].split() if type in "tTdDbB": - if "." in name: name = "static." + name.split(".")[0] + # function names begin with '.' on 64-bit powerpc + if "." in name[1:]: name = "static." + name.split(".")[0] sym[name] = sym.get(name, 0) + int(size, 16) return sym diff --git a/scripts/mkmakefile b/scripts/mkmakefile index 9ad1bd793252..e0f54b9d8fec 100644 --- a/scripts/mkmakefile +++ b/scripts/mkmakefile @@ -13,7 +13,7 @@ test ! -r $2/Makefile -o -O $2/Makefile || exit 0 # Only overwrite automatically generated Makefiles # (so we do not overwrite kernel Makefile) -if ! grep -q Automatically $2/Makefile +if test -e $2/Makefile && ! grep -q Automatically $2/Makefile then exit 0 fi |
