MFC

9 files changed, 21 insertions, 15 deletions

diff --git a/lib/csu/powerpc64/Makefile b/lib/csu/powerpc64/Makefile
index 04926adb8885..095a9ad14a68 100644
--- a/lib/csu/powerpc64/Makefile
+++ b/lib/csu/powerpc64/Makefile
@@ -4,15 +4,14 @@
 
 SRCS=		crt1.c crti.S crtn.S
 OBJS=		${SRCS:N*.h:R:S/$/.o/g}
-OBJS+=		gcrt1.o
-CFLAGS+=	-Wall -Wno-unused \
-		-I${.CURDIR}/../common \
+OBJS+=		Scrt1.o gcrt1.o
+CFLAGS+=	-I${.CURDIR}/../common \
 		-I${.CURDIR}/../../libc/include
 
 all: ${OBJS}
 
 CLEANFILES=	${OBJS}
-CLEANFILES+=	crt1.s gcrt1.s
+CLEANFILES+=	crt1.s gcrt1.s Scrt1.s
 
 # See the comment in lib/csu/common/crtbrand.c for the reason crt1.c is not
 # directly compiled to .o files.
@@ -31,6 +30,13 @@ gcrt1.s: crt1.c
 gcrt1.o: gcrt1.s
 	${CC} ${CFLAGS} -c -o ${.TARGET} gcrt1.s
 
+Scrt1.s: crt1.c
+	${CC} ${CFLAGS} -fPIC -DPIC -S -o ${.TARGET} ${.CURDIR}/crt1.c
+	sed -i "" -e '/\.note\.ABI-tag/s/progbits/note/' ${.TARGET}
+
+Scrt1.o: Scrt1.s
+	${CC} ${CFLAGS} -c -o ${.TARGET} Scrt1.s
+
 realinstall:
 	${INSTALL} -o ${LIBOWN} -g ${LIBGRP} -m ${LIBMODE} \
 	    ${OBJS} ${DESTDIR}${LIBDIR}
diff --git a/lib/libc/gen/getutxent.3 b/lib/libc/gen/getutxent.3
index 5c8b79360275..19205556a876 100644
--- a/lib/libc/gen/getutxent.3
+++ b/lib/libc/gen/getutxent.3
@@ -175,7 +175,7 @@ prefix, corresponding with the device used to facilitate the user login
 session.
 If no TTY character device is used, this field is left blank.
 This field is only applicable to entries of type
-.Dv USER_PROCESS 
+.Dv USER_PROCESS
 and
 .Dv LOGIN_PROCESS .
 .It Fa ut_host
@@ -473,7 +473,7 @@ are extensions.
 .Sh HISTORY
 These functions appeared in
 .Fx 9.0 .
-They replaced the 
+They replaced the
 .In utmp.h
 interface.
 .Sh AUTHORS
diff --git a/lib/libc/gen/posix_spawn.3 b/lib/libc/gen/posix_spawn.3
index 3d902bf24ac8..73359b44b168 100644
--- a/lib/libc/gen/posix_spawn.3
+++ b/lib/libc/gen/posix_spawn.3
@@ -167,7 +167,7 @@ group IDs for the child process are changed as specified in the
 attributes object referenced by
 .Fa attrp .
 .It
-The file actions specified by the spawn file actions object are 
+The file actions specified by the spawn file actions object are
 performed in the order in which they were added to the spawn file
 actions object.
 .It
diff --git a/lib/libc/gen/posix_spawn.c b/lib/libc/gen/posix_spawn.c
index 58044b3a64fa..e4ceb2085e23 100644
--- a/lib/libc/gen/posix_spawn.c
+++ b/lib/libc/gen/posix_spawn.c
@@ -182,7 +182,7 @@ process_file_actions(const posix_spawn_file_actions_t fa)
 		if (error)
 			return (error);
 	}
-	return (0);	
+	return (0);
 }
 
 static int
@@ -193,7 +193,7 @@ do_posix_spawn(pid_t *pid, const char *path,
 {
 	pid_t p;
 	volatile int error = 0;
-	
+
 	p = vfork();
 	switch (p) {
 	case -1:
diff --git a/lib/libc/gen/pututxline.c b/lib/libc/gen/pututxline.c
index 4caa00c9d160..0cc7a0168ca8 100644
--- a/lib/libc/gen/pututxline.c
+++ b/lib/libc/gen/pututxline.c
@@ -57,7 +57,7 @@ futx_open(const char *file)
 		errno = EFTYPE;
 		return (NULL);
 	}
-	
+
 	fp = fdopen(fd, "r+");
 	if (fp == NULL) {
 		_close(fd);
@@ -103,7 +103,7 @@ utx_active_add(const struct futx *fu)
 			/* Allow us to overwrite unused records. */
 			if (partial == -1) {
 				partial = ftello(fp);
-				/* 
+				/*
 				 * Distinguish errors from valid values so we
 				 * don't overwrite good data by accident.
 				 */
diff --git a/lib/libc/stdlib/ptsname.c b/lib/libc/stdlib/ptsname.c
index fc3b719a1f10..40b140de7610 100644
--- a/lib/libc/stdlib/ptsname.c
+++ b/lib/libc/stdlib/ptsname.c
@@ -82,7 +82,7 @@ ptsname(int fildes)
 	/* Make sure fildes points to a master device. */
 	if (__isptmaster(fildes) != 0)
 		goto done;
-	
+
 	if (fdevname_r(fildes, pt_slave + (sizeof _PATH_DEV - 1),
 	    sizeof pt_slave - (sizeof _PATH_DEV - 1)) != NULL)
 		ret = pt_slave;
diff --git a/lib/libmd/sha256.3 b/lib/libmd/sha256.3
index fb96100733b4..f40e6dfd8b4c 100644
--- a/lib/libmd/sha256.3
+++ b/lib/libmd/sha256.3
@@ -127,7 +127,7 @@ argument is non-null it must point to at least 65 characters of buffer space.
 .Xr sha 3
 .Sh HISTORY
 These functions appeared in
-.Fx 4.0 .
+.Fx 6.0 .
 .Sh AUTHORS
 The core hash routines were implemented by Colin Percival based on
 the published
diff --git a/lib/libmd/sha512.3 b/lib/libmd/sha512.3
index 45a40963c6c3..953ee25539a7 100644
--- a/lib/libmd/sha512.3
+++ b/lib/libmd/sha512.3
@@ -127,7 +127,7 @@ argument is non-null it must point to at least 65 characters of buffer space.
 .Xr sha 3
 .Sh HISTORY
 These functions appeared in
-.Fx 4.0 .
+.Fx 9.0 .
 .Sh AUTHORS
 The core hash routines were implemented by Colin Percival based on
 the published
diff --git a/lib/libusb/libusb10.c b/lib/libusb/libusb10.c
index fa50ea784dfb..737e6109aeee 100644
--- a/lib/libusb/libusb10.c
+++ b/lib/libusb/libusb10.c
@@ -636,7 +636,7 @@ libusb_clear_halt(struct libusb20_device *pdev, uint8_t endpoint)
 		return (LIBUSB_ERROR_INVALID_PARAM);
 
 	CTX_LOCK(dev->ctx);
-	err = libusb20_tr_open(xfer, 0, 0, endpoint);
+	err = libusb20_tr_open(xfer, 0, 1, endpoint);
 	CTX_UNLOCK(dev->ctx);
 
 	if (err != 0 && err != LIBUSB20_ERROR_BUSY)