Merge branch 'master' of https://gitlab.redox-os.org/redox-os/relibc

Makefile

@@ -35,6 +35,7 @@ all: | libc libm
 clean:
 	$(CARGO) clean
 	make -C tests clean
+	rm -rf sysroot
 
 check:
 	$(CARGO) check
@@ -43,16 +44,16 @@ fmt:
 	./fmt.sh
 
 install: all
-	mkdir -pv "$(DESTDIR)/lib"
 	mkdir -pv "$(DESTDIR)/include"
 	cp -rv "include"/* "$(DESTDIR)/include"
 	cp -rv "$(BUILD)/include"/* "$(DESTDIR)/include"
+	cp -v "openlibm/include"/*.h "$(DESTDIR)/include"
+	cp -v "openlibm/src"/*.h "$(DESTDIR)/include"
+	mkdir -pv "$(DESTDIR)/lib"
 	cp -v "$(BUILD)/release/libc.a" "$(DESTDIR)/lib"
 	cp -v "$(BUILD)/release/crt0.o" "$(DESTDIR)/lib"
 	cp -v "$(BUILD)/release/crti.o" "$(DESTDIR)/lib"
 	cp -v "$(BUILD)/release/crtn.o" "$(DESTDIR)/lib"
-	cp -rv "openlibm/include"/* "$(DESTDIR)/include"
-	cp -rv "openlibm/src"/*.h "$(DESTDIR)/include"
 	cp -v "$(BUILD)/openlibm/libopenlibm.a" "$(DESTDIR)/lib/libm.a"
 
 libc: $(BUILD)/release/libc.a $(BUILD)/release/crt0.o $(BUILD)/release/crti.o $(BUILD)/release/crtn.o $(BUILD)/include

include/complex.h

-#define OPENLIBM_USE_HOST_FENV_H 1
-#include <openlibm.h>
+#include <openlibm_complex.h>

include/math.h

-#define OPENLIBM_USE_HOST_FENV_H 1
-#include <openlibm.h>
-#undef I
-#undef complex
+#include <openlibm_math.h>

src/header/arpa_inet/cbindgen.toml

@@ -5,3 +5,6 @@ style = "Tag"
 
 [enum]
 prefix_with_name = true
+
+[export.rename]
+"in_addr" = "struct in_addr"

src/header/limits/cbindgen.toml

 sys_includes = []
 include_guard = "_LIMITS_H"
+trailer = "#include <bits/limits.h>"
 language = "C"
 style = "Tag"
-trailer = "#include <bits/limits.h>"
 
 [enum]
 prefix_with_name = true

src/header/mod.rs

-pub mod aio;
+pub mod _aio;
 pub mod arpa_inet;
 pub mod assert;
 pub mod ctype;
@@ -9,7 +9,7 @@ pub mod fenv;
 pub mod float;
 pub mod fnmatch;
 pub mod getopt;
-pub mod grp;
+pub mod _grp;
 pub mod inttypes;
 pub mod libgen;
 pub mod limits;
@@ -45,4 +45,4 @@ pub mod time;
 pub mod unistd;
 pub mod utime;
 pub mod wchar;
-pub mod wctype;
+pub mod _wctype;

src/header/netinet_in/Cargo.toml

-[package]
-name = "netinet"
-version = "0.1.0"
-authors = ["Dan Robertson <danlrobertson89@gmail.com>"]
-
-[dependencies]
-in_h = { path = "in" }

src/header/netinet_in/cbindgen.toml

 sys_includes = ["sys/types.h", "sys/socket.h"]
 include_guard = "_NETINET_IN_H"
-style = "Both"
 language = "C"
+style = "Tag"
 
 [export]
 include = ["sockaddr_in6", "sockaddr_in", "ipv6_mreq"]

src/header/sgtty/cbindgen.toml

 sys_includes = ["sys/ioctl.h"]
 include_guard = "_SGTTY_H"
-style = "Tag"
 language = "C"
+style = "Tag"
 
 [enum]
 prefix_with_name = true

src/header/signal/cbindgen.toml

 sys_includes = ["stdint.h", "sys/types.h", "bits/signal.h"]
 include_guard = "_SIGNAL_H"
-style = "Tag"
 language = "C"
+style = "Tag"
 
 [defines]
 "target_os=linux" = "__linux__"

src/header/sys_ioctl/cbindgen.toml

 include_guard = "_SYS_IOCTL_H"
 language = "C"
-
-# WORKAROUND:
-# sgtty is used by another header, and cbindgen doesn't prefix that with `struct` :|
-style = "Both"
+style = "Tag"
 
 [defines]
 "target_os=linux" = "__linux__"

src/header/sys_resource/cbindgen.toml

@@ -2,10 +2,10 @@ sys_includes = ["sys/types.h", "stdint.h", "sys/time.h"]
 include_guard = "_SYS_RESOURCE_H"
 trailer = "#include <bits/sys/resource.h>"
 language = "C"
-
-# WORKAROUND:
-# Rusage is used by another header, and cbindgen does not prefix that usage with `struct` :|
-style = "Both"
+style = "Tag"
 
 [enum]
 prefix_with_name = true
+
+[export.rename]
+"timeval" = "struct timeval"

src/header/sys_select/cbindgen.toml

@@ -8,5 +8,7 @@ prefix_with_name = true
 
 [export]
 # fd_set is also defined in C because cbindgen is incompatible with mem::size_of booo
-
 exclude = ["FD_SETSIZE", "fd_set"]
+
+[export.rename]
+"timeval" = "struct timeval"

src/header/sys_socket/cbindgen.toml

 sys_includes = ["stddef.h", "stdint.h", "sys/types.h"]
 include_guard = "_SYS_SOCKET_H"
-style = "Both"
 language = "C"
+style = "Tag"
 
 [defines]
 "target_os=linux" = "__linux__"