Backport e9f799d259
Backport from mainline 2020-04-17 Martin Liska <mliska@suse.cz> Jonathan Yong <10walls@gmail.com> PR gcov-profile/94570 * ltmain.sh: Do not define HAVE_DOS_BASED_FILE_SYSTEM for CYGWIN. Backport from mainline 2020-04-17 Martin Liska <mliska@suse.cz> Jonathan Yong <10walls@gmail.com> PR gcov-profile/94570 * coverage.c (coverage_init): Use separator properly. Backport from mainline 2020-04-17 Martin Liska <mliska@suse.cz> Jonathan Yong <10walls@gmail.com> 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>
This commit is contained in:
parent
642eed0f8e
commit
5c09a1b71b
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2020-04-20 Martin Liska <mliska@suse.cz>
|
||||||
|
|
||||||
|
Backport from mainline
|
||||||
|
2020-04-17 Martin Liska <mliska@suse.cz>
|
||||||
|
Jonathan Yong <10walls@gmail.com>
|
||||||
|
|
||||||
|
PR gcov-profile/94570
|
||||||
|
* ltmain.sh: Do not define HAVE_DOS_BASED_FILE_SYSTEM
|
||||||
|
for CYGWIN.
|
||||||
|
|
||||||
2020-03-12 Release Manager
|
2020-03-12 Release Manager
|
||||||
|
|
||||||
* GCC 9.3.0 released.
|
* GCC 9.3.0 released.
|
||||||
|
|
|
@ -1,3 +1,12 @@
|
||||||
|
2020-04-20 Martin Liska <mliska@suse.cz>
|
||||||
|
|
||||||
|
Backport from mainline
|
||||||
|
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-17 H.J. Lu <hongjiu.lu@intel.com>
|
2020-04-17 H.J. Lu <hongjiu.lu@intel.com>
|
||||||
|
|
||||||
Backport from master
|
Backport from master
|
||||||
|
|
|
@ -1201,6 +1201,11 @@ coverage_obj_finish (vec<constructor_elt, va_gc> *ctor)
|
||||||
void
|
void
|
||||||
coverage_init (const char *filename)
|
coverage_init (const char *filename)
|
||||||
{
|
{
|
||||||
|
#if HAVE_DOS_BASED_FILE_SYSTEM
|
||||||
|
const char *separator = "\\";
|
||||||
|
#else
|
||||||
|
const char *separator = "/";
|
||||||
|
#endif
|
||||||
int len = strlen (filename);
|
int len = strlen (filename);
|
||||||
int prefix_len = 0;
|
int prefix_len = 0;
|
||||||
|
|
||||||
|
@ -1217,11 +1222,6 @@ coverage_init (const char *filename)
|
||||||
of filename in order to prevent file path clashing. */
|
of filename in order to prevent file path clashing. */
|
||||||
if (profile_data_prefix)
|
if (profile_data_prefix)
|
||||||
{
|
{
|
||||||
#if HAVE_DOS_BASED_FILE_SYSTEM
|
|
||||||
const char *separator = "\\";
|
|
||||||
#else
|
|
||||||
const char *separator = "/";
|
|
||||||
#endif
|
|
||||||
filename = concat (getpwd (), separator, filename, NULL);
|
filename = concat (getpwd (), separator, filename, NULL);
|
||||||
filename = mangle_path (filename);
|
filename = mangle_path (filename);
|
||||||
len = strlen (filename);
|
len = strlen (filename);
|
||||||
|
@ -1240,7 +1240,7 @@ coverage_init (const char *filename)
|
||||||
if (profile_data_prefix)
|
if (profile_data_prefix)
|
||||||
{
|
{
|
||||||
memcpy (da_file_name, profile_data_prefix, prefix_len);
|
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);
|
memcpy (da_file_name + prefix_len, filename, len);
|
||||||
strcpy (da_file_name + prefix_len + len, GCOV_DATA_SUFFIX);
|
strcpy (da_file_name + prefix_len + len, GCOV_DATA_SUFFIX);
|
||||||
|
|
|
@ -1,3 +1,13 @@
|
||||||
|
2020-04-20 Martin Liska <mliska@suse.cz>
|
||||||
|
|
||||||
|
Backport from mainline
|
||||||
|
2020-04-17 Martin Liska <mliska@suse.cz>
|
||||||
|
Jonathan Yong <10walls@gmail.com>
|
||||||
|
|
||||||
|
PR gcov-profile/94570
|
||||||
|
* filenames.h (defined): Do not define HAVE_DOS_BASED_FILE_SYSTEM
|
||||||
|
for CYGWIN.
|
||||||
|
|
||||||
2020-03-12 Release Manager
|
2020-03-12 Release Manager
|
||||||
|
|
||||||
* GCC 9.3.0 released.
|
* GCC 9.3.0 released.
|
||||||
|
|
|
@ -32,7 +32,8 @@ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__MSDOS__) || defined(_WIN32) || defined(__OS2__) || defined (__CYGWIN__)
|
#if defined(__MSDOS__) || (defined(_WIN32) && ! defined(__CYGWIN__)) || \
|
||||||
|
defined(__OS2__)
|
||||||
# ifndef HAVE_DOS_BASED_FILE_SYSTEM
|
# ifndef HAVE_DOS_BASED_FILE_SYSTEM
|
||||||
# define HAVE_DOS_BASED_FILE_SYSTEM 1
|
# define HAVE_DOS_BASED_FILE_SYSTEM 1
|
||||||
# endif
|
# endif
|
||||||
|
|
|
@ -3425,8 +3425,8 @@ int setenv (const char *, const char *, int);
|
||||||
# define PATH_SEPARATOR ':'
|
# define PATH_SEPARATOR ':'
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
|
#if (defined (_WIN32) && ! defined(__CYGWIN__)) || defined (__MSDOS__) || \
|
||||||
defined (__OS2__)
|
defined (__DJGPP__) || defined (__OS2__)
|
||||||
# define HAVE_DOS_BASED_FILE_SYSTEM
|
# define HAVE_DOS_BASED_FILE_SYSTEM
|
||||||
# define FOPEN_WB "wb"
|
# define FOPEN_WB "wb"
|
||||||
# ifndef DIR_SEPARATOR_2
|
# ifndef DIR_SEPARATOR_2
|
||||||
|
|
Loading…
Reference in New Issue