[edk2-libc Patch 0/9] Update for edk2/master and VS2017/VS2019

[edk2-libc Patch 0/9] Update for edk2/master and VS2017/VS2019

[Michael D Kinney]

Update AppPkg and StdLib* to build using latest edk2/master and 
support VS2017 and VS2019.

Most of the changes are related to warning levels, missing symbols and
duplicate symbols that were uncovered by the use of the /WHOLEARCHIVE
flag.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>

Michael D Kinney (9):
  StdLib: Add /Wv:11 to VS2017/VS2019 CC_FLAGS
  StdLib: Add MdeLibs.dsc.inc to StdLib.dsc
  StdLib: Remove SocketDxe from build
  StdLib/LibC/gdtoa: Remove source file with unused ldtoa() function.
  StdLib/BsdSocketLib: Add missing LibNetUtil dependency to INF
  StdLib/BsdSocketLib: Add /wd4706 to CC_FLAGS
  AppPkg: Add MdeLibs.dsc.inc to AppPkg.dsc
  AppPkg/Applications/Python: Enable HAVE_COPYSIGN define
  AppPkg/Applications/Python/Python-2.7.10: Update INF lib classes

 AppPkg/AppPkg.dsc                                        | 2 ++
 AppPkg/Applications/Python/Ia32/pyconfig.h               | 2 +-
 AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h | 2 +-
 AppPkg/Applications/Python/Python-2.7.10/Python2710.inf  | 7 ++-----
 AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h  | 2 +-
 AppPkg/Applications/Python/X64/pyconfig.h                | 3 +--
 StdLib/BsdSocketLib/BsdSocketLib.inf                     | 4 ++++
 StdLib/LibC/gdtoa/gdtoa.inf                              | 1 -
 StdLib/StdLib.dsc                                        | 2 ++
 StdLib/StdLib.inc                                        | 4 +++-
 10 files changed, 17 insertions(+), 12 deletions(-)

-- 
2.32.0.windows.1

[edk2-libc Patch 1/9] StdLib: Add /Wv:11 to VS2017/VS2019 CC_FLAGS

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Add /Wv:11 to VS2017/VS2017 CC_FLAGS to match the warning level
used by VS2015.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 StdLib/StdLib.inc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index 32e1ae0..d0a0c8a 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -137,3 +137,5 @@
     MSFT:*_VS2015x86_*_CC_FLAGS       = /Wv:11
     MSFT:*_VS2015xASL_*_CC_FLAGS      = /Wv:11
     MSFT:*_VS2015x86xASL_*_CC_FLAGS   = /Wv:11
+    MSFT:*_VS2017_*_CC_FLAGS          = /Wv:11
+    MSFT:*_VS2019_*_CC_FLAGS          = /Wv:11
-- 
2.32.0.windows.1

[edk2-libc Patch 2/9] StdLib: Add MdeLibs.dsc.inc to StdLib.dsc

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Fix missing RegisterFilterLib build failure by adding MdeLibs.dsc.inc
after the [Defines] section of StdLib.dsc.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 StdLib/StdLib.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/StdLib/StdLib.dsc b/StdLib/StdLib.dsc
index 535f16a..d064a1e 100644
--- a/StdLib/StdLib.dsc
+++ b/StdLib/StdLib.dsc
@@ -32,6 +32,8 @@
   DEFINE DEBUG_PRINT_ERROR_LEVEL  = 0x80000000  # Flags to control amount of debug output
   DEFINE DEBUG_PROPERTY_MASK      = 0x0f
 
+!include MdePkg/MdeLibs.dsc.inc
+
 [PcdsFeatureFlag]
 
 [PcdsFixedAtBuild]
-- 
2.32.0.windows.1

[edk2-libc Patch 3/9] StdLib: Remove SocketDxe from build

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

SocketDxe generates build failures with VS2017 and VS2019 due to
use of weak references and /WHOLEARCHIVE.  Disable SocketDxe until
weak references can be removed.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 StdLib/StdLib.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
index d0a0c8a..4c72b4f 100644
--- a/StdLib/StdLib.inc
+++ b/StdLib/StdLib.inc
@@ -99,7 +99,7 @@
 ##########
 #  Socket Layer
 ##########
-  StdLib/SocketDxe/SocketDxe.inf
+#  StdLib/SocketDxe/SocketDxe.inf
 
 
 ##############################################################################
-- 
2.32.0.windows.1

