Commit: 17f3fe6ede4b56388312f4b3aeffb67ee6da3f40 - vim-ktakata-mq (hg)

K.Takata's patch queue for Vim

Commit MetaInfo

• Revision: 17f3fe6ede4b56388312f4b3aeffb67ee6da3f40 (tree)
• Zeit: 2022-01-26 13:02:34
• Autor: K.Takata <kentkt@csc....>
• Commiter: K.Takata

Log Message

Change patch order

Ändern Zusammenfassung

• modified: series
• modified: win32-drop-support-for-pre-vista.patch
• modified: win32-remove-old-code.patch

Diff

diff -r 192a1add6d60 -r 17f3fe6ede4b series
--- a/series	Wed Jan 26 12:44:20 2022 +0900
+++ b/series	Wed Jan 26 13:02:34 2022 +0900
@@ -24,10 +24,10 @@
 drop-support-for-glib-2.2.patch #+rejected
 big5corr.patch
 support-tee-with-sp-on-windows.patch
+win32-remove-old-code.patch
 win32-drop-support-for-pre-vista.patch
 add-msvc-latest-bat.patch
 add-testing-option-7970.patch
 wip-win32-vimdir-encoding.patch #+wip
 win32-directwrite-ambiwidth-auto.patch
-win32-remove-old-code.patch
 fix-config_cache-removal.patch #+rejected

diff -r 192a1add6d60 -r 17f3fe6ede4b win32-drop-support-for-pre-vista.patch
--- a/win32-drop-support-for-pre-vista.patch	Wed Jan 26 12:44:20 2022 +0900
+++ b/win32-drop-support-for-pre-vista.patch	Wed Jan 26 13:02:34 2022 +0900
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  f4f829d8cc8cccfee3d35243392eeec8d349eac7
+# Parent  a17d2a73c8915d9c7fe6808b1304dc8e0ca44aea
 
 diff --git a/README.md b/README.md
 --- a/README.md
@@ -217,7 +217,7 @@
  #	Supported versions depends on your target SDK, check SDKDDKVer.h
  #	See https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
  #
-@@ -305,9 +305,9 @@ MSVCRT_NAME = msvcr$(MSVCRT_VER)
+@@ -303,9 +303,9 @@ MSVCRT_NAME = msvcr$(MSVCRT_VER)
  MSVCRT_NAME = vcruntime$(MSVCRT_VER)
  !endif
  
@@ -228,8 +228,8 @@
 +WINVER = 0x0601
  !endif
  
- # Flag to turn on Win64 compatibility warnings for VC7.x and VC8.
-@@ -537,29 +537,27 @@ OUTDIR=$(OBJDIR)
+ # Use multiprocess build
+@@ -522,27 +522,27 @@ OUTDIR=$(OBJDIR)
  
  ### Validate CPUNR
  !ifndef CPUNR
@@ -261,22 +261,11 @@
  !endif
  
  # Convert processor ID to MVC-compatible number
- !if $(MSVC_MAJOR) < 8
--! if "$(CPUNR)" == "i586"
--CPUARG = /G5
--! elseif "$(CPUNR)" == "i686"
-+! if "$(CPUNR)" == "i686"
- CPUARG = /G6
- ! elseif "$(CPUNR)" == "sse"
- CPUARG = /G6 /arch:SSE
-@@ -574,7 +572,7 @@ CPUARG =
- ! endif
- !else
  # IA32/SSE/SSE2 are only supported on x86
--! if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i586" || "$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
-+! if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
+-!if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i586" || "$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
++!if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
  # VC<11 generates fp87 code by default
- !  if $(MSVC_MAJOR) < 11
+ ! if $(MSVC_MAJOR) < 11
  CPUARG =
 diff --git a/src/os_win32.c b/src/os_win32.c
 --- a/src/os_win32.c

diff -r 192a1add6d60 -r 17f3fe6ede4b win32-remove-old-code.patch
--- a/win32-remove-old-code.patch	Wed Jan 26 12:44:20 2022 +0900
+++ b/win32-remove-old-code.patch	Wed Jan 26 13:02:34 2022 +0900
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent  2b06a3d54d591aecfc9060380a5cf2ea73f8294e
+# Parent  ccdafe30b6575cb9faa117806a7a3e78064499c9
 
 diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
 --- a/src/Make_mvc.mak
@@ -32,7 +32,7 @@
  !endif
  
 @@ -310,9 +308,6 @@ MSVCRT_NAME = vcruntime$(MSVCRT_VER)
- WINVER = 0x0601
+ WINVER = 0x0501
  !endif
  
 -# Flag to turn on Win64 compatibility warnings for VC7.x and VC8.
@@ -67,12 +67,14 @@
  		$(CSCOPE_DEFS) $(TERM_DEFS) $(SOUND_DEFS) $(NETBEANS_DEFS) $(CHANNEL_DEFS) \
  		$(NBDEBUG_DEFS) $(XPM_DEFS) $(SOD_DEFS) $(SOD_INC) \
  		$(DEFINES) -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER)
-@@ -556,66 +541,50 @@ CPUNR = sse2
+@@ -556,68 +541,50 @@ CPUNR = sse2
  !endif
  
  # Convert processor ID to MVC-compatible number
 -!if $(MSVC_MAJOR) < 8
--! if "$(CPUNR)" == "i686"
+-! if "$(CPUNR)" == "i586"
+-CPUARG = /G5
+-! elseif "$(CPUNR)" == "i686"
 -CPUARG = /G6
 -! elseif "$(CPUNR)" == "sse"
 -CPUARG = /G6 /arch:SSE
@@ -87,8 +89,8 @@
 -! endif
 -!else
  # IA32/SSE/SSE2 are only supported on x86
--! if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
-+!if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
+-! if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i586" || "$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
++!if "$(ASSEMBLY_ARCHITECTURE)" == "i386" && ("$(CPUNR)" == "i586" || "$(CPUNR)" == "i686" || "$(CPUNR)" == "any")
  # VC<11 generates fp87 code by default
 -!  if $(MSVC_MAJOR) < 11
 +! if $(MSVC_MAJOR) < 11
@@ -160,7 +162,7 @@
  ! endif
  !endif
  
-@@ -683,16 +652,9 @@ OPTFLAG = /O2
+@@ -685,16 +652,9 @@ OPTFLAG = /O2
  OPTFLAG = /Ox
  ! endif
  
@@ -178,7 +180,7 @@
  ! endif
  
  CFLAGS = $(CFLAGS) $(OPTFLAG) -DNDEBUG $(CPUARG)
-@@ -729,11 +691,9 @@ LIBC = $(LIBC) libcmtd.lib
+@@ -731,11 +691,9 @@ LIBC = $(LIBC) libcmtd.lib
  RCFLAGS = $(RCFLAGS) /D_USING_V110_SDK71_
  !endif
  
@@ -190,7 +192,7 @@
  
  !include Make_all.mak
  !include testdir\Make_all.mak
-@@ -1323,10 +1283,8 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODE
+@@ -1325,10 +1283,8 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODE
  
  # Report link time code generation progress if used.
  !ifdef NODEBUG