diff options
| author | Dan Albert <danalbert@google.com> | 2015-08-28 03:31:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-28 03:31:49 +0000 |
| commit | 4fdae6a1fed3ffadb2411d3b3dd63b42cc90f27e (patch) | |
| tree | 18c8c1014e2e4e5dd85cf1a86f6b06de04c876cc | |
| parent | b3448adb2e071363edcf1b0b39176926eeafed7c (diff) | |
| parent | c59adc02887d4a20101d5a04d816e0280e80a9c0 (diff) | |
| download | toolchain_gcc-4fdae6a1fed3ffadb2411d3b3dd63b42cc90f27e.tar.gz toolchain_gcc-4fdae6a1fed3ffadb2411d3b3dd63b42cc90f27e.tar.bz2 toolchain_gcc-4fdae6a1fed3ffadb2411d3b3dd63b42cc90f27e.zip | |
Merge "Fix mingw build breakage"
| -rw-r--r-- | gcc-4.9/gcc/gcov-io.h | 1 | ||||
| -rw-r--r-- | gcc-4.9/libgcc/libgcov-util.c | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/gcc-4.9/gcc/gcov-io.h b/gcc-4.9/gcc/gcov-io.h index e67bce4ea..895ff9867 100644 --- a/gcc-4.9/gcc/gcov-io.h +++ b/gcc-4.9/gcc/gcov-io.h @@ -187,6 +187,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see # define _GCOV_fwrite fwrite # define _GCOV_fread fread # define _GCOV_fileno fileno +# define _GCOV_fopen fopen #endif #ifndef IN_LIBGCOV diff --git a/gcc-4.9/libgcc/libgcov-util.c b/gcc-4.9/libgcc/libgcov-util.c index 4435cff4f..cb07d2875 100644 --- a/gcc-4.9/libgcc/libgcov-util.c +++ b/gcc-4.9/libgcc/libgcov-util.c @@ -36,6 +36,10 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see /* Borrowed from basic-block.h. */ #define RDIV(X,Y) (((X) + (Y) / 2) / (Y)) +#ifdef __MINGW32__ +#define realpath(path,resolved_path) _fullpath((resolved_path),(path),_MAX_PATH) +#endif + extern gcov_position_t gcov_position(); extern int gcov_is_error(); extern size_t gcov_max_filename; |