diff options
| -rwxr-xr-x | extra/scripts/gen_bits_syscall_h.sh | 4 | ||||
| -rw-r--r-- | libc/sysdeps/linux/arm/Makefile | 6 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/create_module.c | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/extra/scripts/gen_bits_syscall_h.sh b/extra/scripts/gen_bits_syscall_h.sh index bb31914a5..3adb03770 100755 --- a/extra/scripts/gen_bits_syscall_h.sh +++ b/extra/scripts/gen_bits_syscall_h.sh @@ -19,7 +19,7 @@ $CC -E - | echo "#ifndef _SYSCALL_H" ; echo "# error \"Never use <bits/syscall.h> directly; include <sys/syscall.h> instead.\"" ; echo "#endif" ; echo ; - sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#define SYS_\1 \2\ -#define __NR_\1 \2\ + sed -ne 's/^UCLIBC_\([A-Za-z0-9_]*\) *\(.*\)/#define __NR_\1 \2\ +#define SYS_\1 __NR_\1\ #define __STR_NR_\1 \"\2\"/gp' ) diff --git a/libc/sysdeps/linux/arm/Makefile b/libc/sysdeps/linux/arm/Makefile index a27d20856..009d7d8e1 100644 --- a/libc/sysdeps/linux/arm/Makefile +++ b/libc/sysdeps/linux/arm/Makefile @@ -26,12 +26,12 @@ ASFLAGS=$(CFLAGS) TARGET_MACHINE_TYPE=$(shell $(CC) -dumpmachine) -ifeq ($(TARGET_MACHINE_TYPE),arm-pic-elf) +ifeq ($(DOPIC),true) CRT0=crt0pic.S else CRT0=crt0.S endif -CRT0_OBJ=$(patsubst %.S,%.o, $(CRT0)) +CRT0_OBJ=crt0.o SSRC=longjmp.S setjmp.S vfork.S SOBJS=$(patsubst %.S,%.o, $(SSRC)) @@ -50,7 +50,7 @@ ar-target: $(OBJS) $(CRT0_OBJ) $(AR) $(ARFLAGS) $(LIBC) $(OBJS) cp $(CRT0_OBJ) $(TOPDIR)libc/$(CRT0_OBJ) -$(CRT0_OBJ): %.o : %.S +$(CRT0_OBJ): $(CRT0) $(CC) $(CFLAGS) -c $< -o $@ $(STRIPTOOL) -x -R .note -R .comment $*.o diff --git a/libc/sysdeps/linux/common/create_module.c b/libc/sysdeps/linux/common/create_module.c index 93153c8b3..a20395ea0 100644 --- a/libc/sysdeps/linux/common/create_module.c +++ b/libc/sysdeps/linux/common/create_module.c @@ -22,6 +22,7 @@ */ #include <errno.h> +#include <unistd.h> #include <features.h> #include <sys/types.h> #include <sys/syscall.h> |