gdb/testsuite/

        * config/symbian.exp (cyg_to_win): New.
        (symbian_compile): Use it.  Handle c++ and incdir.

diff --git a/ChangeLog.csl b/ChangeLog.csl
index 25ee2d82041ab92c0798fb164f15dfd5a0af29a4..116b6bcd954c59bcce3b62bba4bc3a718b62ce53 100644 (file)
--- a/ChangeLog.csl
+++ b/ChangeLog.csl
@@ -1,3 +1,9 @@
+2006-09-15  Daniel Jacobowitz  <dan@codesourcery.com>
+
+       gdb/testsuite/
+       * config/symbian.exp (cyg_to_win): New.
+       (symbian_compile): Use it.  Handle c++ and incdir.
+
 2006-09-15  Daniel Jacobowitz  <dan@codesourcery.com>
 
        gdb/testsuite/

diff --git a/gdb/testsuite/config/symbian.exp b/gdb/testsuite/config/symbian.exp
index 5c620a0f96ee900733d64defb6655e9222b67442..17e4388b8186511c839c0d6f60571b0855b92b4d 100644 (file)
--- a/gdb/testsuite/config/symbian.exp
+++ b/gdb/testsuite/config/symbian.exp
@@ -16,6 +16,17 @@ proc epoc_run { outvar args } {
     return $result
 }
 
+proc cyg_to_win { source } {
+    set result [file native [file normalize $source]]
+    if { [string first "C:" $result] != -1 } {
+       set result [string map {C: ""} $result]
+    } else {
+       # This appears to be a Unix-thinking sort of TCL.
+       set result "\\cygwin[string map {/ \\} $result]"
+    }
+    return $result
+}
+
 proc symbian_compile { sources destfile type options } {
     global object_map
     global epocroot
@@ -62,12 +73,17 @@ proc symbian_compile { sources destfile type options } {
     set reldir "urel"
 
     set allflags ""
+    set incdirs {}
     foreach option $options {
        # send_user "option: $option\n"
        if { $option == "debug" } {
            set reldir "udeb"
+       } elseif { $option == "c++" } {
+           # Nothing
        } elseif { [regexp -all {additional_flags=(.*)} $option dummy flags] } {
            append allflags " $flags"
+       } elseif { [regexp -all {incdir=(.*)} $option dummy value] } {
+           lappend incdirs $value
        } else {
            warning "Compilation option $option not supported"
            return -1
@@ -91,16 +107,13 @@ proc symbian_compile { sources destfile type options } {
     puts $bldfile "TARGETTYPE EXE"
     puts $bldfile "SOURCEPATH \\."
     foreach source $mysources {
-       set result [file native [file normalize $source]]
-       if { [string first "C:" $result] != -1 } {
-           set result [string map {C: ""} $result]
-       } else {
-           # This appears to be a Unix-thinking sort of TCL.
-           set result "\\cygwin[string map {/ \\} $result]"
-       }
+       set result [cyg_to_win $source]
        # send_user "orig source $source, new source $result\n"
        puts $bldfile "SOURCE $result"
     }
+    foreach incdir $incdirs {
+       puts $bldfile "USERINCLUDE [cyg_to_win $incdir]"
+    }
     puts $bldfile "LIBRARY EUSER.LIB"
     puts $bldfile "LIBRARY ESTLIB.LIB"
     puts $bldfile "STATICLIBRARY MYECRT0.LIB"