From owner-svn-src-stable@freebsd.org Tue May 5 15:29:17 2020 Return-Path: Delivered-To: svn-src-stable@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 3E32013A029; Tue, 5 May 2020 15:29:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49GkCx0yZpz47jp; Tue, 5 May 2020 15:29:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 1AC19180FE; Tue, 5 May 2020 15:29:17 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 045FTGR3072668; Tue, 5 May 2020 15:29:16 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 045FTGHp072667; Tue, 5 May 2020 15:29:16 GMT (envelope-from dim@FreeBSD.org) Message-Id: <202005051529.045FTGHp072667@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Tue, 5 May 2020 15:29:16 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r360659 - stable/11/sys/arm/include X-SVN-Group: stable-11 X-SVN-Commit-Author: dim X-SVN-Commit-Paths: stable/11/sys/arm/include X-SVN-Commit-Revision: 360659 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 05 May 2020 15:29:17 -0000 Author: dim Date: Tue May 5 15:29:16 2020 New Revision: 360659 URL: https://svnweb.freebsd.org/changeset/base/360659 Log: Fix-up for arm, armeb and armv6 builds erroring after r360658, with: In file included from /usr/src/contrib/compiler-rt/lib/builtins/clear_cache.c:26: /usr/obj/arm.armv6/usr/src/tmp/usr/include/machine/sysarch.h:95:22: error: unknown type name 'u_int' int arm_sync_icache (u_int addr, int len); ^ MFC r349887 (by ian): De-pollute arm's sysarch.h. Instead of including stdint.h for uintptr_t, include sys/_types.h and use __types for everything that isn't a native C keyword type. Remove the #include of cdefs.h. It appears after the include of armreg.h which has a precondition of cdefs.h being included before it, so everyone including sysarch.h is already including cdefs.h. (When armv5 support goes away, there will be no need include armreg.h here either.) Unfortunately, the unprefixed struct member names "addr" and "len" cannot be changed, because 3rd-party software is relying on them (libcompiler_rt is one known consumer). Modified: stable/11/sys/arm/include/sysarch.h Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/arm/include/sysarch.h ============================================================================== --- stable/11/sys/arm/include/sysarch.h Tue May 5 12:59:04 2020 (r360658) +++ stable/11/sys/arm/include/sysarch.h Tue May 5 15:29:16 2020 (r360659) @@ -63,12 +63,10 @@ #ifndef LOCORE #ifndef __ASSEMBLER__ -#include - /* - * Pickup definition of uintptr_t + * Pickup definition of various __types. */ -#include +#include /* * Architecture specific syscalls (arm) @@ -81,19 +79,19 @@ #define ARM_GET_VFPSTATE 4 struct arm_sync_icache_args { - uintptr_t addr; /* Virtual start address */ - size_t len; /* Region size */ + __uintptr_t addr; /* Virtual start address */ + __size_t len; /* Region size */ }; struct arm_get_vfpstate_args { - size_t mc_vfp_size; + __size_t mc_vfp_size; void *mc_vfp; }; #ifndef _KERNEL __BEGIN_DECLS -int arm_sync_icache (u_int addr, int len); -int arm_drain_writebuf (void); +int arm_sync_icache(unsigned int, int); +int arm_drain_writebuf(void); int sysarch(int, void *); __END_DECLS #endif