From owner-p4-projects@FreeBSD.ORG  Tue Jun 14 02:11:04 2005
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4CDB716A420; Tue, 14 Jun 2005 02:11:04 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 2741616A41C
	for <perforce@freebsd.org>; Tue, 14 Jun 2005 02:11:04 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0377143D1F
	for <perforce@freebsd.org>; Tue, 14 Jun 2005 02:11:04 +0000 (GMT)
	(envelope-from peter@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5E2B3Xq043226
	for <perforce@freebsd.org>; Tue, 14 Jun 2005 02:11:03 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5E2B3d8043223
	for perforce@freebsd.org; Tue, 14 Jun 2005 02:11:03 GMT
	(envelope-from peter@freebsd.org)
Date: Tue, 14 Jun 2005 02:11:03 GMT
Message-Id: <200506140211.j5E2B3d8043223@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 78508 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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, 14 Jun 2005 02:11:05 -0000

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

Change 78508 by peter@peter_melody on 2005/06/14 02:10:43

	clean up ldt goop

Affected files ...

.. //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#9 edit

Differences ...

==== //depot/projects/hammer/libexec/rtld-elf/i386/reloc.c#9 (text+ko) ====

@@ -327,8 +327,6 @@
 allocate_initial_tls(Obj_Entry *objs)
 {
     void* tls;
-    union descriptor ldt;
-    int error, sel;
 
     /*
      * Fix the size of the static TLS block by using the maximum
@@ -337,21 +335,7 @@
      */
     tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA;
     tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr));
-    error = i386_set_gsbase(tls);
-    if (error < 0) {
-	memset(&ldt, 0, sizeof(ldt));
-	ldt.sd.sd_lolimit = 0xffff;	/* 4G limit */
-	ldt.sd.sd_lobase = ((Elf_Addr)tls) & 0xffffff;
-	ldt.sd.sd_type = SDT_MEMRWA;
-	ldt.sd.sd_dpl = SEL_UPL;
-	ldt.sd.sd_p = 1;		/* present */
-	ldt.sd.sd_hilimit = 0xf;	/* 4G limit */
-	ldt.sd.sd_def32 = 1;	/* 32 bit */
-	ldt.sd.sd_gran = 1;		/* limit in pages */
-	ldt.sd.sd_hibase = (((Elf_Addr)tls) >> 24) & 0xff;
-	sel = i386_set_ldt(LDT_AUTO_ALLOC, &ldt, 1);
-	__asm __volatile("movl %0,%%gs" : : "rm" ((sel << 3) | 7));
-    }
+    i386_set_gsbase(tls);
 }
 
 /* GNU ABI */