diff --git a/Esm/ib/src/linux/startup/Makefile b/Esm/ib/src/linux/startup/Makefile index 00c7f2c..ad23e67 100644 --- a/Esm/ib/src/linux/startup/Makefile +++ b/Esm/ib/src/linux/startup/Makefile @@ -145,7 +145,7 @@ include $(TL_DIR)/Makerules/Maketargets.build include $(TL_DIR)/Makerules/Maketargets.install $(BUILDDIR)/opafmd: $(BUILDDIR)/opafmd.o - $(VS)$(CC) -pie -pthread $(LDFLAGS)$@ $(BUILDDIR)/opafmd.o $(LDLIBS) + $(VS)$(CC) -pthread $(LDFLAGS)$@ $(BUILDDIR)/opafmd.o $(LDLIBS) $(BUILDDIR)/opaxmlextract: $(PROJ_BIN_DIR)/opaxmlextract cp $(PROJ_BIN_DIR)/opaxmlextract $(BUILDDIR) diff --git a/Esm/ib/src/linux/startup/fm_config/Makefile b/Esm/ib/src/linux/startup/fm_config/Makefile index cd3f301..c4108fa 100644 --- a/Esm/ib/src/linux/startup/fm_config/Makefile +++ b/Esm/ib/src/linux/startup/fm_config/Makefile @@ -150,10 +150,10 @@ include $(TL_DIR)/Makerules/Maketargets.build include $(TL_DIR)/Makerules/Maketargets.install $(BUILDDIR)/config_check: $(BUILDDIR)/config_check.o - $(VS)$(CC) -pie $(LDFLAGS)$@ $(BUILDDIR)/config_check.o $(LDLIBS) + $(VS)$(CC) $(LDFLAGS)$@ $(BUILDDIR)/config_check.o $(LDLIBS) $(BUILDDIR)/config_convert: $(BUILDDIR)/config_convert.o - $(VS)$(CC) -pie $(LDFLAGS)$@ $(BUILDDIR)/config_convert.o $(LDLIBS) + $(VS)$(CC) $(LDFLAGS)$@ $(BUILDDIR)/config_convert.o $(LDLIBS) # install for stage phase #include $(TL_DIR)/Makerules/Maketargets.stage diff --git a/Esm/ib/src/linux/startup/sm_capture.sh b/Esm/ib/src/linux/startup/sm_capture.sh index c464bc7..1f8b612 100755 --- a/Esm/ib/src/linux/startup/sm_capture.sh +++ b/Esm/ib/src/linux/startup/sm_capture.sh @@ -38,10 +38,8 @@ SM_EXEC=/usr/lib/opa-fm/runtime/sm IFS_FM_BASE=/usr/lib/opa-fm PROGNAME="$0" -# Hedge against bash vs. sh -dateStr=`date '+%d%b%y%H%M%S'` -dumpLocation="`mktemp -d /tmp/smdump-${dateStr}-XXXXXX`" -dirName=`basename $dumpLocation` +dirName="smdump-"`date '+%d%b%y%H%M%S'` +dumpLocation="/tmp/$dirName" usage() { echo "Usage:" diff --git a/Makerules/Maketargets.build b/Makerules/Maketargets.build index 9cd7844..ebf9fdf 100755 --- a/Makerules/Maketargets.build +++ b/Makerules/Maketargets.build @@ -127,7 +127,7 @@ else # BUILD_TARGET_OS is not VXWORKS $(CMD_TARGETS_EXE) : $(CT_OBJECTS) $(RSCOBJECTS) $(DEPLIBS_TARGETS) @echo Linking executable... @mkdir -p $(dir $@) - $(VS)$(CC) -pie $(LDFLAGS)$@ $(CT_OBJECTS) $(LDLIBS) + $(VS)$(CC) $(LDFLAGS)$@ $(CT_OBJECTS) $(LDLIBS) endif # BUILD_TARGET_OS is VXWORKS endif # CMD_TARGETS_EXE non-null diff --git a/Makerules/Target.LINUX.GNU.X86_64 b/Makerules/Target.LINUX.GNU.X86_64 index 194a8b2..5a852b3 100755 --- a/Makerules/Target.LINUX.GNU.X86_64 +++ b/Makerules/Target.LINUX.GNU.X86_64 @@ -77,8 +77,8 @@ SHLIB_SONAME=$(notdir $(CMD_TARGETS_SHLIB)) # ---------------------------- # -fcheck-new does the opposite of what the manual implies. # -fcheck-new DISABLES the run-time test of return value from new -CMACH = -fPIC -pipe -DTARGET_CPU_FAMILY_X86 -Wall -Werror=format-security -D__X86_64__ -DCPU_LE -m64 -fno-strict-aliasing -fstack-protector -CCMACH = -fPIC -pipe -DTARGET_CPU_FAMILY_X86 -Wall -Werror=format-security -D__X86_64__ -DCPU_LE -m64 -fno-strict-aliasing -fstack-protector -fcheck-new -Wno-ctor-dtor-privacy +CMACH = -pipe -DTARGET_CPU_FAMILY_X86 -Wall -Werror=format-security -D__X86_64__ -DCPU_LE -m64 -fno-strict-aliasing -fstack-protector +CCMACH = -pipe -DTARGET_CPU_FAMILY_X86 -Wall -Werror=format-security -D__X86_64__ -DCPU_LE -m64 -fno-strict-aliasing -fstack-protector -fcheck-new -Wno-ctor-dtor-privacy ifeq ($(shell expr $(GCC_MAJOR_VERSION) \>= 7), 1) ifeq ($(shell expr $(GCC_MINOR_VERSION) \>= 0), 1) CMACH+= -std=gnu90 -Wno-misleading-indentation -Wno-format-truncation