luke
/
abc
mirror of https://github.com/YosysHQ/abc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged in atomb/abc (pull request #2) 

More portability/flexibility fixes
This commit is contained in:
Alan Mishchenko 2013-11-07 19:15:22 -08:00
parent 24ffd5269a 6ce69bf4ed
commit 5021909cb1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -38,10 +38,10 @@ default: $(PROG)
arch_flags : arch_flags.c arch_flags : arch_flags.c
$(CC) arch_flags.c -o arch_flags $(CC) arch_flags.c -o arch_flags
ARCHFLAGS := $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags) ARCHFLAGS ?= $(shell $(CC) arch_flags.c -o arch_flags && ./arch_flags)
OPTFLAGS := -g -O #-DABC_NAMESPACE=xxx OPTFLAGS ?= -g -O #-DABC_NAMESPACE=xxx
CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -I$(PWD)/src CFLAGS += -Wall -Wno-unused-function -Wno-write-strings -Wno-sign-compare $(OPTFLAGS) $(ARCHFLAGS) -Isrc
# Set -Wno-unused-bug-set-variable for GCC 4.6.0 and greater only # Set -Wno-unused-bug-set-variable for GCC 4.6.0 and greater only
ifneq ($(or $(findstring gcc,$(CC)),$(findstring g++,$(CC))),) ifneq ($(or $(findstring gcc,$(CC)),$(findstring g++,$(CC))),)

2
src/misc/util/abc_global.h
View File

@ -274,7 +274,7 @@ static inline int Abc_Lit2LitL( int * pMap, int Lit ) { return Abc_LitNo
typedef ABC_INT64_T abctime; typedef ABC_INT64_T abctime;
static inline abctime Abc_Clock() static inline abctime Abc_Clock()
{ {
#if (defined(LIN) || defined(LIN64) && !(__APPLE__ & __MACH__)) && !defined(__MINGW32__) #if (defined(LIN) || defined(LIN64)) && !(__APPLE__ & __MACH__) && !defined(__MINGW32__)
struct timespec ts; struct timespec ts;
if ( clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) < 0 ) if ( clock_gettime(CLOCK_THREAD_CPUTIME_ID, &ts) < 0 )
return (abctime)-1; return (abctime)-1;