From 5b4bdb9fd387b02c53c76a93af0d47b7342877f6 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Wed, 12 Feb 2020 09:07:20 +0100
Subject: [PATCH] libport: Move the codepage tables back to libwine and stop
 updating them.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 libs/port/Makefile.in         |  65 ------
 libs/wine/Makefile.in         |  65 ++++++
 libs/{port => wine}/c_037.c   |   6 +
 libs/{port => wine}/c_10000.c |   6 +
 libs/{port => wine}/c_10001.c |   6 +
 libs/{port => wine}/c_10002.c |   6 +
 libs/{port => wine}/c_10003.c |   6 +
 libs/{port => wine}/c_10004.c |   6 +
 libs/{port => wine}/c_10005.c |   6 +
 libs/{port => wine}/c_10006.c |   6 +
 libs/{port => wine}/c_10007.c |   6 +
 libs/{port => wine}/c_10008.c |   6 +
 libs/{port => wine}/c_10010.c |   6 +
 libs/{port => wine}/c_10017.c |   6 +
 libs/{port => wine}/c_10021.c |   6 +
 libs/{port => wine}/c_10029.c |   6 +
 libs/{port => wine}/c_10079.c |   6 +
 libs/{port => wine}/c_10081.c |   6 +
 libs/{port => wine}/c_10082.c |   6 +
 libs/{port => wine}/c_1026.c  |   6 +
 libs/{port => wine}/c_1250.c  |   6 +
 libs/{port => wine}/c_1251.c  |   6 +
 libs/{port => wine}/c_1252.c  |   6 +
 libs/{port => wine}/c_1253.c  |   6 +
 libs/{port => wine}/c_1254.c  |   6 +
 libs/{port => wine}/c_1255.c  |   6 +
 libs/{port => wine}/c_1256.c  |   6 +
 libs/{port => wine}/c_1257.c  |   6 +
 libs/{port => wine}/c_1258.c  |   6 +
 libs/{port => wine}/c_1361.c  |   6 +
 libs/{port => wine}/c_20127.c |   6 +
 libs/{port => wine}/c_20866.c |   6 +
 libs/{port => wine}/c_20932.c |   6 +
 libs/{port => wine}/c_21866.c |   6 +
 libs/{port => wine}/c_28591.c |   6 +
 libs/{port => wine}/c_28592.c |   6 +
 libs/{port => wine}/c_28593.c |   6 +
 libs/{port => wine}/c_28594.c |   6 +
 libs/{port => wine}/c_28595.c |   6 +
 libs/{port => wine}/c_28596.c |   6 +
 libs/{port => wine}/c_28597.c |   6 +
 libs/{port => wine}/c_28598.c |   6 +
 libs/{port => wine}/c_28599.c |   6 +
 libs/{port => wine}/c_28603.c |   6 +
 libs/{port => wine}/c_28605.c |   6 +
 libs/{port => wine}/c_437.c   |   6 +
 libs/{port => wine}/c_500.c   |   6 +
 libs/{port => wine}/c_737.c   |   6 +
 libs/{port => wine}/c_775.c   |   6 +
 libs/{port => wine}/c_850.c   |   6 +
 libs/{port => wine}/c_852.c   |   6 +
 libs/{port => wine}/c_855.c   |   6 +
 libs/{port => wine}/c_857.c   |   6 +
 libs/{port => wine}/c_860.c   |   6 +
 libs/{port => wine}/c_861.c   |   6 +
 libs/{port => wine}/c_862.c   |   6 +
 libs/{port => wine}/c_863.c   |   6 +
 libs/{port => wine}/c_864.c   |   6 +
 libs/{port => wine}/c_865.c   |   6 +
 libs/{port => wine}/c_866.c   |   6 +
 libs/{port => wine}/c_869.c   |   6 +
 libs/{port => wine}/c_874.c   |   6 +
 libs/{port => wine}/c_875.c   |   6 +
 libs/{port => wine}/c_932.c   |   6 +
 libs/{port => wine}/c_936.c   |   6 +
 libs/{port => wine}/c_949.c   |   6 +
 libs/{port => wine}/c_950.c   |   6 +
 tools/make_unicode            | 414 ++++++++--------------------------
 68 files changed, 545 insertions(+), 389 deletions(-)
 rename libs/{port => wine}/c_037.c (99%)
 rename libs/{port => wine}/c_10000.c (99%)
 rename libs/{port => wine}/c_10001.c (99%)
 rename libs/{port => wine}/c_10002.c (99%)
 rename libs/{port => wine}/c_10003.c (99%)
 rename libs/{port => wine}/c_10004.c (99%)
 rename libs/{port => wine}/c_10005.c (99%)
 rename libs/{port => wine}/c_10006.c (99%)
 rename libs/{port => wine}/c_10007.c (99%)
 rename libs/{port => wine}/c_10008.c (99%)
 rename libs/{port => wine}/c_10010.c (99%)
 rename libs/{port => wine}/c_10017.c (99%)
 rename libs/{port => wine}/c_10021.c (99%)
 rename libs/{port => wine}/c_10029.c (99%)
 rename libs/{port => wine}/c_10079.c (99%)
 rename libs/{port => wine}/c_10081.c (99%)
 rename libs/{port => wine}/c_10082.c (99%)
 rename libs/{port => wine}/c_1026.c (99%)
 rename libs/{port => wine}/c_1250.c (99%)
 rename libs/{port => wine}/c_1251.c (99%)
 rename libs/{port => wine}/c_1252.c (99%)
 rename libs/{port => wine}/c_1253.c (99%)
 rename libs/{port => wine}/c_1254.c (99%)
 rename libs/{port => wine}/c_1255.c (99%)
 rename libs/{port => wine}/c_1256.c (99%)
 rename libs/{port => wine}/c_1257.c (99%)
 rename libs/{port => wine}/c_1258.c (99%)
 rename libs/{port => wine}/c_1361.c (99%)
 rename libs/{port => wine}/c_20127.c (99%)
 rename libs/{port => wine}/c_20866.c (99%)
 rename libs/{port => wine}/c_20932.c (99%)
 rename libs/{port => wine}/c_21866.c (99%)
 rename libs/{port => wine}/c_28591.c (99%)
 rename libs/{port => wine}/c_28592.c (99%)
 rename libs/{port => wine}/c_28593.c (99%)
 rename libs/{port => wine}/c_28594.c (99%)
 rename libs/{port => wine}/c_28595.c (99%)
 rename libs/{port => wine}/c_28596.c (99%)
 rename libs/{port => wine}/c_28597.c (99%)
 rename libs/{port => wine}/c_28598.c (99%)
 rename libs/{port => wine}/c_28599.c (99%)
 rename libs/{port => wine}/c_28603.c (99%)
 rename libs/{port => wine}/c_28605.c (99%)
 rename libs/{port => wine}/c_437.c (99%)
 rename libs/{port => wine}/c_500.c (99%)
 rename libs/{port => wine}/c_737.c (99%)
 rename libs/{port => wine}/c_775.c (99%)
 rename libs/{port => wine}/c_850.c (99%)
 rename libs/{port => wine}/c_852.c (99%)
 rename libs/{port => wine}/c_855.c (99%)
 rename libs/{port => wine}/c_857.c (99%)
 rename libs/{port => wine}/c_860.c (99%)
 rename libs/{port => wine}/c_861.c (99%)
 rename libs/{port => wine}/c_862.c (99%)
 rename libs/{port => wine}/c_863.c (99%)
 rename libs/{port => wine}/c_864.c (99%)
 rename libs/{port => wine}/c_865.c (99%)
 rename libs/{port => wine}/c_866.c (99%)
 rename libs/{port => wine}/c_869.c (99%)
 rename libs/{port => wine}/c_874.c (99%)
 rename libs/{port => wine}/c_875.c (99%)
 rename libs/{port => wine}/c_932.c (99%)
 rename libs/{port => wine}/c_936.c (99%)
 rename libs/{port => wine}/c_949.c (99%)
 rename libs/{port => wine}/c_950.c (99%)

diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in
index 6cb082838f2..56b8371d8e8 100644
--- a/libs/port/Makefile.in
+++ b/libs/port/Makefile.in
@@ -1,71 +1,6 @@
 STATICLIB = libwine_port.a
 
 C_SRCS = \
-	c_037.c \
-	c_10000.c \
-	c_10001.c \
-	c_10002.c \
-	c_10003.c \
-	c_10004.c \
-	c_10005.c \
-	c_10006.c \
-	c_10007.c \
-	c_10008.c \
-	c_10010.c \
-	c_10017.c \
-	c_10021.c \
-	c_10029.c \
-	c_10079.c \
-	c_10081.c \
-	c_10082.c \
-	c_1026.c \
-	c_1250.c \
-	c_1251.c \
-	c_1252.c \
-	c_1253.c \
-	c_1254.c \
-	c_1255.c \
-	c_1256.c \
-	c_1257.c \
-	c_1258.c \
-	c_1361.c \
-	c_20127.c \
-	c_20866.c \
-	c_20932.c \
-	c_21866.c \
-	c_28591.c \
-	c_28592.c \
-	c_28593.c \
-	c_28594.c \
-	c_28595.c \
-	c_28596.c \
-	c_28597.c \
-	c_28598.c \
-	c_28599.c \
-	c_28603.c \
-	c_28605.c \
-	c_437.c \
-	c_500.c \
-	c_737.c \
-	c_775.c \
-	c_850.c \
-	c_852.c \
-	c_855.c \
-	c_857.c \
-	c_860.c \
-	c_861.c \
-	c_862.c \
-	c_863.c \
-	c_864.c \
-	c_865.c \
-	c_866.c \
-	c_869.c \
-	c_874.c \
-	c_875.c \
-	c_932.c \
-	c_936.c \
-	c_949.c \
-	c_950.c \
 	casemap.c \
 	compose.c \
 	decompose.c \
diff --git a/libs/wine/Makefile.in b/libs/wine/Makefile.in
index 25cefa1c604..01cfc6ba99a 100644
--- a/libs/wine/Makefile.in
+++ b/libs/wine/Makefile.in
@@ -1,6 +1,71 @@
 EXTRALIBS = $(DL_LIBS) $(COREFOUNDATION_LIBS) $(CORESERVICES_LIBS) $(I386_LIBS)
 
 C_SRCS = \
+	c_037.c \
+	c_10000.c \
+	c_10001.c \
+	c_10002.c \
+	c_10003.c \
+	c_10004.c \
+	c_10005.c \
+	c_10006.c \
+	c_10007.c \
+	c_10008.c \
+	c_10010.c \
+	c_10017.c \
+	c_10021.c \
+	c_10029.c \
+	c_10079.c \
+	c_10081.c \
+	c_10082.c \
+	c_1026.c \
+	c_1250.c \
+	c_1251.c \
+	c_1252.c \
+	c_1253.c \
+	c_1254.c \
+	c_1255.c \
+	c_1256.c \
+	c_1257.c \
+	c_1258.c \
+	c_1361.c \
+	c_20127.c \
+	c_20866.c \
+	c_20932.c \
+	c_21866.c \
+	c_28591.c \
+	c_28592.c \
+	c_28593.c \
+	c_28594.c \
+	c_28595.c \
+	c_28596.c \
+	c_28597.c \
+	c_28598.c \
+	c_28599.c \
+	c_28603.c \
+	c_28605.c \
+	c_437.c \
+	c_500.c \
+	c_737.c \
+	c_775.c \
+	c_850.c \
+	c_852.c \
+	c_855.c \
+	c_857.c \
+	c_860.c \
+	c_861.c \
+	c_862.c \
+	c_863.c \
+	c_864.c \
+	c_865.c \
+	c_866.c \
+	c_869.c \
+	c_874.c \
+	c_875.c \
+	c_932.c \
+	c_936.c \
+	c_949.c \
+	c_950.c \
 	collation.c \
 	config.c \
 	cpsymbol.c \
diff --git a/libs/port/c_037.c b/libs/wine/c_037.c
similarity index 99%
rename from libs/port/c_037.c
rename to libs/wine/c_037.c
index 08da32c9b16..a9aee9a49d3 100644
--- a/libs/port/c_037.c
+++ b/libs/wine/c_037.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/037.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -226,3 +230,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_037 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10000.c b/libs/wine/c_10000.c
similarity index 99%
rename from libs/port/c_10000.c
rename to libs/wine/c_10000.c
index 1b8de84524d..6677e0e8f93 100644
--- a/libs/port/c_10000.c
+++ b/libs/wine/c_10000.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10000.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -372,3 +376,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10000 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10001.c b/libs/wine/c_10001.c
similarity index 99%
rename from libs/port/c_10001.c
rename to libs/wine/c_10001.c
index dcc7837935d..5a8f7fb86fd 100644
--- a/libs/port/c_10001.c
+++ b/libs/wine/c_10001.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10001.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[15616] =
@@ -5583,3 +5587,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_10001 =
         0x81, 0x9f, 0xe0, 0xfc, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10002.c b/libs/wine/c_10002.c
similarity index 99%
rename from libs/port/c_10002.c
rename to libs/wine/c_10002.c
index aa888b28a85..e00bf6f94ef 100644
--- a/libs/port/c_10002.c
+++ b/libs/wine/c_10002.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10002.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[32000] =
@@ -8256,3 +8260,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_10002 =
         0x81, 0xfc, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10003.c b/libs/wine/c_10003.c
similarity index 99%
rename from libs/port/c_10003.c
rename to libs/wine/c_10003.c
index 1d48a578793..c355c1f0d86 100644
--- a/libs/port/c_10003.c
+++ b/libs/wine/c_10003.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10003.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[23040] =
@@ -7805,3 +7809,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_10003 =
         0xa1, 0xac, 0xb0, 0xc8, 0xca, 0xfd, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10004.c b/libs/wine/c_10004.c
