[Midnightbsd-cvs] src [10619] trunk/lib/libthread_db: sync with freebsd
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Jun 9 11:31:48 EDT 2018
Revision: 10619
http://svnweb.midnightbsd.org/src/?rev=10619
Author: laffer1
Date: 2018-06-09 11:31:47 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
sync with freebsd
Modified Paths:
--------------
trunk/lib/libthread_db/Makefile
trunk/lib/libthread_db/Symbol.map
trunk/lib/libthread_db/arch/amd64/libc_r_md.c
trunk/lib/libthread_db/arch/amd64/libpthread_md.c
trunk/lib/libthread_db/arch/i386/libc_r_md.c
trunk/lib/libthread_db/arch/i386/libpthread_md.c
trunk/lib/libthread_db/arch/sparc64/libc_r_md.c
trunk/lib/libthread_db/arch/sparc64/libpthread_md.c
trunk/lib/libthread_db/kse.h
trunk/lib/libthread_db/libpthread_db.c
trunk/lib/libthread_db/libpthread_db.h
trunk/lib/libthread_db/libthr_db.c
trunk/lib/libthread_db/thread_db.c
trunk/lib/libthread_db/thread_db.h
trunk/lib/libthread_db/thread_db_int.h
Property Changed:
----------------
trunk/lib/libthread_db/Symbol.map
Modified: trunk/lib/libthread_db/Makefile
===================================================================
--- trunk/lib/libthread_db/Makefile 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/Makefile 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,4 +1,5 @@
# $MidnightBSD$
+# $FreeBSD: stable/10/lib/libthread_db/Makefile 313596 2017-02-11 06:27:42Z ngie $
.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}
@@ -14,7 +15,7 @@
SYM_MAPS+=${.CURDIR}/Symbol.map
SYMBOL_MAPS=${SYM_MAPS}
-VERSION_DEF=${.CURDIR}/../libc/Versions.def
+VERSION_DEF=${SRCTOP}/lib/libc/Versions.def
# Unfortunately, clang gives an incorrect warning about alignment in
# arch/i386/libpthread_md.c, so turn that off for now.
Modified: trunk/lib/libthread_db/Symbol.map
===================================================================
--- trunk/lib/libthread_db/Symbol.map 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/Symbol.map 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,5 +1,5 @@
-/*
- * $MidnightBSD$
+/* $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libthread_db/Symbol.map 209689 2010-07-04 12:08:04Z kib $
*/
FBSD_1.0 {
Property changes on: trunk/lib/libthread_db/Symbol.map
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/lib/libthread_db/arch/amd64/libc_r_md.c
===================================================================
--- trunk/lib/libthread_db/arch/amd64/libc_r_md.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/arch/amd64/libc_r_md.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
Modified: trunk/lib/libthread_db/arch/amd64/libpthread_md.c
===================================================================
--- trunk/lib/libthread_db/arch/amd64/libpthread_md.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/arch/amd64/libpthread_md.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libthread_db/arch/amd64/libpthread_md.c 224684 2011-08-06 17:49:21Z marius $");
#include <sys/procfs.h>
#include <string.h>
Modified: trunk/lib/libthread_db/arch/i386/libc_r_md.c
===================================================================
--- trunk/lib/libthread_db/arch/i386/libc_r_md.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/arch/i386/libc_r_md.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
Modified: trunk/lib/libthread_db/arch/i386/libpthread_md.c
===================================================================
--- trunk/lib/libthread_db/arch/i386/libpthread_md.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/arch/i386/libpthread_md.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libthread_db/arch/i386/libpthread_md.c 181059 2008-07-31 16:26:58Z marcel $");
#include <sys/types.h>
#include <machine/npx.h>
Modified: trunk/lib/libthread_db/arch/sparc64/libc_r_md.c
===================================================================
--- trunk/lib/libthread_db/arch/sparc64/libc_r_md.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/arch/sparc64/libc_r_md.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Marcel Moolenaar
* All rights reserved.
Modified: trunk/lib/libthread_db/arch/sparc64/libpthread_md.c
===================================================================
--- trunk/lib/libthread_db/arch/sparc64/libpthread_md.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/arch/sparc64/libpthread_md.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Marcel Moolenaar
* Copyright (c) 2011 Marius Strobl <marius at FreeBSD.org>
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libthread_db/arch/sparc64/libpthread_md.c 253266 2013-07-12 14:24:52Z marius $");
#include <sys/types.h>
#include <string.h>
@@ -57,9 +58,9 @@
memcpy(mc->mc_fp, r->fr_regs, MIN(sizeof(mc->mc_fp),
sizeof(r->fr_regs)));
- mc->mc_fsr = r->fr_fsr;
- mc->mc_gsr = r->fr_gsr;
- mc->mc_fprs |= FPRS_FEF;
+ mc->_mc_fsr = r->fr_fsr;
+ mc->_mc_gsr = r->fr_gsr;
+ mc->_mc_fprs |= FPRS_FEF;
}
void
@@ -67,11 +68,11 @@
{
const mcontext_t *mc = &uc->uc_mcontext;
- if ((mc->mc_fprs & FPRS_FEF) != 0) {
+ if ((mc->_mc_fprs & FPRS_FEF) != 0) {
memcpy(r->fr_regs, mc->mc_fp, MIN(sizeof(mc->mc_fp),
sizeof(r->fr_regs)));
- r->fr_fsr = mc->mc_fsr;
- r->fr_gsr = mc->mc_gsr;
+ r->fr_fsr = mc->_mc_fsr;
+ r->fr_gsr = mc->_mc_gsr;
} else
memset(r, 0, sizeof(*r));
}
Modified: trunk/lib/libthread_db/kse.h
===================================================================
--- trunk/lib/libthread_db/kse.h 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/kse.h 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*-
* Copyright (C) 2001 Julian Elischer <julian at freebsd.org>
* for the FreeBSD Foundation.
@@ -27,7 +28,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
* DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libthread_db/kse.h 177526 2008-03-23 09:38:11Z jeff $
*/
#ifndef _SYS_KSE_H_
Modified: trunk/lib/libthread_db/libpthread_db.c
===================================================================
--- trunk/lib/libthread_db/libpthread_db.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/libpthread_db.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libthread_db/libpthread_db.c 241720 2012-10-19 05:43:38Z ed $");
#include <stddef.h>
#include <stdlib.h>
@@ -1107,7 +1108,7 @@
return (TD_OK);
}
-struct ta_ops libpthread_db_ops = {
+static struct ta_ops libpthread_db_ops = {
.to_init = pt_init,
.to_ta_clear_event = pt_ta_clear_event,
.to_ta_delete = pt_ta_delete,
Modified: trunk/lib/libthread_db/libpthread_db.h
===================================================================
--- trunk/lib/libthread_db/libpthread_db.h 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/libpthread_db.h 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libthread_db/libpthread_db.h 181059 2008-07-31 16:26:58Z marcel $
*/
#ifndef _LIBPTHREAD_DB_H_
Modified: trunk/lib/libthread_db/libthr_db.c
===================================================================
--- trunk/lib/libthread_db/libthr_db.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/libthr_db.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 Marcel Moolenaar
* Copyright (c) 2005 David Xu
@@ -26,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libthread_db/libthr_db.c 241720 2012-10-19 05:43:38Z ed $");
#include <proc_service.h>
#include <stddef.h>
@@ -765,7 +766,7 @@
return (TD_OK);
}
-struct ta_ops libthr_db_ops = {
+static struct ta_ops libthr_db_ops = {
.to_init = pt_init,
.to_ta_clear_event = pt_ta_clear_event,
.to_ta_delete = pt_ta_delete,
Modified: trunk/lib/libthread_db/thread_db.c
===================================================================
--- trunk/lib/libthread_db/thread_db.c 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/thread_db.c 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* All rights reserved.
@@ -25,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__MBSDID("$MidnightBSD$");
+__FBSDID("$FreeBSD: stable/10/lib/libthread_db/thread_db.c 209689 2010-07-04 12:08:04Z kib $");
#include <proc_service.h>
#include <stddef.h>
Modified: trunk/lib/libthread_db/thread_db.h
===================================================================
--- trunk/lib/libthread_db/thread_db.h 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/thread_db.h 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* Copyright (c) 2004 Marcel Moolenaar
@@ -24,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libthread_db/thread_db.h 209689 2010-07-04 12:08:04Z kib $
*/
#ifndef _THREAD_DB_H_
Modified: trunk/lib/libthread_db/thread_db_int.h
===================================================================
--- trunk/lib/libthread_db/thread_db_int.h 2018-06-09 15:30:56 UTC (rev 10618)
+++ trunk/lib/libthread_db/thread_db_int.h 2018-06-09 15:31:47 UTC (rev 10619)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
/*
* Copyright (c) 2004 David Xu <davidxu at freebsd.org>
* All rights reserved.
@@ -23,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $MidnightBSD$
+ * $FreeBSD: stable/10/lib/libthread_db/thread_db_int.h 209689 2010-07-04 12:08:04Z kib $
*/
#ifndef _THREAD_DB_INT_H_
More information about the Midnightbsd-cvs
mailing list