diff options
| author | Warner Losh <imp@FreeBSD.org> | 2017-10-12 14:56:48 +0000 |
|---|---|---|
| committer | Warner Losh <imp@FreeBSD.org> | 2017-10-12 14:56:48 +0000 |
| commit | 917587f435942c4515652096d0f3d202580d51b0 (patch) | |
| tree | 17275914d0b7dbeaade1bb5b2cd7992b86e008ee | |
| parent | 3006b7c8a97ec2d017b15f0f33ee1d4d6a9d9eee (diff) | |
| download | src-test2-917587f435942c4515652096d0f3d202580d51b0.tar.gz src-test2-917587f435942c4515652096d0f3d202580d51b0.zip | |
Notes
| -rw-r--r-- | sys/boot/Makefile.amd64 | 2 | ||||
| -rw-r--r-- | sys/boot/Makefile.i386 | 2 | ||||
| -rw-r--r-- | sys/boot/Makefile.inc | 8 | ||||
| -rw-r--r-- | sys/boot/Makefile.powerpc | 2 | ||||
| -rw-r--r-- | sys/boot/libsa/Makefile | 2 | ||||
| -rw-r--r-- | sys/boot/libsa32/Makefile (renamed from sys/boot/libstand32/Makefile) | 6 | ||||
| -rw-r--r-- | sys/boot/libsa32/Makefile.depend (renamed from sys/boot/libstand32/Makefile.depend) | 0 |
7 files changed, 10 insertions, 12 deletions
diff --git a/sys/boot/Makefile.amd64 b/sys/boot/Makefile.amd64 index 5e730bd6c62f..1061a9d17552 100644 --- a/sys/boot/Makefile.amd64 +++ b/sys/boot/Makefile.amd64 @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR+= efi -SUBDIR+= libstand32 +SUBDIR+= libsa32 SUBDIR+= zfs SUBDIR+= userboot diff --git a/sys/boot/Makefile.i386 b/sys/boot/Makefile.i386 index 7c1990558ea7..a414f4b8c39d 100644 --- a/sys/boot/Makefile.i386 +++ b/sys/boot/Makefile.i386 @@ -1,7 +1,7 @@ # $FreeBSD$ SUBDIR+= efi -SUBDIR+= libstand32 +SUBDIR+= libsa32 SUBDIR+= zfs .if !defined(LOADER_NO_GELI_SUPPORT) diff --git a/sys/boot/Makefile.inc b/sys/boot/Makefile.inc index 346ca9c2076f..eaa62df8fec3 100644 --- a/sys/boot/Makefile.inc +++ b/sys/boot/Makefile.inc @@ -5,11 +5,11 @@ .if !defined(__BOOT_MAKEFILE_INC__) __BOOT_MAKEFILE_INC__=${MFILE} -SASRC=${SRCTOP}/lib/libstand -# Normal standalone library -LIBSA=${OBJTOP}/sys/boot/libsa/libstand.a +SASRC=${SRCTOP}/sys/boot/libsa +# Normal Standalone library +LIBSA=${OBJTOP}/sys/boot/libsa/libsa.a # Standalone library compiled for 32-bit version of the processor -LIBSA32=${OBJTOP}/sys/boot/libstand32/libstand.a +LIBSA32=${OBJTOP}/sys/boot/libsa32/libsa32.a CFLAGS+=-I${SASRC} diff --git a/sys/boot/Makefile.powerpc b/sys/boot/Makefile.powerpc index 6d76e7094511..a1347d218ecd 100644 --- a/sys/boot/Makefile.powerpc +++ b/sys/boot/Makefile.powerpc @@ -4,6 +4,6 @@ SUBDIR+= fdt .endif -SUBDIR+= libstand32 +SUBDIR+= libsa32 SUBDIR+= ofw SUBDIR+= uboot diff --git a/sys/boot/libsa/Makefile b/sys/boot/libsa/Makefile index 83238e8215f7..2e9c304ac232 100644 --- a/sys/boot/libsa/Makefile +++ b/sys/boot/libsa/Makefile @@ -17,7 +17,7 @@ INTERNALLIB= LIBSTAND_CPUARCH?=${MACHINE_CPUARCH} LIBC_SRC= ${SRCTOP}/lib/libc -LIB?= stand +LIB?= sa NO_PIC= WARNS?= 0 diff --git a/sys/boot/libstand32/Makefile b/sys/boot/libsa32/Makefile index a2013cf77480..69c0374fdb37 100644 --- a/sys/boot/libstand32/Makefile +++ b/sys/boot/libsa32/Makefile @@ -4,20 +4,18 @@ .include "../Makefile.inc" +LIB=sa32 .if ${MACHINE_CPUARCH} == "amd64" LIBSTAND_CPUARCH=i386 .else LIBSTAND_CPUARCH=${MACHINE_CPUARCH} .endif -INTERNALLIB= -INCS= -MAN= -.PATH: ${SASRC} .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "powerpc64" CFLAGS+= -m32 -I. .endif +.PATH: ${SASRC} .include "${SASRC}/Makefile" .if ${MACHINE_CPUARCH} == "amd64" diff --git a/sys/boot/libstand32/Makefile.depend b/sys/boot/libsa32/Makefile.depend index 1d86fce1441d..1d86fce1441d 100644 --- a/sys/boot/libstand32/Makefile.depend +++ b/sys/boot/libsa32/Makefile.depend |