[patch] Fix multi-sim.exp to find libatomic.so in build tree

[Steve Ellcey]

A recent change to GCC made it necessary to find libatomic.so when doing
C and C++ testing.  This change to multi-sim.exp adds code to find
libatomic.so when it is in the build tree but not installed.

Steve Ellcey
address@hidden


2014-04-14  Steve Ellcey  <address@hidden>

        * baseboards/multi-sim.exp (rpath_flags): Add libatomic.so check.


diff --git a/baseboards/multi-sim.exp b/baseboards/multi-sim.exp
index f725c6c..c588fd7 100644
--- a/baseboards/multi-sim.exp
+++ b/baseboards/multi-sim.exp
@@ -58,7 +58,7 @@ proc rpath_flags { args } {
   set mflags "[board_info $board multilib_flags] [libgloss_include_flags] 
[newlib_include_flags] [libgloss_link_flags] [libgloss_link_flags]"
   set rpathflags ""
   set gccpath [get_multilibs]
-  foreach i {libgcc_s.so  libstdc++.so libgfortran.so libc.so} {
+  foreach i {libgcc_s.so  libstdc++.so libgfortran.so libatomic.so libc.so} {
     set result [remote_exec host "$compiler $mflags --print-file-name=$i"]
     set output [lindex $result 1]
     set rpathdir [file dirname $output]
@@ -77,6 +77,11 @@ proc rpath_flags { args } {
         set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libgfortran/.libs"
        }
       }
+      if [string match $i "libatomic.so"] {
+       if [file exists "$gccpath/libatomic/.libs/libatomic.so"] {
+        set rpathflags "$rpathflags -Wl,-rpath=$gccpath/libatomic/.libs"
+       }
+      }
     } else {
       set rpathflags "$rpathflags -Wl,-rpath=$rpathdir"
     }