i386 removal, part 45/x: Remove various bits and pieces related to i386.
authorSascha Wildner <saw@online.de>
Sun, 22 Nov 2015 07:39:46 +0000 (08:39 +0100)
committerSascha Wildner <saw@online.de>
Sun, 22 Nov 2015 07:39:46 +0000 (08:39 +0100)
Makefile_upgrade.inc
etc/Makefile.usr
etc/mtree/BSD.local.dist
etc/mtree/BSD.usr.dist
share/man/man4/Makefile
share/man/man8/Makefile
sys/dev/drm/ttm/ttm_bo_util.c

index d4166d3..1449666 100644 (file)
@@ -2261,6 +2261,9 @@ TO_REMOVE+=/usr/include/sys/syslink.h
 TO_REMOVE+=/usr/include/sys/syslink_msg.h
 TO_REMOVE+=/usr/include/sys/syslink_msg2.h
 TO_REMOVE+=/usr/include/sys/syslink_vfs.h
+TO_REMOVE+=/usr/share/man/man4/i386
+TO_REMOVE+=/usr/share/man/man8/i386
+TO_REMOVE+=/usr/share/man/man9/i386
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
index 1a57bcf..5fa2485 100644 (file)
@@ -10,7 +10,6 @@ DPTBALL=/tmp/dports.tar.gz
 PKGBALL=/tmp/pkgboot.tar.xz
 DPDLURL=https://api.github.com/repos/DragonFlyBSD/DPorts/tarball/
 PKGBOOT_VERSION=02
-PKGBOOT_i386=bootstrap_pkg_${PKGBOOT_VERSION}_x86-32.tar.xz
 PKGBOOT_x86_64=bootstrap_pkg_${PKGBOOT_VERSION}_x86-64.tar.xz
 PKGBOOT=http://mirror-master.dragonflybsd.org/dports/bootstraps/${PKGBOOT_${MACHINE_ARCH}}
 GITNFMSG="git must be present on the system to use this option."
index 37c5299..3057ab8 100644 (file)
             cat3
             ..
             cat4
-                i386
-                ..
             ..
             cat5
             ..
             cat7
             ..
             cat8
-                i386
-                ..
             ..
             cat9
-                i386
-                ..
             ..
             catn
             ..
index 4b3fd98..63df7e1 100644 (file)
             cat3
             ..
             cat4
-                i386
-                ..
             ..
             cat5
             ..
             cat7
             ..
             cat8
-                i386
-                ..
             ..
             cat9
-                i386
-                ..
             ..
             man1
             ..
             man3
             ..
             man4
-                i386
-                ..
             ..
             man5
             ..
             man7
             ..
             man8
-                i386
-                ..
             ..
             man9
-                i386
-                ..
             ..
         ..
         me
index f270a9c..7dc60bb 100644 (file)
@@ -555,8 +555,4 @@ MLINKS+=wpi.4 if_wpi.4
 MLINKS+=xe.4 if_xe.4
 MLINKS+=xl.4 if_xl.4
 
-.if ${MACHINE_ARCH} == "i386"
-SUBDIR=         man4.${MACHINE_ARCH}
-.endif
-
 .include <bsd.prog.mk>
index c1fd534..1ce1756 100644 (file)
@@ -1,6 +1,5 @@
 #      @(#)Makefile    8.1 (Berkeley) 6/5/93
 # $FreeBSD: src/share/man/man8/Makefile,v 1.13.2.12 2002/07/16 14:05:30 ru Exp $
-# $DragonFly: src/share/man/man8/Makefile,v 1.10 2008/08/30 20:27:25 swildner Exp $
 
 MAN=   adding_user.8 \
        crash.8 \
@@ -23,8 +22,4 @@ MLINKS+=yp.8 nis.8 \
        yp.8 NIS.8 \
        yp.8 YP.8
 
-.if ${MACHINE_ARCH} == "i386"
-SUBDIR=        man8.${MACHINE_ARCH}
-.endif
-
 .include <bsd.prog.mk>
index 92929de..b87f356 100644 (file)
@@ -461,7 +461,7 @@ static int ttm_buffer_object_transfer(struct ttm_buffer_object *bo,
 vm_memattr_t
 ttm_io_prot(uint32_t caching_flags)
 {
-#if defined(__i386__) || defined(__x86_64__)
+#if defined(__x86_64__)
        if (caching_flags & TTM_PL_FLAG_WC)
                return (VM_MEMATTR_WRITE_COMBINING);
        else