d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mostly libsa"

Browse Source 
This reverts accidentally pushed r325377.
This commit is contained in:
imp 2017-11-04 03:07:58 +00:00
parent 329443cbc5
commit f27d1f601f
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/boot/defs.mk
View File

@ -84,7 +84,6 @@ CFLAGS+= -DLOADER_MBR_SUPPORT
.if ${LOADER_GELI_SUPPORT:Uyes} == "yes" .if ${LOADER_GELI_SUPPORT:Uyes} == "yes"
CFLAGS+= -DLOADER_GELI_SUPPORT CFLAGS+= -DLOADER_GELI_SUPPORT
.endif .endif
.endif
_ILINKS=machine _ILINKS=machine
.if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64" .if ${MACHINE} != ${MACHINE_CPUARCH} && ${MACHINE} != "arm64"

4
sys/boot/libsa/Makefile
View File

@ -14,7 +14,7 @@ MK_SSP= no
.include "../Makefile.inc" .include "../Makefile.inc"
INTERNALLIB= INTERNALLIB=
LIBSA_CPUARCH?=${MACHINE_CPUARCH} LIBSTAND_CPUARCH?=${MACHINE_CPUARCH}
LIBC_SRC= ${SRCTOP}/lib/libc LIBC_SRC= ${SRCTOP}/lib/libc
LIB?= sa LIB?= sa
@ -83,7 +83,7 @@ SRCS+= syncicache.c
SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c SRCS+= uuid_create_nil.c uuid_equal.c uuid_from_string.c uuid_is_nil.c uuid_to_string.c
# _setjmp/_longjmp # _setjmp/_longjmp
.PATH: ${SASRC}/${LIBSA_CPUARCH} .PATH: ${SASRC}/${LIBSTAND_CPUARCH}
SRCS+= _setjmp.S SRCS+= _setjmp.S
# decompression functionality from libbz2 # decompression functionality from libbz2

4
sys/boot/libsa32/Makefile
View File

@ -4,9 +4,9 @@
LIB=sa32 LIB=sa32
.if ${MACHINE_CPUARCH} == "amd64" .if ${MACHINE_CPUARCH} == "amd64"
LIBSA_CPUARCH=i386 LIBSTAND_CPUARCH=i386
.else .else
LIBSA_CPUARCH=${MACHINE_CPUARCH} LIBSTAND_CPUARCH=${MACHINE_CPUARCH}
.endif .endif
.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64"