Date: Fri, 11 Oct 2002 13:40:07 -0700 (PDT) From: Serguei Tzukanov <tzukanov@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 19096 for review Message-ID: <200210112040.g9BKe7ug044661@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=19096 Change 19096 by tzukanov@tzukanov_antares on 2002/10/11 13:39:15 More random bits here and there. Affected files ... .. //depot/projects/s390/Makefile.inc1#3 edit .. //depot/projects/s390/libexec/Makefile#3 edit .. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390.h#1 add .. //depot/projects/s390/secure/lib/libcrypto/opensslconf-s390x.h#1 add .. //depot/projects/s390/sys/boot/Makefile#2 edit .. //depot/projects/s390/sys/sys/devicestat.h#3 edit .. //depot/projects/s390/sys/sys/elf_common.h#3 edit .. //depot/projects/s390/sys/sys/ibmlabel.h#1 add .. //depot/projects/s390/usr.bin/Makefile#3 edit .. //depot/projects/s390/usr.bin/gprof/gprof.h#2 edit .. //depot/projects/s390/usr.bin/gprof/s390.c#1 add .. //depot/projects/s390/usr.bin/gprof/s390.h#1 add .. //depot/projects/s390/usr.bin/gprof/s390x.c#1 add .. //depot/projects/s390/usr.bin/gprof/s390x.h#1 add .. //depot/projects/s390/usr.bin/xlint/arch/s390/targparam.h#1 add .. //depot/projects/s390/usr.bin/xlint/arch/s390x/targparam.h#1 add .. //depot/projects/s390/usr.bin/xlint/lint1/param.h#2 edit .. //depot/projects/s390/usr.sbin/pppd/main.c#3 edit Differences ... ==== //depot/projects/s390/Makefile.inc1#3 (text+ko) ==== @@ -624,8 +624,13 @@ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif +.if ${TARGET_ARCH} == "s390" || ${TARGET_ARCH} == "s390x" +_libopcodes= gnu/usr.bin/binutils/libopcodes +.endif + build-tools: -.for _tool in bin/csh bin/sh ${_games} gnu/usr.bin/cc/cc_tools ${_fortran} \ +.for _tool in bin/csh bin/sh ${_games} ${_libopcodes} \ + gnu/usr.bin/cc/cc_tools ${_fortran} \ ${_libroken4} ${_libkrb5} lib/libncurses ${_share} \ usr.bin/awk usr.bin/file usr.sbin/sysinstall ${ECHODIR} "===> ${_tool}"; \ ==== //depot/projects/s390/libexec/Makefile#3 (text+ko) ==== @@ -23,7 +23,6 @@ rpc.rwalld \ rpc.sprayd \ rshd \ - rtld-elf \ save-entropy \ talkd \ tcpd \ @@ -31,6 +30,10 @@ xtend \ ypxfr +.if ${MACHINE_ARCH} != s390 +SUBDIR+=rtld-elf +.endif + .if !defined(NO_BIND) SUBDIR+=named-xfer .endif ==== //depot/projects/s390/sys/boot/Makefile#2 (text+ko) ==== @@ -1,7 +1,9 @@ # $FreeBSD: src/sys/boot/Makefile,v 1.14 2002/07/07 18:10:38 jake Exp $ # Build the add-in FORTH interpreter +.if ${MACHINE_ARCH} != "s390" && ${MACHINE_ARCH} != "s390x" SUBDIR+= ficl +.endif # Build OpenFirmware library .if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "sparc64" @@ -9,7 +11,9 @@ .endif # Pick the machine-dependant subdir based on the target architecture. +.if ${MACHINE_ARCH} != "s390" && ${MACHINE_ARCH} != "s390x" SUBDIR+= ${MACHINE} +.endif # Build ARC / AlphaBIOS executable on the Alpha # (this is a WIP (work in progress)) ==== //depot/projects/s390/sys/sys/devicestat.h#3 (text+ko) ==== @@ -115,7 +115,8 @@ DEVSTAT_TYPE_MASK = 0x00f, DEVSTAT_TYPE_IF_SCSI = 0x010, DEVSTAT_TYPE_IF_IDE = 0x020, - DEVSTAT_TYPE_IF_OTHER = 0x030, + DEVSTAT_TYPE_IF_CSS = 0x030, + DEVSTAT_TYPE_IF_OTHER = 0x040, DEVSTAT_TYPE_IF_MASK = 0x0f0, DEVSTAT_TYPE_PASS = 0x100 } devstat_type_flags; ==== //depot/projects/s390/sys/sys/elf_common.h#3 (text+ko) ==== @@ -134,6 +134,7 @@ #define EM_SPARC32PLUS 18 /* SPARC v8plus */ #define EM_PPC 20 /* PowerPC 32-bit */ #define EM_PPC64 21 /* PowerPC 64-bit */ +#define EM_S390 22 /* IBM S/390 and zSeries */ #define EM_ARM 40 /* ARM */ #define EM_SPARCV9 43 /* SPARC v9 64-bit */ #define EM_IA_64 50 /* Intel IA-46 Processor */ ==== //depot/projects/s390/usr.bin/Makefile#3 (text+ko) ==== @@ -240,7 +240,7 @@ .endif # Things which don't compile on new platforms yet: -.if ${MACHINE_ARCH} != "ia64" +.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "s390" SUBDIR+=truss xlint .endif ==== //depot/projects/s390/usr.bin/gprof/gprof.h#2 (text+ko) ==== @@ -71,6 +71,12 @@ #if mips # include "mips.h" #endif +#if defined(__s390__) && !defined(__s390x__) +# include "s390.h" +#endif +#if __s390x__ +# include "s390x.h" +#endif /* ==== //depot/projects/s390/usr.bin/xlint/lint1/param.h#2 (text+ko) ==== @@ -65,9 +65,15 @@ #ifdef __ia64__ #define PTRDIFF_IS_LONG 1 #define SIZEOF_IS_ULONG 1 +#elif __s390x__ +#define PTRDIFF_IS_LONG 1 +#define SIZEOF_IS_ULONG 1 #elif __alpha__ #define PTRDIFF_IS_LONG 1 #define SIZEOF_IS_ULONG 1 +#elif defined(__s390__) && !defined(__s390x__) +#define PTRDIFF_IS_LONG 0 +#define SIZEOF_IS_ULONG 0 #elif __i386__ #define PTRDIFF_IS_LONG 0 #define SIZEOF_IS_ULONG 0 ==== //depot/projects/s390/usr.sbin/pppd/main.c#3 (text+ko) ==== @@ -1530,10 +1530,13 @@ break; case 'r': f = va_arg(args, char *); -#ifndef __powerpc__ +#if !defined(__powerpc__) && !defined(__s390__) n = vfmtmsg(buf, buflen + 1, f, va_arg(args, va_list)); #else - /* On the powerpc, a va_list is an array of 1 structure */ + /* + * On powerpc and s390/s390x, a va_list is + * an array of 1 structure. + */ n = vfmtmsg(buf, buflen + 1, f, va_arg(args, void *)); #endif buf += n; 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?200210112040.g9BKe7ug044661>