build: fix build on darwin

Signed-off-by: Weijia Wang <contact@weijia.wang>
This commit is contained in:
Weijia Wang 2022-07-31 13:41:07 +02:00
parent dc2be77f63
commit f9aa9b4a07
7 changed files with 49 additions and 9 deletions

View file

@ -39,6 +39,10 @@
#include <sys/stat.h>
#include <sys/mman.h>
#ifdef __APPLE__
#include <fcntl.h>
#endif
#include <pthread.h>
#include <poll.h>
@ -1495,6 +1499,9 @@ send_overflow_client(void *data)
/* Limit the send buffer size for the display socket to guarantee
* that the test will cause an overflow. */
sock = wl_display_get_fd(c->wl_display);
#ifdef __APPLE__
assert(fcntl(sock, F_SETFL, ~O_NONBLOCK) != -1);
#endif
assert(setsockopt(sock, SOL_SOCKET, SO_SNDBUF, &optval, sizeof(optval)) == 0);
/* Request to break out of 'display_run' in the main process */

View file

@ -63,6 +63,14 @@ static int fall_back;
* __interceptor_ and check at run time if they linked to anything or not.
*/
#ifdef __APPLE__
#define DECL(ret_type, func, ...) \
static ret_type (*real_ ## func)(__VA_ARGS__); \
static int wrapped_calls_ ## func;
#define REAL(func) \
(__typeof__(real_ ## func))dlsym(RTLD_NEXT, #func)
#else
#define DECL(ret_type, func, ...) \
ret_type __interceptor_ ## func(__VA_ARGS__) __attribute__((weak)); \
static ret_type (*real_ ## func)(__VA_ARGS__); \
@ -71,6 +79,7 @@ static int fall_back;
#define REAL(func) (__interceptor_ ## func) ? \
__interceptor_ ## func : \
(__typeof__(&__interceptor_ ## func))dlsym(RTLD_NEXT, #func)
#endif
DECL(int, socket, int, int, int);
DECL(int, fcntl, int, int, ...);

View file

@ -63,7 +63,12 @@ static int timeouts_enabled = 1;
/* set to one if the output goes to the terminal */
static int is_atty = 0;
#ifdef __APPLE__
extern const struct test __start_test_section __asm("section$start$__RODATA$test_section");
extern const struct test __stop_test_section __asm("section$end$__RODATA$test_section");
#else
extern const struct test __start_test_section, __stop_test_section;
#endif
static const struct test *
find_test(const char *name)
@ -308,6 +313,12 @@ is_debugger_attached(void)
return rc;
}
#else
static int
is_debugger_attached(void)
{
return 0;
}
#endif
int main(int argc, char *argv[])

View file

@ -37,11 +37,17 @@ struct test {
int must_fail;
} __attribute__ ((aligned (16)));
#ifdef __APPLE__
#define TEST_SECTION "__RODATA,test_section"
#else
#define TEST_SECTION "test_section"
#endif
#define TEST(name) \
static void name(void); \
\
const struct test test##name \
__attribute__ ((used, section ("test_section"))) = { \
__attribute__ ((used, section (TEST_SECTION))) = { \
#name, name, 0 \
}; \
\
@ -51,7 +57,7 @@ struct test {
static void name(void); \
\
const struct test test##name \
__attribute__ ((used, section ("test_section"))) = { \
__attribute__ ((used, section (TEST_SECTION))) = { \
#name, name, 1 \
}; \
\