svn commit: r281004 - in head/lib/libc: arm/sys mips/sys powerpc powerpc/sys powerpc64 powerpc64/sys sparc64 sparc64/sys sys

[Ed Maste]

Author: emaste
Date: Thu Apr  2 21:18:11 2015
New Revision: 281004
URL: https://svnweb.freebsd.org/changeset/base/281004

Log:
  libc: Eliminate duplicate copies of __vdso_gettc.c
  
  Sponsored by:	The FreeBSD Foundation
  Differential Revision:	https://reviews.freebsd.org/D2152

Added:
  head/lib/libc/sys/trivial-vdso_tc.c
     - copied unchanged from r281003, head/lib/libc/sparc64/sys/__vdso_gettc.c
Deleted:
  head/lib/libc/arm/sys/__vdso_gettc.c
  head/lib/libc/mips/sys/__vdso_gettc.c
  head/lib/libc/powerpc/sys/__vdso_gettc.c
  head/lib/libc/powerpc64/sys/__vdso_gettc.c
  head/lib/libc/sparc64/sys/__vdso_gettc.c
Modified:
  head/lib/libc/arm/sys/Makefile.inc
  head/lib/libc/mips/sys/Makefile.inc
  head/lib/libc/powerpc/Makefile.inc
  head/lib/libc/powerpc64/Makefile.inc
  head/lib/libc/sparc64/Makefile.inc

Modified: head/lib/libc/arm/sys/Makefile.inc
==============================================================================
--- head/lib/libc/arm/sys/Makefile.inc	Thu Apr  2 20:14:51 2015	(r281003)
+++ head/lib/libc/arm/sys/Makefile.inc	Thu Apr  2 21:18:11 2015	(r281004)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCS+=	__vdso_gettc.c
+SRCS+=	trivial-vdso_tc.c
 
 MDASM= Ovfork.S brk.S cerror.S pipe.S ptrace.S sbrk.S shmat.S sigreturn.S syscall.S
 

Modified: head/lib/libc/mips/sys/Makefile.inc
==============================================================================
--- head/lib/libc/mips/sys/Makefile.inc	Thu Apr  2 20:14:51 2015	(r281003)
+++ head/lib/libc/mips/sys/Makefile.inc	Thu Apr  2 21:18:11 2015	(r281004)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCS+=	__vdso_gettc.c
+SRCS+=	trivial-vdso_tc.c
 
 MDASM=  Ovfork.S brk.S cerror.S exect.S \
 	fork.S pipe.S ptrace.S sbrk.S syscall.S

Modified: head/lib/libc/powerpc/Makefile.inc
==============================================================================
--- head/lib/libc/powerpc/Makefile.inc	Thu Apr  2 20:14:51 2015	(r281003)
+++ head/lib/libc/powerpc/Makefile.inc	Thu Apr  2 21:18:11 2015	(r281004)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCS+=	__vdso_gettc.c
+SRCS+=	trivial-vdso_tc.c
 
 # Long double is 64-bits
 MDSRCS+=machdep_ldisd.c

Modified: head/lib/libc/powerpc64/Makefile.inc
==============================================================================
--- head/lib/libc/powerpc64/Makefile.inc	Thu Apr  2 20:14:51 2015	(r281003)
+++ head/lib/libc/powerpc64/Makefile.inc	Thu Apr  2 21:18:11 2015	(r281004)
@@ -1,6 +1,6 @@
 # $FreeBSD$
 
-SRCS+=	__vdso_gettc.c
+SRCS+=	trivial-vdso_tc.c
 
 # Long double is 64-bits
 MDSRCS+=machdep_ldisd.c

Modified: head/lib/libc/sparc64/Makefile.inc
==============================================================================
--- head/lib/libc/sparc64/Makefile.inc	Thu Apr  2 20:14:51 2015	(r281003)
+++ head/lib/libc/sparc64/Makefile.inc	Thu Apr  2 21:18:11 2015	(r281004)
@@ -5,7 +5,7 @@
 
 .include "fpu/Makefile.inc"
 
-SRCS+=	__vdso_gettc.c
+SRCS+=	trivial-vdso_tc.c
 
 # Long double is quad precision
 GDTOASRCS+=strtorQ.c

Copied: head/lib/libc/sys/trivial-vdso_tc.c (from r281003, head/lib/libc/sparc64/sys/__vdso_gettc.c)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/lib/libc/sys/trivial-vdso_tc.c	Thu Apr  2 21:18:11 2015	(r281004, copy of r281003, head/lib/libc/sparc64/sys/__vdso_gettc.c)
@@ -0,0 +1,48 @@
+/*-
+ * Copyright (c) 2013 Konstantin Belousov <kib at FreeBSD.org>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/types.h>
+#include <sys/time.h>
+#include <sys/vdso.h>
+#include <errno.h>
+
+#pragma weak __vdso_gettc
+u_int
+__vdso_gettc(const struct vdso_timehands *th)
+{
+
+	return (0);
+}
+
+#pragma weak __vdso_gettimekeep
+int
+__vdso_gettimekeep(struct vdso_timekeep **tk)
+{
+
+	return (ENOSYS);
+}