build: remove -DLIBUCONTEXT_ASSEMBLY

Meson does not support separate defines for .S compile.
arm_linker_fix
osy 2021-01-02 21:08:54 -08:00 committed by Ariadne Conill
parent e4233715f3
commit d31c95a11a
19 changed files with 18 additions and 7 deletions

View File

@ -105,7 +105,7 @@ docs: ${MANPAGES}
$(CC) -std=gnu99 -D_BSD_SOURCE -fPIC -DPIC ${CFLAGS} ${CPPFLAGS} -c -o $@ $< $(CC) -std=gnu99 -D_BSD_SOURCE -fPIC -DPIC ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
.S.o: .S.o:
$(CC) -fPIC -DPIC -DLIBUCONTEXT_ASSEMBLY ${CFLAGS} ${CPPFLAGS} -c -o $@ $< $(CC) -fPIC -DPIC ${CFLAGS} ${CPPFLAGS} -c -o $@ $<
${LIBUCONTEXT_NAME}_clean: ${LIBUCONTEXT_NAME}_clean:
rm -f ${LIBUCONTEXT_NAME} rm -f ${LIBUCONTEXT_NAME}

View File

@ -17,6 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"

View File

@ -19,6 +19,7 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"

View File

@ -58,10 +58,4 @@ PROC_NAME(__proc): \
#define REG_OFFSET(__reg) (MCONTEXT_GREGS + ((__reg) * REG_SZ)) #define REG_OFFSET(__reg) (MCONTEXT_GREGS + ((__reg) * REG_SZ))
#ifndef LIBUCONTEXT_ASSEMBLY
#include <libucontext/libucontext.h>
#endif
#endif #endif

View File

@ -17,6 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"

View File

@ -17,6 +17,7 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -17,6 +17,7 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -17,6 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"

View File

@ -18,6 +18,7 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -17,6 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"

View File

@ -17,6 +17,7 @@
#include <string.h> #include <string.h>
#include <stdint.h> #include <stdint.h>
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"

View File

@ -17,6 +17,7 @@
#include <stdint.h> #include <stdint.h>
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
extern void libucontext_trampoline(void); extern void libucontext_trampoline(void);

View File

@ -1,2 +1,3 @@
#include "defs.h" #include "defs.h"
#include <libucontext/libucontext.h>
#include "common-trampoline.c" #include "common-trampoline.c"