2001-05-01 Matt Hiller <hiller@redhat.com>

	  * lib/libgloss.exp (get_multilibs): Correction to Catherine
	  Moore's patch of 2000-06-09.

diff --git a/ChangeLog b/ChangeLog
index 922b9f74d2d3cf98b54ae72850324a38e0a87e19..60b2abda056ae66dfa77fc128a7ecfe396dc7d6e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,15 @@
+2001-05-01  Matt Hiller  <hiller@redhat.com>
+  
+        * lib/libgloss.exp (get_multilibs): Correction to Catherine
+        Moore's patch of 2000-06-09.
+
 2001-04-11  Rob Savoye  <rob@slipknot.welcomehome.org>
 
        * Clean.tcl: Add -r to rm, so it gets rid of CVS directories.
        * .clean: Don't install the debian or redhat packaging directories.
        * Makefle.am: Install dejagnu.h. Fix dist2 target, so we build our
        own tarballs, instead of letting automake do it for us.
-       * examples/cala/Makefile.am: Use noist_PROGRAMS, so calc doesn't
+       * examples/calc/Makefile.am: Use noist_PROGRAMS, so calc doesn't
        get installed.
        * doc/Makefile.am: Install the man page for runtest.
        * configure.in: Make VERSION 1.4.0, not just 1.4, so distributions

diff --git a/lib/libgloss.exp b/lib/libgloss.exp
index 8c5bf873ccbcd034b85732bbd5b33bab476819a8..98c8d5381975165a9fa73642fa0175cf5a844fee 100644 (file)
--- a/lib/libgloss.exp
+++ b/lib/libgloss.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 92, 93, 94, 95, 96, 97, 98, 1999 Free Software Foundation, Inc.
+# Copyright (C) 92 - 2000, 2001 Free Software Foundation, Inc.
 
 # 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
@@ -421,12 +421,15 @@ proc get_multilibs { args } {
     # set output [exec $objdump_name --file-headers objfmtst.o ]
     set default_multilib [exec $compiler --print-multi-lib]
     set default_multilib [lindex $default_multilib 0];
-    set extra [string trimleft $default_multilib "."]
+    set extra [string trimleft $default_multilib ".;@"]
 
     # extract the options and their directory names as know by gcc
     foreach i "[exec $compiler --print-multi-lib]" {
        if {$extra != ""} {
-         set i [string trimright $i $extra"]
+           # string trimright would do the wrong thing if we included
+           # the leading @ in $extra
+           set i [string trimright $i $extra]
+           set i [string trimright $i "@"]
        }
        set opts ""
        set dir ""