diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 4 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.xml/tdesc-arch.exp | 14 | ||||
| -rw-r--r-- | gdb/xml-support.c | 4 |
4 files changed, 22 insertions, 5 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8e38ada..532dc63 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-12-11 Tom Tromey <tromey@adacore.com> + + * xml-support.c (xml_fetch_content_from_file): Use FOPEN_RB. + 2019-12-18 Tom Tromey <tromey@adacore.com> PR build/25268: diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1079e71..4f8d851 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-12-11 Tom Tromey <tromey@adacore.com> + + * gdb.xml/tdesc-arch.exp (set_arch): Add "trans_mode" parameter. + Add crlf test. + 2019-12-18 Simon Marchi <simon.marchi@efficios.com> * gdb.base/default.exp: Update value of $_gdb_major. diff --git a/gdb/testsuite/gdb.xml/tdesc-arch.exp b/gdb/testsuite/gdb.xml/tdesc-arch.exp index 617ab06..d98e50e 100644 --- a/gdb/testsuite/gdb.xml/tdesc-arch.exp +++ b/gdb/testsuite/gdb.xml/tdesc-arch.exp @@ -55,13 +55,16 @@ if { "$arch1" == "" || "$arch2" == "" || "$default_arch" == "" } { # Run these tests twice, once for $arch1 and once for $arch2, to # make sure that the tdesc file overrides the global default. +# TRANS_MODE indicates how newlines should be represented; it should +# be one of the values supported by "fconfigure -translation". -proc set_arch { arch which } { +proc set_arch { arch which trans_mode } { global gdb_prompt global subdir set filename [standard_output_file tdesc-arch.xml] set fd [open $filename w] + fconfigure $fd -translation $trans_mode puts $fd \ "<target> <architecture>$arch</architecture> @@ -92,8 +95,13 @@ proc set_arch { arch which } { remote_file host delete $filename } -set_arch $arch1 first -set_arch $arch2 second +set_arch $arch1 first lf +set_arch $arch2 second lf + +with_test_prefix crlf { + set_arch $arch1 first crlf + set_arch $arch2 second crlf +} # Check an invalid architecture setting. set filename [standard_output_file tdesc-arch.xml] diff --git a/gdb/xml-support.c b/gdb/xml-support.c index f5a1427..0f0806f 100644 --- a/gdb/xml-support.c +++ b/gdb/xml-support.c @@ -977,11 +977,11 @@ xml_fetch_content_from_file (const char *filename, void *baton) { char *fullname = concat (dirname, "/", filename, (char *) NULL); - file = gdb_fopen_cloexec (fullname, FOPEN_RT); + file = gdb_fopen_cloexec (fullname, FOPEN_RB); xfree (fullname); } else - file = gdb_fopen_cloexec (filename, FOPEN_RT); + file = gdb_fopen_cloexec (filename, FOPEN_RB); if (file == NULL) return {}; |