Date: Sat, 11 May 2002 15:01:37 -0700 (PDT) From: Jake Burkholder <jake@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 11184 for review Message-ID: <200205112201.g4BM1bZ50562@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=11184 Change 11184 by jake@jake_sparc64 on 2002/05/11 15:00:51 Integ@11182 Affected files ... ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#13 integrate ... //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#8 integrate ... //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#5 integrate ... //depot/projects/sparc64/sys/alpha/alpha/alphadump.c#1 branch ... //depot/projects/sparc64/sys/boot/i386/Makefile#4 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/Makefile#3 integrate ... //depot/projects/sparc64/sys/boot/i386/boot2/boot2.c#8 integrate ... //depot/projects/sparc64/sys/conf/files.alpha#14 integrate ... //depot/projects/sparc64/sys/sparc64/conf/SUN4U#29 edit ... //depot/projects/sparc64/sys/sys/kerneldump.h#3 integrate Differences ... ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu.c#13 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.5 2002/04/27 21:56:28 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu.c,v 1.6 2002/05/11 21:20:04 jake Exp $"); #include <sys/param.h> ==== //depot/projects/sparc64/lib/libc/sparc64/fpu/fpu_explode.c#8 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.4 2002/04/27 21:56:28 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/fpu/fpu_explode.c,v 1.5 2002/05/11 21:20:04 jake Exp $"); /* * FPU subroutines: `explode' the machine's `packed binary' format numbers ==== //depot/projects/sparc64/lib/libc/sparc64/sys/__sparc_utrap_emul.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.1 2002/04/27 21:56:28 jake Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/sparc64/sys/__sparc_utrap_emul.c,v 1.2 2002/05/11 21:20:05 jake Exp $"); #include <sys/types.h> #include <machine/cpufunc.h> ==== //depot/projects/sparc64/sys/boot/i386/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.15 2002/05/10 00:52:00 obrien Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.16 2002/05/11 21:41:03 peter Exp $ -SUBDIR= mbr boot0 btx cdboot kgzldr libi386 loader +SUBDIR= mbr boot0 btx boot2 cdboot kgzldr libi386 loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/sparc64/sys/boot/i386/boot2/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.24 2002/05/10 04:05:42 jhb Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.25 2002/05/11 21:39:59 peter Exp $ PROG= boot2 NOMAN= @@ -48,6 +48,12 @@ boot1.o: boot1.s ${AS} ${AFLAGS} --defsym FLAGS=${B1FLAGS} ${.IMPSRC} -o ${.TARGET} +boot2.o: boot2.c + ${CC} ${CFLAGS} -S -o boot2.s.tmp ${.IMPSRC} + sed -e '/align/d' -e '/nop/d' < boot2.s.tmp > boot2.s + rm -f boot2.s.tmp + ${AS} ${AFLAGS} -o boot2.o boot2.s + boot2.h: boot1.out ${NM} -t d ${.ALLSRC} | awk '/([0-9])+ T xread/ \ { x = $$1 - ORG1; printf("#define XREADORG 0x7%x\n", x) }' \ ==== //depot/projects/sparc64/sys/boot/i386/boot2/boot2.c#8 (text+ko) ==== @@ -14,7 +14,7 @@ */ /* - * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.39 2002/04/11 09:21:10 pb Exp $ + * $FreeBSD: src/sys/boot/i386/boot2/boot2.c,v 1.41 2002/05/11 21:49:39 peter Exp $ */ #include <sys/param.h> @@ -154,7 +154,6 @@ static int dskread(void *, unsigned, unsigned); static int printf(const char *,...); static int putchar(int); -static void *memcpy(void *, const void *, size_t); static uint32_t memsize(int); static int drvread(void *, unsigned, unsigned); static int keyhit(unsigned); @@ -162,6 +161,8 @@ static int xgetc(int); static int getc(int); +#define memcpy __builtin_memcpy + static inline void readfile(const char *fname, void *buf, size_t size) { @@ -743,17 +744,6 @@ return xputc(c); } -static void * -memcpy(void *dst, const void *src, size_t size) -{ - const char *s; - char *d; - - for (d = dst, s = src; size; size--) - *d++ = *s++; - return dst; -} - static uint32_t memsize(int type) { ==== //depot/projects/sparc64/sys/conf/files.alpha#14 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.alpha,v 1.84 2002/04/15 23:28:09 obrien Exp $ +# $FreeBSD: src/sys/conf/files.alpha,v 1.85 2002/05/11 21:53:46 gallatin Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -31,6 +31,7 @@ clean "atkbdmap.h" # alpha/alpha/alpha-gdbstub.c optional ddb +alpha/alpha/alphadump.c standard alpha/alpha/api_up1000.c optional api_up1000 alpha/alpha/atomic.s standard alpha/alpha/autoconf.c standard ==== //depot/projects/sparc64/sys/sparc64/conf/SUN4U#29 (text+ko) ==== @@ -65,3 +65,9 @@ options KTR_COMPILE=0xffffffff options KTR_ENTRIES=8192 options KTR_MASK=0 + +#options NFS_ROOT +#options BOOTP +#options BOOTP_NFSROOT +#options BOOTP_NFSV3 +#options BOOTP_COMPAT ==== //depot/projects/sparc64/sys/sys/kerneldump.h#3 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/kerneldump.h,v 1.4 2002/05/05 13:47:21 mux Exp $ + * $FreeBSD: src/sys/sys/kerneldump.h,v 1.5 2002/05/11 21:53:46 gallatin Exp $ */ #ifndef _SYS_KERNELDUMP_H @@ -65,6 +65,7 @@ uint32_t version; #define KERNELDUMPVERSION 1 uint32_t architectureversion; +#define KERNELDUMP_ALPHA_VERSION 1 #define KERNELDUMP_I386_VERSION 1 #define KERNELDUMP_IA64_VERSION 1 uint64_t dumplength; /* excl headers */ To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205112201.g4BM1bZ50562>