oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up arch Makefiles for libminc

Browse Source
This commit is contained in:
Arun Thomas 2012-08-10 19:02:30 +02:00
parent 3131ad3154
commit fbad9eaf95
4 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Makefile
View File

@ -76,7 +76,7 @@ SUBDIR+= ../common/include/prop
.if defined(__MINIX) .if defined(__MINIX)
.include "Makefile.minix.inc" .include "Makefile.minix.inc"
SUBDIR+= arch/${MACHINE} SUBDIR+= arch/${MACHINE_ARCH}
SUBDIR+= arch sys minix SUBDIR+= arch sys minix
SUBDIR+= net netinet netinet6 SUBDIR+= net netinet netinet6
.endif .endif

2
include/arch/Makefile
View File

@ -53,7 +53,7 @@ SUBDIR+= xen
# x68k x86_64 xen \ # x68k x86_64 xen \
# zaurus # zaurus
INCSYMLINKS= ${MACHINE} /usr/include/machine INCSYMLINKS= ${MACHINE_ARCH} /usr/include/machine
INCSYMLINKS+= machine/float.h /usr/include/float.h \ INCSYMLINKS+= machine/float.h /usr/include/float.h \
machine/stdarg.h /usr/include/stdarg.h machine/stdarg.h /usr/include/stdarg.h

14
lib/libminc/Makefile
View File

@ -10,13 +10,11 @@ CPPFLAGS.sched_start.c+= -I${NETBSDSRCDIR}
LIBCSRCDIR=${NETBSDSRCDIR}/lib/libc LIBCSRCDIR=${NETBSDSRCDIR}/lib/libc
MACHINE_ARCH=${MACHINE}
# #
# Shared libc with userspace (/common/lib/libc) # Shared libc with userspace (/common/lib/libc)
# #
.include "${NETBSDSRCDIR}/common/lib/libc/Makefile.inc" .include "${NETBSDSRCDIR}/common/lib/libc/Makefile.inc"
.include "${.CURDIR}/arch/${MACHINE}/Makefile.libc.inc" .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.libc.inc"
.if empty(SRCS:Mbyte_swap_8.*) .if empty(SRCS:Mbyte_swap_8.*)
SRCS+= bswap64.c SRCS+= bswap64.c
.endif .endif
@ -88,8 +86,8 @@ CLEANFILES+= errlist.c
isnanf_ieee754.c isnand_ieee754.c \ isnanf_ieee754.c isnand_ieee754.c \
isfinitef_ieee754.c isfinited_ieee754.c \ isfinitef_ieee754.c isfinited_ieee754.c \
signbitf_ieee754.c signbitd_ieee754.c \ signbitf_ieee754.c signbitd_ieee754.c \
nanf.c infinityl.c nanf.c
.PATH.c: ${LIBCSRCDIR}/arch/${MACHINE}/gen ${LIBCSRCDIR}/gen/minix \ .PATH.c: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gen ${LIBCSRCDIR}/gen/minix \
${LIBCSRCDIR}/gen ${LIBCSRCDIR} ${LIBCSRCDIR}/gen ${LIBCSRCDIR}
SRCS+= ${i} SRCS+= ${i}
CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include
@ -106,8 +104,8 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include
.endfor .endfor
# Import from string # Import from string
.for i in strcspn.c strerror.c strerror_r.c strtol.c \ .for i in strcspn.c strerror.c strerror_r.c strtol.c \
bcmp.S bcopy.S bzero.S bcopy.S bzero.S
.PATH.S: ${LIBCSRCDIR}/arch/${MACHINE}/string .PATH.S: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string
.PATH.c: ${LIBCSRCDIR}/string .PATH.c: ${LIBCSRCDIR}/string
SRCS+= ${i} SRCS+= ${i}
CPPFLAGS.${i}+= -D_LIBC -I${LIBCSRCDIR}/include CPPFLAGS.${i}+= -D_LIBC -I${LIBCSRCDIR}/include
@ -133,7 +131,7 @@ CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include -I${LIBCSRCDIR}/locale
stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \ stime.c syscall.c _ucontext.c umask.c unlink.c waitpid.c \
brksize.S _ipc.S _senda.S ucontext.S mmap.c init.c brksize.S _ipc.S _senda.S ucontext.S mmap.c init.c
.PATH.c: ${LIBCSRCDIR}/sys-minix .PATH.c: ${LIBCSRCDIR}/sys-minix
.PATH.S: ${LIBCSRCDIR}/arch/${MACHINE}/sys-minix .PATH.S: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/sys-minix
SRCS+= ${i} SRCS+= ${i}
CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include
.endfor .endfor

12
lib/libminc/arch/i386/Makefile.libc.inc
View File

@ -2,3 +2,15 @@ SRCS+= byte_swap_2.S byte_swap_4.S ffs.S _setjmp.S
SRCS+= memchr.S memcmp.S memcpy.S memmove.S memset.S \ SRCS+= memchr.S memcmp.S memcpy.S memmove.S memset.S \
strcat.S strchr.S strcmp.S strcpy.S strlen.S \ strcat.S strchr.S strcmp.S strcpy.S strlen.S \
strncmp.S strrchr.S strncmp.S strrchr.S
.for i in infinityl.c
.PATH.c: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/gen
SRCS+= ${i}
CPPFLAGS.${i}+= -I${LIBCSRCDIR}/include
.endfor
# Import from string
.for i in bcmp.S
.PATH.S: ${LIBCSRCDIR}/arch/${MACHINE_ARCH}/string
SRCS+= ${i}
CPPFLAGS.${i}+= -D_LIBC -I${LIBCSRCDIR}/include
.endfor