From owner-p4-projects@FreeBSD.ORG  Tue Aug  3 11:26:45 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4EACA16A4D0; Tue,  3 Aug 2004 11:26:45 +0000 (GMT)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 2A65B16A4CE
	for <perforce@freebsd.org>; Tue,  3 Aug 2004 11:26:45 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 08A9343D41
	for <perforce@freebsd.org>; Tue,  3 Aug 2004 11:26:45 +0000 (GMT)
	(envelope-from dfr@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i73BQieI067755
	for <perforce@freebsd.org>; Tue, 3 Aug 2004 11:26:44 GMT
	(envelope-from dfr@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i73BQisf067752
	for perforce@freebsd.org; Tue, 3 Aug 2004 11:26:44 GMT
	(envelope-from dfr@freebsd.org)
Date: Tue, 3 Aug 2004 11:26:44 GMT
Message-Id: <200408031126.i73BQisf067752@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	dfr@freebsd.org using -f
From: Doug Rabson <dfr@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 58773 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Aug 2004 11:26:46 -0000

http://perforce.freebsd.org/chv.cgi?CH=58773

Change 58773 by dfr@dfr_home on 2004/08/03 11:26:19

	Integrate new file manually.

Affected files ...

.. //depot/projects/kse/lib/libc/gen/tls.c#5 integrate
.. //depot/projects/kse/libexec/rtld-elf/rtld_tls.h#3 integrate
.. //depot/projects/kse/tools/regression/tls/Makefile#4 integrate
.. //depot/projects/kse/tools/regression/tls/Makefile.inc#1 branch
.. //depot/projects/kse/tools/regression/tls/libxx/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/libxx/xx.c#3 integrate
.. //depot/projects/kse/tools/regression/tls/libyy/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/libyy/yy.c#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls1/Makefile#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls1/ttls1.c#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls2/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls2/ttls2.c#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/Makefile#2 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#3 integrate
.. //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#3 integrate

Differences ...

==== //depot/projects/kse/lib/libc/gen/tls.c#5 (text+ko) ====


==== //depot/projects/kse/libexec/rtld-elf/rtld_tls.h#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/Makefile#4 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libxx/Makefile#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libxx/xx.c#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libyy/Makefile#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/libyy/yy.c#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls1/Makefile#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls1/ttls1.c#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls2/Makefile#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls2/ttls2.c#2 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls3/Makefile#2 (text+ko) ====

@@ -3,7 +3,7 @@
 all: ttls3
 
 LDFLAGS=-shared -Bsymbolic --allow-shlib-undefined
-CFLAGS+= -L${.CURDIR}/../../../../lib/libc -lc
+CFLAGS+= -L${.CURDIR}/../../../../lib/libc -lc -lthr
 CFLAGS+= -Wl,--rpath=${.CURDIR}/../../../../lib/libc
 CFLAGS+= -Wl,--rpath=${.OBJDIR}
 CFLAGS+= -Wl,--dynamic-linker=${.CURDIR}/../../../../libexec/rtld-elf/ld-elf.so.1

==== //depot/projects/kse/tools/regression/tls/ttls3/elftls.S#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls3/tls-test-lib.c#3 (text+ko) ====


==== //depot/projects/kse/tools/regression/tls/ttls3/tls-test.c#3 (text+ko) ====