Skip to content

Commit

Permalink
Suppress the warnings when building with GCC11 (bytecodealliance#1622)
Browse files Browse the repository at this point in the history
Add pragma to ignore "-Waddress-of-packed-member"
Adds `void` parameter to the prototype of some functions to make them
have strict declarations
  • Loading branch information
casaroli authored Oct 20, 2022
1 parent cb1905c commit 373311a
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
13 changes: 13 additions & 0 deletions core/iwasm/aot/arch/aot_reloc_xtensa.c
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,23 @@ apply_relocation(AOTModule *module, uint8 *target_section_addr,
imm16 = (int16)(relative_offset >> 2);

/* write back the imm16 to the l32r instruction */

/* GCC >= 9 complains if we have a pointer that could be
* unaligned. This can happen because the struct is packed.
* These pragma are to suppress the warnings because the
* function put_imm16_to_addr already handles unaligned
* pointers correctly. */
#if __GNUC__ >= 9
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Waddress-of-packed-member"
#endif
if (is_little_endian())
put_imm16_to_addr(imm16, &l32r_insn->l.imm16);
else
put_imm16_to_addr(imm16, &l32r_insn->b.imm16);
#if __GNUC__ >= 9
#pragma GCC diagnostic pop
#endif

break;
}
Expand Down
6 changes: 3 additions & 3 deletions core/shared/platform/include/platform_api_extension.h
Original file line number Diff line number Diff line change
Expand Up @@ -99,19 +99,19 @@ os_thread_exit(void *retval);
* @return 0 if success, -1 otherwise
*/
int
os_thread_env_init();
os_thread_env_init(void);

/**
* Destroy current thread environment
*/
void
os_thread_env_destroy();
os_thread_env_destroy(void);

/**
* Whether the thread environment is initialized
*/
bool
os_thread_env_inited();
os_thread_env_inited(void);

/**
* Suspend execution of the calling thread for (at least)
Expand Down
2 changes: 1 addition & 1 deletion core/shared/utils/bh_hashmap.h
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ bh_hash_map_get_struct_size(HashMap *hashmap);
* @return the memory space occupied by HashMapElem structure
*/
uint32
bh_hash_map_get_elem_struct_size();
bh_hash_map_get_elem_struct_size(void);

/**
* Traverse the hash map and call the callback function
Expand Down
2 changes: 1 addition & 1 deletion core/shared/utils/bh_queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef void (*bh_queue_handle_msg_callback)(void *message, void *arg);
typedef void (*bh_msg_cleaner)(void *msg);

bh_queue *
bh_queue_create();
bh_queue_create(void);

void
bh_queue_destroy(bh_queue *queue);
Expand Down
2 changes: 1 addition & 1 deletion core/shared/utils/runtime_timer.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ extern "C" {
#endif

uint64
bh_get_tick_ms();
bh_get_tick_ms(void);
uint32
bh_get_elpased_ms(uint32 *last_system_clock);

Expand Down

0 comments on commit 373311a

Please sign in to comment.