From owner-p4-projects@FreeBSD.ORG  Sat Apr  3 01:42:14 2004
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 7F17616A4D0; Sat,  3 Apr 2004 01:42:13 -0800 (PST)
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 4D1DC16A4CE
	for <perforce@freebsd.org>; Sat,  3 Apr 2004 01:42:13 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2DC3843D39
	for <perforce@freebsd.org>; Sat,  3 Apr 2004 01:42:13 -0800 (PST)
	(envelope-from dfr@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.10/8.12.10) with ESMTP id i339gCGe096945
	for <perforce@freebsd.org>; Sat, 3 Apr 2004 01:42:12 -0800 (PST)
	(envelope-from dfr@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.10/8.12.10/Submit) id i339gCvx096936
	for perforce@freebsd.org; Sat, 3 Apr 2004 01:42:12 -0800 (PST)
	(envelope-from dfr@freebsd.org)
Date: Sat, 3 Apr 2004 01:42:12 -0800 (PST)
Message-Id: <200404030942.i339gCvx096936@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 50246 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: Sat, 03 Apr 2004 09:42:14 -0000

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

Change 50246 by dfr@dfr_home on 2004/04/03 01:42:05

	Phdr align field is in bits, not log2(bits).

Affected files ...

.. //depot/projects/kse/libexec/rtld-elf/i386/rtld_machdep.h#3 edit

Differences ...

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

@@ -59,8 +59,8 @@
 	(((InitFunc)(target))())
 
 #define calculate_tls_offset(prev_offset, size, align) \
-	(((prev_offset) + (size) + ((1 << (align)) - 1)) \
-	    & ~((1 << (align)) - 1))
+	(((prev_offset) + (size) + ((align) - 1)) \
+	    & ~((align) - 1))
 
 typedef struct {
     unsigned long ti_module;