From owner-svn-src-all@freebsd.org Fri Dec 4 15:59:23 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 2DB964A4734; Fri, 4 Dec 2020 15:59:23 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4CncpM0h3Nz4tMj; Fri, 4 Dec 2020 15:59:22 +0000 (UTC) (envelope-from arichardson.kde@gmail.com) Received: by mail-ej1-f48.google.com with SMTP id m19so9338772ejj.11; Fri, 04 Dec 2020 07:59:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Ca0LI/K9DiJARSfwWI44t0TJIQcAFphjh5HxYzdyG/k=; b=BuFVHxkdso5tPmNqJUD2AKuyMcHbzjtjIDDKZywLGXSCjT5rW/5fJmbsvLSnNnZow1 3j09KFJ9xs8cz0YpRsTpB+U+zLhGH5gUzqfhQpjK4N2sGOA6eQtHKrzdByDBa+AiXFau baWEPw/gxQruA3CiIdP+2oWAqRCZ/9Upauq98TfbDzG+a2lAFtTAhoF0t4m29aqSA4Yp wpzQL1EK8NLDq1mfAu47ULj4PU1kpanXiGd0YuTcEqYEwdZscpERy+Gq10or3FdpZk8W c6AYHRmS33gWhiShJy4QOzHQkYAIQInbydIe9mGj1EUUy0DA6L2g0AgcKNvznle/p5i7 SFhA== X-Gm-Message-State: AOAM532cuzYzXk3+HAcVdGzRZanHymG1VGv4J7HETTBCcH87TOFt85Xz is51aAV7UDYIrxDqBohBX9EpRIrSpF3pmw== X-Google-Smtp-Source: ABdhPJx/AufaG/lgVxZcBsEHvutrg4F78eOrr+RVklVo3HeX3HftmVnlJK1zZCl4aV3kPxEzX6oeaQ== X-Received: by 2002:a17:906:c83b:: with SMTP id dd27mr7830182ejb.356.1607097561729; Fri, 04 Dec 2020 07:59:21 -0800 (PST) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com. [209.85.128.50]) by smtp.gmail.com with ESMTPSA id ck27sm2622663edb.13.2020.12.04.07.59.21 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 04 Dec 2020 07:59:21 -0800 (PST) Received: by mail-wm1-f50.google.com with SMTP id v14so5930129wml.1; Fri, 04 Dec 2020 07:59:21 -0800 (PST) X-Received: by 2002:a1c:67c5:: with SMTP id b188mr5086016wmc.147.1607097561127; Fri, 04 Dec 2020 07:59:21 -0800 (PST) MIME-Version: 1.0 References: <202012041450.0B4EouQ2024632@repo.freebsd.org> In-Reply-To: <202012041450.0B4EouQ2024632@repo.freebsd.org> From: Alexander Richardson Date: Fri, 4 Dec 2020 15:59:10 +0000 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r368329 - head/stand/kshim To: Hans Petter Selasky Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4CncpM0h3Nz4tMj X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; TAGGED_FROM(0.00)[] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Dec 2020 15:59:23 -0000 On Fri, 4 Dec 2020 at 14:51, Hans Petter Selasky wrote: > > Author: hselasky > Date: Fri Dec 4 14:50:55 2020 > New Revision: 368329 > URL: https://svnweb.freebsd.org/changeset/base/368329 > > Log: > Fix definition of int64_t and uint64_t when long is 64-bit. This gets the kernel > shim code in line with the rest of the kernel, sys/x86/include/_types.h. > > MFC after: 1 week > Sponsored by: Mellanox Technologies // NVIDIA Networking > > Modified: > head/stand/kshim/bsd_kernel.h > > Modified: head/stand/kshim/bsd_kernel.h > ============================================================================== > --- head/stand/kshim/bsd_kernel.h Fri Dec 4 14:09:12 2020 (r368328) > +++ head/stand/kshim/bsd_kernel.h Fri Dec 4 14:50:55 2020 (r368329) > @@ -208,9 +208,17 @@ typedef unsigned int uint32_t; > #define _INT32_T_DECLARED > typedef signed int int32_t; > #define _UINT64_T_DECLARED > +#ifndef __LP64__ > typedef unsigned long long uint64_t; > +#else > +typedef unsigned long uint64_t; > +#endif > #define _INT16_T_DECLARED > +#ifndef __LP64__ > typedef signed long long int64_t; > +#else > +typedef signed long int64_t; > +#endif > > typedef uint16_t uid_t; > typedef uint16_t gid_t; Since we no longer support ancient compilers, could we simplify this and just use typedef __UINT64_TYPE__ uint64_t; typedef __INT64_TYPE__ int64_t; ? This will work across all architectures and ABIs, and appears to work starting with GCC 4.5.3 and Clang 3.5: https://godbolt.org/z/TWavfb Alex