From owner-svn-src-all@FreeBSD.ORG Sun Nov 29 17:27:59 2009 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A67F106566C; Sun, 29 Nov 2009 17:27:59 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 664128FC16; Sun, 29 Nov 2009 17:27:59 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id nATHRxha002338; Sun, 29 Nov 2009 17:27:59 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nATHRwIC002328; Sun, 29 Nov 2009 17:27:58 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200911291727.nATHRwIC002328@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sun, 29 Nov 2009 17:27:58 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199901 - in stable/7: . sys/compat/pecoff sys/conf sys/i386/conf sys/i386/include sys/modules sys/modules/pecoff sys/pc98/conf sys/pc98/include X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 17:27:59 -0000 Author: bz Date: Sun Nov 29 17:27:58 2009 New Revision: 199901 URL: http://svn.freebsd.org/changeset/base/199901 Log: MFC r179785, r180496: Remove obselete PECOFF image activator support. Discussed with: secteam, kib Approved by: re (kensmith) Deleted: stable/7/sys/compat/pecoff/ stable/7/sys/i386/include/pecoff_machdep.h stable/7/sys/modules/pecoff/ stable/7/sys/pc98/include/pecoff_machdep.h Modified: stable/7/ObsoleteFiles.inc (contents, props changed) stable/7/UPDATING stable/7/sys/conf/files.i386 stable/7/sys/conf/files.pc98 stable/7/sys/conf/options.i386 stable/7/sys/conf/options.pc98 stable/7/sys/i386/conf/NOTES stable/7/sys/modules/Makefile stable/7/sys/pc98/conf/NOTES Directory Properties: stable/7/sys/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/ObsoleteFiles.inc ============================================================================== --- stable/7/ObsoleteFiles.inc Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/ObsoleteFiles.inc Sun Nov 29 17:27:58 2009 (r199901) @@ -14,6 +14,10 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20091129: pecoff image activator removed +.if ${TARGET_ARCH} == "i386" +OLD_FILES+=usr/include/machine/pecoff_machdep.h +.endif # 20090203: adding_user.8 moved to adding_user.7 OLD_FILES+=usr/share/man/man8/adding_user.8.gz # 20080407: pkg_sign has been removed Modified: stable/7/UPDATING ============================================================================== --- stable/7/UPDATING Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/UPDATING Sun Nov 29 17:27:58 2009 (r199901) @@ -8,6 +8,9 @@ Items affecting the ports and packages s /usr/ports/UPDATING. Please read that file before running portupgrade. +20091129: + PECOFF image activator support removed. + 20090831: The newly imported zic(8) produces a new format in the output. Please run tzsetup(8) to install the newly created Modified: stable/7/sys/conf/files.i386 ============================================================================== --- stable/7/sys/conf/files.i386 Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/conf/files.i386 Sun Nov 29 17:27:58 2009 (r199901) @@ -98,7 +98,6 @@ compat/ndis/subr_ntoskrnl.c optional ndi compat/ndis/subr_pe.c optional ndisapi pci compat/ndis/subr_usbd.c optional ndisapi pci compat/ndis/winx32_wrap.S optional ndisapi pci -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 Modified: stable/7/sys/conf/files.pc98 ============================================================================== --- stable/7/sys/conf/files.pc98 Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/conf/files.pc98 Sun Nov 29 17:27:58 2009 (r199901) @@ -60,7 +60,6 @@ compat/linux/linux_sysctl.c optional com compat/linux/linux_time.c optional compat_linux compat/linux/linux_uid16.c optional compat_linux compat/linux/linux_util.c optional compat_linux -compat/pecoff/imgact_pecoff.c optional pecoff_support compat/svr4/imgact_svr4.c optional compat_svr4 compat/svr4/svr4_fcntl.c optional compat_svr4 compat/svr4/svr4_filio.c optional compat_svr4 Modified: stable/7/sys/conf/options.i386 ============================================================================== --- stable/7/sys/conf/options.i386 Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/conf/options.i386 Sun Nov 29 17:27:58 2009 (r199901) @@ -27,8 +27,6 @@ DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h NDISAPI opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h Modified: stable/7/sys/conf/options.pc98 ============================================================================== --- stable/7/sys/conf/options.pc98 Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/conf/options.pc98 Sun Nov 29 17:27:58 2009 (r199901) @@ -25,8 +25,6 @@ COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.h LINPROCFS opt_dontuse.h LINSYSFS opt_dontuse.h -PECOFF_DEBUG opt_pecoff.h -PECOFF_SUPPORT opt_dontuse.h # Change KVM size. Changes things all over the kernel. KVA_PAGES opt_global.h Modified: stable/7/sys/i386/conf/NOTES ============================================================================== --- stable/7/sys/i386/conf/NOTES Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/i386/conf/NOTES Sun Nov 29 17:27:58 2009 (r199901) @@ -1221,10 +1221,6 @@ options KSTACK_PAGES=3 options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -options PECOFF_SUPPORT -options PECOFF_DEBUG - options I4B_SMP_WORKAROUND options I586_PMC_GUPROF=0x70000 options KBDIO_DEBUG=2 Modified: stable/7/sys/modules/Makefile ============================================================================== --- stable/7/sys/modules/Makefile Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/modules/Makefile Sun Nov 29 17:27:58 2009 (r199901) @@ -215,7 +215,6 @@ SUBDIR= ${_3dfx} \ ${_pccard} \ ${_pcfclock} \ pcn \ - ${_pecoff} \ ${_pf} \ ${_pflog} \ plip \ @@ -433,7 +432,6 @@ _opensolaris= opensolaris .endif _pccard= pccard _pcfclock= pcfclock -_pecoff= pecoff _pst= pst _ray= ray _rdma= rdma @@ -588,7 +586,7 @@ _zfs= zfs .if ${MACHINE_ARCH} == "ia64" # Modules not enabled on ia64 (as compared to i386) include: # aac acpi aout apm atspeaker drm ibcs2 linprocfs linux ncv -# nsp oltr pecoff s3 sbni stg vesa +# nsp oltr s3 sbni stg vesa # acpi is not enabled because it is broken as a module on ia64 _aic= aic #_ar= ar not 64-bit clean Modified: stable/7/sys/pc98/conf/NOTES ============================================================================== --- stable/7/sys/pc98/conf/NOTES Sun Nov 29 17:25:32 2009 (r199900) +++ stable/7/sys/pc98/conf/NOTES Sun Nov 29 17:27:58 2009 (r199901) @@ -749,10 +749,6 @@ options KSTACK_PAGES=3 options FB_INSTALL_CDEV # install a CDEV entry in /dev -# PECOFF module (Win32 Execution Format) -options PECOFF_SUPPORT -options PECOFF_DEBUG - options I4B_SMP_WORKAROUND options I586_PMC_GUPROF=0x70000 options KBDIO_DEBUG=2