tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

a few DBG=-g build fixes, both arches

Browse Source 
- setlogin() not available
	- softfloat needed in -lminc for arm

Change-Id: I7f92621ebbca9ce08dc377b3fa61dee089071757
This commit is contained in:
Ben Gras 2013-06-15 23:43:39 +00:00
parent 71ac8a3a8a
commit 3dcaef1cc7
4 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/libc/arch/arm/Makefile.inc
View File

@ -21,4 +21,8 @@ SRCS+= fixunsgen64_ieee754.c fixunsdfsi_ieee754.c
SOFTFLOAT_BITS=32 SOFTFLOAT_BITS=32
.endif .endif
.if defined(__MINIX)
.include "${LIBCDIR}/softfloat/Makefile.inc"
.else
.include <softfloat/Makefile.inc> .include <softfloat/Makefile.inc>
.endif

9
lib/libc/softfloat/Makefile.inc
View File

@ -1,10 +1,19 @@
# $NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $ # $NetBSD: Makefile.inc,v 1.10 2011/07/04 02:53:15 mrg Exp $
SOFTFLOAT_BITS?=64 SOFTFLOAT_BITS?=64
.if defined(__MINIX)
.PATH: ${ARCHDIR}/softfloat \
${LIBCDIR}/softfloat/bits${SOFTFLOAT_BITS} ${LIBCDIR}/softfloat
.else
.PATH: ${ARCHDIR}/softfloat \ .PATH: ${ARCHDIR}/softfloat \
${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat ${.CURDIR}/softfloat/bits${SOFTFLOAT_BITS} ${.CURDIR}/softfloat
.endif
.if defined(__MINIX)
CPPFLAGS+= -I${ARCHDIR}/softfloat -I${LIBCDIR}/softfloat
.else
CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat CPPFLAGS+= -I${ARCHDIR}/softfloat -I${.CURDIR}/softfloat
.endif
CPPFLAGS+= -DSOFTFLOAT_FOR_GCC CPPFLAGS+= -DSOFTFLOAT_FOR_GCC
SRCS.softfloat= softfloat.c SRCS.softfloat= softfloat.c

8
lib/libminc/Makefile
View File

@ -9,6 +9,7 @@ LIB= minc
CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR} CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR}
LIBCSRCDIR= ${NETBSDSRCDIR}/lib/libc LIBCSRCDIR= ${NETBSDSRCDIR}/lib/libc
LIBCDIR= ${NETBSDSRCDIR}/lib/libc
CPPFLAGS+= -I${LIBCSRCDIR}/include -I${LIBCSRCDIR} CPPFLAGS+= -I${LIBCSRCDIR}/include -I${LIBCSRCDIR}
CPPFLAGS+= -D_LIBMINC CPPFLAGS+= -D_LIBMINC
@ -144,7 +145,7 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/locale
# Import from sys-minix # Import from sys-minix
.for i in access.c brk.c close.c environ.c execve.c fork.c \ .for i in access.c brk.c close.c environ.c execve.c fork.c \
getgid.c getpid.c getuid.c gettimeofday.c loadname.c \ getgid.c getpid.c geteuid.c getuid.c gettimeofday.c loadname.c \
link.c _mcontext.c mknod.c mmap.c nanosleep.c open.c \ link.c _mcontext.c mknod.c mmap.c nanosleep.c open.c \
read.c sbrk.c select.c setuid.c sigprocmask.c stat.c \ read.c sbrk.c select.c setuid.c sigprocmask.c stat.c \
stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \ stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \
@ -156,4 +157,9 @@ SRCS+= ${i}
CPPFLAGS+= -D_LIBSYS CPPFLAGS+= -D_LIBSYS
.if exists (${ARCHDIR}/Makefile.inc)
.PATH: ${ARCHDIR}
.include "${ARCHDIR}/Makefile.inc"
.endif
.include <bsd.lib.mk> .include <bsd.lib.mk>

2
lib/libutil/login_cap.c
View File

@ -700,6 +700,7 @@ setusercontext(login_cap_t *lc, struct passwd *pwd, uid_t uid, u_int flags)
} }
errno = 0; errno = 0;
#ifndef __minix
if (flags & LOGIN_SETLOGIN) if (flags & LOGIN_SETLOGIN)
if (setlogin(pwd->pw_name) == -1) { if (setlogin(pwd->pw_name) == -1) {
syslog(LOG_ERR, "setlogin(%s) failure: %m", syslog(LOG_ERR, "setlogin(%s) failure: %m",
@ -707,6 +708,7 @@ setusercontext(login_cap_t *lc, struct passwd *pwd, uid_t uid, u_int flags)
login_close(flc); login_close(flc);
return (-1); return (-1);
} }
#endif
if (flags & LOGIN_SETUSER) if (flags & LOGIN_SETUSER)
if (setuid(uid) == -1) { if (setuid(uid) == -1) {