* gen-params (VTABLE_LABEL_PREFIX): Handle windows32.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@25130 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 12 insertions, 4 deletions

diff --git a/libio/ChangeLog b/libio/ChangeLog
index bd136405326..8f9dcd2d834 100644
--- a/libio/ChangeLog
+++ b/libio/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 10 09:25:48 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* gen-params (VTABLE_LABEL_PREFIX): Handle windows32. 
+
 Wed Feb  3 22:05:41 1999  H.J. Lu  (hjl@gnu.org)
 			  Jeffrey A Law  (law@cygnus.com)
 
diff --git a/libio/gen-params b/libio/gen-params
index 37ee742e21c..b2ed89ab164 100755
--- a/libio/gen-params
+++ b/libio/gen-params
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 1992, 1993, 1994 Free Software Foundation
+# Copyright (C) 1992, 1993, 1994, 1997, 1998, 1999 Free Software Foundation
 # 
 # This file is part of the GNU IO Library.  This library is free
 # software; you can redistribute it and/or modify it under the
@@ -124,9 +124,13 @@ if test -z "${NAMES_HAVE_UNDERSCORE}" -o -z "${DOLLAR_IN_LABEL}" \
 	>>dummy.out
       # Now we get rid of the <>, and any other junk on the nm output line.
       # (We get rid of <filebuf> in case nm included debugging output for
-      # class filebuf itself.)  Finally, we select the first line of
-      # the result, and hope that's what we wanted!
-      vtab_name=`${SED} -n -e '/<filebuf>/d' -e 's/^.*<\(.*\)>.*$/\1/p' \
+      # class filebuf itself.)  On windows32, we also need to delete the 
+      # unique sections (.data$_vt$*), otherwise we get the wrong result.
+      # Finally, we select the first line of the result, and hope that's 
+      # what we wanted!
+      vtab_name=`${SED} -n -e '/<filebuf>/d' \
+        -e '/\.data[$_.]<_vt\$7filebuf>/d' \
+        -e 's/^.*<\(.*\)>.*$/\1/p' \
         <dummy.out | ${SED} -n -e '1p'`
       case "${vtab_name}" in
         *7filebuf) echo "#define ${macro_prefix}VTABLE_LABEL_HAS_LENGTH 1" ;;