[edk2-libc Patch 4/9] StdLib/LibC/gdtoa: Remove source file with unused ldtoa() function.

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Removing the ldtoa.c file from the INF removes the ldtoa()
function from this library.  The ldtoa() function is not used
and when /WHOLEARCHIVE linker flag is enabled this unused
function makes references to other functions that are not
implemented and that generates a link failure.  Removing the
unused source file resolves the link failure.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 StdLib/LibC/gdtoa/gdtoa.inf | 1 -
 1 file changed, 1 deletion(-)

diff --git a/StdLib/LibC/gdtoa/gdtoa.inf b/StdLib/LibC/gdtoa/gdtoa.inf
index 08ef5e0..51def1c 100644
--- a/StdLib/LibC/gdtoa/gdtoa.inf
+++ b/StdLib/LibC/gdtoa/gdtoa.inf
@@ -52,7 +52,6 @@
 
   # Private interfaces interfacing to libc
   dtoa.c
-  ldtoa.c
   gdtoa.c
 
   # private interfaces
-- 
2.32.0.windows.1

[edk2-libc Patch 5/9] StdLib/BsdSocketLib: Add missing LibNetUtil dependency to INF

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Add LibNetUtil to BsdSocketLib INF file that fails with missing
symbols for inet_ntoa(), inet_aton(), inet_ntop(), inet_network()
when BsdSocketLib is linked to another component.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 StdLib/BsdSocketLib/BsdSocketLib.inf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/StdLib/BsdSocketLib/BsdSocketLib.inf b/StdLib/BsdSocketLib/BsdSocketLib.inf
index 238b709..44b7899 100644
--- a/StdLib/BsdSocketLib/BsdSocketLib.inf
+++ b/StdLib/BsdSocketLib/BsdSocketLib.inf
@@ -108,6 +108,7 @@
   DevUtility
   UefiBootServicesTableLib
   UefiLib
+  LibNetUtil
 
 [Protocols]
   gEfiSocketServiceBindingProtocolGuid
-- 
2.32.0.windows.1

[edk2-libc Patch 6/9] StdLib/BsdSocketLib: Add /wd4706 to CC_FLAGS

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Disable warning 4706 to allow assignments in conditional
statements.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 StdLib/BsdSocketLib/BsdSocketLib.inf | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/StdLib/BsdSocketLib/BsdSocketLib.inf b/StdLib/BsdSocketLib/BsdSocketLib.inf
index 44b7899..c806c4a 100644
--- a/StdLib/BsdSocketLib/BsdSocketLib.inf
+++ b/StdLib/BsdSocketLib/BsdSocketLib.inf
@@ -113,3 +113,6 @@
 [Protocols]
   gEfiSocketServiceBindingProtocolGuid
   gEfiSocketProtocolGuid
+
+[BuildOptions]
+   MSFT:*_*_*_CC_FLAGS = /wd4706
-- 
2.32.0.windows.1

[edk2-libc Patch 7/9] AppPkg: Add MdeLibs.dsc.inc to AppPkg.dsc

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Fix missing RegisterFilterLib build failure by adding MdeLibs.dsc.inc
after the [Defines] section of AppPkg.dsc.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 AppPkg/AppPkg.dsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/AppPkg/AppPkg.dsc b/AppPkg/AppPkg.dsc
index 42af080..c2305d7 100644
--- a/AppPkg/AppPkg.dsc
+++ b/AppPkg/AppPkg.dsc
@@ -28,6 +28,8 @@
   DEFINE DEBUG_PRINT_ERROR_LEVEL  = 0x80000040  # Flags to control amount of debug output
   DEFINE DEBUG_PROPERTY_MASK      = 0
 
+!include MdePkg/MdeLibs.dsc.inc
+
 [PcdsFeatureFlag]
 
 [PcdsFixedAtBuild]
-- 
2.32.0.windows.1

[edk2-libc Patch 8/9] AppPkg/Applications/Python: Enable HAVE_COPYSIGN define

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Update Python configuration to enable the HAVE_COPYSIGN define
to prevent multiple defined symbols link failure for copysign().

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 AppPkg/Applications/Python/Ia32/pyconfig.h               | 2 +-
 AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h | 2 +-
 AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h  | 2 +-
 AppPkg/Applications/Python/X64/pyconfig.h                | 3 +--
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/AppPkg/Applications/Python/Ia32/pyconfig.h b/AppPkg/Applications/Python/Ia32/pyconfig.h
index ef241a9..2d73346 100644
--- a/AppPkg/Applications/Python/Ia32/pyconfig.h
+++ b/AppPkg/Applications/Python/Ia32/pyconfig.h
@@ -125,7 +125,7 @@
 #undef HAVE_CONIO_H
 
 /* Define to 1 if you have the 'copysign' function. */
