diff mbox

gdb/testsuite: Add D support to gdb_default_target_compile

Message ID CABOHX+eGh84pSjxegpmK1dOsGd3DxvzNe9y-_LkTL+TqXCzLpQ@mail.gmail.com
State New
Headers show

Commit Message

Iain Buclaw Feb. 1, 2016, 12:46 p.m. UTC
Hi,

As discussed a couple months back.  Adding support for D in
gdb_default_target_compile, which should allow D sources to be used in
the testsuite.

Iain.

Comments

Pedro Alves Feb. 10, 2016, 12:29 p.m. UTC | #1
On 02/01/2016 12:46 PM, Iain Buclaw wrote:
> Hi,
> 
> As discussed a couple months back.  Adding support for D in
> gdb_default_target_compile, which should allow D sources to be used in
> the testsuite.

Looks fine, but could you send a patch to dejagnu too, so that our
copy can be dropped at some point?

Thanks,
Pedro Alves
Iain Buclaw Feb. 11, 2016, 7:04 a.m. UTC | #2
On 10 February 2016 at 13:29, Pedro Alves <palves@redhat.com> wrote:
> On 02/01/2016 12:46 PM, Iain Buclaw wrote:
>> Hi,
>>
>> As discussed a couple months back.  Adding support for D in
>> gdb_default_target_compile, which should allow D sources to be used in
>> the testsuite.
>
> Looks fine, but could you send a patch to dejagnu too, so that our
> copy can be dropped at some point?
>
> Thanks,
> Pedro Alves
>

Yep, I have a patch against dejagnu ready.  I just haven't searched
for their patches ML just yet.

Thanks.
Iain
Pedro Alves Feb. 11, 2016, 10 a.m. UTC | #3
On 02/11/2016 07:04 AM, Iain Buclaw wrote:

> Yep, I have a patch against dejagnu ready.  I just haven't searched
> for their patches ML just yet.

It's dejagnu at gnu.org.  I'm not aware of a separate patches list.

Thanks,
Pedro Alves
Iain Buclaw Feb. 18, 2016, 8:52 p.m. UTC | #4
On 11 February 2016 at 11:00, Pedro Alves <palves@redhat.com> wrote:
> On 02/11/2016 07:04 AM, Iain Buclaw wrote:
>
>> Yep, I have a patch against dejagnu ready.  I just haven't searched
>> for their patches ML just yet.
>
> It's dejagnu at gnu.org.  I'm not aware of a separate patches list.
>
> Thanks,
> Pedro Alves
>

Thanks, I've sent it the patch request to Dejagnu, and pushed this in.
diff mbox

Patch

gdb/testsuite/ChangeLog:
        * lib/future.exp: Add D support.
        (gdb_find_gdc): New proc.
        (gdb_default_target_compile): Add D support.

---
diff --git a/gdb/testsuite/lib/future.exp b/gdb/testsuite/lib/future.exp
index 538fa5a..da0dd15 100644
--- a/gdb/testsuite/lib/future.exp
+++ b/gdb/testsuite/lib/future.exp
@@ -41,6 +41,27 @@  proc gdb_find_gnatmake {} {
     return $GM
 }   
 
+proc gdb_find_gdc {} {
+    global tool_root_dir
+    print "Tool Root: $tool_root_dir"
+
+    if {![is_remote host]} {
+	set file [lookfor_file $tool_root_dir gdc]
+	if { $file == "" } {
+	    set file [lookfor_file $tool_root_dir gcc/gdc]
+	}
+	if { $file != "" } {
+	    set CC "$file -B[file dirname $file]/"
+	} else {
+	    set CC [transform gdc]
+	}
+    } else {
+	set CC [transform gdc]
+    }
+    print "CC: $CC"
+    return $CC
+}
+
 proc gdb_find_gfortran {} {
     global tool_root_dir
 
@@ -185,6 +206,18 @@  proc gdb_default_target_compile {source destfile type options} {
 	    }
 	}
 
+	if { $i == "d" } {
+	    set compiler_type "d"
+	    if {[board_info $dest exists dflags]} {
+		append add_flags " [target_info dflags]"
+	    }
+	    if {[board_info $dest exists dcompiler]} {
+		set compiler [target_info dcompiler]
+	    } else {
+		set compiler [find_gdc]
+	    }
+	}
+
 	if { $i == "f77" } {
 	    set compiler_type "f77"
 	    if {[board_info $dest exists f77flags]} {
@@ -285,6 +318,7 @@  proc gdb_default_target_compile {source destfile type options} {
 
     global CC_FOR_TARGET
     global CXX_FOR_TARGET
+    global DC_FOR_TARGET
     global F77_FOR_TARGET
     global F90_FOR_TARGET
     global GNATMAKE_FOR_TARGET
@@ -309,6 +343,12 @@  proc gdb_default_target_compile {source destfile type options} {
 	}
     }
 
+    if {[info exists DC_FOR_TARGET]} {
+	if { $compiler_type == "d" } {
+	    set compiler $DC_FOR_TARGET
+	}
+    }
+
     if {[info exists F77_FOR_TARGET]} {
 	if { $compiler_type == "f77" } {
 	    set compiler $F77_FOR_TARGET
@@ -560,6 +600,11 @@  if {[info procs find_go_linker] == ""} {
     set use_gdb_compile 1
 }
 
+if {[info procs find_gdc] == ""} {
+    rename gdb_find_gdc find_gdc
+    set use_gdb_compile 1
+}
+
 if {$use_gdb_compile} {
     catch {rename default_target_compile {}}
     rename gdb_default_target_compile default_target_compile