On Dec 25, 2011 5:27 AM, "Andreas Tobler" <andreast-list_at_fgznet.ch> wrote: > > On 25.12.11 00:59, Justin Hibbits wrote: >> >> On Dec 24, 2011 6:46 PM, "FreeBSD Tinderbox"<tinderbox_at_freebsd.org> wrote: >>> >>> >>> TB --- 2011-12-24 21:13:44 - tinderbox 2.8 running on >> >> freebsd-current.sentex.ca >>> >>> TB --- 2011-12-24 21:13:44 - starting HEAD tinderbox run for >> >> powerpc64/powerpc >>> >>> TB --- 2011-12-24 21:13:44 - cleaning the object tree >>> TB --- 2011-12-24 21:13:56 - cvsupping the source tree >>> TB --- 2011-12-24 21:13:56 - /usr/bin/csup -z -r 3 -g -L 1 -h >> >> cvsup.sentex.ca /tinderbox/HEAD/powerpc64/powerpc/supfile >>> >>> TB --- 2011-12-24 21:14:08 - building world >>> TB --- 2011-12-24 21:14:08 - CROSS_BUILD_TESTING=YES >>> TB --- 2011-12-24 21:14:08 - MAKEOBJDIRPREFIX=/obj >>> TB --- 2011-12-24 21:14:08 - PATH=/usr/bin:/usr/sbin:/bin:/sbin >>> TB --- 2011-12-24 21:14:08 - SRCCONF=/dev/null >>> TB --- 2011-12-24 21:14:08 - TARGET=powerpc >>> TB --- 2011-12-24 21:14:08 - TARGET_ARCH=powerpc64 >>> TB --- 2011-12-24 21:14:08 - TZ=UTC >>> TB --- 2011-12-24 21:14:08 - __MAKE_CONF=/dev/null >>> TB --- 2011-12-24 21:14:08 - cd /src >>> TB --- 2011-12-24 21:14:08 - /usr/bin/make -B buildworld >>>>>> >>>>>> World build started on Sat Dec 24 21:14:08 UTC 2011 >>>>>> Rebuilding the temporary build tree >>>>>> stage 1.1: legacy release compatibility shims >>>>>> stage 1.2: bootstrap tools >>>>>> stage 2.1: cleaning up the object tree >>>>>> stage 2.2: rebuilding the object tree >>>>>> stage 2.3: build tools >>>>>> stage 3: cross tools >>>>>> stage 4.1: building includes >>>>>> stage 4.2: building libraries >>>>>> stage 4.3: make dependencies >>>>>> stage 4.4: building everything >>>>>> stage 5.1: building 32 bit shim libraries >>>>>> World build completed on Sat Dec 24 23:35:25 UTC 2011 >>> >>> TB --- 2011-12-24 23:35:25 - generating LINT kernel config >>> TB --- 2011-12-24 23:35:25 - cd /src/sys/powerpc/conf >>> TB --- 2011-12-24 23:35:25 - /usr/bin/make -B LINT >>> TB --- 2011-12-24 23:35:25 - cd /src/sys/powerpc/conf >>> TB --- 2011-12-24 23:35:25 - /usr/sbin/config -m LINT >>> TB --- 2011-12-24 23:35:25 - building LINT kernel >>> TB --- 2011-12-24 23:35:25 - CROSS_BUILD_TESTING=YES >>> TB --- 2011-12-24 23:35:25 - MAKEOBJDIRPREFIX=/obj >>> TB --- 2011-12-24 23:35:25 - PATH=/usr/bin:/usr/sbin:/bin:/sbin >>> TB --- 2011-12-24 23:35:25 - SRCCONF=/dev/null >>> TB --- 2011-12-24 23:35:25 - TARGET=powerpc >>> TB --- 2011-12-24 23:35:25 - TARGET_ARCH=powerpc64 >>> TB --- 2011-12-24 23:35:25 - TZ=UTC >>> TB --- 2011-12-24 23:35:25 - __MAKE_CONF=/dev/null >>> TB --- 2011-12-24 23:35:25 - cd /src >>> TB --- 2011-12-24 23:35:25 - /usr/bin/make -B buildkernel KERNCONF=LINT >>>>>> >>>>>> Kernel build for LINT started on Sat Dec 24 23:35:25 UTC 2011 >>>>>> stage 1: configuring the kernel >>>>>> stage 2.1: cleaning up the object tree >>>>>> stage 2.2: rebuilding the object tree >>>>>> stage 2.3: build tools >>>>>> stage 3.1: making dependencies >>>>>> stage 3.2: building everything >>> >>> [...] >>> cc -c -O -pipe -std=c99 -Wall -Wredundant-decls -Wnested-externs >> >> -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline >> -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions >> -Wmissing-include-dirs -fdiagnostics-show-option -nostdinc -I. >> -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/libfdt -D_KERNEL >> -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common >> -finline-limit=15000 --param inline-unit-growth=100 --param >> large-function-growth=1000 -fno-builtin -msoft-float -Wa,-many >> -fno-omit-frame-pointer -msoft-float -mno-altivec -mcall-aixdesc >> -ffreestanding -fstack-protector -Werror /src/sys/dev/fb/fb.c >>> >>> cc -c -O -pipe -std=c99 -Wall -Wredundant-decls -Wnested-externs >> >> -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Winline >> -Wcast-qual -Wundef -Wno-pointer-sign -fformat-extensions >> -Wmissing-include-dirs -fdiagnostics-show-option -nostdinc -I. >> -I/src/sys -I/src/sys/contrib/altq -I/src/sys/contrib/libfdt -D_KERNEL >> -DHAVE_KERNEL_OPTION_HEADERS -include opt_global.h -fno-common >> -finline-limit=15000 --param inline-unit-growth=100 --param >> large-function-growth=1000 -fno-builtin -msoft-float -Wa,-many >> -fno-omit-frame-pointer -msoft-float -mno-altivec -mcall-aixdesc >> -ffreestanding -fstack-protector -Werror /src/sys/dev/hwpmc/hwpmc_powerpc.c >>> >>> /src/sys/dev/hwpmc/hwpmc_powerpc.c: In function 'powerpc_intr': >>> /src/sys/dev/hwpmc/hwpmc_powerpc.c:689: error: 'AMD_PMC_ENABLE' >> >> undeclared (first use in this function) >>> >>> /src/sys/dev/hwpmc/hwpmc_powerpc.c:689: error: (Each undeclared >> >> identifier is reported only once >>> >>> /src/sys/dev/hwpmc/hwpmc_powerpc.c:689: error: for each function it >> >> appears in.) >>> >>> /src/sys/dev/hwpmc/hwpmc_powerpc.c:689: error: 'union pmc_md_pmc' has no >> >> member named 'pm_amd' >>> >>> /src/sys/dev/hwpmc/hwpmc_powerpc.c:689: error: 'union pmc_md_pmc' has no >> >> member named 'pm_amd' >>> >>> *** Error code 1 >>> >>> Stop in /obj/powerpc.powerpc64/src/sys/LINT. >>> *** Error code 1 >>> >>> Stop in /src. >>> *** Error code 1 >>> >>> Stop in /src. >>> TB --- 2011-12-24 23:45:43 - WARNING: /usr/bin/make returned exit code 1 >>> TB --- 2011-12-24 23:45:43 - ERROR: failed to build LINT kernel >>> TB --- 2011-12-24 23:45:43 - 7497.27 user 1367.80 system 9118.84 real >>> >>> >>> http://tinderbox.freebsd.org/tinderbox-head-HEAD-powerpc64-powerpc.full >>> _______________________________________________ >>> freebsd-current_at_freebsd.org mailing list >>> http://lists.freebsd.org/mailman/listinfo/freebsd-current >>> To unsubscribe, send any mail to " freebsd-current-unsubscribe_at_freebsd.org" >> >> >> Sorry about this, bad patch when I tested the build. I'll fix it tomorrow >> when I get time. > > > Something like this? > > Andreas > > Index: hwpmc_powerpc.c > =================================================================== > --- hwpmc_powerpc.c (revision 228872) > +++ hwpmc_powerpc.c (working copy) > _at__at_ -686,10 +686,10 _at__at_ > v = pm->pm_sc.pm_reloadcount; > config = mfspr(SPR_MMCR0); > > - KASSERT((config & ~AMD_PMC_ENABLE) == > - (pm->pm_md.pm_amd.pm_amd_evsel & ~AMD_PMC_ENABLE), > + KASSERT((config & ~POWERPC_PMC_ENABLE) == > + (pm->pm_md.pm_powerpc.pm_powerpc_evsel & ~POWERPC_PMC_ENABLE), > ("[powerpc,%d] config mismatch reg=0x%x pm=0x%x", __LINE__, > - config, pm->pm_md.pm_amd.pm_amd_evsel)); > + config, pm->pm_md.pm_powerpc.pm_powerpc_evsel)); > > mtspr(SPR_MMCR0, config | SPR_MMCR0_FC); > powerpc_pmcn_write(i, v); > > It's fine to delete the assert, I sent Nathan a patch to do so, but don't expect to commit it until tonight or tomorrow. You could commit a deletion if you want. - JustinReceived on Sun Dec 25 2011 - 10:42:53 UTC
This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:22 UTC