-#undef HAVE_COPYSIGN
+#define HAVE_COPYSIGN         1
 
 /* Define to 1 if you have the 'ctermid' function. */
 #undef HAVE_CTERMID
diff --git a/AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h b/AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h
index 5aa936c..5a86ec3 100644
--- a/AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h
+++ b/AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h
@@ -138,7 +138,7 @@
 #undef HAVE_CONIO_H
 
 /* Define to 1 if you have the 'copysign' function. */
-#undef HAVE_COPYSIGN
+#define HAVE_COPYSIGN         1
 
 /* Define to 1 if you have the 'ctermid' function. */
 #undef HAVE_CTERMID
diff --git a/AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h b/AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h
index 92731f7..f07db09 100644
--- a/AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h
+++ b/AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h
@@ -138,7 +138,7 @@
 #undef HAVE_CONIO_H
 
 /* Define to 1 if you have the 'copysign' function. */
-#undef HAVE_COPYSIGN
+#define HAVE_COPYSIGN         1
 
 /* Define to 1 if you have the 'ctermid' function. */
 #undef HAVE_CTERMID
diff --git a/AppPkg/Applications/Python/X64/pyconfig.h b/AppPkg/Applications/Python/X64/pyconfig.h
index 81dbada..00ff4f9 100644
--- a/AppPkg/Applications/Python/X64/pyconfig.h
+++ b/AppPkg/Applications/Python/X64/pyconfig.h
@@ -132,7 +132,7 @@
 #undef HAVE_CONIO_H
 
 /* Define to 1 if you have the 'copysign' function. */
-#undef HAVE_COPYSIGN
+#define HAVE_COPYSIGN         1
 
 /* Define to 1 if you have the 'ctermid' function. */
 #undef HAVE_CTERMID
@@ -1299,4 +1299,3 @@
 //#undef volatile
 
 #endif /*Py_PYCONFIG_H*/
-
-- 
2.32.0.windows.1

[edk2-libc Patch 9/9] AppPkg/Applications/Python/Python-2.7.10: Update INF lib classes

[Michael D Kinney]

REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549

Add BsdSocketLib and EfiSocketLib to [LibraryClasses] section
of Python-2.7.10.inf.  Even if sockets are disabled in Python
config, with the /WHOLEARCHIVE linker option, there are still
references to the socket related functions.  Add these lib
classes so the link can pass for both sockets enabled and sockets
disabled builds.

Cc: Rebecca Cran <rebecca@nuviainc.com>
Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
---
 AppPkg/Applications/Python/Python-2.7.10/Python2710.inf | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/AppPkg/Applications/Python/Python-2.7.10/Python2710.inf b/AppPkg/Applications/Python/Python-2.7.10/Python2710.inf
index 2675630..ccf0c60 100644
--- a/AppPkg/Applications/Python/Python-2.7.10/Python2710.inf
+++ b/AppPkg/Applications/Python/Python-2.7.10/Python2710.inf
@@ -43,11 +43,8 @@
   LibGen
   LibNetUtil
   DevMedia
-  #
-# Comment out the following two library classes if socket support is
-# NOT being built in to Python.
-  #BsdSocketLib
-  #EfiSocketLib
+  BsdSocketLib
+  EfiSocketLib
 
 [FixedPcd]
   gEfiMdePkgTokenSpaceGuid.PcdDebugPropertyMask|0x0F
-- 
2.32.0.windows.1

Re: [edk2-libc Patch 3/9] StdLib: Remove SocketDxe from build

[Rebecca Cran]

Maybe add a comment saying why it's disabled, in case fixing it takes 
some time?


-- 
Rebecca Cran


On 8/17/21 11:42 PM, Michael D Kinney wrote:
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549
>
> SocketDxe generates build failures with VS2017 and VS2019 due to
> use of weak references and /WHOLEARCHIVE.  Disable SocketDxe until
> weak references can be removed.
>
> Cc: Rebecca Cran <rebecca@nuviainc.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> ---
>   StdLib/StdLib.inc | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
> index d0a0c8a..4c72b4f 100644
> --- a/StdLib/StdLib.inc
> +++ b/StdLib/StdLib.inc
> @@ -99,7 +99,7 @@
>   ##########
>   #  Socket Layer
>   ##########
> -  StdLib/SocketDxe/SocketDxe.inf
> +#  StdLib/SocketDxe/SocketDxe.inf
>   
>   
>   ##############################################################################

