* lib/libgloss.exp [get_multilibs]: Compute multitop earlier, and

use --print-multi-directory if available.

diff --git a/dejagnu/ChangeLog b/dejagnu/ChangeLog
index 96f8889..5eba743 100644 (file)
--- a/dejagnu/ChangeLog
+++ b/dejagnu/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-09  Alexandre Oliva  <aoliva@redhat.com>
+
+       * lib/libgloss.exp [get_multilibs]: Compute multitop earlier, and
+       use --print-multi-directory if available.
+
 2002-02-05  Nick Clifton  <nickc@cambridge.redhat.com>
 
        * lib/libgloss.exp (g++_include_flags): Add top level

diff --git a/dejagnu/lib/libgloss.exp b/dejagnu/lib/libgloss.exp
index 24cd70b..e9c6cf8 100644 (file)
--- a/dejagnu/lib/libgloss.exp
+++ b/dejagnu/lib/libgloss.exp
@@ -453,6 +453,30 @@ proc get_multilibs { args } {
        set comp_base_dir [file dirname [file dirname [file dirname [file dirname [file dirname [exec $compiler --print-prog-name=cc1]]]]]];
     }
 
+    # search for the top level multilib directory
+    set multitop [lookfor_file "${comp_base_dir}" "${target_alias}"]
+    if { $multitop == "" } {
+       set multitop [lookfor_file "${comp_base_dir}" "libraries"]
+       if { $multitop == "" } {
+           set multitop "[lookfor_file ${comp_base_dir} gcc/xgcc]"
+           if { $multitop != "" } {
+               set multitop [file dirname [file dirname $multitop]];
+           } else {
+               return ""
+           }
+       }
+    }
+
+    set gccpath [eval exec "$compiler" --print-multi-directory $mopts];
+    set gccpath [lindex $gccpath 0];
+    if { $gccpath != "" } {
+       verbose "GCC path is $gccpath";
+       if { [llength $args] == 0 } {
+           set board_info($target_board,multitop) "$multitop/$gccpath"
+       }
+       return "$multitop/$gccpath";
+    }
+
     # set output [exec $objdump_name --file-headers objfmtst.o ]
     set default_multilib [exec $compiler --print-multi-lib]
     set default_multilib [lindex $default_multilib 0];
@@ -508,20 +532,6 @@ proc get_multilibs { args } {
        verbose "options after multimatches: $moptions" 3
     }
 
-    # search for the top level multilib directory
-    set multitop [lookfor_file "${comp_base_dir}" "${target_alias}"]
-    if { $multitop == "" } {
-       set multitop [lookfor_file "${comp_base_dir}" "libraries"]
-       if { $multitop == "" } {
-           set multitop "[lookfor_file ${comp_base_dir} gcc/xgcc]"
-           if { $multitop != "" } {
-               set multitop [file dirname [file dirname $multitop]];
-           } else {
-               return ""
-           }
-       }
-    }
-
     # make a list of -m<foo> options from the various compiler config variables
     set gccpath ""