diff options
-rw-r--r-- | Makefile | 4 | ||||
-rw-r--r-- | kernel/log.h | 14 | ||||
-rw-r--r-- | kernel/yosys.h | 2 |
3 files changed, 10 insertions, 10 deletions
@@ -162,8 +162,8 @@ yosys.html: misc/yosys.html $(P) cp misc/yosys.html yosys.html else ifeq ($(CONFIG),mxe) -CXX = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc -LD = /usr/local/src/mxe/usr/bin/i686-pc-mingw32-gcc +CXX = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc +LD = /usr/local/src/mxe/usr/bin/i686-w64-mingw32.static-gcc CXXFLAGS += -std=gnu++0x -Os -D_POSIX_SOURCE CXXFLAGS := $(filter-out -fPIC,$(CXXFLAGS)) LDFLAGS := $(filter-out -rdynamic,$(LDFLAGS)) -s diff --git a/kernel/log.h b/kernel/log.h index c265bae42..33e624dcb 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -163,11 +163,13 @@ struct PerformanceTimer } static int64_t query() { -#if defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) +# if _WIN32 + return 0; +# elif defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) struct timespec ts; clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts); return int64_t(ts.tv_sec)*1000000000 + ts.tv_nsec; -#elif defined(RUSAGE_SELF) +# elif defined(RUSAGE_SELF) struct rusage rusage; int64_t t; if (getrusage(RUSAGE_SELF, &rusage) == -1) { @@ -177,11 +179,9 @@ struct PerformanceTimer t = 1000000000ULL * (int64_t) rusage.ru_utime.tv_sec + (int64_t) rusage.ru_utime.tv_usec * 1000ULL; t += 1000000000ULL * (int64_t) rusage.ru_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL; return t; -#elif _WIN32 - return 0; -#else - #error Dont know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?). -#endif +# else +# error Dont know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?). +# endif } void reset() { diff --git a/kernel/yosys.h b/kernel/yosys.h index c8bc46b65..cc15ca47c 100644 --- a/kernel/yosys.h +++ b/kernel/yosys.h @@ -91,9 +91,9 @@ # define mkdir _mkdir # define popen _popen # define pclose _pclose -# define PATH_MAX MAX_PATH # ifndef __MINGW32__ +# define PATH_MAX MAX_PATH # define isatty _isatty # define fileno _fileno # endif |