From owner-p4-projects@FreeBSD.ORG  Fri Nov  5 23:23:22 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8463516A4CF; Fri,  5 Nov 2004 23:23:22 +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 DC7D116A4E1
	for <perforce@freebsd.org>; Fri,  5 Nov 2004 23:23:21 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CDC9743D39
	for <perforce@freebsd.org>; Fri,  5 Nov 2004 23:23:21 +0000 (GMT)
	(envelope-from peter@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 iA5NNLov040667
	for <perforce@freebsd.org>; Fri, 5 Nov 2004 23:23:21 GMT
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.11/8.12.11/Submit) id iA5NNLIh040663
	for perforce@freebsd.org; Fri, 5 Nov 2004 23:23:21 GMT
	(envelope-from peter@freebsd.org)
Date: Fri, 5 Nov 2004 23:23:21 GMT
Message-Id: <200411052323.iA5NNLIh040663@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>
Subject: PERFORCE change 64389 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: Fri, 05 Nov 2004 23:23:23 -0000

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

Change 64389 by peter@peter_daintree on 2004/11/05 23:23:09

	Invade rtld-elf for i386 as well, so it can run on amd64 machines.

Affected files ...

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

Differences ...

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

@@ -327,8 +327,10 @@
 allocate_initial_tls(Obj_Entry *objs)
 {
     void* tls;
+#ifndef COMPAT_32BIT
     union descriptor ldt;
     int sel;
+#endif
 
     /*
      * Fix the size of the static TLS block by using the maximum
@@ -338,6 +340,7 @@
     tls_static_space = tls_last_offset + RTLD_STATIC_TLS_EXTRA;
     tls = allocate_tls(objs, NULL, 2*sizeof(Elf_Addr), sizeof(Elf_Addr));
 
+#ifndef COMPAT_32BIT
     memset(&ldt, 0, sizeof(ldt));
     ldt.sd.sd_lolimit = 0xffff;	/* 4G limit */
     ldt.sd.sd_lobase = ((Elf_Addr)tls) & 0xffffff;
@@ -350,6 +353,9 @@
     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));
+#else
+    _amd64_set_gsbase(tls);
+#endif
 }
 
 /* GNU ABI */