similarity index 99%
rename from libs/port/c_10004.c
rename to libs/wine/c_10004.c
index 0a84ad8a709..4bfb089f8f0 100644
--- a/libs/port/c_10004.c
+++ b/libs/wine/c_10004.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10004.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -263,3 +267,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10004 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10005.c b/libs/wine/c_10005.c
similarity index 99%
rename from libs/port/c_10005.c
rename to libs/wine/c_10005.c
index 4fa57d422a7..1cf1d5f16d0 100644
--- a/libs/port/c_10005.c
+++ b/libs/wine/c_10005.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10005.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -247,3 +251,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10005 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10006.c b/libs/wine/c_10006.c
similarity index 99%
rename from libs/port/c_10006.c
rename to libs/wine/c_10006.c
index 0470ad5c81f..5c40a98ba04 100644
--- a/libs/port/c_10006.c
+++ b/libs/wine/c_10006.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10006.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -291,3 +295,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10006 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10007.c b/libs/wine/c_10007.c
similarity index 99%
rename from libs/port/c_10007.c
rename to libs/wine/c_10007.c
index 5096fef719c..e2e24118599 100644
--- a/libs/port/c_10007.c
+++ b/libs/wine/c_10007.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10007.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -295,3 +299,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10007 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10008.c b/libs/wine/c_10008.c
similarity index 99%
rename from libs/port/c_10008.c
rename to libs/wine/c_10008.c
index 078e714c9f8..f3b8738793b 100644
--- a/libs/port/c_10008.c
+++ b/libs/wine/c_10008.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10008.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[20992] =
@@ -5954,3 +5958,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_10008 =
         0xa1, 0xa9, 0xb0, 0xf7, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10010.c b/libs/wine/c_10010.c
similarity index 99%
rename from libs/port/c_10010.c
rename to libs/wine/c_10010.c
index 7732c9fcaeb..e481e5fcf0e 100644
--- a/libs/port/c_10010.c
+++ b/libs/wine/c_10010.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10010.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -370,3 +374,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10010 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10017.c b/libs/wine/c_10017.c
similarity index 99%
rename from libs/port/c_10017.c
rename to libs/wine/c_10017.c
index 703dcf0cf95..948a3ad02c5 100644
--- a/libs/port/c_10017.c
+++ b/libs/wine/c_10017.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10017.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -295,3 +299,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10017 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10021.c b/libs/wine/c_10021.c
similarity index 99%
rename from libs/port/c_10021.c
rename to libs/wine/c_10021.c
index ee50fb712c5..f3f0526c8ad 100644
--- a/libs/port/c_10021.c
+++ b/libs/wine/c_10021.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10021.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -254,3 +258,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10021 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10029.c b/libs/wine/c_10029.c
similarity index 99%
rename from libs/port/c_10029.c
rename to libs/wine/c_10029.c
index a07a72bd42b..1ac3fec7ee0 100644
--- a/libs/port/c_10029.c
+++ b/libs/wine/c_10029.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10029.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -305,3 +309,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10029 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10079.c b/libs/wine/c_10079.c
similarity index 99%
rename from libs/port/c_10079.c
rename to libs/wine/c_10079.c
index ec304274b47..55cd8494df2 100644
--- a/libs/port/c_10079.c
+++ b/libs/wine/c_10079.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10079.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -370,3 +374,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10079 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10081.c b/libs/wine/c_10081.c
similarity index 99%
rename from libs/port/c_10081.c
rename to libs/wine/c_10081.c
index 5edb7439b77..9933531bd12 100644
--- a/libs/port/c_10081.c
+++ b/libs/wine/c_10081.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10081.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -370,3 +374,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10081 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_10082.c b/libs/wine/c_10082.c
similarity index 99%
rename from libs/port/c_10082.c
rename to libs/wine/c_10082.c
index 50e67177127..e3c309118c8 100644
--- a/libs/port/c_10082.c
+++ b/libs/wine/c_10082.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/10082.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -370,3 +374,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_10082 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1026.c b/libs/wine/c_1026.c
similarity index 99%
rename from libs/port/c_1026.c
rename to libs/wine/c_1026.c
index 2e04afd74fa..854c0c65b36 100644
--- a/libs/port/c_1026.c
+++ b/libs/wine/c_1026.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1026.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -226,3 +230,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1026 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1250.c b/libs/wine/c_1250.c
similarity index 99%
rename from libs/port/c_1250.c
rename to libs/wine/c_1250.c
index b8648753d49..1daad02ff25 100644
--- a/libs/port/c_1250.c
+++ b/libs/wine/c_1250.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1250.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -584,3 +588,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1250 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1251.c b/libs/wine/c_1251.c
similarity index 99%
rename from libs/port/c_1251.c
rename to libs/wine/c_1251.c
index c8bb5a8259f..79d0090c550 100644
--- a/libs/port/c_1251.c
+++ b/libs/wine/c_1251.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1251.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -420,3 +424,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1251 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1252.c b/libs/wine/c_1252.c
similarity index 99%
rename from libs/port/c_1252.c
rename to libs/wine/c_1252.c
index eb87fc542bc..173bb48080c 100644
--- a/libs/port/c_1252.c
+++ b/libs/wine/c_1252.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1252.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -582,3 +586,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1252 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1253.c b/libs/wine/c_1253.c
similarity index 99%
rename from libs/port/c_1253.c
rename to libs/wine/c_1253.c
index 6f0184d2852..023a4d9ee85 100644
--- a/libs/port/c_1253.c
+++ b/libs/wine/c_1253.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1253.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -432,3 +436,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1253 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1254.c b/libs/wine/c_1254.c
similarity index 99%
rename from libs/port/c_1254.c
rename to libs/wine/c_1254.c
index 9dbe5c41d7e..b483548563c 100644
--- a/libs/port/c_1254.c
+++ b/libs/wine/c_1254.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1254.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -584,3 +588,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1254 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1255.c b/libs/wine/c_1255.c
similarity index 99%
rename from libs/port/c_1255.c
rename to libs/wine/c_1255.c
index 1f873fd2204..495f19fddb3 100644
--- a/libs/port/c_1255.c
+++ b/libs/wine/c_1255.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1255.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -325,3 +329,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1255 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1256.c b/libs/wine/c_1256.c
similarity index 99%
rename from libs/port/c_1256.c
rename to libs/wine/c_1256.c
index c24856a2df1..93446807100 100644
--- a/libs/port/c_1256.c
+++ b/libs/wine/c_1256.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1256.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -359,3 +363,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1256 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1257.c b/libs/wine/c_1257.c
similarity index 99%
rename from libs/port/c_1257.c
rename to libs/wine/c_1257.c
index 54255f2d4c3..07cf22da9c8 100644
--- a/libs/port/c_1257.c
+++ b/libs/wine/c_1257.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1257.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -283,3 +287,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1257 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1258.c b/libs/wine/c_1258.c
similarity index 99%
rename from libs/port/c_1258.c
rename to libs/wine/c_1258.c
index c12f4bd2430..d75f2aa0cd7 100644
--- a/libs/port/c_1258.c
+++ b/libs/wine/c_1258.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1258.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -317,3 +321,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_1258 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_1361.c b/libs/wine/c_1361.c
similarity index 99%
rename from libs/port/c_1361.c
rename to libs/wine/c_1361.c
index 81f2d646fd4..f9915a22c58 100644
--- a/libs/port/c_1361.c
+++ b/libs/wine/c_1361.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/1361.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[29184] =
@@ -8668,3 +8672,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_1361 =
         0x84, 0xd3, 0xd8, 0xde, 0xe0, 0xf9, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_20127.c b/libs/wine/c_20127.c
