From owner-svn-src-stable-6@FreeBSD.ORG Sun Nov 29 17:35:31 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AE71B106568D; Sun, 29 Nov 2009 17:35:31 +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 9A4658FC08; Sun, 29 Nov 2009 17:35:31 +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 nATHZVJS002545; Sun, 29 Nov 2009 17:35:31 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nATHZVuk002535; Sun, 29 Nov 2009 17:35:31 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200911291735.nATHZVuk002535@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Sun, 29 Nov 2009 17:35:31 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r199902 - in stable/6: . 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-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 29 Nov 2009 17:35:31 -0000 Author: bz Date: Sun Nov 29 17:35:31 2009 New Revision: 199902 URL: http://svn.freebsd.org/changeset/base/199902 Log: MFC r179785, r180496: Remove obselete PECOFF image activator support. Discussed with: secteam, kib Approved by: re (kensmith) Deleted: stable/6/sys/compat/pecoff/ stable/6/sys/i386/include/pecoff_machdep.h stable/6/sys/modules/pecoff/ stable/6/sys/pc98/include/pecoff_machdep.h Modified: stable/6/ObsoleteFiles.inc (contents, props changed) stable/6/UPDATING stable/6/sys/conf/files.i386 stable/6/sys/conf/files.pc98 stable/6/sys/conf/options.i386 stable/6/sys/conf/options.pc98 stable/6/sys/i386/conf/NOTES stable/6/sys/modules/Makefile stable/6/sys/pc98/conf/NOTES Directory Properties: stable/6/sys/ (props changed) stable/6/sys/conf/ (props changed) stable/6/sys/contrib/pf/ (props changed) stable/6/sys/dev/cxgb/ (props changed) Modified: stable/6/ObsoleteFiles.inc ============================================================================== --- stable/6/ObsoleteFiles.inc Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/ObsoleteFiles.inc Sun Nov 29 17:35:31 2009 (r199902) @@ -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/6/UPDATING ============================================================================== --- stable/6/UPDATING Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/UPDATING Sun Nov 29 17:35:31 2009 (r199902) @@ -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. + 20081128: FreeBSD 6.4-RELEASE Modified: stable/6/sys/conf/files.i386 ============================================================================== --- stable/6/sys/conf/files.i386 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/files.i386 Sun Nov 29 17:35:31 2009 (r199902) @@ -109,7 +109,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/6/sys/conf/files.pc98 ============================================================================== --- stable/6/sys/conf/files.pc98 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/files.pc98 Sun Nov 29 17:35:31 2009 (r199902) @@ -66,7 +66,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/6/sys/conf/options.i386 ============================================================================== --- stable/6/sys/conf/options.i386 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/options.i386 Sun Nov 29 17:35:31 2009 (r199902) @@ -25,8 +25,6 @@ COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.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/6/sys/conf/options.pc98 ============================================================================== --- stable/6/sys/conf/options.pc98 Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/conf/options.pc98 Sun Nov 29 17:35:31 2009 (r199902) @@ -23,8 +23,6 @@ IBCS2 opt_dontuse.h COMPAT_LINUX opt_dontuse.h COMPAT_SVR4 opt_dontuse.h DEBUG_SVR4 opt_svr4.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/6/sys/i386/conf/NOTES ============================================================================== --- stable/6/sys/i386/conf/NOTES Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/i386/conf/NOTES Sun Nov 29 17:35:31 2009 (r199902) @@ -1117,10 +1117,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/6/sys/modules/Makefile ============================================================================== --- stable/6/sys/modules/Makefile Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/modules/Makefile Sun Nov 29 17:35:31 2009 (r199902) @@ -199,7 +199,6 @@ SUBDIR= ${_3dfx} \ ${_pccard} \ ${_pcfclock} \ pcn \ - ${_pecoff} \ ${_pf} \ ${_pflog} \ plip \ @@ -386,7 +385,6 @@ _nwfs= nwfs _oltr= oltr _pccard= pccard _pcfclock= pcfclock -_pecoff= pecoff _pst= pst _puc= puc _ray= ray @@ -510,7 +508,7 @@ _twa= twa .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/6/sys/pc98/conf/NOTES ============================================================================== --- stable/6/sys/pc98/conf/NOTES Sun Nov 29 17:27:58 2009 (r199901) +++ stable/6/sys/pc98/conf/NOTES Sun Nov 29 17:35:31 2009 (r199902) @@ -709,10 +709,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