Re: [edk2-libc Patch 0/9] Update for edk2/master and VS2017/VS2019

[Rebecca Cran]

For patches 1,2,4,7-9:


Reviewed-by: Rebecca Cran <rebecca@nuviainc.com>


-- 
Rebecca Cran


On 8/17/21 11:41 PM, Michael D Kinney wrote:
> Update AppPkg and StdLib* to build using latest edk2/master and
> support VS2017 and VS2019.
>
> Most of the changes are related to warning levels, missing symbols and
> duplicate symbols that were uncovered by the use of the /WHOLEARCHIVE
> flag.
>
> Cc: Rebecca Cran <rebecca@nuviainc.com>
> Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
>
> Michael D Kinney (9):
>    StdLib: Add /Wv:11 to VS2017/VS2019 CC_FLAGS
>    StdLib: Add MdeLibs.dsc.inc to StdLib.dsc
>    StdLib: Remove SocketDxe from build
>    StdLib/LibC/gdtoa: Remove source file with unused ldtoa() function.
>    StdLib/BsdSocketLib: Add missing LibNetUtil dependency to INF
>    StdLib/BsdSocketLib: Add /wd4706 to CC_FLAGS
>    AppPkg: Add MdeLibs.dsc.inc to AppPkg.dsc
>    AppPkg/Applications/Python: Enable HAVE_COPYSIGN define
>    AppPkg/Applications/Python/Python-2.7.10: Update INF lib classes
>
>   AppPkg/AppPkg.dsc                                        | 2 ++
>   AppPkg/Applications/Python/Ia32/pyconfig.h               | 2 +-
>   AppPkg/Applications/Python/Python-2.7.10/Ia32/pyconfig.h | 2 +-
>   AppPkg/Applications/Python/Python-2.7.10/Python2710.inf  | 7 ++-----
>   AppPkg/Applications/Python/Python-2.7.10/X64/pyconfig.h  | 2 +-
>   AppPkg/Applications/Python/X64/pyconfig.h                | 3 +--
>   StdLib/BsdSocketLib/BsdSocketLib.inf                     | 4 ++++
>   StdLib/LibC/gdtoa/gdtoa.inf                              | 1 -
>   StdLib/StdLib.dsc                                        | 2 ++
>   StdLib/StdLib.inc                                        | 4 +++-
>   10 files changed, 17 insertions(+), 12 deletions(-)
>

Re: [edk2-devel] [edk2-libc Patch 3/9] StdLib: Remove SocketDxe from build

[Michael D Kinney]

Good idea.

I was going to enter a BZ too.

Mike

> -----Original Message-----
> From: devel@edk2.groups.io <devel@edk2.groups.io> On Behalf Of Rebecca Cran
> Sent: Wednesday, August 18, 2021 11:32 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; devel@edk2.groups.io
> Subject: Re: [edk2-devel] [edk2-libc Patch 3/9] StdLib: Remove SocketDxe from build
> 
> Maybe add a comment saying why it's disabled, in case fixing it takes
> some time?
> 
> 
> --
> Rebecca Cran
> 
> 
> On 8/17/21 11:42 PM, Michael D Kinney wrote:
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3549
> >
> > SocketDxe generates build failures with VS2017 and VS2019 due to
> > use of weak references and /WHOLEARCHIVE.  Disable SocketDxe until
> > weak references can be removed.
> >
> > Cc: Rebecca Cran <rebecca@nuviainc.com>
> > Signed-off-by: Michael D Kinney <michael.d.kinney@intel.com>
> > ---
> >   StdLib/StdLib.inc | 2 +-
> >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/StdLib/StdLib.inc b/StdLib/StdLib.inc
> > index d0a0c8a..4c72b4f 100644
> > --- a/StdLib/StdLib.inc
> > +++ b/StdLib/StdLib.inc
> > @@ -99,7 +99,7 @@
> >   ##########
> >   #  Socket Layer
> >   ##########
> > -  StdLib/SocketDxe/SocketDxe.inf
> > +#  StdLib/SocketDxe/SocketDxe.inf
> >
> >
> >   ##############################################################################
> 
> 
> 
>