Date: Sat, 11 Jun 2005 08:15:32 +0530 From: Joseph Koshy <joseph.koshy@gmail.com> To: FreeBSD Tinderbox <tinderbox@freebsd.org> Cc: powerpc@freebsd.org, current@freebsd.org Subject: Re: [current tinderbox] failure on powerpc/powerpc Message-ID: <84dead72050610194577ec99ad@mail.gmail.com> In-Reply-To: <20050610211947.335657306E@freebsd-current.sentex.ca> References: <20050610211947.335657306E@freebsd-current.sentex.ca>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_1552_30161612.1118457932110 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline >>>> "tb" =3D=3D "FreeBSD Tinderbox" wrote: tb> =3D=3D=3D> hwpmc (all) tb> cc -O2 -pipe -fno-strict-aliasing -Werror -D_KERNEL -DKLD_MODULE -nostdinc -I- -include /tinderbox/CURRENT/powerpc/powerpc/obj/powerpc/tinderbox/CURRENT/powerpc/po= werpc/src/sys/GENERIC/opt_global.h -I. -I@ -I@/contrib/altq -I@/../include -finline-limit=3D15000 -fno-common -g -mlongcall -fno-omit-frame-pointer -I/tinderbox/CURRENT/powerpc/powerpc/obj/powerpc/tinderbox/CURRENT/powerpc/= powerpc/src/sys/GENERIC -msoft-float -ffreestanding -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual -fformat-extensions -std=3Dc99 -Wsystem-headers -Werror -Wall -Wno-format-y2k -Wno-uninitialized -c /tinderbox/CURRENT/powerpc/powerpc/src/sys/modules/hwpmc/../../dev/hwpmc/hw= pmc_mod.c tb> In file included from @/sys/pmc.h:35, tb> from /tinderbox/CURRENT/powerpc/powerpc/src/sys/modules/hwpmc/../../dev/hwpmc/hw= pmc_mod.c:41: tb> ./machine/profile.h:40: error: redefinition of typedef 'uintfptr_t' tb> @/sys/types.h:285: error: previous declaration of 'uintfptr_t' was here tb> *** Error code 1 The attached patch brings PPC in line with the other architectures. Could someone please review? --=20 FreeBSD Volunteer, http://people.freebsd.org/~jkoshy ------=_Part_1552_30161612.1118457932110 Content-Type: text/plain; name=ppc.txt; charset=us-ascii Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="ppc.txt" Index: sys/powerpc/include/profile.h =================================================================== RCS file: /cvs/FreeBSD/src/sys/powerpc/include/profile.h,v retrieving revision 1.4 diff -u -r1.4 profile.h --- sys/powerpc/include/profile.h 7 Jan 2005 02:29:19 -0000 1.4 +++ sys/powerpc/include/profile.h 11 Jun 2005 01:43:04 -0000 @@ -37,7 +37,6 @@ #define FUNCTION_ALIGNMENT 16 typedef u_int fptrdiff_t; -typedef u_int uintfptr_t; #define MCOUNT \ void \ @@ -63,6 +62,11 @@ ((pc >= (uintfptr_t)bintr) ? (uintfptr_t)bintr : \ (uintfptr_t)btrap) : ~0U) -#endif + +#else /* !_KERNEL */ + +typedef u_int uintfptr_t; + +#endif /* _KERNEL */ #endif /* !_MACHINE_PROFILE_H_ */ ------=_Part_1552_30161612.1118457932110--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?84dead72050610194577ec99ad>