proxmox-mirrors/wasi-libc
1
0
Fork 0
mirror of https://git.proxmox.com/git/wasi-libc synced 2025-08-16 10:05:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix debug build's predefined-macros.txt (#407)

Browse Source 
This commit fixes the ability to build `wasi-libc` with `-g` options and
possibly without `-O2` options as well. I've found this useful when
debugging issues as historically that the build fails when `-g` is
passed or optimizations are removed due to the checks against these
expectation files. This commit adds more filters to the list of macros
to ensure that optimization/debug related ones are all removed from the
expectation lists.
This commit is contained in:
Alex Crichton 2023-04-05 14:13:39 -05:00 committed by GitHub
parent 1dfe5c302d
commit 38f48942fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -702,6 +702,10 @@ check-symbols: startup_files libc
| sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \ | sed -e 's/__GNUC_VA_LIST $$/__GNUC_VA_LIST 1/' \
| grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \ | grep -v '^#define __\(BOOL\|INT_\(LEAST\|FAST\)\(8\|16\|32\|64\)\|INT\|LONG\|LLONG\|SHRT\)_WIDTH__' \
| grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \ | grep -v '^#define __GCC_HAVE_SYNC_COMPARE_AND_SWAP_\(1\|2\|4\|8\)' \
| grep -v '^#define NDEBUG' \
| grep -v '^#define __OPTIMIZE__' \
| grep -v '^#define assert' \
| grep -v '^#define __NO_INLINE__' \
> "$(SYSROOT_SHARE)/predefined-macros.txt" > "$(SYSROOT_SHARE)/predefined-macros.txt"
# Check that the computed metadata matches the expected metadata. # Check that the computed metadata matches the expected metadata.

3
expected/wasm32-wasi-threads/predefined-macros.txt
View File

@ -1119,7 +1119,6 @@
#define NAN (0.0f/0.0f) #define NAN (0.0f/0.0f)
#define NBBY 8 #define NBBY 8
#define NCARGS 131072 #define NCARGS 131072
#define NDEBUG 1
#define ND_NA_FLAG_OVERRIDE 0x00000020 #define ND_NA_FLAG_OVERRIDE 0x00000020
#define ND_NA_FLAG_ROUTER 0x00000080 #define ND_NA_FLAG_ROUTER 0x00000080
#define ND_NA_FLAG_SOLICITED 0x00000040 #define ND_NA_FLAG_SOLICITED 0x00000040
@ -2685,7 +2684,6 @@
#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4 #define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4
#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1 #define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1
#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0 #define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0
#define __OPTIMIZE__ 1
#define __ORDER_BIG_ENDIAN__ 4321 #define __ORDER_BIG_ENDIAN__ 4321
#define __ORDER_LITTLE_ENDIAN__ 1234 #define __ORDER_LITTLE_ENDIAN__ 1234
#define __ORDER_PDP_ENDIAN__ 3412 #define __ORDER_PDP_ENDIAN__ 3412
@ -3112,7 +3110,6 @@
#define and_eq &= #define and_eq &=
#define asin(x) __tg_real_complex(asin, (x)) #define asin(x) __tg_real_complex(asin, (x))
#define asinh(x) __tg_real_complex(asinh, (x)) #define asinh(x) __tg_real_complex(asinh, (x))
#define assert(x) (void)0
#define atan(x) __tg_real_complex(atan, (x)) #define atan(x) __tg_real_complex(atan, (x))
#define atan2(x,y) __tg_real_2(atan2, (x), (y)) #define atan2(x,y) __tg_real_2(atan2, (x), (y))
#define atanh(x) __tg_real_complex(atanh, (x)) #define atanh(x) __tg_real_complex(atanh, (x))

3
expected/wasm32-wasi/predefined-macros.txt
View File

@ -1119,7 +1119,6 @@
#define NAN (0.0f/0.0f) #define NAN (0.0f/0.0f)
#define NBBY 8 #define NBBY 8
#define NCARGS 131072 #define NCARGS 131072
#define NDEBUG 1
#define ND_NA_FLAG_OVERRIDE 0x00000020 #define ND_NA_FLAG_OVERRIDE 0x00000020
#define ND_NA_FLAG_ROUTER 0x00000080 #define ND_NA_FLAG_ROUTER 0x00000080
#define ND_NA_FLAG_SOLICITED 0x00000040 #define ND_NA_FLAG_SOLICITED 0x00000040
@ -2648,7 +2647,6 @@
#define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4 #define __OPENCL_MEMORY_SCOPE_SUB_GROUP 4
#define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1 #define __OPENCL_MEMORY_SCOPE_WORK_GROUP 1
#define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0 #define __OPENCL_MEMORY_SCOPE_WORK_ITEM 0
#define __OPTIMIZE__ 1
#define __ORDER_BIG_ENDIAN__ 4321 #define __ORDER_BIG_ENDIAN__ 4321
#define __ORDER_LITTLE_ENDIAN__ 1234 #define __ORDER_LITTLE_ENDIAN__ 1234
#define __ORDER_PDP_ENDIAN__ 3412 #define __ORDER_PDP_ENDIAN__ 3412
@ -3073,7 +3071,6 @@
#define and_eq &= #define and_eq &=
#define asin(x) __tg_real_complex(asin, (x)) #define asin(x) __tg_real_complex(asin, (x))
#define asinh(x) __tg_real_complex(asinh, (x)) #define asinh(x) __tg_real_complex(asinh, (x))
#define assert(x) (void)0
#define atan(x) __tg_real_complex(atan, (x)) #define atan(x) __tg_real_complex(atan, (x))
#define atan2(x,y) __tg_real_2(atan2, (x), (y)) #define atan2(x,y) __tg_real_2(atan2, (x), (y))
#define atanh(x) __tg_real_complex(atanh, (x)) #define atanh(x) __tg_real_complex(atanh, (x))