Merge GDB 7.5.1

gdb/testsuite/lib/future.exp

 # Copyright 2004, 2007-2012 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
 # the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
@@ skipping 42 matching lines @@
             set CC "$file -B[file dirname $file]/"
         } else {
             set CC [transform gfortran]
         }
     } else {
         set CC [transform gfortran]
     }
     return $CC
 }
 
+proc gdb_find_go {} {
+    global tool_root_dir
+
+    set GO ""
+
+    if {![is_remote host]} {
+        set file [lookfor_file $tool_root_dir gccgo]
+        if { $file != "" } {
+            set root [file dirname $file]
+            set GO "$file -B$root/gcc/"
+        }
+    }
+
+    if { $GO == "" } {
+        set GO [transform gccgo]
+    }
+
+    return $GO
+}
+
+proc gdb_find_go_linker {} {
+    return [find_go]
+}
+
 proc gdb_default_target_compile {source destfile type options} {
     global target_triplet
     global tool_root_dir
     global CFLAGS_FOR_TARGET
     global compiler_flags
 
     if { $destfile == "" && $type != "preprocess" && $type != "none" } {
         error "Must supply an output filename for the compile to default_target_compile"
     }
 
     set add_flags ""
     set libs ""
     set compiler_type "c"
     set compiler ""
+    set linker ""
+    # linker_opts_order is one of "sources-then-flags", "flags-then-sources".
+    # The order shouldn't matter.  It's done this way to preserve
+    # existing behavior.
+    set linker_opts_order "sources-then-flags"
     set ldflags ""
     set dest [target_info name]
 
     if {[info exists CFLAGS_FOR_TARGET]} {
         append add_flags " $CFLAGS_FOR_TARGET"
     }
 
     if {[info exists target_info(host,name)]} {
         set host [host_info name]
     } else {
@@ skipping 44 matching lines @@
             if {[board_info $dest exists f90flags]} {
                 append add_flags " [target_info f90flags]"
             }
             if {[board_info $dest exists f90compiler]} {
                 set compiler [target_info f90compiler]
             } else {
                 set compiler [find_gfortran]
             }
         }
 
+        if { $i == "go" } {
+            set compiler_type "go"
+            if {[board_info $dest exists goflags]} {
+                append add_flags " [target_info goflags]"
+            }
+            if {[board_info $dest exists gocompiler]} {
+                set compiler [target_info gocompiler]
+            } else {
+                set compiler [find_go]
+            }
+            if {[board_info $dest exists golinker]} {
+                set linker [target_info golinker]
+            } else {
+                set linker [find_go_linker]
+            }
+            if {[board_info $dest exists golinker_opts_order]} {
+                set linker_opts_order [target_info golinker_opts_order]
+            }
+        }
+
         if {[regexp "^dest=" $i]} {
             regsub "^dest=" $i "" tmp
             if {[board_info $tmp exists name]} {
                 set dest [board_info $tmp name]
             } else {
                 set dest $tmp
             }
         }
         if {[regexp "^compiler=" $i]} {
             regsub "^compiler=" $i "" tmp
@@ skipping 35 matching lines @@
 
     if {[board_info $host exists cflags_for_target]} {
         append add_flags " [board_info $host cflags_for_target]"
     }
 
     global CC_FOR_TARGET
     global CXX_FOR_TARGET
     global F77_FOR_TARGET
     global F90_FOR_TARGET
     global GNATMAKE_FOR_TARGET
+    global GO_FOR_TARGET
+    global GO_LD_FOR_TARGET
 
     if {[info exists GNATMAKE_FOR_TARGET]} {
         if { $compiler_type == "ada" } {
             set compiler $GNATMAKE_FOR_TARGET
         }
     }
 
     if {[info exists CC_FOR_TARGET]} {
         if { $compiler == "" } {
             set compiler $CC_FOR_TARGET
@@ skipping 11 matching lines @@
             set compiler $F77_FOR_TARGET
         }
     }
 
     if {[info exists F90_FOR_TARGET]} {
         if { $compiler_type == "f90" } {
             set compiler $F90_FOR_TARGET
         }
     }
 
+    if { $compiler_type == "go" } {
+        if {[info exists GO_FOR_TARGET]} {
+            set compiler $GO_FOR_TARGET
+        }
+        if {[info exists GO_LD_FOR_TARGET]} {
+            set linker $GO_LD_FOR_TARGET
+        }
+    }
+
+    if { $type == "executable" && $linker != "" } {
+        set compiler $linker
+    }
+
     if { $compiler == "" } {
         set compiler [board_info $dest compiler]
         if { $compiler == "" } {
             return "default_target_compile: No compiler to compile with"
         }
     }
 
     if {![is_remote host]} {
         if { [which $compiler] == 0 } {
             return "default_target_compile: Can't find $compiler."
@@ skipping 122 matching lines @@
         remote_file host delete a.out
     } else {
         if { $destfile != "" } {
             append add_flags " -o $destfile"
         }
     }
 
     # This is obscure: we put SOURCES at the end when building an
     # object, because otherwise, in some situations, libtool will
     # become confused about the name of the actual source file.
-    if {$type == "object"} {
-        set opts "$add_flags $sources"
-    } else {
-        set opts "$sources $add_flags"
+    switch $type {
+        "object" {
+            set opts "$add_flags $sources"
+        }
+        "executable" {
+            switch $linker_opts_order {
+                "flags-then-sources" {
+                    set opts "$add_flags $sources"
+                }
+                "sources-then-flags" {
+                    set opts "$sources $add_flags"
+                }
+                default {
+                    error "Invalid value for board_info linker_opts_order"
+                }
+            }
+        }
+        default {
+            set opts "$sources $add_flags"
+        }
     }
 
     if {[is_remote host]} {
         if {[host_info exists use_at]} {
             set fid [open "atfile" "w"]
             puts $fid "$opts"
             close $fid
             set opts "@[remote_download host atfile]"
             remote_file build delete atfile
         }
@@ skipping 41 matching lines @@
 if {[info procs find_gnatmake] == ""} {
     rename gdb_find_gnatmake find_gnatmake
     set use_gdb_compile 1
 }
 
 if {[info procs find_gfortran] == ""} {
     rename gdb_find_gfortran find_gfortran
     set use_gdb_compile 1
 }
 
+if {[info procs find_go_linker] == ""} {
+    rename gdb_find_go find_go
+    rename gdb_find_go_linker find_go_linker
+    set use_gdb_compile 1
+}
+
 if {$use_gdb_compile} {
     catch {rename default_target_compile {}}
     rename gdb_default_target_compile default_target_compile
 }