folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

makefile: remove NOASYNC and NOPTHREADS options

Browse source 
These were possibly useful options when asynch support was being
added long ago.  Async simulator I/O is quite stable and should always
be leveraged whenever pthreads is available.
This commit is contained in:
Mark Pizzolato 2020-01-24 18:06:06 -08:00
parent c88a450628
commit a4a65101bf
1 changed files with 16 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
makefile
View file

@ -70,12 +70,6 @@
# Internal ROM support can be disabled if GNU make is invoked with # Internal ROM support can be disabled if GNU make is invoked with
# DONT_USE_ROMS=1 on the command line. # DONT_USE_ROMS=1 on the command line.
# #
# The use of pthreads for various things can be disabled if GNU make is
# invoked with NOPTHREADS=1 on the command line.
#
# Asynchronous I/O support can be disabled if GNU make is invoked with
# NOASYNCH=1 on the command line.
#
# For linting (or other code analyzers) make may be invoked similar to: # For linting (or other code analyzers) make may be invoked similar to:
# #
# make GCC=cppcheck CC_OUTSPEC= LDFLAGS= CFLAGS_G="--enable=all --template=gcc" CC_STD=--std=c99 # make GCC=cppcheck CC_OUTSPEC= LDFLAGS= CFLAGS_G="--enable=all --template=gcc" CC_STD=--std=c99
@ -261,10 +255,7 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
LTO_EXCLUDE_VERSIONS = LTO_EXCLUDE_VERSIONS =
PCAPLIB = pcap PCAPLIB = pcap
ifeq (agcc,$(findstring agcc,${GCC})) # Android target build? ifeq (agcc,$(findstring agcc,${GCC})) # Android target build?
OS_CCDEFS = -D_GNU_SOURCE OS_CCDEFS = -D_GNU_SOURCE -DSIM_ASYNCH_IO
ifeq (,$(NOASYNCH))
OS_CCDEFS += -DSIM_ASYNCH_IO
endif
OS_LDFLAGS = -lm OS_LDFLAGS = -lm
else # Non-Android (or Native Android) Builds else # Non-Android (or Native Android) Builds
ifeq (,$(INCLUDES)$(LIBRARIES)) ifeq (,$(INCLUDES)$(LIBRARIES))
@ -471,38 +462,25 @@ ifeq (${WIN32},) #*nix Environments (&& cygwin)
OS_LDFLAGS += -lrt OS_LDFLAGS += -lrt
$(info using librt: $(call find_lib,rt)) $(info using librt: $(call find_lib,rt))
endif endif
ifneq (,$(NOPTHREADS)) ifneq (,$(call find_include,pthread))
OS_CCDEFS += -DDONT_USE_READER_THREAD ifneq (,$(call find_lib,pthread))
else OS_CCDEFS += -DUSE_READER_THREAD -DSIM_ASYNCH_IO
ifneq (,$(call find_include,pthread)) OS_LDFLAGS += -lpthread
$(info using libpthread: $(call find_lib,pthread) $(call find_include,pthread))
else
LIBEXTSAVE := ${LIBEXT}
LIBEXT = a
ifneq (,$(call find_lib,pthread)) ifneq (,$(call find_lib,pthread))
OS_CCDEFS += -DUSE_READER_THREAD OS_CCDEFS += -DUSE_READER_THREAD -DSIM_ASYNCH_IO
ifeq (,$(NOASYNCH))
OS_CCDEFS += -DSIM_ASYNCH_IO
endif
OS_LDFLAGS += -lpthread OS_LDFLAGS += -lpthread
$(info using libpthread: $(call find_lib,pthread) $(call find_include,pthread)) $(info using libpthread: $(call find_lib,pthread) $(call find_include,pthread))
else else
LIBEXTSAVE := ${LIBEXT} ifneq (,$(findstring Haiku,$(OSTYPE)))
LIBEXT = a OS_CCDEFS += -DUSE_READER_THREAD -DSIM_ASYNCH_IO
ifneq (,$(call find_lib,pthread)) $(info using libpthread: $(call find_include,pthread))
OS_CCDEFS += -DUSE_READER_THREAD
ifeq (,$(NOASYNCH))
OS_CCDEFS += -DSIM_ASYNCH_IO
endif
OS_LDFLAGS += -lpthread
$(info using libpthread: $(call find_lib,pthread) $(call find_include,pthread))
else
ifneq (,$(findstring Haiku,$(OSTYPE)))
OS_CCDEFS += -DUSE_READER_THREAD
ifeq (,$(NOASYNCH))
OS_CCDEFS += -DSIM_ASYNCH_IO
endif
$(info using libpthread: $(call find_include,pthread))
endif
endif endif
LIBEXT = $(LIBEXTSAVE)
endif endif
LIBEXT = $(LIBEXTSAVE)
endif endif
endif endif
# Find PCRE RegEx library. # Find PCRE RegEx library.
@ -963,17 +941,11 @@ else
$(info include paths are: ${INCPATH}) $(info include paths are: ${INCPATH})
# Give preference to any MinGW provided threading (if available) # Give preference to any MinGW provided threading (if available)
ifneq (,$(call find_include,pthread)) ifneq (,$(call find_include,pthread))
PTHREADS_CCDEFS = -DUSE_READER_THREAD PTHREADS_CCDEFS = -DUSE_READER_THREAD -DSIM_ASYNCH_IO
ifeq (,$(NOASYNCH))
PTHREADS_CCDEFS += -DSIM_ASYNCH_IO
endif
PTHREADS_LDFLAGS = -lpthread PTHREADS_LDFLAGS = -lpthread
else else
ifeq (pthreads,$(shell if exist ..\windows-build\pthreads\Pre-built.2\include\pthread.h echo pthreads)) ifeq (pthreads,$(shell if exist ..\windows-build\pthreads\Pre-built.2\include\pthread.h echo pthreads))
PTHREADS_CCDEFS = -DUSE_READER_THREAD -DPTW32_STATIC_LIB -D_POSIX_C_SOURCE -I../windows-build/pthreads/Pre-built.2/include PTHREADS_CCDEFS = -DUSE_READER_THREAD -DPTW32_STATIC_LIB -D_POSIX_C_SOURCE -I../windows-build/pthreads/Pre-built.2/include -DSIM_ASYNCH_IO
ifeq (,$(NOASYNCH))
PTHREADS_CCDEFS += -DSIM_ASYNCH_IO
endif
PTHREADS_LDFLAGS = -lpthreadGC2 -L..\windows-build\pthreads\Pre-built.2\lib PTHREADS_LDFLAGS = -lpthreadGC2 -L..\windows-build\pthreads\Pre-built.2\lib
endif endif
endif endif