similarity index 99%
rename from libs/port/c_20127.c
rename to libs/wine/c_20127.c
index 5c6a9f70331..d67735c36db 100644
--- a/libs/port/c_20127.c
+++ b/libs/wine/c_20127.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/20127.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -327,3 +331,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_20127 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_20866.c b/libs/wine/c_20866.c
similarity index 99%
rename from libs/port/c_20866.c
rename to libs/wine/c_20866.c
index bee9ee638aa..99305f9b4d8 100644
--- a/libs/port/c_20866.c
+++ b/libs/wine/c_20866.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/20866.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -387,3 +391,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_20866 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_20932.c b/libs/wine/c_20932.c
similarity index 99%
rename from libs/port/c_20932.c
rename to libs/wine/c_20932.c
index 480f16cd6ba..57260064089 100644
--- a/libs/port/c_20932.c
+++ b/libs/wine/c_20932.c
@@ -2,6 +2,10 @@
 /* generated from http://www.unicode.org/Public/MAPPINGS/OBSOLETE/EASTASIA/JIS */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[23808] =
@@ -6554,3 +6558,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_20932 =
         0x8e, 0x8e, 0xa1, 0xfe, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_21866.c b/libs/wine/c_21866.c
similarity index 99%
rename from libs/port/c_21866.c
rename to libs/wine/c_21866.c
index e33c80f3f38..2436caf0e58 100644
--- a/libs/port/c_21866.c
+++ b/libs/wine/c_21866.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/21866.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -387,3 +391,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_21866 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28591.c b/libs/wine/c_28591.c
similarity index 99%
rename from libs/port/c_28591.c
rename to libs/wine/c_28591.c
index b27379f5021..4018724737a 100644
--- a/libs/port/c_28591.c
+++ b/libs/wine/c_28591.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28591.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -327,3 +331,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28591 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28592.c b/libs/wine/c_28592.c
similarity index 99%
rename from libs/port/c_28592.c
rename to libs/wine/c_28592.c
index 1f12cf5a102..9262a80d293 100644
--- a/libs/port/c_28592.c
+++ b/libs/wine/c_28592.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28592.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -327,3 +331,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28592 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28593.c b/libs/wine/c_28593.c
similarity index 99%
rename from libs/port/c_28593.c
rename to libs/wine/c_28593.c
index 53c3e0be902..2b6eb3903d0 100644
--- a/libs/port/c_28593.c
+++ b/libs/wine/c_28593.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28593.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -333,3 +337,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28593 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28594.c b/libs/wine/c_28594.c
similarity index 99%
rename from libs/port/c_28594.c
rename to libs/wine/c_28594.c
index 076db417ae8..5aebd3230a9 100644
--- a/libs/port/c_28594.c
+++ b/libs/wine/c_28594.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28594.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -327,3 +331,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28594 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28595.c b/libs/wine/c_28595.c
similarity index 99%
rename from libs/port/c_28595.c
rename to libs/wine/c_28595.c
index 6b3c4e52a97..fddc82cd1e3 100644
--- a/libs/port/c_28595.c
+++ b/libs/wine/c_28595.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28595.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -362,3 +366,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28595 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28596.c b/libs/wine/c_28596.c
similarity index 99%
rename from libs/port/c_28596.c
rename to libs/wine/c_28596.c
index 8655cfe595e..40ba9781dc1 100644
--- a/libs/port/c_28596.c
+++ b/libs/wine/c_28596.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28596.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -367,3 +371,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28596 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28597.c b/libs/wine/c_28597.c
similarity index 99%
rename from libs/port/c_28597.c
rename to libs/wine/c_28597.c
index 97d52a476fb..9e783d4eaf0 100644
--- a/libs/port/c_28597.c
+++ b/libs/wine/c_28597.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28597.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -336,3 +340,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28597 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28598.c b/libs/wine/c_28598.c
similarity index 99%
rename from libs/port/c_28598.c
rename to libs/wine/c_28598.c
index c1faeeedaea..19a44a70ebb 100644
--- a/libs/port/c_28598.c
+++ b/libs/wine/c_28598.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28598.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -349,3 +353,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28598 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28599.c b/libs/wine/c_28599.c
similarity index 99%
rename from libs/port/c_28599.c
rename to libs/wine/c_28599.c
index 255ac659b17..e34f33fdc23 100644
--- a/libs/port/c_28599.c
+++ b/libs/wine/c_28599.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28599.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -327,3 +331,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28599 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28603.c b/libs/wine/c_28603.c
similarity index 99%
rename from libs/port/c_28603.c
rename to libs/wine/c_28603.c
index 1f79f758944..91746e69f0f 100644
--- a/libs/port/c_28603.c
+++ b/libs/wine/c_28603.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28603.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -542,3 +546,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28603 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_28605.c b/libs/wine/c_28605.c
similarity index 99%
rename from libs/port/c_28605.c
rename to libs/wine/c_28605.c
index 7b5e786d4ea..e4d2ab78013 100644
--- a/libs/port/c_28605.c
+++ b/libs/wine/c_28605.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/28605.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -327,3 +331,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_28605 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_437.c b/libs/wine/c_437.c
similarity index 99%
rename from libs/port/c_437.c
rename to libs/wine/c_437.c
index 4a510105e6f..7b5972e2c60 100644
--- a/libs/port/c_437.c
+++ b/libs/wine/c_437.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/437.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -627,3 +631,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_437 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_500.c b/libs/wine/c_500.c
similarity index 99%
rename from libs/port/c_500.c
rename to libs/wine/c_500.c
index a8cc2a53fef..0db590000cd 100644
--- a/libs/port/c_500.c
+++ b/libs/wine/c_500.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/500.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -226,3 +230,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_500 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_737.c b/libs/wine/c_737.c
similarity index 99%
rename from libs/port/c_737.c
rename to libs/wine/c_737.c
index bfc341db315..ac9e9ce5c93 100644
--- a/libs/port/c_737.c
+++ b/libs/wine/c_737.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/737.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -403,3 +407,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_737 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_775.c b/libs/wine/c_775.c
similarity index 99%
rename from libs/port/c_775.c
rename to libs/wine/c_775.c
index de814371d29..56f8e2d210a 100644
--- a/libs/port/c_775.c
+++ b/libs/wine/c_775.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/775.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -617,3 +621,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_775 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_850.c b/libs/wine/c_850.c
similarity index 99%
rename from libs/port/c_850.c
rename to libs/wine/c_850.c
index 9ed282c575b..e4f8ceac52c 100644
--- a/libs/port/c_850.c
+++ b/libs/wine/c_850.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/850.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -627,3 +631,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_850 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_852.c b/libs/wine/c_852.c
similarity index 99%
rename from libs/port/c_852.c
rename to libs/wine/c_852.c
index adc2adbdb0c..9befad03643 100644
--- a/libs/port/c_852.c
+++ b/libs/wine/c_852.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/852.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -617,3 +621,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_852 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_855.c b/libs/wine/c_855.c
similarity index 99%
rename from libs/port/c_855.c
rename to libs/wine/c_855.c
index c561a7e29fc..17b24cc25f1 100644
--- a/libs/port/c_855.c
+++ b/libs/wine/c_855.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/855.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -422,3 +426,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_855 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_857.c b/libs/wine/c_857.c
similarity index 99%
rename from libs/port/c_857.c
rename to libs/wine/c_857.c
index 649612da05e..8dc07791f13 100644
--- a/libs/port/c_857.c
+++ b/libs/wine/c_857.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/857.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -650,3 +654,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_857 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_860.c b/libs/wine/c_860.c
similarity index 99%
rename from libs/port/c_860.c
rename to libs/wine/c_860.c
index ffb82c0bb30..d406e808cf7 100644
--- a/libs/port/c_860.c
+++ b/libs/wine/c_860.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/860.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -614,3 +618,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_860 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_861.c b/libs/wine/c_861.c
similarity index 99%
rename from libs/port/c_861.c
rename to libs/wine/c_861.c
index 7265dd9deac..ee113dd5fb0 100644
--- a/libs/port/c_861.c
+++ b/libs/wine/c_861.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/861.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -614,3 +618,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_861 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_862.c b/libs/wine/c_862.c
similarity index 99%
rename from libs/port/c_862.c
rename to libs/wine/c_862.c
index bd1486987b1..814a79ed874 100644
--- a/libs/port/c_862.c
+++ b/libs/wine/c_862.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/862.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -638,3 +642,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_862 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_863.c b/libs/wine/c_863.c
similarity index 99%
rename from libs/port/c_863.c
rename to libs/wine/c_863.c
index 9801c8ffb67..c8bbc2bbc49 100644
--- a/libs/port/c_863.c
+++ b/libs/wine/c_863.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/863.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -614,3 +618,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_863 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_864.c b/libs/wine/c_864.c
similarity index 99%
rename from libs/port/c_864.c
rename to libs/wine/c_864.c
index 526e52cd0aa..29a27db4dae 100644
--- a/libs/port/c_864.c
+++ b/libs/wine/c_864.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/864.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -455,3 +459,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_864 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_865.c b/libs/wine/c_865.c
similarity index 99%
rename from libs/port/c_865.c
rename to libs/wine/c_865.c
index 29a6b86ab65..89925f6693a 100644
--- a/libs/port/c_865.c
+++ b/libs/wine/c_865.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/865.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -614,3 +618,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_865 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_866.c b/libs/wine/c_866.c
similarity index 99%
rename from libs/port/c_866.c
rename to libs/wine/c_866.c
index 2aa82dbdc15..b1bac35e562 100644
--- a/libs/port/c_866.c
+++ b/libs/wine/c_866.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/866.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -453,3 +457,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_866 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_869.c b/libs/wine/c_869.c
similarity index 99%
rename from libs/port/c_869.c
rename to libs/wine/c_869.c
index a9872ac2d29..d37ad8a743b 100644
--- a/libs/port/c_869.c
+++ b/libs/wine/c_869.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/869.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -419,3 +423,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_869 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_874.c b/libs/wine/c_874.c
similarity index 99%
rename from libs/port/c_874.c
rename to libs/wine/c_874.c
index 00bdc52578c..7e466e79e35 100644
--- a/libs/port/c_874.c
+++ b/libs/wine/c_874.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/874.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[512] =
@@ -427,3 +431,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_874 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_875.c b/libs/wine/c_875.c
similarity index 99%
rename from libs/port/c_875.c
rename to libs/wine/c_875.c
index 3069e65898a..224607b33eb 100644
--- a/libs/port/c_875.c
+++ b/libs/wine/c_875.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/875.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[256] =
@@ -240,3 +244,5 @@ const struct sbcs_table DECLSPEC_HIDDEN cptable_875 =
     uni2cp_low,
     uni2cp_high
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_932.c b/libs/wine/c_932.c
similarity index 99%
rename from libs/port/c_932.c
rename to libs/wine/c_932.c
index 3dab46d76db..e4f8dc4d176 100644
--- a/libs/port/c_932.c
+++ b/libs/wine/c_932.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/932.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[15616] =
@@ -5599,3 +5603,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_932 =
         0x81, 0x9f, 0xe0, 0xfc, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_936.c b/libs/wine/c_936.c
