@@ -1,5 +1,12 @@
2019-12-04 Andrew Burgess <andrew.burgess@embecosm.com>
+ * lib/gdb.exp (gdb_compile): Add -J compiler option when building
+ Fortran tests.
+ * gdb.mi/mi-fortran-modules.exp: Compile source files in correct
+ order.
+
+2019-12-04 Andrew Burgess <andrew.burgess@embecosm.com>
+
* gdb.fortran/type-kinds.exp (test_cast_1_to_type_kind): Handle
casting to type with no kind specified.
(test_basic_parsing_of_type_kinds): Additional tests for types
@@ -22,7 +22,7 @@
standard_testfile "mi-fortran-modules.f90" "mi-fortran-modules-2.f90"
if {[prepare_for_testing "failed to prepare" ${testfile} \
- [list $srcfile $srcfile2] {debug f90}]} {
+ [list $srcfile2 $srcfile] {debug f90}]} {
return -1
}
@@ -3719,6 +3719,16 @@
} else {
set new_options [universal_compile_options]
}
+
+ # Place (and look for) Fortran `.mod` files in the output
+ # directory for this specific test.
+ if {[lsearch -exact $options f77] != -1 \
+ || [lsearch -exact $options f90] != -1 } {
+ # Fortran compile.
+ set mod_path [standard_output_file ""]
+ lappend new_options "additional_flags=-J${mod_path}"
+ }
+
set shlib_found 0
set shlib_load 0
set getting_compiler_info 0