CVS commit: src/sys/arch/ia64/stand/ia64
Module Name:src Committed By: scole Date: Fri Aug 5 17:08:10 UTC 2016 Modified Files: src/sys/arch/ia64/stand/ia64/efi: Makefile src/sys/arch/ia64/stand/ia64/ski: Makefile Log Message: PR port-ia64/51261 Put skiload loader.efi loader.sym in /usr/mdec To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/efi/Makefile cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/efi/Makefile diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.3 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.4 --- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.3 Sat Jan 22 19:19:19 2011 +++ src/sys/arch/ia64/stand/ia64/efi/Makefile Fri Aug 5 17:08:10 2016 @@ -1,48 +1,37 @@ +# $NetBSD: Makefile,v 1.4 2016/08/05 17:08:10 scole Exp $ + S= ${.CURDIR}/../../../../.. VERSIONFILE= ${.CURDIR}/version .include "../Makefile.booters" -PROG= loader.sym - -MAN=# Tell bsd.prog.mk that loader.sym is not a man page. - -INTERNALPROG= +PROGS= loader.sym loader.efi +MAN.loader.sym= # no man +MAN.loader.efi= # no man -SRCS= start.S conf.c efimd.c vers.c main.c - -CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include -CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH} CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libefi/ -CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libshell/ CPPFLAGS+= -I${IA64_STAND_DIR}/common/ CPPFLAGS+= -I${S} - -CPPFLAGS+= -DLOADER - -CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \ - -DHEAP_VARIABLE - - -# Pick up FreeBSD glue -#CPPFLAGS+= -I${.CURDIR}/../../ +CPPFLAGS+= -DLOADER -DLIBKERN_OPTIMISE_SPACE -DHEAP_VARIABLE # Always add MI sources .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" +# need to do this after common stuff pulled in +SRCS.loader.sym:= start.S conf.c efimd.c vers.c main.c ${SRCS} -FILES= loader.efi - +# XXX verify +BINDIR?= /usr/mdec LDSCRIPT= ${.CURDIR}/ldscript.${MACHINE_ARCH} LDFLAGS= -Wl,-T${LDSCRIPT} -shared -symbolic -nostdlib -${PROG}: ${LDSCRIPT} +loader.sym: ${LDSCRIPT} -CLEANFILES+= vers.c loader.efi ${OBJS} +CLEANFILES+= vers.c ${OBJS} NEWVERSWHAT= "EFI boot" ${MACHINE_ARCH} @@ -50,14 +39,14 @@ vers.c: ${VERSIONFILE} ${SOURCES} ${HOST_SH} ${S}/conf/newvers_stand.sh ${${MKREPRO} == "yes" :?:-D} \ ${.ALLSRC} ${MACHINE} ${NEWVERSWHAT} -loader.efi: ${PROG} - if [ `${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*' | wc -l` != 0 ]; then \ - ${OBJDUMP} -t ${.ALLSRC} | fgrep '*UND*'; \ +loader.efi: loader.sym + if [ `${OBJDUMP} -t loader.sym | fgrep '*UND*' | wc -l` != 0 ]; then \ + ${OBJDUMP} -t loader.sym | fgrep '*UND*'; \ exit 1; \ fi ${OBJCOPY} -j .data -j .dynamic -j .dynstr -j .dynsym -j .hash \ -j .rela.dyn -j .reloc -j .sdata -j .text \ - --target=efi-app-${MACHINE_ARCH} ${.ALLSRC} ${.TARGET} + --target=efi-app-${MACHINE_ARCH} loader.sym ${.TARGET} @echo link finished. all: loader.efi Index: src/sys/arch/ia64/stand/ia64/ski/Makefile diff -u src/sys/arch/ia64/stand/ia64/ski/Makefile:1.4 src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5 --- src/sys/arch/ia64/stand/ia64/ski/Makefile:1.4 Sat Jan 22 19:19:19 2011 +++ src/sys/arch/ia64/stand/ia64/ski/Makefile Fri Aug 5 17:08:10 2016 @@ -6,6 +6,7 @@ VERSIONFILE= ${.CURDIR}/version PROG= skiload MAN=# +BINDIR?= /usr/mdec STRIP= # We must not strip skiload at install time. @@ -16,8 +17,6 @@ SRCS= conf.c copy.c delay.c devicename. CPPFLAGS+= -DLOADER -DSKIFS CPPFLAGS+= -I${S} CPPFLAGS+= -I${IA64_STAND_DIR}/common -CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include -CPPFLAGS+= -I${IA64_STAND_DIR}/efi/include/${MACHINE_ARCH} CPPFLAGS+= -DLIBKERN_OPTIMISE_SPACE \ -DHEAP_VARIABLE
CVS commit: src/sys/arch/ia64/stand/ia64
Module Name:src Committed By: matt Date: Wed Aug 21 07:17:08 UTC 2013 Modified Files: src/sys/arch/ia64/stand/ia64: Makefile.booters Log Message: Use To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/Makefile.booters Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/Makefile.booters diff -u src/sys/arch/ia64/stand/ia64/Makefile.booters:1.4 src/sys/arch/ia64/stand/ia64/Makefile.booters:1.5 --- src/sys/arch/ia64/stand/ia64/Makefile.booters:1.4 Thu May 27 06:58:14 2010 +++ src/sys/arch/ia64/stand/ia64/Makefile.booters Wed Aug 21 07:17:08 2013 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile.booters,v 1.4 2010/05/27 06:58:14 dholland Exp $ +# $NetBSD: Makefile.booters,v 1.5 2013/08/21 07:17:08 matt Exp $ .include +.include STRIPFLAG= BINMODE=444 @@ -23,29 +24,6 @@ CFLAGS+= -ffreestanding -fshort-wchar -W LDFLAGS+= #-nostdlib CPPFLAGS+= -D_STANDALONE -.if !make(obj) && !make(clean) && !make(cleandir) -.BEGIN: machine -.NOPATH: machine -.endif - -realdepend realall: machine lib -CLEANFILES= machine - -machine: - -rm -f $@ - ln -s $S/arch/${MACHINE_ARCH}/include $@ - -${OBJS}: machine lib - -lib: -.ifdef LIBOBJ - -rm -f $@ - ln -s ${LIBOBJ}/lib . - [ -d ${LIBOBJ}/lib ] || mkdir ${LIBOBJ}/lib -.else - mkdir lib -.endif - ### find out what to use for libkern KERN_AS= library .include "${S}/lib/libkern/Makefile.inc"
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: maxv Date: Sun Jun 25 12:04:37 UTC 2017 Modified Files: src/sys/arch/ia64/stand/ia64/ski: devicename.c Log Message: uninitialized variable, found by Mootja To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/stand/ia64/ski/devicename.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.9 --- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8 Mon Aug 15 09:06:39 2016 +++ src/sys/arch/ia64/stand/ia64/ski/devicename.c Sun Jun 25 12:04:37 2017 @@ -1,4 +1,4 @@ -/* $NetBSD: devicename.c,v 1.8 2016/08/15 09:06:39 maxv Exp $ */ +/* $NetBSD: devicename.c,v 1.9 2017/06/25 12:04:37 maxv Exp $ */ /*- * Copyright (c) 1998 Michael Smith @@ -236,8 +236,7 @@ ski_fmtdev(void *vdev) break; case DEVT_NET: - /* XXX XXX XXX: Yay, 'len' is not initialized here */ - snprintf(buf, buflen - len, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit); + snprintf(buf, buflen, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit); break; } return(buf);
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: scole Date: Tue Jan 14 16:23:08 UTC 2020 Modified Files: src/sys/arch/ia64/stand/ia64/ski: ssc.c Log Message: add noinline attribute To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/ia64/stand/ia64/ski/ssc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/ski/ssc.c diff -u src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3 src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.4 --- src/sys/arch/ia64/stand/ia64/ski/ssc.c:1.3 Mon Jul 20 04:59:04 2009 +++ src/sys/arch/ia64/stand/ia64/ski/ssc.c Tue Jan 14 16:23:07 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ssc.c,v 1.3 2009/07/20 04:59:04 kiyohara Exp $ */ +/* $NetBSD: ssc.c,v 1.4 2020/01/14 16:23:07 scole Exp $ */ /*- * Copyright (c) 2001 Doug Rabson @@ -41,6 +41,8 @@ * PSR.dt across the SSC call. We do this by saving and restoring psr.l * completely. */ + +__attribute__((__noinline__)) u_int64_t ssc(u_int64_t in0, u_int64_t in1, u_int64_t in2, u_int64_t in3, int which) {
CVS commit: src/sys/arch/ia64/stand/ia64/efi
Module Name:src Committed By: lukem Date: Thu Jul 2 09:07:25 UTC 2020 Modified Files: src/sys/arch/ia64/stand/ia64/efi: Makefile Log Message: loader.efi doesn't have source (Untested fix) To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/ia64/stand/ia64/efi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/efi/Makefile diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.6 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.7 --- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.6 Sun Apr 9 22:50:02 2017 +++ src/sys/arch/ia64/stand/ia64/efi/Makefile Thu Jul 2 09:07:24 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2017/04/09 22:50:02 christos Exp $ +# $NetBSD: Makefile,v 1.7 2020/07/02 09:07:24 lukem Exp $ S= ${.CURDIR}/../../../../.. @@ -9,6 +9,8 @@ PROGS= loader.sym loader.efi MAN.loader.sym= # no man MAN.loader.efi= # no man +SRCS.loader.efi= # no SRCS + CPPFLAGS+= -I${IA64_STAND_DIR}/efi/libefi/ CPPFLAGS+= -I${IA64_STAND_DIR}/common/ CPPFLAGS+= -I${S}
CVS commit: src/sys/arch/ia64/stand/ia64/efi
Module Name:src Committed By: christos Date: Sun Apr 9 22:50:02 UTC 2017 Modified Files: src/sys/arch/ia64/stand/ia64/efi: Makefile Log Message: move vers.c evaluation before we use ${SRCS} To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/efi/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/efi/Makefile diff -u src/sys/arch/ia64/stand/ia64/efi/Makefile:1.5 src/sys/arch/ia64/stand/ia64/efi/Makefile:1.6 --- src/sys/arch/ia64/stand/ia64/efi/Makefile:1.5 Sat Apr 8 15:53:21 2017 +++ src/sys/arch/ia64/stand/ia64/efi/Makefile Sun Apr 9 18:50:02 2017 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2017/04/08 19:53:21 christos Exp $ +# $NetBSD: Makefile,v 1.6 2017/04/09 22:50:02 christos Exp $ S= ${.CURDIR}/../../../../.. @@ -18,6 +18,8 @@ CPPFLAGS+= -DLOADER -DLIBKERN_OPTIMISE_S .PATH: ${.CURDIR}/../../common .include "${.CURDIR}/../../common/Makefile.inc" +.include "${S}/conf/newvers_stand.mk" + # need to do this after common stuff pulled in SRCS.loader.sym:= start.S conf.c efimd.c main.c ${SRCS} @@ -54,6 +56,5 @@ DPADD= ${LIBEFI} ${LIBLIST} # Cross dependencies between LIBEFI and LIB(SA|KERN). Need to elaborate below. LDADD= ${LIBEFI} ${LIBLIST} ${LIBEFI} ${LIBLIST} -.include "${S}/conf/newvers_stand.mk" .include
CVS commit: src/sys/arch/ia64/stand/ia64/efi
Module Name:src Committed By: kre Date: Sat Aug 18 06:52:57 UTC 2018 Modified Files: src/sys/arch/ia64/stand/ia64/efi: main.c Log Message: More gnu-efi update fallout ... the symbol EFI_SIMPLE_NETWORK_PROTOCOL has been replaced with EFI_SIMPLE_NETWORK_PROTOCOL_GUID and the old one (EFI_SIMPLE_NETWORK_PROTOCOL) is now something completely different. Adapt... (should help the ia64 build) To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/stand/ia64/efi/main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/efi/main.c diff -u src/sys/arch/ia64/stand/ia64/efi/main.c:1.11 src/sys/arch/ia64/stand/ia64/efi/main.c:1.12 --- src/sys/arch/ia64/stand/ia64/efi/main.c:1.11 Thu Aug 4 18:07:43 2016 +++ src/sys/arch/ia64/stand/ia64/efi/main.c Sat Aug 18 06:52:57 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: main.c,v 1.11 2016/08/04 18:07:43 scole Exp $ */ +/* $NetBSD: main.c,v 1.12 2018/08/18 06:52:57 kre Exp $ */ /*- * Copyright (c) 1998 Michael Smith @@ -63,7 +63,7 @@ EFI_GUID devid = DEVICE_PATH_PROTOCOL; EFI_GUID hcdp = HCDP_TABLE_GUID; EFI_GUID imgid = LOADED_IMAGE_PROTOCOL; EFI_GUID mps = MPS_TABLE_GUID; -EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL; +EFI_GUID netid = EFI_SIMPLE_NETWORK_PROTOCOL_GUID; EFI_GUID sal = SAL_SYSTEM_TABLE_GUID; EFI_GUID smbios = SMBIOS_TABLE_GUID;
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: christos Date: Sat Dec 17 18:41:13 UTC 2016 Modified Files: src/sys/arch/ia64/stand/ia64/ski: Makefile Log Message: XXX: Can't do PIE yet because of gp relocation in start.S To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/ski/Makefile diff -u src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5 src/sys/arch/ia64/stand/ia64/ski/Makefile:1.6 --- src/sys/arch/ia64/stand/ia64/ski/Makefile:1.5 Fri Aug 5 13:08:10 2016 +++ src/sys/arch/ia64/stand/ia64/ski/Makefile Sat Dec 17 13:41:13 2016 @@ -4,6 +4,7 @@ VERSIONFILE= ${.CURDIR}/version .include "../Makefile.booters" +NOPIE= yes PROG= skiload MAN=# BINDIR?= /usr/mdec
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: maxv Date: Mon Aug 15 09:06:40 UTC 2016 Modified Files: src/sys/arch/ia64/stand/ia64/ski: devicename.c Log Message: Two uninitialized vars, found by brainy. The former is similar to the one I fixed in ia64/stand/efi/libefi/devicename.c. I don't know how to fix the latter, so just add a comment. I will probably file a PR for this one. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/ia64/stand/ia64/ski/devicename.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/ski/devicename.c diff -u src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7 src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.8 --- src/sys/arch/ia64/stand/ia64/ski/devicename.c:1.7 Tue Apr 8 21:51:06 2014 +++ src/sys/arch/ia64/stand/ia64/ski/devicename.c Mon Aug 15 09:06:39 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: devicename.c,v 1.7 2014/04/08 21:51:06 martin Exp $ */ +/* $NetBSD: devicename.c,v 1.8 2016/08/15 09:06:39 maxv Exp $ */ /*- * Copyright (c) 1998 Michael Smith @@ -91,7 +91,7 @@ ski_parsedev(struct ski_devdesc **dev, c struct devsw *dv; int dv_type; int i, unit, slice, partition, err; - char *cp; + char *cp = NULL; const char *np; /* minimum length check */ @@ -146,6 +146,10 @@ ski_parsedev(struct ski_devdesc **dev, c cp++; } } + if (cp == NULL) { + err = EINVAL; + goto fail; + } if (*cp && (*cp != ':')) { err = EINVAL; goto fail; @@ -169,6 +173,10 @@ ski_parsedev(struct ski_devdesc **dev, c goto fail; } } + if (cp == NULL) { + err = EINVAL; + goto fail; + } if (*cp && (*cp != ':')) { err = EINVAL; goto fail; @@ -228,6 +236,7 @@ ski_fmtdev(void *vdev) break; case DEVT_NET: + /* XXX XXX XXX: Yay, 'len' is not initialized here */ snprintf(buf, buflen - len, "%s%d:", dev->d_dev->dv_name, dev->d_kind.netif.unit); break; }
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: kiyohara Date: Tue Nov 10 11:14:48 UTC 2009 Modified Files: src/sys/arch/ia64/stand/ia64/ski: acpi_stub.c Log Message: Fix build failure. acpi.h moves to external/intel-public/acpica/dist/include/. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c diff -u src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.4 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.5 --- src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.4 Wed Jul 30 11:57:24 2008 +++ src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c Tue Nov 10 11:14:48 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_stub.c,v 1.4 2008/07/30 11:57:24 cherry Exp $ */ +/* $NetBSD: acpi_stub.c,v 1.5 2009/11/10 11:14:48 kiyohara Exp $ */ /*- * Copyright (c) 2003 Marcel Moolenaar @@ -34,7 +34,7 @@ #include #include -#include +#include #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC7
CVS commit: src/sys/arch/ia64/stand/ia64/ski
Module Name:src Committed By: kiyohara Date: Wed Nov 11 05:19:35 UTC 2009 Modified Files: src/sys/arch/ia64/stand/ia64/ski: acpi_stub.c Log Message: Include instead of . Thanks cegger@ To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c diff -u src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.5 src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.6 --- src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c:1.5 Tue Nov 10 11:14:48 2009 +++ src/sys/arch/ia64/stand/ia64/ski/acpi_stub.c Wed Nov 11 05:19:34 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_stub.c,v 1.5 2009/11/10 11:14:48 kiyohara Exp $ */ +/* $NetBSD: acpi_stub.c,v 1.6 2009/11/11 05:19:34 kiyohara Exp $ */ /*- * Copyright (c) 2003 Marcel Moolenaar @@ -34,7 +34,7 @@ #include #include -#include +#include #define APIC_IO_SAPIC 6 #define APIC_LOCAL_SAPIC7