similarity index 99%
rename from libs/port/c_936.c
rename to libs/wine/c_936.c
index 198a5b61b24..d466eaa6bf5 100644
--- a/libs/port/c_936.c
+++ b/libs/wine/c_936.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/936.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[32512] =
@@ -7948,3 +7952,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_936 =
         0x81, 0xfe, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_949.c b/libs/wine/c_949.c
similarity index 99%
rename from libs/port/c_949.c
rename to libs/wine/c_949.c
index 0b2335b68a5..916bdb7f92c 100644
--- a/libs/port/c_949.c
+++ b/libs/wine/c_949.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/949.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[32512] =
@@ -9106,3 +9110,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_949 =
         0x81, 0xfe, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/libs/port/c_950.c b/libs/wine/c_950.c
similarity index 99%
rename from libs/port/c_950.c
rename to libs/wine/c_950.c
index 013b0ff3ff8..985344f4560 100644
--- a/libs/port/c_950.c
+++ b/libs/wine/c_950.c
@@ -2,6 +2,10 @@
 /* generated from https://download.microsoft.com/download/C/F/7/CF713A5E-9FBC-4FD6-9246-275F65C0E498/Windows Supported Code Page Data Files.zip:CodpageFiles/950.txt */
 /* DO NOT EDIT!! */
 
+#include "wine/asm.h"
+
+#ifdef __ASM_OBSOLETE
+
 #include "wine/unicode.h"
 
 static const WCHAR cp2uni[32512] =
@@ -8355,3 +8359,5 @@ const struct dbcs_table DECLSPEC_HIDDEN cptable_950 =
         0x81, 0xfe, 0x00, 0x00
     }
 };
