diff options
| author | Martin Liska <mliska@suse.cz> | 2020-04-17 09:22:51 +0200 |
|---|---|---|
| committer | Martin Liska <mliska@suse.cz> | 2020-04-17 09:22:51 +0200 |
| commit | e9f799d25973fc38022c5ea71ed5a2bca58a847f (patch) | |
| tree | 45d891055925f87dfb3bb0fd48d29cf1241e29c3 /gcc | |
| parent | 61b58e7fa5aea3ef0c7db2d9f75d17d65dff56a3 (diff) | |
| download | gcc-e9f799d25973fc38022c5ea71ed5a2bca58a847f.zip gcc-e9f799d25973fc38022c5ea71ed5a2bca58a847f.tar.gz gcc-e9f799d25973fc38022c5ea71ed5a2bca58a847f.tar.bz2 | |
Do not use HAVE_DOS_BASED_FILE_SYSTEM for Cygwin.
PR gcov-profile/94570
* ltmain.sh: Do not define HAVE_DOS_BASED_FILE_SYSTEM
for CYGWIN.
PR gcov-profile/94570
* coverage.c (coverage_init): Use separator properly.
PR gcov-profile/94570
* filenames.h (defined): Do not define HAVE_DOS_BASED_FILE_SYSTEM
for CYGWIN.
Co-Authored-By: Jonathan Yong <10walls@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/coverage.c | 12 |
2 files changed, 12 insertions, 6 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 53413e7..80a3761 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2020-04-17 Martin Liska <mliska@suse.cz> + Jonathan Yong <10walls@gmail.com> + + PR gcov-profile/94570 + * coverage.c (coverage_init): Use separator properly. + 2020-04-16 Peter Bergner <bergner@linux.ibm.com> PR rtl-optimization/93974 diff --git a/gcc/coverage.c b/gcc/coverage.c index 45c0278..7d82e44 100644 --- a/gcc/coverage.c +++ b/gcc/coverage.c @@ -1200,6 +1200,11 @@ coverage_obj_finish (vec<constructor_elt, va_gc> *ctor) void coverage_init (const char *filename) { +#if HAVE_DOS_BASED_FILE_SYSTEM + const char *separator = "\\"; +#else + const char *separator = "/"; +#endif int len = strlen (filename); int prefix_len = 0; @@ -1216,11 +1221,6 @@ coverage_init (const char *filename) of filename in order to prevent file path clashing. */ if (profile_data_prefix) { -#if HAVE_DOS_BASED_FILE_SYSTEM - const char *separator = "\\"; -#else - const char *separator = "/"; -#endif filename = concat (getpwd (), separator, filename, NULL); if (profile_prefix_path) { @@ -1252,7 +1252,7 @@ coverage_init (const char *filename) if (profile_data_prefix) { memcpy (da_file_name, profile_data_prefix, prefix_len); - da_file_name[prefix_len++] = '/'; + da_file_name[prefix_len++] = *separator; } memcpy (da_file_name + prefix_len, filename, len); strcpy (da_file_name + prefix_len + len, GCOV_DATA_SUFFIX); |