Merge 8.6

Author: jan.nijtmans

win/tclWin32Dll.c

@@ -26,13 +26,28 @@
 
 static HINSTANCE hInstance;	/* HINSTANCE of this DLL. */
 
+#if defined(__GNUC__)
+
+/*
+ * Need to add noinline flag to DllMain declaration so that gcc -O3 does not
+ * inline asm code into DllEntryPoint and cause a compile time error because
+ * of redefined local labels.
+ */
+
+BOOL APIENTRY		DllMain(HINSTANCE hInst, DWORD reason,
+			    LPVOID reserved) __attribute__ ((noinline));
+
+#else /* !__GNUC__ */
+
 /*
  * The following declaration is for the VC++ DLL entry point.
  */
 
 BOOL APIENTRY		DllMain(HINSTANCE hInst, DWORD reason,
 			    LPVOID reserved);
 
+#endif /* __GNUC__ */
+
 /*
  * The following structure and linked list is to allow us to map between
  * volume mount points and drive letters on the fly (no Win API exists for

win/tclWinFCmd.c

@@ -282,7 +282,7 @@ DoRenameFile(
 #ifndef HAVE_NO_SEH
     __try {
 #endif
-	if ((*MoveFileW)(nativeSrc, nativeDst) != FALSE) {
+	if (MoveFileW(nativeSrc, nativeDst) != FALSE) {
 	    retval = TCL_OK;
 	}
 #ifndef HAVE_NO_SEH