+
+#endif /* __ASM_OBSOLETE */
diff --git a/tools/make_unicode b/tools/make_unicode
index 80bf6304c39..bffde1d1e0f 100755
--- a/tools/make_unicode
+++ b/tools/make_unicode
@@ -40,71 +40,70 @@ my $DEF_CHAR = ord '?';
 
 my @allfiles =
 (
-    [ 37,    "CodpageFiles/037.txt",    "IBM EBCDIC US Canada" ],
-    [ 437,   "CodpageFiles/437.txt",    "OEM United States" ],
-    [ 500,   "CodpageFiles/500.txt",    "IBM EBCDIC International" ],
-    [ 737,   "CodpageFiles/737.txt",    "OEM Greek 437G" ],
-    [ 775,   "CodpageFiles/775.txt",    "OEM Baltic" ],
-    [ 850,   "CodpageFiles/850.txt",    "OEM Multilingual Latin 1" ],
-    [ 852,   "CodpageFiles/852.txt",    "OEM Slovak Latin 2" ],
-    [ 855,   "CodpageFiles/855.txt",    "OEM Cyrillic" ],
-    [ 857,   "CodpageFiles/857.txt",    "OEM Turkish" ],
-    [ 860,   "CodpageFiles/860.txt",    "OEM Portuguese" ],
-    [ 861,   "CodpageFiles/861.txt",    "OEM Icelandic" ],
-    [ 862,   "CodpageFiles/862.txt",    "OEM Hebrew" ],
-    [ 863,   "CodpageFiles/863.txt",    "OEM Canadian French" ],
-    [ 864,   "CodpageFiles/864.txt",    "OEM Arabic" ],
-    [ 865,   "CodpageFiles/865.txt",    "OEM Nordic" ],
-    [ 866,   "CodpageFiles/866.txt",    "OEM Russian" ],
-    [ 869,   "CodpageFiles/869.txt",    "OEM Greek" ],
-    [ 874,   "CodpageFiles/874.txt",    "ANSI/OEM Thai" ],
-    [ 875,   "CodpageFiles/875.txt",    "IBM EBCDIC Greek" ],
-    [ 932,   "CodpageFiles/932.txt",    "ANSI/OEM Japanese Shift-JIS" ],
-    [ 936,   "CodpageFiles/936.txt",    "ANSI/OEM Simplified Chinese GBK" ],
-    [ 949,   "CodpageFiles/949.txt",    "ANSI/OEM Korean Unified Hangul" ],
-    [ 950,   "CodpageFiles/950.txt",    "ANSI/OEM Traditional Chinese Big5" ],
-    [ 1026,  "CodpageFiles/1026.txt",   "IBM EBCDIC Latin 5 Turkish" ],
-    [ 1250,  "CodpageFiles/1250.txt",   "ANSI Eastern Europe" ],
-    [ 1251,  "CodpageFiles/1251.txt",   "ANSI Cyrillic" ],
-    [ 1252,  "CodpageFiles/1252.txt",   "ANSI Latin 1" ],
-    [ 1253,  "CodpageFiles/1253.txt",   "ANSI Greek" ],
-    [ 1254,  "CodpageFiles/1254.txt",   "ANSI Turkish" ],
-    [ 1255,  "CodpageFiles/1255.txt",   "ANSI Hebrew" ],
-    [ 1256,  "CodpageFiles/1256.txt",   "ANSI Arabic" ],
-    [ 1257,  "CodpageFiles/1257.txt",   "ANSI Baltic" ],
-    [ 1258,  "CodpageFiles/1258.txt",   "ANSI/OEM Viet Nam" ],
-    [ 1361,  "CodpageFiles/1361.txt",   "Korean Johab" ],
-    [ 10000, "CodpageFiles/10000.txt",  "Mac Roman" ],
-    [ 10001, "CodpageFiles/10001.txt",  "Mac Japanese" ],
-    [ 10002, "CodpageFiles/10002.txt",  "Mac Traditional Chinese" ],
-    [ 10003, "CodpageFiles/10003.txt",  "Mac Korean" ],
-    [ 10004, "CodpageFiles/10004.txt",  "Mac Arabic" ],
-    [ 10005, "CodpageFiles/10005.txt",  "Mac Hebrew" ],
-    [ 10006, "CodpageFiles/10006.txt",  "Mac Greek" ],
-    [ 10007, "CodpageFiles/10007.txt",  "Mac Cyrillic" ],
-    [ 10008, "CodpageFiles/10008.txt",  "Mac Simplified Chinese" ],
-    [ 10010, "CodpageFiles/10010.txt",  "Mac Romanian" ],
-    [ 10017, "CodpageFiles/10017.txt",  "Mac Ukrainian" ],
-    [ 10021, "CodpageFiles/10021.txt",  "Mac Thai" ],
-    [ 10029, "CodpageFiles/10029.txt",  "Mac Latin 2" ],
-    [ 10079, "CodpageFiles/10079.txt",  "Mac Icelandic" ],
-    [ 10081, "CodpageFiles/10081.txt",  "Mac Turkish" ],
-    [ 10082, "CodpageFiles/10082.txt",  "Mac Croatian" ],
-    [ 20127, "CodpageFiles/20127.txt",  "US-ASCII (7bit)" ],
-    [ 20866, "CodpageFiles/20866.txt",  "Russian KOI8" ],
-    [ 20932, "OBSOLETE/EASTASIA/JIS",   "EUC-JP" ],
-    [ 21866, "CodpageFiles/21866.txt",  "Ukrainian KOI8" ],
-    [ 28591, "CodpageFiles/28591.txt",  "ISO 8859-1 Latin 1" ],
-    [ 28592, "CodpageFiles/28592.txt",  "ISO 8859-2 Latin 2 (East European)" ],
-    [ 28593, "CodpageFiles/28593.txt",  "ISO 8859-3 Latin 3 (South European)" ],
-    [ 28594, "CodpageFiles/28594.txt",  "ISO 8859-4 Latin 4 (Baltic old)" ],
-    [ 28595, "CodpageFiles/28595.txt",  "ISO 8859-5 Cyrillic" ],
-    [ 28596, "CodpageFiles/28596.txt",  "ISO 8859-6 Arabic" ],
-    [ 28597, "CodpageFiles/28597.txt",  "ISO 8859-7 Greek" ],
-    [ 28598, "CodpageFiles/28598.txt",  "ISO 8859-8 Hebrew" ],
-    [ 28599, "CodpageFiles/28599.txt",  "ISO 8859-9 Latin 5 (Turkish)" ],
-    [ 28603, "CodpageFiles/28603.txt",  "ISO 8859-13 Latin 7 (Baltic)" ],
-    [ 28605, "CodpageFiles/28605.txt",  "ISO 8859-15 Latin 9 (Euro)" ],
+    "CodpageFiles/037.txt",
+    "CodpageFiles/437.txt",
+    "CodpageFiles/500.txt",
+    "CodpageFiles/737.txt",
+    "CodpageFiles/775.txt",
+    "CodpageFiles/850.txt",
+    "CodpageFiles/852.txt",
+    "CodpageFiles/855.txt",
+    "CodpageFiles/857.txt",
+    "CodpageFiles/860.txt",
+    "CodpageFiles/861.txt",
+    "CodpageFiles/862.txt",
+    "CodpageFiles/863.txt",
+    "CodpageFiles/864.txt",
+    "CodpageFiles/865.txt",
+    "CodpageFiles/866.txt",
+    "CodpageFiles/869.txt",
+    "CodpageFiles/874.txt",
+    "CodpageFiles/875.txt",
+    "CodpageFiles/932.txt",
+    "CodpageFiles/936.txt",
+    "CodpageFiles/949.txt",
+    "CodpageFiles/950.txt",
+    "CodpageFiles/1026.txt",
+    "CodpageFiles/1250.txt",
+    "CodpageFiles/1251.txt",
+    "CodpageFiles/1252.txt",
+    "CodpageFiles/1253.txt",
+    "CodpageFiles/1254.txt",
+    "CodpageFiles/1255.txt",
+    "CodpageFiles/1256.txt",
+    "CodpageFiles/1257.txt",
+    "CodpageFiles/1258.txt",
+    "CodpageFiles/1361.txt",
+    "CodpageFiles/10000.txt",
+    "CodpageFiles/10001.txt",
+    "CodpageFiles/10002.txt",
+    "CodpageFiles/10003.txt",
+    "CodpageFiles/10004.txt",
+    "CodpageFiles/10005.txt",
+    "CodpageFiles/10006.txt",
+    "CodpageFiles/10007.txt",
+    "CodpageFiles/10008.txt",
+    "CodpageFiles/10010.txt",
+    "CodpageFiles/10017.txt",
+    "CodpageFiles/10021.txt",
+    "CodpageFiles/10029.txt",
+    "CodpageFiles/10079.txt",
+    "CodpageFiles/10081.txt",
+    "CodpageFiles/10082.txt",
+    "CodpageFiles/20127.txt",
+    "CodpageFiles/20866.txt",
+    "CodpageFiles/21866.txt",
+    "CodpageFiles/28591.txt",
+    "CodpageFiles/28592.txt",
+    "CodpageFiles/28593.txt",
+    "CodpageFiles/28594.txt",
+    "CodpageFiles/28595.txt",
+    "CodpageFiles/28596.txt",
+    "CodpageFiles/28597.txt",
+    "CodpageFiles/28598.txt",
+    "CodpageFiles/28599.txt",
+    "CodpageFiles/28603.txt",
+    "CodpageFiles/28605.txt",
 );
 
 
