From eb0cd40155cbaba6c1a6cba937abf1979e802831 Mon Sep 17 00:00:00 2001 From: pme Date: Sun, 13 May 2001 11:08:57 +0000 Subject: [PATCH] 2001-05-13 John David Anglin * mkcheck.in (setup_size_command): Use Berkeley "-B" mode with GNU size. Add hpux case for HP size. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42036 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++-v3/ChangeLog | 5 +++++ libstdc++-v3/mkcheck.in | 19 +++++++++++++++---- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index d283b7f..7bd4c6b 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,8 @@ +2001-05-13 John David Anglin + + * mkcheck.in (setup_size_command): Use Berkeley "-B" mode with GNU + size. Add hpux case for HP size. + 2001-05-11 Benjamin Kosnik * testsuite/*/*.cc: Remove spaces, make sure testcases return zero. diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in index 0d59d8b..e7b8353 100755 --- a/libstdc++-v3/mkcheck.in +++ b/libstdc++-v3/mkcheck.in @@ -16,7 +16,8 @@ ### flags and whatnot, we can take out all those things and source ### that file from here. (Write that file with this in mind...) -### XXX Note that breaking out of this with ^C will not work. Dunno why. +### XXX Note that breaking out of this with ^C will not work under +### Solaris (at least). Dunno why. # 1: variables @@ -195,9 +196,9 @@ setup_size_command() function size_command() { case $1 in - TEXT) TEXT=$(size -A $EXENAME | grep ^.text | awk '{print $2}') ;; - DATA) DATA=$(size -A $EXENAME | awk '/^\.data[ ]/{print $2}') ;; - SIZE) SIZE=$(size -A $EXENAME | grep otal | awk '{print $2}') ;; + TEXT) TEXT=$(size -B $EXENAME | tail -1 | awk '{print $1}') ;; + DATA) DATA=$(size -B $EXENAME | tail -1 | awk '{print $2}') ;; + SIZE) SIZE=$(size -B $EXENAME | tail -1 | awk '{print $4}') ;; esac } else @@ -215,6 +216,16 @@ setup_size_command() esac } ;; + *hpux*) + function size_command() + { + case $1 in + TEXT) TEXT=$(size $EXENAME | awk '{print $1}') ;; + DATA) DATA=$(size $EXENAME | awk '{print $3}') ;; + SIZE) SIZE=$(size $EXENAME | awk '{print $7}') ;; + esac + } + ;; *irix*) function size_command() { -- 2.7.4