Deleted Added
full compact
1c1
< # $FreeBSD: stable/10/sys/modules/linux/Makefile 276429 2014-12-30 22:22:46Z neel $
---
> # $FreeBSD: stable/10/sys/modules/linux/Makefile 293514 2016-01-09 15:44:38Z dchagin $
9a10,11
> VDSO= linux${SFX}_vdso
>
16c18
< linux_timer.c \
---
> linux_timer.c linux_vdso.c \
18c20,21
< vnode_if.h device_if.h bus_if.h assym.s
---
> vnode_if.h device_if.h bus_if.h assym.s \
> linux${SFX}_support.s
27c30
< OBJS= linux${SFX}_locore.o linux${SFX}_support.o
---
> OBJS= ${VDSO}.so
41c44
< CLEANFILES= linux${SFX}_assym.h linux${SFX}_genassym.o
---
> CLEANFILES= linux${SFX}_assym.h linux${SFX}_genassym.o linux${SFX}_locore.o
44,47c47
< .if exists(@)
< linux${SFX}_assym.h: @/kern/genassym.sh
< .endif
< sh @/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
---
> sh ${SYSDIR}/kern/genassym.sh linux${SFX}_genassym.o > ${.TARGET}
49,50c49,54
< linux${SFX}_locore.o: linux${SFX}_locore.s linux${SFX}_assym.h
< ${CC} -c -x assembler-with-cpp -DLOCORE ${CFLAGS} \
---
> linux${SFX}_locore.o: linux${SFX}_assym.h assym.s
> ${CC} -x assembler-with-cpp -DLOCORE -m32 -shared -s \
> -pipe -I. -I${SYSDIR} -Werror -Wall -fno-common -nostdinc -nostdlib \
> -fno-omit-frame-pointer \
> -Wl,-T${.CURDIR}/../../${MACHINE_CPUARCH}/linux${SFX}/${VDSO}.lds.s \
> -Wl,-soname=${VDSO}.so.1,--eh-frame-hdr,-fPIC,-warn-common \
53c57
< linux${SFX}_support.o: linux${SFX}_support.s assym.s linux${SFX}_assym.h
---
> linux${SFX}_support.o: linux${SFX}_assym.h assym.s
57c61,71
< linux${SFX}_genassym.o: linux${SFX}_genassym.c linux.h @ machine x86
---
> .if ${MACHINE_CPUARCH} == "amd64"
> ${VDSO}.so: linux${SFX}_locore.o
> ${OBJCOPY} --input binary --output elf64-x86-64-freebsd \
> --binary-architecture i386 linux${SFX}_locore.o ${.TARGET}
> .else
> ${VDSO}.so: linux${SFX}_locore.o
> ${OBJCOPY} --input binary --output elf32-i386-freebsd \
> --binary-architecture i386 linux${SFX}_locore.o ${.TARGET}
> .endif
>
> linux${SFX}_genassym.o:
65a80,81
> .if defined(DEBUG)
> CFLAGS+= -DDEBUG
66a83
> .endif