@@ -661,10 +660,12 @@ sub get_glyphs_mapping(@)
 
 ################################################################
 # build EUC-JP table from the JIS 0208/0212 files
-sub output_eucjp_codepage($$)
+sub dump_eucjp_codepage()
 {
-    my ($dir, $comment) = @_;
-
+    @cp2uni = ();
+    @glyph2uni = ();
+    @lead_bytes = ();
+    @uni2cp = ();
     $default_char = $DEF_CHAR;
     $default_wchar = 0x30fb;
 
@@ -702,8 +703,7 @@ sub output_eucjp_codepage($$)
         }
     }
 
-    my $name = "$dir/JIS0208.TXT";
-    my $INPUT = open_data_file( $MAPPINGS, $name );
+    my $INPUT = open_data_file( $MAPPINGS, "OBSOLETE/EASTASIA/JIS/JIS0208.TXT" );
     while (<$INPUT>)
     {
         next if /^\#/;  # skip comments
@@ -714,12 +714,11 @@ sub output_eucjp_codepage($$)
             add_mapping( 0x8080 + hex $1, hex $2 );
             next;
         }
-        die "$name: Unrecognized line $_\n";
+        die "Unrecognized line $_\n";
     }
     close $INPUT;
 
-    $name = "$dir/JIS0212.TXT";
-    $INPUT = open_data_file( $MAPPINGS, $name );
+    $INPUT = open_data_file( $MAPPINGS, "OBSOLETE/EASTASIA/JIS/JIS0212.TXT" );
     while (<$INPUT>)
     {
         next if /^\#/;  # skip comments
@@ -730,11 +729,11 @@ sub output_eucjp_codepage($$)
             add_mapping( 0x8000 + hex $1, hex $2 );
             next;
         }
-        die "$name: Unrecognized line $_\n";
+        die "Unrecognized line $_\n";
     }
     close $INPUT;
 
-    output_codepage_file( 20932, "$MAPPINGS/$dir", $comment );
+    output_codepage_file( 20932 );
 }
 
 
@@ -857,203 +856,6 @@ sub dump_array($$@)
 }
 
 
