commit 9eb3c1fb36eb61da3191d5ddabd0b810faadf5bb parent cdae0c6feda7f01b5670b4e8db5454dae42328db Author: Roberto Vargas <roberto.vargas@arm.com> Date: Wed, 19 Dec 2018 12:55:07 +0000 [libc] Fix problems with inclusion path and _sigaction.c Change-Id: Id63750d2c07135db2136a7eb27d9527ee270bbe2 Diffstat:
28 files changed, 63 insertions(+), 30 deletions(-)
diff --git a/src/libc/Makefile b/src/libc/Makefile @@ -1,6 +1,7 @@ .POSIX: PROJECTDIR =../.. include $(PROJECTDIR)/scripts/rules.mk +include rules.mk TARGET = $(PROJECTDIR)/lib/libc.a DIRS = arch\ diff --git a/src/libc/arch/Makefile b/src/libc/arch/Makefile @@ -1,6 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk +include ../rules.mk DIRS = amd64 arm32 arm64 rmode diff --git a/src/libc/arch/amd64/Makefile b/src/libc/arch/amd64/Makefile @@ -1,6 +1,7 @@ .POSIX: PROJECTDIR =../../../.. include $(PROJECTDIR)/scripts/rules.mk +include ../../rules.mk OBJS = longjmp.o setjmp.o DIRS = netbsd openbsd dragonfly linux darwin diff --git a/src/libc/arch/amd64/darwin/Makefile b/src/libc/arch/amd64/darwin/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = __Exit.o \ __close.o \ diff --git a/src/libc/arch/amd64/dragonfly/Makefile b/src/libc/arch/amd64/dragonfly/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ _close.o \ diff --git a/src/libc/arch/amd64/dragonfly/_sigaction.c b/src/libc/arch/amd64/dragonfly/_sigaction.c @@ -0,0 +1,14 @@ +#include <stddef.h> +#include <sys.h> + +extern int _sigaction2(int sig, + struct sigaction *new, struct sigaction *old, + int siginfo[], int num); + +int +_sigaction(int sig, struct sigaction *new, struct sigaction *old) +{ + extern int _setcontext[]; + + return _sigaction2(sig, new, old, _setcontext, 2); +} diff --git a/src/libc/arch/amd64/linux/Makefile b/src/libc/arch/amd64/linux/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ _close.o \ diff --git a/src/libc/arch/amd64/netbsd/Makefile b/src/libc/arch/amd64/netbsd/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ _close.o \ diff --git a/src/libc/arch/amd64/openbsd/Makefile b/src/libc/arch/amd64/openbsd/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ _close.o \ diff --git a/src/libc/arch/amd64/openbsd/_sigaction.c b/src/libc/arch/amd64/openbsd/_sigaction.c @@ -0,0 +1,14 @@ +#include <stddef.h> +#include <sys.h> + +extern int _sigaction2(int sig, + struct sigaction *new, struct sigaction *old, + int siginfo[], int num); + +int +_sigaction(int sig, struct sigaction *new, struct sigaction *old) +{ + extern int _setcontext[]; + + return _sigaction2(sig, new, old, _setcontext, 2); +} diff --git a/src/libc/arch/arm32/Makefile b/src/libc/arch/arm32/Makefile @@ -1,6 +1,7 @@ .POSIX: PROJECTDIR =../../../.. include $(PROJECTDIR)/scripts/rules.mk +include ../../rules.mk OBJS = longjmp.o setjmp.o DIRS = linux diff --git a/src/libc/arch/arm32/linux/Makefile b/src/libc/arch/arm32/linux/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ _close.o \ diff --git a/src/libc/arch/arm64/Makefile b/src/libc/arch/arm64/Makefile @@ -1,6 +1,7 @@ .POSIX: PROJECTDIR =../../../.. include $(PROJECTDIR)/scripts/rules.mk +include ../../rules.mk OBJS = longjmp.o setjmp.o DIRS = linux diff --git a/src/libc/arch/arm64/linux/Makefile b/src/libc/arch/arm64/linux/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ _close.o \ diff --git a/src/libc/arch/rmode/rcode/Makefile b/src/libc/arch/rmode/rcode/Makefile @@ -1,7 +1,7 @@ .POSIX: PROJECTDIR =../../../../.. include $(PROJECTDIR)/scripts/rules.mk -include ../../rules.mk +include ../../../rules.mk OBJS = _Exit.o \ raise.o \ diff --git a/src/libc/arch/rules.mk b/src/libc/arch/rules.mk @@ -1,4 +0,0 @@ -SYSERRNO = $(INCDIR)/bits/$(SYS)/sys/errno.h - -_sys_errlist.c: $(SYSERRNO) - ../../mkerrstr $(SYSERRNO) diff --git a/src/libc/assert/Makefile b/src/libc/assert/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = __assert.o\ assert.o\ diff --git a/src/libc/ctype/Makefile b/src/libc/ctype/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = ctype.o\ isalnum.o\ diff --git a/src/libc/locale/Makefile b/src/libc/locale/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = localeconv.o\ setlocale.o\ diff --git a/src/libc/rules.mk b/src/libc/rules.mk @@ -0,0 +1,7 @@ +INCLUDE = -I$(INCDIR) -I$(INCDIR)/bits/$(SYS) -I$(INCDIR)/bits/$(ARCH) +MORECFLAGS = -w + +SYSERRNO = $(INCDIR)/bits/$(SYS)/sys/errno.h + +_sys_errlist.c: $(SYSERRNO) + ../../mkerrstr $(SYSERRNO) diff --git a/src/libc/stdio/Makefile b/src/libc/stdio/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = __getc.o\ __putc.o\ diff --git a/src/libc/stdlib/Makefile b/src/libc/stdlib/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = abort.o\ abs.o\ diff --git a/src/libc/string/Makefile b/src/libc/string/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = memchr.o\ memcmp.o\ diff --git a/src/libc/time/Makefile b/src/libc/time/Makefile @@ -1,8 +1,7 @@ .POSIX: PROJECTDIR =../../.. include $(PROJECTDIR)/scripts/rules.mk - -MORECFLAGS = -w +include ../rules.mk OBJS = _daysyear.o\ asctime.o\ diff --git a/src/libc/time/gmtime.c b/src/libc/time/gmtime.c @@ -1,5 +1,6 @@ #include <time.h> -#include "libc.h" + +#include "../libc.h" #undef gmtime struct tm * diff --git a/src/libc/time/localtime.c b/src/libc/time/localtime.c @@ -1,5 +1,6 @@ #include <time.h> -#include "libc.h" + +#include "../libc.h" #undef localtime struct tm * diff --git a/src/libc/time/mktime.c b/src/libc/time/mktime.c @@ -1,6 +1,7 @@ #include <limits.h> #include <time.h> -#include "libc.h" + +#include "../libc.h" #undef mktime static int diff --git a/src/libc/time/strftime.c b/src/libc/time/strftime.c @@ -1,6 +1,7 @@ #include <time.h> #include <string.h> -#include "libc.h" + +#include "../libc.h" #undef strftime static char *days[] = {