Merge pull request swiftlang#713 from dcci/stdlib

[stdlib] Initial FreeBSD port.
jinzekid · Dec 25, 2015 · a954ebe · a954ebe
2 parents 569a80c + 8f301b6
commit a954ebe
Show file tree

Hide file tree

Showing 4 changed files with 378 additions and 1 deletion.
diff --git a/stdlib/public/CMakeLists.txt b/stdlib/public/CMakeLists.txt
@@ -27,6 +27,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
   endif()
 endif()
 
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
   add_subdirectory(Glibc)
 endif()
diff --git a/stdlib/public/Glibc/CMakeLists.txt b/stdlib/public/Glibc/CMakeLists.txt
@@ -17,7 +17,12 @@ if (NOT EXISTS "${GLIBC_ARCH_INCLUDE_PATH}/sys")
 endif()
 
 # Generate module.map
+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
 configure_file(module.map.in "${CMAKE_CURRENT_BINARY_DIR}/module.map" @ONLY)
+endif()
+if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+configure_file(module.freebsd.map.in "${CMAKE_CURRENT_BINARY_DIR}/module.map" @ONLY)
+endif()
 
 add_custom_command_target(unused_var
     COMMAND

diff --git a/stdlib/public/Glibc/Glibc.swift b/stdlib/public/Glibc/Glibc.swift
@@ -18,10 +18,18 @@
 
 public var errno: Int32 {
   get {
+#if os(FreeBSD)
+    return __error().memory
+#else
     return __errno_location().memory
+#endif
   }
   set(val) {
+#if os(FreeBSD)
+    return __error().memory = val
+#else
     return __errno_location().memory = val
+#endif
   }
 }