Merge 8.7

4 files changed, 3 insertions, 58 deletions

diff --git a/unix/Makefile.in b/unix/Makefile.in
index da057d8..e092a2d 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -956,7 +956,8 @@ testresults/valgrind/%.result: ${TCL_EXE} ${TCLTEST_EXE}
 	@mkdir -p testresults/valgrind
 	$(SHELL_ENV) $(VALGRIND) $(VALGRINDARGS) ./${TCLTEST_EXE} \
 		$(TOP_DIR)/tests/all.tcl -singleproc 1 -constraints valgrind \
-		-file $(basename $(notdir $@)) > $@ 2>&1
+		-file $(basename $(notdir $@)) > $@.tmp 2>&1
+	@mv $@.tmp $@
 .PRECIOUS: testresults/valgrind/%.result
 
 
@@ -966,7 +967,7 @@ testresults/valgrind/%.success: testresults/valgrind/%.result
 	@printf '\n >&2'
 	@status=$$(./${TCLTEST_EXE} $(TOP_DIR)/tools/valgrind_check_success \
 		file $(basename $@).result); \
-	if [ "$$status" -eq 1 ]; then exit 0; else exit 1; fi
+	if [ "$$status" -eq 1 ]; then touch $@; exit 0; else exit 1; fi
 
 valgrind_each: $(addprefix testresults/valgrind/,$(addsuffix .success,$(notdir\
 	$(wildcard $(TOP_DIR)/tests/*.test))))
diff --git a/unix/configure b/unix/configure
index c57ee40..be09ad6 100755
--- a/unix/configure
+++ b/unix/configure
@@ -7631,56 +7631,6 @@ printf "%s\n" "#define _LARGEFILE64_SOURCE 1" >>confdefs.h
 	tcl_flags="$tcl_flags _LARGEFILE64_SOURCE"
     fi
 
-
-    if test ${tcl_cv_flag__largefile_source64+y}
-then :
-  printf %s "(cached) " >&6
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <sys/stat.h>
-int
-main (void)
-{
-char *p = (char *)open64;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  tcl_cv_flag__largefile_source64=no
-else $as_nop
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#define _LARGEFILE_SOURCE64 1
-#include <sys/stat.h>
-int
-main (void)
-{
-char *p = (char *)open64;
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"
-then :
-  tcl_cv_flag__largefile_source64=yes
-else $as_nop
-  tcl_cv_flag__largefile_source64=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-    if test "x${tcl_cv_flag__largefile_source64}" = "xyes" ; then
-
-printf "%s\n" "#define _LARGEFILE_SOURCE64 1" >>confdefs.h
-
-	tcl_flags="$tcl_flags _LARGEFILE_SOURCE64"
-    fi
-
     if test "x${tcl_flags}" = "x" ; then
 	{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: none" >&5
 printf "%s\n" "none" >&6; }
diff --git a/unix/tcl.m4 b/unix/tcl.m4
index b85bcdf..bed1c75 100644
--- a/unix/tcl.m4
+++ b/unix/tcl.m4
@@ -2329,7 +2329,6 @@ AC_DEFUN([SC_TCL_LINK_LIBS], [
 #	Might define the following vars:
 #		_ISOC99_SOURCE
 #		_LARGEFILE64_SOURCE
-#		_LARGEFILE_SOURCE64
 #
 #--------------------------------------------------------------------
 
@@ -2353,8 +2352,6 @@ AC_DEFUN([SC_TCL_EARLY_FLAGS],[
 	[char *p = (char *)strtoll; char *q = (char *)strtoull;])
     SC_TCL_EARLY_FLAG(_LARGEFILE64_SOURCE,[#include <sys/stat.h>],
 	[struct stat64 buf; int i = stat64("/", &buf);])
-    SC_TCL_EARLY_FLAG(_LARGEFILE_SOURCE64,[#include <sys/stat.h>],
-	[char *p = (char *)open64;])
     if test "x${tcl_flags}" = "x" ; then
 	AC_MSG_RESULT([none])
     else
diff --git a/unix/tclConfig.h.in b/unix/tclConfig.h.in
index 1396b69..f5c0e8b 100644
--- a/unix/tclConfig.h.in
+++ b/unix/tclConfig.h.in
@@ -492,9 +492,6 @@
 /* Add the _LARGEFILE64_SOURCE flag when building */
 #undef _LARGEFILE64_SOURCE
 
-/* Add the _LARGEFILE_SOURCE64 flag when building */
-#undef _LARGEFILE_SOURCE64
-
 /* # needed in sys/socket.h Should OS/390 do the right thing with sockets? */
 #undef _OE_SOCKETS