MdeModulePkg RegularExpressionDxe: Update Oniguruma to 6.9.0

[mirror_edk2.git] / MdeModulePkg / Universal / RegularExpressionDxe / RegularExpressionDxe.inf

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
index 4bf8502e7ed46dc2fed9f6e3146ca302896946c3..7490a03c5c116ac1331712016f0cab4d82fb7c87 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
@@ -29,6 +29,7 @@
   Oniguruma/OnigurumaIntrinsics.c | MSFT\r
 \r
 # Upstream Oniguruma code\r
+  Oniguruma/onig_init.c\r
   Oniguruma/oniguruma.h\r
   Oniguruma/regcomp.c\r
   Oniguruma/regenc.c\r
@@ -50,9 +51,13 @@
   Oniguruma/st.h\r
 \r
 # Supported Character Encodings\r
-  Oniguruma/enc/ascii.c\r
-  Oniguruma/enc/unicode.c\r
-  Oniguruma/enc/utf16_le.c\r
+  Oniguruma/ascii.c\r
+  Oniguruma/unicode.c\r
+  Oniguruma/unicode_fold1_key.c\r
+  Oniguruma/unicode_fold2_key.c\r
+  Oniguruma/unicode_fold3_key.c\r
+  Oniguruma/unicode_unfold_key.c\r
+  Oniguruma/utf16_le.c\r
 \r
 [Packages]\r
   MdePkg/MdePkg.dec\r
@@ -75,11 +80,8 @@
 \r
 [BuildOptions]\r
   # Override MSFT build option to remove /Oi and /GL\r
-  MSFT:DEBUG_*_IA32_CC_FLAGS   == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm\r
-  MSFT:RELEASE_*_IA32_CC_FLAGS == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2  /FIAutoGen.h /EHs-c- /GR- /GF\r
-  MSFT:DEBUG_*_X64_CC_FLAGS    == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /Zi /Gm /X\r
-  MSFT:RELEASE_*_X64_CC_FLAGS  == /nologo /c /WX /GS- /W4 /Gs32768 /D UNICODE /O1b2s /FIAutoGen.h /EHs-c- /GR- /GF /Gy /X\r
-  INTEL:*_*_*_CC_FLAGS         =  /Oi-\r
+  MSFT:*_*_*_CC_FLAGS          = /GL-\r
+  INTEL:*_*_*_CC_FLAGS         = /Oi-\r
 \r
   # Oniguruma: potentially uninitialized local variable used\r
   MSFT:*_*_*_CC_FLAGS = /wd4701\r
@@ -93,3 +95,17 @@
   # Oniguruma: 'type cast' : truncation from 'OnigUChar *' to 'unsigned int'\r
   MSFT:*_*_*_CC_FLAGS = /wd4305 /wd4306\r
 \r
+  # Oniguruma: nameless union declared in regparse.h\r
+  MSFT:*_*_*_CC_FLAGS = /wd4201\r
+\r
+  # Oniguruma: 'type cast' : "int" to "OnigUChar", function pointer to "void *"\r
+  MSFT:*_*_*_CC_FLAGS = /wd4244 /wd4054\r
+\r
+  # Oniguruma: previous local declaration\r
+  MSFT:*_*_*_CC_FLAGS = /wd4456\r
+\r
+  # Oniguruma: signed and unsigned mismatch/cast\r
+  MSFT:*_*_*_CC_FLAGS = /wd4018 /wd4245 /wd4389\r
+\r
+  # Oniguruma: error: variable 'fp' set but not used\r
+  GCC:*_*_*_CC_FLAGS = -Wno-error=unused-but-set-variable\r