From owner-svn-src-head@freebsd.org Sun Nov 13 21:06:02 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 875CFC40EA7; Sun, 13 Nov 2016 21:06:02 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from smtp-out-so.shaw.ca (smtp-out-so.shaw.ca [64.59.136.139]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 364BD1DAE; Sun, 13 Nov 2016 21:06:01 +0000 (UTC) (envelope-from cy.schubert@komquats.com) Received: from spqr.komquats.com ([96.50.22.10]) by shaw.ca with SMTP id 61yLctaEdKjjy61yMcylu5; Sun, 13 Nov 2016 14:05:55 -0700 X-Authority-Analysis: v=2.2 cv=SPoybKnH c=1 sm=1 tr=0 a=jvE2nwUzI0ECrNeyr98KWA==:117 a=jvE2nwUzI0ECrNeyr98KWA==:17 a=L24OOQBejmoA:10 a=XldT38RWNwACPDQzwzUA:9 a=BhoTE4oazmdckCm9QMcA:9 a=CjuIK1q_8ugA:10 a=xr5EFR828UCq0TXsHGoA:9 a=EdegKuqBs0Cm16o9:21 a=AAdyl_OY14z4h87p:21 a=hquHOILUSkIA:10 a=YxBL1-UpAAAA:8 a=6I5d2MoRAAAA:8 a=ics_IjAVWSmO8OVX31YA:9 a=BOg4e644cxQA:10 a=Ia-lj3WSrqcvXOmTRaiG:22 a=IjZwj45LgO3ly-622nXo:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTPS id DFAF11951; Sun, 13 Nov 2016 13:05:52 -0800 (PST) Received: from slippy (localhost [127.0.0.1]) by slippy.cwsent.com (8.15.2/8.15.2) with ESMTP id uADL5qie048679; Sun, 13 Nov 2016 13:05:52 -0800 (PST) (envelope-from Cy.Schubert@cschubert.com) Message-Id: <201611132105.uADL5qie048679@slippy.cwsent.com> X-Mailer: exmh version 2.8.0 04/21/2012 with nmh-1.6 Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Adrian Chadd cc: Cy Schubert , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r308493 - in head: contrib/amd contrib/amd/amd contrib/amd/amq contrib/amd/conf/checkmount contrib/amd/conf/mtab contrib/amd/conf/nfs_prot contrib/amd/conf/transp contrib/amd/conf/umoun... In-Reply-To: Message from Adrian Chadd of "Sat, 12 Nov 2016 17:27:15 -0800." Mime-Version: 1.0 Content-Type: multipart/mixed ; boundary="==_Exmh_1479071040_95650" Date: Sun, 13 Nov 2016 13:05:52 -0800 X-CMAE-Envelope: MS4wfDmMq0jBmImM+zs4qpEIfqGY5yoOHfD6HckSRXuM+hM1knyGs4zDKL/Z067RmwtYRWvKOk1OCIWeXBmCMu2/njt+M0BxriD6koKOyHaS7dhgOaeaYTR2 WKnevSoZhFNLvR45EZ1xQVBvyRQGmtbPKoYCmDbTpL6df7fC+UhibndLsvIZ9+wf3+0OZJ85dHI3fkDbGA650DJoim7vlF6Zj21qxzA3oX6GntreRDkoIe1L GsA5W3T7WaJi5TDfxcLRu+A7qaXuTu2kUl2ySM9cS/s7k7gt0ZFVGlUsMTt2e8iYNpGesaf6g7LR5BRersnGaQ== X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 13 Nov 2016 21:06:02 -0000 This is a multipart MIME message. --==_Exmh_1479071040_95650 Content-Type: text/plain; charset=us-ascii In message , Adrian Chadd writes: > After looking at this, i'm not sure how this is supposed to work on a > 32 bit platform at all. > > Is there some vendor patch to fix compilation on 32 bit platforms? If > not, can we back this out until we get it compiling on 32 bit > platforms? Hi Adrian, Can you retry with the following attachment? You'll need to cd to src/contrib to apply it. It appears the upline's git commit to address 32 bit issues didn't go far enough. Strangely though, only mips failed to build. I'm sorry about this. --==_Exmh_1479071040_95650 Content-Type: text/plain ; name="amd.diff"; charset=us-ascii Content-Description: amd.diff Content-Disposition: attachment; filename="amd.diff" Index: amd/amd/readdir.c =================================================================== --- amd/amd/readdir.c (revision 308608) +++ amd/amd/readdir.c (working copy) @@ -38,6 +38,7 @@ */ +#include #ifdef HAVE_CONFIG_H # include #endif /* HAVE_CONFIG_H */ @@ -201,7 +202,7 @@ static int amfs_readdir_browsable(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsentry *ep, u_int count, int fully_browsable) { - u_int gen = *(u_int *) cookie; + u_int gen = *(u_int *) (uintptr_t) cookie; int chain_length, i; static nfsentry *te, *te_next; static int j; @@ -364,7 +365,7 @@ static int amfs_readdir(am_node *mp, nfscookie cookie, nfsdirlist *dp, nfsentry *ep, u_int count) { - u_int gen = *(u_int *) cookie; + u_int gen = *(u_int *) (uintptr_t) cookie; am_node *xp; dp->dl_eof = FALSE; /* assume readdir not done */ @@ -639,7 +640,7 @@ am_dirlist3 *dp, am_entry3 *ep, u_int count, int fully_browsable) { - uint64 gen = *(uint64 *) cookie; + uint64 gen = *(uint64 *) (uintptr_t) cookie; int chain_length, i; static am_entry3 *te, *te_next; static int j; @@ -796,7 +797,7 @@ amfs_readdir3(am_node *mp, am_cookie3 cookie, am_dirlist3 *dp, am_entry3 *ep, u_int count) { - uint64 gen = *(uint64 *) cookie; + uint64 gen = *(uint64 *) (uintptr_t) cookie; am_node *xp; if (amuDebug(D_READDIR)) @@ -944,8 +945,8 @@ return amfs_readdir(mp, cookie, dp, ep, count); } else { if (browsable) - return amfs_readdir3_browsable(mp, (am_cookie3) cookie, dp, ep, count, full); + return amfs_readdir3_browsable(mp, (am_cookie3) (uintptr_t) cookie, dp, ep, count, full); else - return amfs_readdir3(mp, (am_cookie3) cookie, dp, ep, count); + return amfs_readdir3(mp, (am_cookie3) (uintptr_t) cookie, dp, ep, count); } } Index: amd/amq/amq.c =================================================================== --- amd/amq/amq.c (revision 308608) +++ amd/amq/amq.c (working copy) @@ -79,7 +79,7 @@ static void time_print(time_type tt) { - time_t t = (time_t)tt; + time_t t = (time_t)*tt; struct tm *tp = localtime(&t); printf("%02d/%02d/%04d %02d:%02d:%02d", tp->tm_mon + 1, tp->tm_mday, Index: amd/include/amq_defs.h =================================================================== --- amd/include/amq_defs.h (revision 308608) +++ amd/include/amq_defs.h (working copy) @@ -66,7 +66,7 @@ /* * TYPEDEFS */ -typedef long *time_type; +typedef time_t *time_type; typedef struct amq_mount_info amq_mount_info; typedef struct amq_map_info amq_map_info; typedef struct amq_mount_stats amq_mount_stats; --==_Exmh_1479071040_95650 Content-Type: text/plain; charset=us-ascii Cheers, Cy Schubert FreeBSD UNIX: Web: http://www.FreeBSD.org The need of the many outweighs the greed of the few. --==_Exmh_1479071040_95650--