From 7876275f82918609fc609dd3bf1e5ef898c0db3f Mon Sep 17 00:00:00 2001
From: Lauri Tirkkonen <lotheac@iki.fi>
Date: Mon, 7 Jan 2019 13:04:54 +0200
Subject: [PATCH] libc: alias llseek to lseek

now that off_t is always 64 bits, we don't need llseek() anymore. so
make the symbol equal to lseek.
---
 usr/src/lib/libc/amd64/Makefile      |  1 -
 usr/src/lib/libc/common/sys/llseek.s | 52 ------------------------------------
 usr/src/lib/libc/common/sys/lseek.s  |  1 +
 usr/src/lib/libc/i386/Makefile.com   |  1 -
 usr/src/lib/libc/port/mapfile-vers   |  3 +--
 5 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 usr/src/lib/libc/common/sys/llseek.s

diff --git a/usr/src/lib/libc/amd64/Makefile b/usr/src/lib/libc/amd64/Makefile
index e35d4b20f8..477431d018 100644
--- a/usr/src/lib/libc/amd64/Makefile
+++ b/usr/src/lib/libc/amd64/Makefile
@@ -224,7 +224,6 @@ COMSYSOBJS=			\
 	ioctl.o			\
 	kaio.o			\
 	kill.o			\
-	llseek.o		\
 	lseek.o			\
 	mmapobjsys.o		\
 	memcntl.o		\
diff --git a/usr/src/lib/libc/common/sys/llseek.s b/usr/src/lib/libc/common/sys/llseek.s
deleted file mode 100644
index 398516548c..0000000000
--- a/usr/src/lib/libc/common/sys/llseek.s
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * CDDL HEADER START
- *
- * The contents of this file are subject to the terms of the
- * Common Development and Distribution License (the "License").
- * You may not use this file except in compliance with the License.
- *
- * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
- * or http://www.opensolaris.org/os/licensing.
- * See the License for the specific language governing permissions
- * and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL HEADER in each
- * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
- * If applicable, add the following below this CDDL HEADER, with the
- * fields enclosed by brackets "[]" replaced with your own identifying
- * information: Portions Copyright [yyyy] [name of copyright owner]
- *
- * CDDL HEADER END
- */
-/*	Copyright (c) 1988 AT&T	*/
-/*	  All Rights Reserved	*/
-
-
-/*
- * Copyright 2004 Sun Microsystems, Inc.  All rights reserved.
- * Use is subject to license terms.
- */
-
-	.file	"llseek.s"
-
-/*
- * C library -- llseek
- * offset_t llseek(int fildes, offset_t offset, int whence);
- */
-
-#include <sys/asm_linkage.h>
-
-	ANSI_PRAGMA_WEAK(llseek,function)
-
-#include "SYS.h"
-
-#if CLONGSIZE == 8	/* from sys/asm_linkage.h */
-	/*
-	 * For _LP64, llseek() is the same as lseek().
-	 */
-	SYSCALL2_RVAL1(llseek,lseek)
-#else
-	SYSCALL64(llseek)
-#endif
-	RET
-	SET_SIZE(llseek)
diff --git a/usr/src/lib/libc/common/sys/lseek.s b/usr/src/lib/libc/common/sys/lseek.s
index 9e2b36804a..6f9be153cd 100644
--- a/usr/src/lib/libc/common/sys/lseek.s
+++ b/usr/src/lib/libc/common/sys/lseek.s
@@ -36,6 +36,7 @@
 
 	ANSI_PRAGMA_WEAK(lseek,function)
 	ANSI_PRAGMA_WEAK2(lseek64,lseek,function)
+	ANSI_PRAGMA_WEAK2(llseek,lseek,function)
 
 #include "SYS.h"
 
diff --git a/usr/src/lib/libc/i386/Makefile.com b/usr/src/lib/libc/i386/Makefile.com
index 9f9a5bd9b4..9d3015cde9 100644
--- a/usr/src/lib/libc/i386/Makefile.com
+++ b/usr/src/lib/libc/i386/Makefile.com
@@ -239,7 +239,6 @@ COMSYSOBJS=			\
 	ioctl.o			\
 	kaio.o			\
 	kill.o			\
-	llseek.o		\
 	lseek.o			\
 	mmapobjsys.o		\
 	memcntl.o		\
diff --git a/usr/src/lib/libc/port/mapfile-vers b/usr/src/lib/libc/port/mapfile-vers
index b24fae915b..60e8c9127f 100644
--- a/usr/src/lib/libc/port/mapfile-vers
+++ b/usr/src/lib/libc/port/mapfile-vers
@@ -1813,7 +1813,7 @@ $endif
 	llabs;
 	lldiv;
 	llog10;
-	llseek;
+	llseek { FLAGS = NODYNSORT };
 	lltostr;
 	lmul;
 	lrand48;
@@ -3188,7 +3188,6 @@ $endif
 	_ecvt					{ FLAGS = NODYNSORT };
 	_fcvt					{ FLAGS = NODYNSORT };
 	_getc_unlocked				{ FLAGS = NODYNSORT };
-	_llseek					{ FLAGS = NODYNSORT };
 	_pthread_attr_getdetachstate		{ FLAGS = NODYNSORT };
 	_pthread_attr_getinheritsched		{ FLAGS = NODYNSORT };
 	_pthread_attr_getschedparam		{ FLAGS = NODYNSORT };
-- 
2.11.4.GIT