Merge pull request #79751 from Steelskin/fabrice/update-ucrt-modulemap

Update ucrt.modulemap for Windows SDK 10.0.26100

Author: Steelskin

stdlib/public/Platform/ucrt.modulemap

@@ -10,13 +10,55 @@
 //
 //===----------------------------------------------------------------------===//
 
-module _complex [system] {
+// The following modules have to be standalone top-level modules to deal with
+// version 10.0.26100 of the Windows SDK.
+module _malloc [system] [no_undeclared_includes] {
+  use corecrt
+  header "malloc.h"
+  export *
+}
+
+module _complex [system] [no_undeclared_includes] {
+  use corecrt
+  use std
   header "complex.h"
   export *
 }
 
+module _fenv [system] [no_undeclared_includes] {
+  use corecrt
+  use _float
+  header "fenv.h"
+  export *
+}
+
+module _float [system] [no_undeclared_includes] {
+  use corecrt
+  header "float.h"
+  export *
+}
+
+module _stddef [system] [no_undeclared_includes] {
+  header "stddef.h"
+  export *
+}
+
+module _stdlib [system] [no_undeclared_includes] {
+  use corecrt
+  header "stdlib.h"
+  export *
+}
+
 module ucrt [system] {
+  export _malloc
+
   module C {
+    export _complex
+    export _fenv
+    export _float
+    export _stddef
+    export _stdlib
+
     module ctype {
       header "ctype.h"
       export *
@@ -27,16 +69,6 @@ module ucrt [system] {
       export *
     }
 
-    module fenv {
-      header "fenv.h"
-      export *
-    }
-
-    module float {
-      header "float.h"
-      export *
-    }
-
     module inttypes {
       header "inttypes.h"
       export *
@@ -57,21 +89,9 @@ module ucrt [system] {
       export *
     }
 
-    module stddef {
-      header "stddef.h"
-      export *
-    }
-
     module stdio {
       header "stdio.h"
       export *
-
-      // NOTE(compnerd) this is a horrible workaround for the fact that
-      // Microsoft has fully inlined nearly all of the printf family of
-      // functions in the headers which results in the definitions being elided
-      // resulting in undefined symbols.  The legacy_stdio_definitions provides
-      // out-of-line definitions for these functions.
-      link "legacy_stdio_definitions"
     }
 
     module stdlib {
@@ -132,11 +152,6 @@ module ucrt [system] {
     export *
   }
 
-  module malloc {
-    header "malloc.h"
-    export *
-  }
-
   module minmax {
     header "minmax.h"
     export *