Date: Fri, 6 Nov 2009 06:09:04 +0000 (UTC) From: Marcel Moolenaar <marcel@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r198968 - head/sys/powerpc/powerpc Message-ID: <200911060609.nA6695t4004666@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Fri Nov 6 06:09:04 2009 New Revision: 198968 URL: http://svn.freebsd.org/changeset/base/198968 Log: Unbreak E500 builds. The inline assembly for the 970 CPUs is invalid when compiling for BookE. Modified: head/sys/powerpc/powerpc/cpu.c Modified: head/sys/powerpc/powerpc/cpu.c ============================================================================== --- head/sys/powerpc/powerpc/cpu.c Fri Nov 6 01:11:59 2009 (r198967) +++ head/sys/powerpc/powerpc/cpu.c Fri Nov 6 06:09:04 2009 (r198968) @@ -118,7 +118,9 @@ static void cpu_print_speed(void); static void cpu_6xx_setup(int cpuid, uint16_t vers); static void cpu_6xx_print_cacheinfo(u_int, uint16_t); static void cpu_e500_setup(int cpuid, uint16_t vers); +#ifndef E500 static void cpu_970_setup(int cpuid, uint16_t vers); +#endif void cpu_setup(u_int cpuid) @@ -195,12 +197,14 @@ cpu_setup(u_int cpuid) cpu_6xx_setup(cpuid, vers); break; +#ifndef E500 case IBM970: case IBM970FX: case IBM970GX: case IBM970MP: cpu_970_setup(cpuid, vers); break; +#endif case FSL_E500v1: case FSL_E500v2: @@ -429,6 +433,7 @@ cpu_e500_setup(int cpuid, uint16_t vers) printf("cpu%d: HID0 %b", cpuid, (int)hid0, HID0_E500_BITMASK); } +#ifndef E500 static void cpu_970_setup(int cpuid, uint16_t vers) { @@ -458,4 +463,4 @@ cpu_970_setup(int cpuid, uint16_t vers) : "=r" (hid0_hi) : "K" (SPR_HID0)); printf("cpu%d: HID0 %b", cpuid, (int)(hid0_hi), HID0_970_BITMASK); } - +#endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911060609.nA6695t4004666>