mkcheck.in (setup_size_command): Use Berkeley "-B" mode with GNU size.

2001-05-13  John David Anglin  <dave@hiauly1.hia.nrc.ca>

	* mkcheck.in (setup_size_command): Use Berkeley "-B" mode with GNU
	size.  Add hpux case for HP size.

From-SVN: r42036

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index d283b7ffbcd80a3bc0a6c1d8ac1d4a69da629039..7bd4c6b0a85fd9287ab87db3a987b5a5f8de0833 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,8 @@
+2001-05-13  John David Anglin  <dave@hiauly1.hia.nrc.ca>
+
+       * mkcheck.in (setup_size_command): Use Berkeley "-B" mode with GNU
+       size.  Add hpux case for HP size.
+
 2001-05-11   Benjamin Kosnik  <bkoz@redhat.com>
 
        * testsuite/*/*.cc: Remove spaces, make sure testcases return zero.

diff --git a/libstdc++-v3/mkcheck.in b/libstdc++-v3/mkcheck.in
index 0d59d8b137a430479ec93dc9e38654d21d464b22..e7b8353a5a39556e99beedc68baa388aa9dbe7ce 100755 (executable)
--- 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()
         {