Merge branch 'cbindgen-update' into 'master'

Cbindgen update

See merge request redox-os/relibc!229

.gitmodules

@@ -3,7 +3,7 @@
 	url = https://gitlab.redox-os.org/redox-os/openlibm.git
 [submodule "cbindgen"]
 	path = cbindgen
-	url = https://gitlab.redox-os.org/redox-os/cbindgen.git
+	url = https://github.com/eqrion/cbindgen.git
 [submodule "ralloc"]
 	path = ralloc
 	url = https://gitlab.redox-os.org/redox-os/ralloc.git

Cargo.toml

@@ -8,8 +8,8 @@ name = "relibc"
 crate-type = ["staticlib"]
 
 [workspace]
-members = ["src/crt0", "src/crti", "src/crtn", "src/ld_so", "cbindgen"]
-exclude = ["core_io", "ralloc"]
+members = ["src/crt0", "src/crti", "src/crtn", "src/ld_so"]
+exclude = ["cbindgen", "core_io", "ralloc"]
 
 [build-dependencies]
 cc = "1.0.25"

Makefile

@@ -38,6 +38,7 @@ all: | headers libs
 
 clean:
 	$(CARGO) clean
+	$(CARGO) clean --manifest-path cbindgen/Cargo.toml
 	$(MAKE) -C tests clean
 	rm -rf sysroot
 

cbindgen @ e19526e0

-Subproject commit 1160d13c374376ae66bd010649c87faf2af8783b
+Subproject commit e19526e00b3fe6921b881682147a1fe5d6b64124

include.sh

@@ -7,7 +7,7 @@ set -e
 include="$(realpath "$1")"
 
 cargo build --release --manifest-path cbindgen/Cargo.toml
-cbindgen="$(realpath target/release/cbindgen)"
+cbindgen="$(realpath cbindgen/target/release/cbindgen)"
 
 if [ "$SUPRESS_ALL_THE_ERRORS" = "yes" ]; then
     echo -e "\e[91mNote: Warnings by cbindgen are suppressed in include.sh.\e[0m"

src/header/_aio/cbindgen.toml

@@ -2,6 +2,7 @@ sys_includes = []
 include_guard = "_AIO_H"
 language = "C"
 style = "Tag"
+no_default_includes = true
 
 [enum]
 prefix_with_name = true

src/header/_fenv/cbindgen.toml

@@ -2,6 +2,7 @@ sys_includes = ["stdint.h", "sys/types.h"]
 include_guard = "_FENV_H"
 language = "C"
 style = "Tag"
+no_default_includes = true
 
 [enum]
 prefix_with_name = true

src/header/_template/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = []
 include_guard = "_TEMPLATE_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/_wctype/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = []
 include_guard = "_WCTYPE_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/arpa_inet/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = ["stddef.h", "sys/socket.h", "netinet/in.h"]
 include_guard = "_ARPA_INET_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/assert/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = ["bits/assert.h"]
 include_guard = "_ASSERT_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/ctype/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = ["bits/ctype.h"]
 include_guard = "_CTYPE_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/dirent/cbindgen.toml

@@ -3,6 +3,8 @@ include_guard = "_DIRENT_H"
 language = "C"
 style = "Both"
 trailer = "#include <bits/dirent.h>"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/dl-tls/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = []
 include_guard = "_DL_TLS_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/dlfcn/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = []
 include_guard = "_DLFCN_H"
 language = "C"
 style = "Type"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/errno/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = ["bits/errno.h"]
 include_guard = "_ERRNO_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/fcntl/cbindgen.toml

@@ -3,6 +3,8 @@ include_guard = "_FCNTL_H"
 trailer = "#include <bits/fcntl.h>"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [defines]
 "target_os=linux" = "__linux__"

src/header/float/cbindgen.toml

@@ -2,6 +2,8 @@ sys_includes = ["sys/types.h", "bits/float.h"]
 include_guard = "_FLOAT_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true

src/header/fnmatch/cbindgen.toml

 include_guard = "_FNMATCH_H"
 language = "C"
 style = "Tag"
+no_includes = true
+cpp_compat = true
 
 [enum]
 prefix_with_name = true