Skip to content

Commit

Permalink
ci: check public headers conform to c++ ISO standards
Browse files Browse the repository at this point in the history
  • Loading branch information
64 committed Nov 28, 2024
1 parent 8487c65 commit e86a001
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 10 deletions.
21 changes: 14 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
- name: Build mlibc
run: 'xbstrap install ${{matrix.builds}}'
working-directory: build/
- name: Check public headers conform to C89/C99/C11
- name: Check public headers conform to ISO standards with pedantic warnings
if: ${{matrix.builds == 'mlibc-headers-only'}}
working-directory: build/
run: |
Expand All @@ -63,13 +63,20 @@ jobs:
GCC_ARCH="i686"
;;
esac
ALL_HDRS="packages/${{matrix.builds}}/usr/include/**.h"
GCC_ARGS="$GCC_ARCH-linux-mlibc-gcc -x c -S /dev/null -o /dev/null -I packages/${{matrix.builds}}/usr/include -I packages/linux-headers/usr/include -nostdlib -Werror -Wpedantic -Wsystem-headers"
ALL_INCLUDES="-- -include\0%s\0 packages/${{matrix.builds}}/usr/include/**.h"
GCC_ARGS="-S /dev/null -o /dev/null -I packages/${{matrix.builds}}/usr/include -I packages/linux-headers/usr/include -nostdlib -Werror -Wpedantic -Wsystem-headers"
GCC_C_ARGS="$GCC_ARCH-linux-mlibc-gcc -x c $GCC_ARGS"
GCC_CXX_ARGS="$GCC_ARCH-linux-mlibc-g++ -x c++ $GCC_ARGS"
# For C89, exclude complex.h, and -Wlong-long
printf -- '-include\0%s\0' $ALL_HDRS | sed 's/complex.h/stdio.h/' | xargs -0 $GCC_ARGS -std=c89 -Wno-long-long
printf -- '-include\0%s\0' $ALL_HDRS | xargs -0 $GCC_ARGS -std=c99
printf -- '-include\0%s\0' $ALL_HDRS | xargs -0 $GCC_ARGS -std=c11
# For C89, exclude complex.h. We also exclude -Wlong-long because fixing it mostly involves adding
# __extension__ to a bunch of places (and musl doesn't even bother).
printf $ALL_INCLUDES | sed 's/complex.h/stdio.h/' | xargs -0 $GCC_C_ARGS -std=c89 -Wno-long-long
printf $ALL_INCLUDES | xargs -0 $GCC_C_ARGS -std=c99
printf $ALL_INCLUDES | xargs -0 $GCC_C_ARGS -std=c11
printf $ALL_INCLUDES | xargs -0 $GCC_CXX_ARGS -std=c++98 -Wno-long-long
printf $ALL_INCLUDES | xargs -0 $GCC_CXX_ARGS -std=c++11
printf $ALL_INCLUDES | xargs -0 $GCC_CXX_ARGS -std=c++14
printf $ALL_INCLUDES | xargs -0 $GCC_CXX_ARGS -std=c++17
- name: Test mlibc
run: 'meson test -v -C pkg-builds/${{matrix.builds}}'
working-directory: build/
Expand Down
5 changes: 3 additions & 2 deletions options/ansi/include/uchar.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ extern "C" {
#include <bits/mbstate.h>
#include <bits/size_t.h>

#ifndef __cplusplus
/* These are builtin types since C++11. */
#if !defined(__cplusplus) || __cplusplus < 201100L
typedef __CHAR16_TYPE__ char16_t;
typedef __CHAR32_TYPE__ char32_t;
#endif /* __cplusplus */
#endif

#ifndef __MLIBC_ABI_ONLY

Expand Down
2 changes: 1 addition & 1 deletion options/posix/include/fcntl.h
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ int posix_fallocate(int __fd, off_t __offset, off_t __size);
struct file_handle {
unsigned int handle_bytes;
int handle_type;
unsigned char f_handle[0];
__extension__ unsigned char f_handle[0];
};
#endif

Expand Down

0 comments on commit e86a001

Please sign in to comment.