-################################################################
-# dump a unicode->ascii mapping table
-sub dump_uni2cp_table($$)
-{
-    my ($width, $def) = @_;
-
-    # count the number of unicode->ascii subtables that contain something
-
-    my @lowerbounds;
-    my @upperbounds;
-    my $index = 0;
-    my @filled = (-1) x 256;
-    for (my $i = 0; $i < 65536; $i++)
-    {
-        next unless defined $uni2cp[$i];
-        if ($filled[$i >> 8] == -1)
-        {
-          $lowerbounds[$index] = $i & 0xff;
-          $upperbounds[$index] = 0xff - $lowerbounds[$index];
-          $filled[$i >> 8] = $index * 256;
-          $index++;
-        }
-        else
-        {
-          $upperbounds[$index-1] = 0xff - ($i & 0xff);
-        }
-    }
-
-    # add defaults mapping at the end
-    $filled[256] = $index * 256;
-    $lowerbounds[$index] = 255;
-    $upperbounds[$index] = 0;
-    $index++;
-
-    # collapse blocks upwards if possible
-    my $removed = 0;
-    $index = 0;
-    for (my $i = 0; $i < 257; $i++)
-    {
-        next if $filled[$i] == -1;
-        if ($upperbounds[$index - 1] > $lowerbounds[$index])
-        {
-           $removed += $lowerbounds[$index];
-        }
-        else
-        {
-           $removed += $upperbounds[$index - 1];
-           $lowerbounds[$index] = $upperbounds[$index - 1];
-        }
-        $filled[$i] -= $removed;
-        $index++;
-    }
-
-    # output all the subtables into a single array
-
-    printf OUTPUT "static const unsigned %s uni2cp_low[] =\n{\n", $width == 8 ? "char" : "short";
-
-    for (my $i = $index = 0; $i < 257; $i++)
-    {
-        next if $filled[$i] == -1;
-        my $start = ($i << 8) + $lowerbounds[$index];
-        my $end = ($i << 8) + 255;
-        if ($i == 256)
-        {
-            print OUTPUT "    /* defaults */\n";
-            printf OUTPUT "%s\n};\n\n", dump_array( $width, 0, ($def) x ($end - $start + 1) );
-        }
-        else
-        {
-            printf OUTPUT "    /* 0x%04x .. 0x%04x */\n", $start, $end;
-            printf OUTPUT "%s,\n", dump_array( $width, $def, @uni2cp[$start .. $end] );
-        }
-        $index++;
-    }
-
-    # output a table of the offsets of the subtables in the previous array
-
-    for (my $i = 0; $i < 256; $i++)
-    {
-        if ($filled[$i] == -1) { $filled[$i] = $filled[256]; }
-    }
-    printf OUTPUT "static const unsigned short uni2cp_high[256] =\n";
-    printf OUTPUT "{\n%s\n};\n\n", dump_array( 16, 0, @filled[0..255] );
-}
-
-################################################################
-# dump an SBCS mapping table
-sub dump_sbcs_table($$$$)
-{
-    my ($codepage, $name, $def, $defw) = @_;
-    my $i;
-
-    # output the ascii->unicode table
-
-    if (@glyph2uni)
-    {
-        printf OUTPUT "static const WCHAR cp2uni[512] =\n";
-        printf OUTPUT "{\n%s", dump_array( 16, $defw, @cp2uni[0 .. 255] );
-        printf OUTPUT ",\n    /* glyphs */\n%s\n};\n\n",
-                      dump_array( 16, $defw, get_glyphs_mapping(@cp2uni[0 .. 255]) );
-    }
-    else
-    {
-        printf OUTPUT "static const WCHAR cp2uni[256] =\n";
-        printf OUTPUT "{\n%s\n};\n\n", dump_array( 16, $defw, @cp2uni[0 .. 255] );
-    }
-
-    dump_uni2cp_table( 8, $def );
-
-    # output the code page descriptor
-
-    printf OUTPUT "const struct sbcs_table DECLSPEC_HIDDEN cptable_%03d =\n{\n", $codepage;
-    printf OUTPUT "    { %d, 1, 0x%04x, 0x%04x, \"%s\" },\n",
-                  $codepage, $def, $defw, $name;
-    printf OUTPUT "    cp2uni,\n";
-    if (@glyph2uni) { printf OUTPUT "    cp2uni + 256,\n"; }
-    else { printf OUTPUT "    cp2uni,\n"; }
-    printf OUTPUT "    uni2cp_low,\n";
-    printf OUTPUT "    uni2cp_high\n};\n";
-}
-
-
-################################################################
-# dump a DBCS mapping table
-sub dump_dbcs_table($$$$@)
-{
-    my ($codepage, $name, $def, $defw, @lb_ranges) = @_;
-
-    # build a list of lead bytes that are actually used
-
-    my @lblist = ();
-    LBLOOP: for (my $y = 0; $y <= $#lead_bytes; $y++)
-    {
-        $cp2uni[$lead_bytes[$y]] = $defw;
-        my $base = $lead_bytes[$y] << 8;
-        for (my $x = 0; $x < 256; $x++)
-        {
-            if (defined $cp2uni[$base+$x])
-            {
-                push @lblist,$lead_bytes[$y];
-                next LBLOOP;
-            }
-        }
-    }
-    my $unused = ($#lead_bytes > $#lblist);
-
-    # output the ascii->unicode table for the single byte chars
-
-    printf OUTPUT "static const WCHAR cp2uni[%d] =\n", 256 * ($#lblist + 2 + $unused);
-    printf OUTPUT "{\n%s,\n", dump_array( 16, $defw, @cp2uni[0 .. 255] );
-
-    # output the default table for unused lead bytes
-
-    if ($unused)
-    {
-        printf OUTPUT "    /* unused lead bytes */\n";
-        printf OUTPUT "%s,\n", dump_array( 16, 0, ($defw) x 256 );
-    }
-
-    # output the ascii->unicode table for each DBCS lead byte
-
-    for (my $y = 0; $y <= $#lblist; $y++)
-    {
-        my $base = $lblist[$y] << 8;
-        printf OUTPUT "    /* lead byte %02x */\n", $lblist[$y];
-        printf OUTPUT "%s", dump_array( 16, $defw, @cp2uni[$base .. $base+255] );
-        printf OUTPUT ($y < $#lblist) ? ",\n" : "\n};\n\n";
-    }
-
-    # output the lead byte subtables offsets
-
-    my @offsets = (0) x 256;
-    for (my $x = 0; $x <= $#lblist; $x++) { $offsets[$lblist[$x]] = $x + 1; }
-    if ($unused)
-    {
-        # increment all lead bytes offset to take into account the unused table
-        for (my $x = 0; $x <= $#lead_bytes; $x++) { $offsets[$lead_bytes[$x]]++; }
-    }
-    printf OUTPUT "static const unsigned char cp2uni_leadbytes[256] =\n";
-    printf OUTPUT "{\n%s\n};\n\n", dump_array( 8, 0, @offsets );
-
-    dump_uni2cp_table( 16, $def );
-
-    # output the code page descriptor
-
-    printf OUTPUT "const struct dbcs_table DECLSPEC_HIDDEN cptable_%03d =\n{\n", $codepage;
-    printf OUTPUT "    { %d, 2, 0x%04x, 0x%04x, \"%s\" },\n",
-                  $codepage, $def, $defw, $name;
-    printf OUTPUT "    cp2uni,\n";
-    printf OUTPUT "    cp2uni_leadbytes,\n";
-    printf OUTPUT "    uni2cp_low,\n";
-    printf OUTPUT "    uni2cp_high,\n";
-    printf OUTPUT "    {\n    %s\n    }\n", dump_array( 8, 0, @lb_ranges, 0, 0 );
-    printf OUTPUT "};\n";
-}
-
-
 ################################################################
 # dump an SBCS mapping table in binary format
 sub dump_binary_sbcs_table($)
@@ -2392,30 +2194,11 @@ sub dump_combining_class($)
 
 ################################################################
 # output a codepage definition file from the global tables
-sub output_codepage_file($$$)
+sub output_codepage_file($)
 {
-    my ($codepage, $filename, $comment) = @_;
+    my $codepage = shift;
 
-    my $output = sprintf "libs/port/c_%03d.c", $codepage;
-    open OUTPUT,">$output.new" or die "Cannot create $output";
-
-    printf "Building %s (%s)\n", $output, $comment;
-
-    # dump all tables
-
-    printf OUTPUT "/* code page %03d (%s) */\n", $codepage, $comment;
-    print OUTPUT "/* generated from $filename */\n";
-    print OUTPUT "/* DO NOT EDIT!! */\n\n";
-    printf OUTPUT "#include \"wine/unicode.h\"\n\n";
-
-    if (!@lead_bytes) { dump_sbcs_table( $codepage, $comment, $default_char, $default_wchar ); }
-    else { dump_dbcs_table( $codepage, $comment, $default_char, $default_wchar, get_lb_ranges() ); }
-    close OUTPUT;
-    save_file($output);
-
-    # same thing in binary format
-
-    $output = sprintf "nls/c_%03d.nls", $codepage;
+    my $output = sprintf "nls/c_%03d.nls", $codepage;
     open OUTPUT,">$output.new" or die "Cannot create $output";
 
     printf "Building %s\n", $output;
@@ -2428,13 +2211,21 @@ sub output_codepage_file($$$)
 
 ################################################################
 # output a codepage table from a Microsoft-style mapping file
-sub output_msdata_codepage($$)
+sub dump_msdata_codepage($)
 {
-    my ($filename, $comment) = @_;
+    my $filename = shift;
+
     my $state = "";
     my ($codepage, $width, $count);
     my ($lb_cur, $lb_end);
 
+    @cp2uni = ();
+    @glyph2uni = ();
+    @lead_bytes = ();
+    @uni2cp = ();
+    $default_char = $DEF_CHAR;
+    $default_wchar = $DEF_CHAR;
+
     my $INPUT = open_data_file( $MSCODEPAGES, $filename ) or die "Cannot open $filename";
 
     while (<$INPUT>)
@@ -2511,32 +2302,7 @@ sub output_msdata_codepage($$)
     }
     close $INPUT;
 
-    output_codepage_file( $codepage, "$MSCODEPAGES:$filename", $comment );
-}
-
-
-################################################################
-# read an input file and generate the corresponding .c file
-sub handle_codepage_file(@)
-{
-    my ($codepage, $filename, $comment) = @_;
-
-    @cp2uni = ();
-    @glyph2uni = ();
-    @lead_bytes = ();
-    @uni2cp = ();
-    $default_char = $DEF_CHAR;
-    $default_wchar = $DEF_CHAR;
-
-    # some codepage files are special
-    if ($codepage == 20932)
-    {
-        output_eucjp_codepage( $filename, $comment );
-    }
-    else
-    {
-        output_msdata_codepage( $filename, $comment );
-    }
+    output_codepage_file( $codepage );
 }
 
 
@@ -2613,8 +2379,8 @@ dump_vertical( "dlls/gdi32/vertical.c" );
 dump_vertical( "dlls/wineps.drv/vertical.c" );
 dump_nameprep( "dlls/kernel32/nameprep.c" );
 dump_intl_nls("nls/l_intl.nls");
-
-foreach my $file (@allfiles) { handle_codepage_file( @{$file} ); }
+foreach my $file (@allfiles) { dump_msdata_codepage( $file ); }
+dump_eucjp_codepage();
 
 exit 0;