[stdlib] Renamed cross-platform C helper functions in Darwin so that we can share them with Glibc.

Author: rintaro

stdlib/public/Platform/CMakeLists.txt

@@ -2,7 +2,7 @@ add_swift_library(swiftDarwin IS_SDK_OVERLAY
   Darwin.swift
   POSIXError.swift
   MachError.swift
-  Misc.mm
+  Misc.c
   tgmath.swift.gyb
   SWIFT_COMPILE_FLAGS -Xfrontend -disable-objc-attr-requires-foundation-module
   API_NOTES_NON_OVERLAY)

stdlib/public/Platform/Darwin.swift

@@ -146,16 +146,16 @@ public var stderr : UnsafeMutablePointer<FILE> {
 //===----------------------------------------------------------------------===//
 
 @warn_unused_result
-@_silgen_name("_swift_Darwin_open") 
-func _swift_Darwin_open(
+@_silgen_name("_swift_Platform_open") 
+func _swift_Platform_open(
   path: UnsafePointer<CChar>,
   _ oflag: CInt,
   _ mode: mode_t
 ) -> CInt
 
 @warn_unused_result
-@_silgen_name("_swift_Darwin_openat")
-func _swift_Darwin_openat(fd: CInt,
+@_silgen_name("_swift_Platform_openat")
+func _swift_Platform_openat(fd: CInt,
   _ path: UnsafePointer<CChar>,
   _ oflag: CInt,
   _ mode: mode_t
@@ -166,7 +166,7 @@ public func open(
   path: UnsafePointer<CChar>,
   _ oflag: CInt
 ) -> CInt {
-  return _swift_Darwin_open(path, oflag, 0)
+  return _swift_Platform_open(path, oflag, 0)
 }
 
 @warn_unused_result
@@ -175,7 +175,7 @@ public func open(
   _ oflag: CInt,
   _ mode: mode_t
 ) -> CInt {
-  return _swift_Darwin_open(path, oflag, mode)
+  return _swift_Platform_open(path, oflag, mode)
 }
 
 @warn_unused_result
@@ -184,7 +184,7 @@ public func openat(
   _ path: UnsafePointer<CChar>,
   _ oflag: CInt
 ) -> CInt {
-  return _swift_Darwin_openat(fd, path, oflag, 0)
+  return _swift_Platform_openat(fd, path, oflag, 0)
 }
 
 @warn_unused_result
@@ -194,20 +194,20 @@ public func openat(
   _ oflag: CInt,
   _ mode: mode_t
 ) -> CInt {
-  return _swift_Darwin_openat(fd, path, oflag, mode)
+  return _swift_Platform_openat(fd, path, oflag, mode)
 }
 
 @warn_unused_result
-@_silgen_name("_swift_Darwin_fcntl")
-internal func _swift_Darwin_fcntl(
+@_silgen_name("_swift_Platform_fcntl")
+internal func _swift_Platform_fcntl(
   fd: CInt,
   _ cmd: CInt,
   _ value: CInt
 ) -> CInt
 
 @warn_unused_result
-@_silgen_name("_swift_Darwin_fcntlPtr")
-internal func _swift_Darwin_fcntlPtr(
+@_silgen_name("_swift_Platform_fcntlPtr")
+internal func _swift_Platform_fcntlPtr(
   fd: CInt,
   _ cmd: CInt,
   _ ptr: UnsafeMutablePointer<Void>
@@ -218,7 +218,7 @@ public func fcntl(
   fd: CInt,
   _ cmd: CInt
 ) -> CInt {
-  return _swift_Darwin_fcntl(fd, cmd, 0)
+  return _swift_Platform_fcntl(fd, cmd, 0)
 }
 
 @warn_unused_result
@@ -227,7 +227,7 @@ public func fcntl(
   _ cmd: CInt,
   _ value: CInt
 ) -> CInt {
-  return _swift_Darwin_fcntl(fd, cmd, value)
+  return _swift_Platform_fcntl(fd, cmd, value)
 }
 
 @warn_unused_result
@@ -236,7 +236,7 @@ public func fcntl(
   _ cmd: CInt,
   _ ptr: UnsafeMutablePointer<Void>
 ) -> CInt {
-  return _swift_Darwin_fcntlPtr(fd, cmd, ptr)
+  return _swift_Platform_fcntlPtr(fd, cmd, ptr)
 }
 
 public var S_IFMT: mode_t   { return mode_t(0o170000) }
@@ -315,15 +315,15 @@ public var SEM_FAILED: UnsafeMutablePointer<sem_t> {
 }
 
 @warn_unused_result
-@_silgen_name("_swift_Darwin_sem_open2")
-internal func _swift_Darwin_sem_open2(
+@_silgen_name("_swift_Platform_sem_open2")
+internal func _swift_Platform_sem_open2(
   name: UnsafePointer<CChar>,
   _ oflag: CInt
 ) -> UnsafeMutablePointer<sem_t>
 
 @warn_unused_result
-@_silgen_name("_swift_Darwin_sem_open4")
-internal func _swift_Darwin_sem_open4(
+@_silgen_name("_swift_Platform_sem_open4")
+internal func _swift_Platform_sem_open4(
   name: UnsafePointer<CChar>,
   _ oflag: CInt,
   _ mode: mode_t,
@@ -335,7 +335,7 @@ public func sem_open(
   name: UnsafePointer<CChar>,
   _ oflag: CInt
 ) -> UnsafeMutablePointer<sem_t> {
-  return _swift_Darwin_sem_open2(name, oflag)
+  return _swift_Platform_sem_open2(name, oflag)
 }
 
 @warn_unused_result
@@ -345,6 +345,6 @@ public func sem_open(
   _ mode: mode_t,
   _ value: CUnsignedInt
 ) -> UnsafeMutablePointer<sem_t> {
-  return _swift_Darwin_sem_open4(name, oflag, mode, value)
+  return _swift_Platform_sem_open4(name, oflag, mode, value)
 }
 

stdlib/public/Platform/Misc.mm renamed to stdlib/public/Platform/Misc.c

@@ -1,4 +1,4 @@
-//===--- Misc.mm - Darwin overlay helpers ---------------------------------===//
+//===--- Misc.c - Darwin overlay helpers ----------------------------------===//
 //
 // This source file is part of the Swift.org open source project
 //
@@ -13,49 +13,51 @@
 #include <fcntl.h>
 #include <semaphore.h>
 
-#define _REENTRANT
-#include <math.h>
-
-extern "C" int 
-_swift_Darwin_open(const char *path, int oflag, mode_t mode) {
+extern int
+_swift_Platform_open(const char *path, int oflag, mode_t mode) {
   return open(path, oflag, mode);
 }
 
-extern "C" int 
-_swift_Darwin_openat(int fd, const char *path, int oflag, mode_t mode) {
+extern int
+_swift_Platform_openat(int fd, const char *path, int oflag, mode_t mode) {
   return openat(fd, path, oflag, mode);
 }
 
-extern "C" sem_t *_swift_Darwin_sem_open2(const char *name, int oflag) {
+extern sem_t *_swift_Platform_sem_open2(const char *name, int oflag) {
   return sem_open(name, oflag);
 }
 
-extern "C" sem_t *_swift_Darwin_sem_open4(const char *name, int oflag,
-                                          mode_t mode, unsigned int value) {
+extern sem_t *_swift_Platform_sem_open4(const char *name, int oflag,
+                                        mode_t mode, unsigned int value) {
   return sem_open(name, oflag, mode, value);
 }
 
-extern "C" int
-_swift_Darwin_fcntl(int fd, int cmd, int value) {
+extern int
+_swift_Platform_fcntl(int fd, int cmd, int value) {
   return fcntl(fd, cmd, value);
 }
 
-extern "C" int
-_swift_Darwin_fcntlPtr(int fd, int cmd, void* ptr) {
+extern int
+_swift_Platform_fcntlPtr(int fd, int cmd, void* ptr) {
   return fcntl(fd, cmd, ptr);
 }
 
-extern "C" float
+#if defined(__APPLE__)
+#define _REENTRANT
+#include <math.h>
+
+extern float
 _swift_Darwin_lgammaf_r(float x, int *psigngam) {
   return lgammaf_r(x, psigngam);
 }
 
-extern "C" double
+extern double
 _swift_Darwin_lgamma_r(double x, int *psigngam) {
   return lgamma_r(x, psigngam);
 }
 
-extern "C" long double
+extern long double
 _swift_Darwin_lgammal_r(long double x, int *psigngam) {
   return lgammal_r(x, psigngam);
 }
+#endif