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

More robust and correct readline support and fix to VMS build for HP2100

Browse source
This commit is contained in:
Mark Pizzolato 2012-03-25 15:55:36 -07:00
parent c205070554
commit 027c921cfc
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
descrip.mms
View file

@ -371,7 +371,7 @@ HP2100_SOURCE1 = $(HP2100_DIR)HP2100_STDDEV.C,$(HP2100_DIR)HP2100_DP.C,\
$(HP2100_DIR)HP2100_CPU6.C,$(HP2100_DIR)HP2100_CPU7.C $(HP2100_DIR)HP2100_CPU6.C,$(HP2100_DIR)HP2100_CPU7.C
HP2100_LIB2 = $(LIB_DIR)HP2100L2-$(ARCH).OLB HP2100_LIB2 = $(LIB_DIR)HP2100L2-$(ARCH).OLB
HP2100_SOURCE2 = $(HP2100_DIR)HP2100_FP1.C,$(HP2100_DIR)HP2100_BACI.C,\ HP2100_SOURCE2 = $(HP2100_DIR)HP2100_FP1.C,$(HP2100_DIR)HP2100_BACI.C,\
$(HP2100_DIR)HP2100_MPX.C,$(HP2100_DIR)HP2100_PIF.C \ $(HP2100_DIR)HP2100_MPX.C,$(HP2100_DIR)HP2100_PIF.C,\
$(HP2100_DIR)HP2100_DI.C,$(HP2100_DIR)HP2100_DI_DA.C,\ $(HP2100_DIR)HP2100_DI.C,$(HP2100_DIR)HP2100_DI_DA.C,\
$(HP2100_DIR)HP_DISCLIB.C $(HP2100_DIR)HP_DISCLIB.C
.IFDEF ALPHA_OR_IA64 .IFDEF ALPHA_OR_IA64

22
makefile
View file

@ -32,13 +32,11 @@
# CC Command (and platform available options). (Poor man's autoconf) # CC Command (and platform available options). (Poor man's autoconf)
# #
# building the pdp11, or any vax simulator could use networking support # building the pdp11, or any vax simulator could use networking support
BUILD_SINGLE := $(MAKECMDGOALS) $(BLANK_SUFFIX)
ifneq (,$(or $(findstring pdp11,$(MAKECMDGOALS)),$(findstring vax,$(MAKECMDGOALS)),$(findstring all,$(MAKECMDGOALS)))) ifneq (,$(or $(findstring pdp11,$(MAKECMDGOALS)),$(findstring vax,$(MAKECMDGOALS)),$(findstring all,$(MAKECMDGOALS))))
NETWORK_USEFUL = true NETWORK_USEFUL = true
ifneq (,$(findstring all,$(MAKECMDGOALS))$(word 2,$(MAKECMDGOALS))) ifneq (,$(findstring all,$(MAKECMDGOALS))$(word 2,$(MAKECMDGOALS)))
BUILD_MULTIPLE = s BUILD_MULTIPLE = s
BUILD_SINGLE := $(MAKECMDGOALS) $(BUILD_SINGLE)
else
BUILD_SINGLE := $(MAKECMDGOALS) $(BUILD_SINGLE)
endif endif
else else
ifeq ($(MAKECMDGOALS),) ifeq ($(MAKECMDGOALS),)
@ -210,8 +208,8 @@ ifeq ($(WIN32),) #*nix Environments (&& cygwin)
else else
$(error using libpcap: $(call find_lib,$(PCAPLIB)) missing pcap.h) $(error using libpcap: $(call find_lib,$(PCAPLIB)) missing pcap.h)
endif endif
LIBEXT = $(LIBEXTSAVE)
endif endif
LIBEXT = $(LIBEXTSAVE)
endif endif
ifneq (,$(findstring USE_NETWORK,$(NETWORK_CCDEFS))$(findstring USE_SHARED,$(NETWORK_CCDEFS))) ifneq (,$(findstring USE_NETWORK,$(NETWORK_CCDEFS))$(findstring USE_SHARED,$(NETWORK_CCDEFS)))
# Given we have libpcap components, consider other network connections as well # Given we have libpcap components, consider other network connections as well
@ -344,14 +342,16 @@ ifneq (3,$(GCC_MAJOR_VERSION))
CFLAGS_O += -Wno-unused-result CFLAGS_O += -Wno-unused-result
endif endif
endif endif
BUILD_FEATURES := $(BUILD_FEATURES). GCC Version: $(GCC_VERSION) ifeq (clean,$(MAKECMDGOALS))
$(info ***) BUILD_FEATURES := $(BUILD_FEATURES). GCC Version: $(GCC_VERSION)
$(info *** $(BUILD_SINGLE)Simulator$(BUILD_MULTIPLE) being built with:) $(info ***)
$(info *** $(BUILD_FEATURES).) $(info *** $(BUILD_SINGLE)Simulator$(BUILD_MULTIPLE) being built with:)
ifneq (,$(NETWORK_FEATURES)) $(info *** $(BUILD_FEATURES).)
$(info *** $(NETWORK_FEATURES).) ifneq (,$(NETWORK_FEATURES))
$(info *** $(NETWORK_FEATURES).)
endif
$(info ***)
endif endif
$(info ***)
ifneq ($(DONT_USE_ROMS),) ifneq ($(DONT_USE_ROMS),)
ROMS_OPT = -DDONT_USE_INTERNAL_ROM ROMS_OPT = -DDONT_USE_INTERNAL_ROM
else else

2
scp.c
View file

@ -3987,6 +3987,8 @@ if (!initialized) {
handle = dlopen("libreadline." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL); handle = dlopen("libreadline." __STR(HAVE_DLOPEN), RTLD_NOW|RTLD_GLOBAL);
if (!handle) if (!handle)
handle = dlopen("libreadline." __STR(HAVE_DLOPEN) ".6", RTLD_NOW|RTLD_GLOBAL); handle = dlopen("libreadline." __STR(HAVE_DLOPEN) ".6", RTLD_NOW|RTLD_GLOBAL);
if (!handle)
handle = dlopen("libreadline." __STR(HAVE_DLOPEN) ".5", RTLD_NOW|RTLD_GLOBAL);
if (handle) { if (handle) {
p_readline = dlsym(handle, "readline"); p_readline = dlsym(handle, "readline");
p_add_history = dlsym(handle, "add_history"); p_add_history = dlsym(handle, "add_history");