Date: Tue, 5 May 2020 15:29:16 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> 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 Message-ID: <202005051529.045FTGHp072667@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <sys/cdefs.h> - /* - * Pickup definition of uintptr_t + * Pickup definition of various __types. */ -#include <sys/stdint.h> +#include <sys/_types.h> /* * 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005051529.045FTGHp072667>