Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 7 Jul 2014 00:27:09 +0000 (UTC)
From:      Marcel Moolenaar <marcel@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r268351 - in head: cddl/contrib/opensolaris/lib/libdtrace/common cddl/lib/libzpool etc/etc.ia64 gnu/lib/csu gnu/lib/libgcc gnu/usr.bin/binutils/as/ia64-freebsd gnu/usr.bin/binutils/ld g...
Message-ID:  <201407070027.s670R9aV016742@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: marcel
Date: Mon Jul  7 00:27:09 2014
New Revision: 268351
URL: http://svnweb.freebsd.org/changeset/base/268351

Log:
  Remove ia64.
  
  This includes:
  o   All directories named *ia64*
  o   All files named *ia64*
  o   All ia64-specific code guarded by __ia64__
  o   All ia64-specific makefile logic
  o   Mention of ia64 in comments and documentation
  
  This excludes:
  o   Everything under contrib/
  o   Everything under crypto/
  o   sys/xen/interface
  o   sys/sys/elf_common.h
  
  Discussed at: BSDcan

Deleted:
  head/etc/etc.ia64/
  head/gnu/usr.bin/binutils/as/ia64-freebsd/
  head/gnu/usr.bin/binutils/ld/Makefile.ia64
  head/gnu/usr.bin/binutils/ld/elf64_ia64_fbsd.sh
  head/gnu/usr.bin/binutils/libbfd/Makefile.ia64
  head/gnu/usr.bin/binutils/libopcodes/Makefile.ia64
  head/gnu/usr.bin/gdb/arch/ia64/
  head/gnu/usr.bin/gdb/kgdb/trgt_ia64.c
  head/lib/clang/include/IA64GenAsmWriter.inc
  head/lib/clang/include/IA64GenDAGISel.inc
  head/lib/clang/include/IA64GenInstrInfo.inc
  head/lib/clang/include/IA64GenRegisterInfo.inc
  head/lib/csu/ia64/
  head/lib/libc/ia64/
  head/lib/libkvm/kvm_ia64.c
  head/lib/libthr/arch/ia64/
  head/lib/libthread_db/arch/ia64/
  head/lib/msun/ia64/
  head/libexec/rtld-elf/ia64/
  head/release/ia64/
  head/sbin/Makefile.ia64
  head/sbin/mca/
  head/secure/lib/libcrypto/opensslconf-ia64.h
  head/sys/boot/Makefile.ia64
  head/sys/boot/efi/include/ia64/
  head/sys/boot/ficl/ia64/
  head/sys/boot/ia64/
  head/sys/cddl/contrib/opensolaris/common/atomic/ia64/
  head/sys/conf/Makefile.ia64
  head/sys/conf/files.ia64
  head/sys/conf/ldscript.ia64
  head/sys/conf/options.ia64
  head/sys/contrib/ia64/
  head/sys/dev/hwpmc/hwpmc_ia64.c
  head/sys/dev/uart/uart_cpu_ia64.c
  head/sys/ia64/
  head/sys/libkern/ia64/
  head/sys/xen/interface/arch-ia64/
  head/sys/xen/interface/arch-ia64.h
  head/tools/regression/ia64/
  head/tools/tools/gdb_regofs/ia64.c
  head/usr.bin/Makefile.ia64
  head/usr.bin/gprof/ia64.h
  head/usr.bin/truss/ia64-fbsd.c
  head/usr.bin/xlint/arch/ia64/
  head/usr.sbin/Makefile.ia64
Modified:
  head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
  head/cddl/lib/libzpool/Makefile
  head/gnu/lib/csu/Makefile
  head/gnu/lib/libgcc/Makefile
  head/gnu/usr.bin/binutils/ld/Makefile
  head/gnu/usr.bin/binutils/libbfd/Makefile
  head/gnu/usr.bin/binutils/libbfd/bfd.h
  head/gnu/usr.bin/cc/Makefile.tgt
  head/gnu/usr.bin/cc/include/Makefile
  head/lib/Makefile
  head/lib/libarchive/Makefile
  head/lib/libc/Makefile
  head/lib/libc/gen/tls.c
  head/lib/libc/mips/arith.h
  head/lib/libc/xdr/xdr_float.c
  head/lib/libkvm/kvm_amd64.c
  head/lib/libkvm/kvm_i386.c
  head/lib/libstand/Makefile
  head/lib/msun/sparc64/fenv.h
  head/lib/msun/src/math.h
  head/lib/ncurses/ncurses/Makefile
  head/libexec/rtld-elf/rtld.c
  head/release/doc/README
  head/release/doc/en_US.ISO8859-1/hardware/article.xml
  head/release/doc/en_US.ISO8859-1/readme/article.xml
  head/release/doc/share/examples/Makefile.relnotesng
  head/release/doc/share/misc/dev.archlist.txt
  head/release/doc/share/xml/release.ent
  head/rescue/rescue/Makefile
  head/sbin/bsdlabel/bsdlabel.8
  head/sbin/bsdlabel/bsdlabel.c
  head/sbin/fdisk/fdisk.c
  head/share/dict/freebsd
  head/share/examples/etc/make.conf
  head/share/man/man4/acpi.4
  head/share/man/man4/aout.4
  head/share/man/man4/inet.4
  head/share/man/man4/smp.4
  head/share/man/man5/src.conf.5
  head/share/man/man9/atomic.9
  head/share/man/man9/get_cyclecount.9
  head/share/mk/bsd.cpu.mk
  head/share/mk/bsd.endian.mk
  head/share/mk/bsd.sys.mk
  head/sys/Makefile
  head/sys/boot/common/Makefile.inc
  head/sys/boot/efi/include/amd64/pe.h
  head/sys/boot/efi/include/efiapi.h
  head/sys/boot/efi/include/i386/pe.h
  head/sys/boot/ficl/loader.c
  head/sys/boot/libstand32/Makefile
  head/sys/boot/userboot/libstand/Makefile
  head/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h
  head/sys/compat/freebsd32/freebsd32_misc.c
  head/sys/compat/freebsd32/freebsd32_util.h
  head/sys/compat/ia32/ia32_util.h
  head/sys/compat/ndis/pe_var.h
  head/sys/conf/kern.mk
  head/sys/contrib/dev/acpica/acpica_prep.sh
  head/sys/dev/acpica/acpi_hpet.c
  head/sys/dev/amr/amrio.h
  head/sys/dev/ath/if_ath_ahb.c
  head/sys/dev/ath/if_ath_pci.c
  head/sys/dev/atkbdc/atkbdc.c
  head/sys/dev/drm/drm.h
  head/sys/dev/drm/drm_sarea.h
  head/sys/dev/drm2/drm.h
  head/sys/dev/drm2/drm_sarea.h
  head/sys/dev/fb/fbreg.h
  head/sys/dev/pci/vga_pci.c
  head/sys/dev/sound/pcm/pcm.h
  head/sys/dev/sym/sym_hipd.c
  head/sys/dev/txp/if_txp.c
  head/sys/dev/vt/hw/vga/vt_vga.c
  head/sys/kern/imgact_elf.c
  head/sys/kern/kern_exec.c
  head/sys/kern/kern_thread.c
  head/sys/kern/link_elf.c
  head/sys/kern/subr_witness.c
  head/sys/modules/Makefile
  head/sys/modules/acpi/acpi/Makefile
  head/sys/modules/hwpmc/Makefile
  head/sys/modules/ppc/Makefile
  head/sys/modules/sound/sound/Makefile
  head/sys/sys/disklabel.h
  head/sys/sys/efi.h
  head/sys/sys/fnv_hash.h
  head/sys/sys/kerneldump.h
  head/sys/sys/sysctl.h
  head/sys/sys/sysent.h
  head/sys/vm/vm_mmap.c
  head/sys/vm/vm_pageout.c
  head/sys/vm/vm_unix.c
  head/sys/x86/include/segments.h
  head/sys/x86/iommu/intel_drv.c
  head/tools/build/mk/OptionalObsoleteFiles.inc
  head/tools/regression/README
  head/tools/regression/filemon/Makefile
  head/usr.bin/gprof/gprof.h
  head/usr.bin/truss/extern.h
  head/usr.bin/truss/main.c
  head/usr.bin/xlint/lint1/param.h
  head/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c
  head/usr.sbin/config/config.5
  head/usr.sbin/crunch/crunchide/Makefile
  head/usr.sbin/crunch/crunchide/exec_elf32.c
  head/usr.sbin/mergemaster/mergemaster.sh
  head/usr.sbin/ntp/config.h
  head/usr.sbin/pkg/elf_tables.h

Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c
==============================================================================
--- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -230,9 +230,6 @@ prepare_elf32(dtrace_hdl_t *dtp, const d
 #if defined(__arm__)
 /* XXX */
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-#elif defined(__ia64__)
-/* XXX */
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 #elif defined(__i386) || defined(__amd64)
 			rel->r_offset = s->dofs_offset +
 			    dofr[j].dofr_offset;
@@ -424,8 +421,6 @@ prepare_elf64(dtrace_hdl_t *dtp, const d
 #ifdef DOODAD
 #if defined(__arm__)
 /* XXX */
-#elif defined(__ia64__)
-/* XXX */
 #elif defined(__mips__)
 /* XXX */
 #elif defined(__powerpc__)
@@ -535,8 +530,6 @@ dump_elf32(dtrace_hdl_t *dtp, const dof_
 	elf_file.ehdr.e_type = ET_REL;
 #if defined(__arm__)
 	elf_file.ehdr.e_machine = EM_ARM;
-#elif defined(__ia64__)
-	elf_file.ehdr.e_machine = EM_IA_64;
 #elif defined(__mips__)
 	elf_file.ehdr.e_machine = EM_MIPS;
 #elif defined(__powerpc__)
@@ -683,8 +676,6 @@ dump_elf64(dtrace_hdl_t *dtp, const dof_
 	elf_file.ehdr.e_type = ET_REL;
 #if defined(__arm__)
 	elf_file.ehdr.e_machine = EM_ARM;
-#elif defined(__ia64__)
-	elf_file.ehdr.e_machine = EM_IA_64;
 #elif defined(__mips__)
 	elf_file.ehdr.e_machine = EM_MIPS;
 #elif defined(__powerpc__)
@@ -814,15 +805,6 @@ dt_modtext(dtrace_hdl_t *dtp, char *p, i
 printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
 	return (0);
 }
-#elif defined(__ia64__)
-/* XXX */
-static int
-dt_modtext(dtrace_hdl_t *dtp, char *p, int isenabled, GElf_Rela *rela,
-    uint32_t *off)
-{
-printf("%s:%s(%d): DOODAD\n",__FUNCTION__,__FILE__,__LINE__);
-	return (0);
-}
 #elif defined(__mips__)
 /* XXX */
 static int
@@ -1235,9 +1217,7 @@ process_obj(dtrace_hdl_t *dtp, const cha
 
 	if (dtp->dt_oflags & DTRACE_O_LP64) {
 		eclass = ELFCLASS64;
-#if defined(__ia64__)
-		emachine1 = emachine2 = EM_IA_64;
-#elif defined(__mips__)
+#if defined(__mips__)
 		emachine1 = emachine2 = EM_MIPS;
 #elif defined(__powerpc__)
 		emachine1 = emachine2 = EM_PPC64;
@@ -1258,7 +1238,7 @@ process_obj(dtrace_hdl_t *dtp, const cha
 #elif defined(__sparc)
 		emachine1 = EM_SPARC;
 		emachine2 = EM_SPARC32PLUS;
-#elif defined(__i386) || defined(__amd64) || defined(__ia64__)
+#elif defined(__i386) || defined(__amd64)
 		emachine1 = emachine2 = EM_386;
 #endif
 		symsize = sizeof (Elf32_Sym);

Modified: head/cddl/lib/libzpool/Makefile
==============================================================================
--- head/cddl/lib/libzpool/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/cddl/lib/libzpool/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -14,7 +14,7 @@
 .if exists(${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S)
 .PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
 ATOMIC_SRCS=	opensolaris_atomic.S
-.if ${MACHINE_ARCH} != "ia64" && ${MACHINE_ARCH} != "sparc64"
+.if ${MACHINE_ARCH} != "sparc64"
 ACFLAGS+=	-Wa,--noexecstack
 .endif
 .else

Modified: head/gnu/lib/csu/Makefile
==============================================================================
--- head/gnu/lib/csu/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/lib/csu/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -28,13 +28,6 @@ MKDEP=		-DCRT_BEGIN
 CFLAGS+=	-DTARGET_ARM_EABI
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-BEGINSRC=	crtbegin.asm
-ENDSRC=		crtend.asm
-CFLAGS+=	-x assembler-with-cpp	# Ugly hack
-CFLAGS+=	-include osreldate.h
-.undef SRCS				# hack for 'make depend'
-.endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 TGTOBJS=	crtsavres.o
 SRCS+=		crtsavres.asm

Modified: head/gnu/lib/libgcc/Makefile
==============================================================================
--- head/gnu/lib/libgcc/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/lib/libgcc/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -137,17 +137,6 @@ LIB2FUNCS_EXTRA+= fixdfdi.c fixunssfsi.c
 .endif
 .endif
 
-.if ${TARGET_CPUARCH} == "ia64"
-#	from config/ia64/t-ia64
-LIB1ASMSRC   = lib1funcs.asm
-LIB1ASMFUNCS = __divxf3 __divdf3 __divsf3 \
-	__divdi3 __moddi3 __udivdi3 __umoddi3 \
-	__divsi3 __modsi3 __udivsi3 __umodsi3 __save_stack_nonlocal \
-	__nonlocal_goto __restore_stack_nonlocal __trampoline \
-	_fixtfdi _fixunstfdi _floatditf
-LIB2ADDEH = unwind-ia64.c unwind-sjlj.c unwind-c.c
-.endif
-
 .if ${TARGET_ARCH} == "powerpc"
 #	from config/rs6000/t-ppccomm
 LIB2FUNCS_EXTRA = tramp.asm

Modified: head/gnu/usr.bin/binutils/ld/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/ld/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/usr.bin/binutils/ld/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -5,10 +5,6 @@
 
 .PATH: ${SRCDIR}/ld
 
-.if ${TARGET_ARCH} == "ia64"
-CFLAGS+= -O1
-.endif
-
 PROG=	ld
 SCRIPTDIR= /usr/libdata/ldscripts
 SRCS+=	ldcref.c \

Modified: head/gnu/usr.bin/binutils/libbfd/Makefile
==============================================================================
--- head/gnu/usr.bin/binutils/libbfd/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/usr.bin/binutils/libbfd/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -42,7 +42,7 @@ SRCS+=	archive.c \
 	targets.c \
 	targmatch.h \
 	tekhex.c
-.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64")
+.if ${TARGET_ARCH} == "sparc64"
 WARNS?=	2
 .endif
 CFLAGS+= -D_GNU_SOURCE

Modified: head/gnu/usr.bin/binutils/libbfd/bfd.h
==============================================================================
--- head/gnu/usr.bin/binutils/libbfd/bfd.h	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/usr.bin/binutils/libbfd/bfd.h	Mon Jul  7 00:27:09 2014	(r268351)
@@ -85,7 +85,7 @@ extern "C" {
 #define BFD_HOST_64BIT_LONG 0
 #define BFD_HOST_64_BIT long long
 #define BFD_HOST_U_64_BIT unsigned long long
-#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) || defined(__ia64__)
+#elif defined(__alpha__) || defined(__sparc64__) || defined(__amd64__)
 #define BFD_HOST_64BIT_LONG 1
 #define BFD_HOST_64_BIT long
 #define BFD_HOST_U_64_BIT unsigned long

Modified: head/gnu/usr.bin/cc/Makefile.tgt
==============================================================================
--- head/gnu/usr.bin/cc/Makefile.tgt	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/usr.bin/cc/Makefile.tgt	Mon Jul  7 00:27:09 2014	(r268351)
@@ -11,9 +11,6 @@ TARGET_CPUARCH=${MACHINE_CPUARCH}
 TARGET_ARCH?=	${MACHINE_ARCH}
 GCC_CPU=${TARGET_CPUARCH:C/amd64/i386/:C/powerpc/rs6000/:C/sparc64/sparc/}
 
-.if ${TARGET_ARCH} == "ia64"
-TARGET_CPU_DEFAULT= MASK_GNU_AS|MASK_GNU_LD
-.endif
 .if ${TARGET_ARCH} == "sparc64"
 TARGET_CPU_DEFAULT= TARGET_CPU_ultrasparc
 .endif

Modified: head/gnu/usr.bin/cc/include/Makefile
==============================================================================
--- head/gnu/usr.bin/cc/include/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/gnu/usr.bin/cc/include/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -12,8 +12,6 @@ INCSDIR=${INCLUDEDIR}/gcc/${GCCVER}
 INCS=	ammintrin.h emmintrin.h mmintrin.h mm3dnow.h pmmintrin.h \
 	tmmintrin.h xmmintrin.h mm_malloc.h
 INCS+=	wmmintrin.h __wmmintrin_aes.h __wmmintrin_pclmul.h
-.elif ${TARGET_ARCH} == "ia64"
-INCS=	ia64intrin.h
 .elif ${TARGET_ARCH} == "arm"
 INCS=	mmintrin.h
 .elif ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "powerpc64"

Modified: head/lib/Makefile
==============================================================================
--- head/lib/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -44,7 +44,6 @@ SUBDIR=	${SUBDIR_ORDERED} \
 	libdevstat \
 	libdwarf \
 	libedit \
-	${_libefi} \
 	libexecinfo \
 	libexpat \
 	libfetch \
@@ -237,11 +236,6 @@ _librtld_db=	librtld_db
 _libvmmapi=	libvmmapi
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-_libefi=	libefi
-_libsmb=	libsmb
-.endif
-
 .if ${MACHINE_CPUARCH} == "mips"
 _libproc=	libproc
 _librtld_db=	librtld_db

Modified: head/lib/libarchive/Makefile
==============================================================================
--- head/lib/libarchive/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libarchive/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -41,7 +41,7 @@ SHARED_CFLAGS+=	-DHAVE_ICONV=1 -DHAVE_IC
 .endif
 
 .if ${MACHINE_ARCH:Marm*} != "" || ${MACHINE_ARCH:Mmips*} != "" || \
-	${MACHINE_ARCH:Msparc64*} != "" || ${MACHINE_ARCH:Mia64*} != ""
+	${MACHINE_ARCH:Msparc64*} != ""
 NO_WCAST_ALIGN=	yes
 .if ${MACHINE_ARCH:M*64*} == ""
 CFLAGS+=	-DPPMD_32BIT

Modified: head/lib/libc/Makefile
==============================================================================
--- head/lib/libc/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libc/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -80,7 +80,6 @@ NOASM=
 .include "${LIBC_SRCTOP}/nls/Makefile.inc"
 .include "${LIBC_SRCTOP}/posix1e/Makefile.inc"
 .if ${LIBC_ARCH} != "amd64" && \
-    ${LIBC_ARCH} != "ia64" && \
     ${LIBC_ARCH} != "powerpc64" && \
     ${LIBC_ARCH} != "sparc64" && \
     ${MACHINE_ARCH:Mmipsn32*} == "" && \

Modified: head/lib/libc/gen/tls.c
==============================================================================
--- head/lib/libc/gen/tls.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libc/gen/tls.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -62,7 +62,7 @@ void _rtld_free_tls(void *tls, size_t tc
 void *__libc_allocate_tls(void *oldtls, size_t tcbsize, size_t tcbalign);
 void __libc_free_tls(void *tls, size_t tcbsize, size_t tcbalign);
 
-#if defined(__ia64__) || defined(__amd64__)
+#if defined(__amd64__)
 #define TLS_TCB_ALIGN 16
 #elif defined(__powerpc__) || defined(__i386__) || defined(__arm__) || \
     defined(__sparc64__) || defined(__mips__)
@@ -71,8 +71,7 @@ void __libc_free_tls(void *tls, size_t t
 #error TLS_TCB_ALIGN undefined for target architecture
 #endif
 
-#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || \
-    defined(__powerpc__)
+#if defined(__arm__) || defined(__mips__) || defined(__powerpc__)
 #define TLS_VARIANT_I
 #endif
 #if defined(__i386__) || defined(__amd64__) || defined(__sparc64__)

Modified: head/lib/libc/mips/arith.h
==============================================================================
--- head/lib/libc/mips/arith.h	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libc/mips/arith.h	Mon Jul  7 00:27:09 2014	(r268351)
@@ -18,9 +18,6 @@
 #define Double_Align
 #else
 /* TODO: Generate these values on a LE machine */
-/* Current values were stolen from ia64 except the
- * Xpointer define.
- */
 #define IEEE_8087
 #define Arith_Kind_ASL 1
 #define Long int

Modified: head/lib/libc/xdr/xdr_float.c
==============================================================================
--- head/lib/libc/xdr/xdr_float.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libc/xdr/xdr_float.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -63,7 +63,7 @@ __FBSDID("$FreeBSD$");
 
 #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \
     defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \
-    defined(__arm__) || defined(__ppc__) || defined(__ia64__) || \
+    defined(__arm__) || defined(__ppc__) || \
     defined(__arm26__) || defined(__sparc64__) || defined(__amd64__)
 #include <machine/endian.h>
 #define IEEEFP

Modified: head/lib/libkvm/kvm_amd64.c
==============================================================================
--- head/lib/libkvm/kvm_amd64.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libkvm/kvm_amd64.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -81,7 +81,7 @@ struct vmstate {
 /*
  * Map the ELF headers into the process' address space. We do this in two
  * steps: first the ELF header itself and using that information the whole
- * set of headers. (Taken from kvm_ia64.c)
+ * set of headers.
  */
 static int
 _kvm_maphdrs(kvm_t *kd, size_t sz)
@@ -105,7 +105,6 @@ _kvm_maphdrs(kvm_t *kd, size_t sz)
 
 /*
  * Translate a physical memory address to a file-offset in the crash-dump.
- * (Taken from kvm_ia64.c)
  */
 static size_t
 _kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs)

Modified: head/lib/libkvm/kvm_i386.c
==============================================================================
--- head/lib/libkvm/kvm_i386.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libkvm/kvm_i386.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -87,7 +87,7 @@ struct vmstate {
 /*
  * Map the ELF headers into the process' address space. We do this in two
  * steps: first the ELF header itself and using that information the whole
- * set of headers. (Taken from kvm_ia64.c)
+ * set of headers.
  */
 static int
 _kvm_maphdrs(kvm_t *kd, size_t sz)
@@ -111,7 +111,6 @@ _kvm_maphdrs(kvm_t *kd, size_t sz)
 
 /*
  * Translate a physical memory address to a file-offset in the crash-dump.
- * (Taken from kvm_ia64.c)
  */
 static size_t
 _kvm_pa2off(kvm_t *kd, uint64_t pa, off_t *ofs)

Modified: head/lib/libstand/Makefile
==============================================================================
--- head/lib/libstand/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/libstand/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -57,12 +57,10 @@ SRCS+= ntoh.c
 
 # string functions from libc
 .PATH: ${.CURDIR}/../libc/string
-.if ${MACHINE_CPUARCH} != "ia64"
 SRCS+=	bcmp.c bcopy.c bzero.c ffs.c memccpy.c memchr.c memcmp.c memcpy.c \
 	memmove.c memset.c qdivrem.c strcat.c strchr.c strcmp.c strcpy.c \
 	strcspn.c strlen.c strncat.c strncmp.c strncpy.c strpbrk.c \
 	strrchr.c strsep.c strspn.c strstr.c strtok.c swab.c
-.endif
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${.CURDIR}/../libc/arm/gen
 
@@ -83,17 +81,6 @@ SRCS+=	aeabi_memcmp.S aeabi_memcpy.S aea
 .endif
 
 .endif
-.if ${MACHINE_CPUARCH} == "ia64"
-.PATH: ${.CURDIR}/../libc/ia64/string
-SRCS+=	bcmp.c bcopy.S bzero.S ffs.S memccpy.c memchr.c memcmp.c memcpy.S \
-	memmove.S memset.c strcat.c strchr.c strcmp.c strcpy.c strcspn.c \
-	strlen.c strncat.c strncmp.c strncpy.c strpbrk.c strrchr.c strsep.c \
-	strspn.c strstr.c strtok.c swab.c
-
-.PATH: ${.CURDIR}/../libc/ia64/gen
-SRCS+= __divdi3.S __divsi3.S __moddi3.S __modsi3.S
-SRCS+= __udivdi3.S __udivsi3.S __umoddi3.S __umodsi3.S
-.endif
 .if ${MACHINE_CPUARCH} == "powerpc"
 .PATH: ${.CURDIR}/../libc/quad
 SRCS+=	ashldi3.c ashrdi3.c

Modified: head/lib/msun/sparc64/fenv.h
==============================================================================
--- head/lib/msun/sparc64/fenv.h	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/msun/sparc64/fenv.h	Mon Jul  7 00:27:09 2014	(r268351)
@@ -108,9 +108,9 @@ fesetexceptflag(const fexcept_t *__flagp
 }
 
 /*
- * In contrast with the ia64 platform, it seems to be worthwhile to
- * inline this function on sparc64 even when the arguments are not
- * compile-time constants.  Perhaps this depends on the register window.
+ * It seems to be worthwhile to inline this function even when the
+ * arguments are not compile-time constants.  Perhaps this depends
+ * on the register window.
  */
 __fenv_static inline int
 feraiseexcept(int __excepts)

Modified: head/lib/msun/src/math.h
==============================================================================
--- head/lib/msun/src/math.h	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/msun/src/math.h	Mon Jul  7 00:27:09 2014	(r268351)
@@ -69,10 +69,6 @@ extern const union __nan_un {
 #define	math_errhandling	MATH_ERREXCEPT
 
 #define	FP_FAST_FMAF	1
-#ifdef __ia64__
-#define	FP_FAST_FMA	1
-#define	FP_FAST_FMAL	1
-#endif
 
 /* Symbolic constants to classify floating point numbers. */
 #define	FP_INFINITE	0x01

Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/lib/ncurses/ncurses/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -55,7 +55,7 @@ HAVE_TERMIOS_H=		1
 HAVE_TERMIO_H=		0
 HAVE_VSSCANF=		1
 HEADER_STDBOOL=		1
-# XXX amd64, ia64 1L and int
+# XXX amd64 1L and int
 ONEUL=			1UL
 TYPEOF_CHTYPE=		long
 TYPEOF_MMASK_T=		long

Modified: head/libexec/rtld-elf/rtld.c
==============================================================================
--- head/libexec/rtld-elf/rtld.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/libexec/rtld-elf/rtld.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -3084,9 +3084,7 @@ do_dlsym(void *handle, const char *name,
     const Elf_Sym *def;
     SymLook req;
     RtldLockState lockstate;
-#ifndef __ia64__
     tls_index ti;
-#endif
     int res;
 
     def = NULL;
@@ -3191,24 +3189,17 @@ do_dlsym(void *handle, const char *name,
 
 	/*
 	 * The value required by the caller is derived from the value
-	 * of the symbol. For the ia64 architecture, we need to
-	 * construct a function descriptor which the caller can use to
-	 * call the function with the right 'gp' value. For other
-	 * architectures and for non-functions, the value is simply
-	 * the relocated value of the symbol.
+	 * of the symbol. this is simply the relocated value of the
+	 * symbol.
 	 */
 	if (ELF_ST_TYPE(def->st_info) == STT_FUNC)
 	    return (make_function_pointer(def, defobj));
 	else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
 	    return (rtld_resolve_ifunc(defobj, def));
 	else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
-#ifdef __ia64__
-	    return (__tls_get_addr(defobj->tlsindex, def->st_value));
-#else
 	    ti.ti_module = defobj->tlsindex;
 	    ti.ti_offset = def->st_value;
 	    return (__tls_get_addr(&ti));
-#endif
 	} else
 	    return (defobj->relocbase + def->st_value);
     }
@@ -4341,7 +4332,7 @@ tls_get_addr_common(Elf_Addr **dtvp, int
 	return (tls_get_addr_slow(dtvp, index, offset));
 }
 
-#if defined(__arm__) || defined(__ia64__) || defined(__mips__) || defined(__powerpc__)
+#if defined(__arm__) || defined(__mips__) || defined(__powerpc__)
 
 /*
  * Allocate Static TLS using the Variant I method.

Modified: head/release/doc/README
==============================================================================
--- head/release/doc/README	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/release/doc/README	Mon Jul  7 00:27:09 2014	(r268351)
@@ -99,10 +99,10 @@ element will be included.  For example:
 
 	<para arch="sparc64">SPARC64-specific text</para>
 
-The currently-supported architectures are amd64, arm, i386, ia64,
-pc98, powerpc, and sparc64.  An element may appear for multiple
-architectures by specifying a comma-separated list of architectures
-(i.e. arch="sparc64,ia64").
+The currently-supported architectures are amd64, arm, i386, pc98,
+powerpc and sparc64.  An element may appear for multiple architectures
+by specifying a comma-separated list of architectures
+(i.e. arch="sparc64,amd64").
 
 When creating a translation, make a new directory under this
 directory with a language code (paralleling the DocProj directory

Modified: head/release/doc/en_US.ISO8859-1/hardware/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/hardware/article.xml	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/release/doc/en_US.ISO8859-1/hardware/article.xml	Mon Jul  7 00:27:09 2014	(r268351)
@@ -129,10 +129,10 @@
       </itemizedlist>
 
       <para>&intel; EM64T is an extended version of IA-32 (x86) and
-	different from &intel; IA-64 (Itanium) architecture, which
-	&os;/ia64 supports.  Some &intel;'s old documentation refers
-	to &intel; EM64T as <quote>64-bit extension technology</quote>
-	or <quote>IA-32e</quote>.</para>
+	different from &intel; IA-64 (Itanium) architecture.  Some
+	&intel;'s old documentation refers to &intel; EM64T as
+	<quote>64-bit extension technology</quote> or
+	<quote>IA-32e</quote>.</para>
 
       <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP)
 	configurations are supported.</para>
@@ -232,41 +232,6 @@
 	more information.</para>
     </sect2>
 
-    <sect2 xml:id="proc-ia64">
-      <title>ia64</title>
-
-      <para>Currently supported processors are the <link xlink:href="http://people.freebsd.org/~marcel/refs/ia64/itanium/24532003.pdf">&itanium;</link>;
-	and the <link xlink:href="http://people.freebsd.org/~marcel/refs/ia64/itanium2/25111003.pdf">&itanium;
-	  2</link>.</para>
-
-      <para>Supported chipsets include:</para>
-
-      <itemizedlist>
-	<listitem>
-	  <para>HP zx1</para>
-	</listitem>
-
-	<listitem>
-	  <para>&intel; 460GX</para>
-	</listitem>
-
-	<listitem>
-	  <para>&intel; E8870</para>
-	</listitem>
-      </itemizedlist>
-
-      <para>Both Uniprocessor (UP) and Symmetric Multi-processor (SMP)
-	configurations are supported.</para>
-
-      <para>Most devices that can be found in or are compatible with
-	&arch.ia64; machines are fully supported.  The notable
-	exception is the VGA console. The &os; support for VGA
-	consoles is at this time too much based on PC hardware and not
-	all &arch.ia64; machines have chipsets that provide sufficient
-	PC legacy support. As such &man.syscons.4; can not be enabled
-	and the use of a serial console is required.</para>
-    </sect2>
-
     <sect2 xml:id="proc-pc98">
       <title>pc98</title>
 
@@ -651,9 +616,8 @@
     <sect2 xml:id="disk">
       <title>Disk Controllers</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;,
-	&arch.sparc64;] IDE/ATA controllers (&man.ata.4;
-	driver)</para>
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;, &arch.sparc64;]
+	IDE/ATA controllers (&man.ata.4; driver)</para>
 
       <para>[&arch.pc98;] IDE/ATA controllers (wdc driver)</para>
 
@@ -1124,8 +1088,8 @@
       <para>[&arch.i386;] DigiBoard intelligent serial cards (digi
 	driver)</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;] PCI-Based
-	multi-port serial boards (&man.puc.4; driver)</para>
+      <para>[&arch.amd64;, &arch.i386;] PCI-Based multi-port serial
+	boards (&man.puc.4; driver)</para>
 
       <itemizedlist>
 	<listitem>
@@ -1147,10 +1111,6 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.ia64;] Diva Serial (GSP) Multiport UART</para>
-	</listitem>
-
-	<listitem>
 	  <para>[&arch.amd64;, &arch.i386;] Dolphin Peripherals
 	    4025/4035/4036</para>
 	</listitem>
@@ -1428,7 +1388,7 @@
     <sect2 xml:id="usb">
       <title>USB Devices</title>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] A
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] A
 	range of USB peripherals are supported; devices known to work
 	are listed in this section.  Owing to the generic nature of
 	most USB devices, with some exceptions any device of a given
@@ -1436,14 +1396,14 @@
 	here.</para>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	  USB Ethernet adapters can be found in the section listing
 	  <link linkend="ethernet">Ethernet
 	    interfaces</link>.</para>
       </note>
 
       <note>
-	<para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	<para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	  USB Bluetooth adapters can be found in <link linkend="bluetooth">Bluetooth</link> section.</para>
       </note>
 
@@ -1451,14 +1411,14 @@
 
       &hwlist.uhci;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] USB
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] USB
 	2.0 controllers using the EHCI interface (&man.ehci.4;
 	driver)</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Hubs</para>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Keyboards (&man.ukbd.4; driver)</para>
 
       <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
@@ -1490,7 +1450,7 @@
 
       &hwlist.umodem;
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;] Mice
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;] Mice
 	(&man.ums.4; driver)</para>
 
       &hwlist.ulpt;
@@ -1569,7 +1529,7 @@
 	  found at <uri xlink:href="http://www.x.org/">http://www.x.org/</uri>.</para>;
       </note>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Keyboards including:</para>
 
       <itemizedlist>
@@ -1588,12 +1548,12 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	    USB keyboards (&man.ukbd.4; driver)</para>
 	</listitem>
       </itemizedlist>
 
-      <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+      <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	Pointing devices including:</para>
 
       <itemizedlist>
@@ -1613,7 +1573,7 @@
 	</listitem>
 
 	<listitem>
-	  <para>[&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;]
+	  <para>[&arch.amd64;, &arch.i386;, &arch.pc98;]
 	    USB mice (&man.ums.4; driver)</para>
 	</listitem>
       </itemizedlist>

Modified: head/release/doc/en_US.ISO8859-1/readme/article.xml
==============================================================================
--- head/release/doc/en_US.ISO8859-1/readme/article.xml	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/release/doc/en_US.ISO8859-1/readme/article.xml	Mon Jul  7 00:27:09 2014	(r268351)
@@ -68,7 +68,6 @@
       <para>&os; is an operating system based on 4.4 BSD Lite for
 	AMD64 and Intel EM64T based PC hardware (&arch.amd64;),
 	Intel, AMD, Cyrix or NexGen <quote>x86</quote> based PC hardware (&arch.i386;),
-	Intel Itanium Processor based computers (&arch.ia64;),
 	NEC PC-9801/9821 series PCs and compatibles (&arch.pc98;),
 	and &ultrasparc; machines (&arch.sparc64;).  Versions
 	for the &arm; (&arch.arm;), &mips; (&arch.mips;), and
@@ -326,7 +325,7 @@
       </para>
 
       <para>On platforms that support &man.bsdinstall.8; (currently
-	&arch.amd64;, &arch.i386;, &arch.ia64;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the
+	&arch.amd64;, &arch.i386;, &arch.pc98;, and &arch.sparc64;), these documents are generally available via the
 	Documentation menu during installation.  Once the system is
 	installed, you can revisit this menu by re-running the
 	&man.bsdinstall.8; utility.</para>

Modified: head/release/doc/share/examples/Makefile.relnotesng
==============================================================================
--- head/release/doc/share/examples/Makefile.relnotesng	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/release/doc/share/examples/Makefile.relnotesng	Mon Jul  7 00:27:09 2014	(r268351)
@@ -6,7 +6,7 @@
 # the build tree.
 #
 
-ARCHS=		amd64 ia64 i386 pc98 powerpc sparc64
+ARCHS=		amd64 i386 pc98 powerpc sparc64
 MULTITEXTS=	
 UNITEXTS=	hardware readme relnotes errata
 

Modified: head/release/doc/share/misc/dev.archlist.txt
==============================================================================
--- head/release/doc/share/misc/dev.archlist.txt	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/release/doc/share/misc/dev.archlist.txt	Mon Jul  7 00:27:09 2014	(r268351)
@@ -35,43 +35,43 @@
 # Empty lines, and lines beginning with "#" are ignored.
 # <Driver name><tab><arch>[,<arch>...]
 #
-aac	i386,ia64,amd64
+aac	i386,amd64
 adv	i386,pc98,amd64
 adw	i386,pc98,amd64
 aha	i386
 ahb	i386
-ahd	i386,sparc64,ia64,amd64
+ahd	i386,sparc64,amd64
 aic	i386,pc98,amd64
 amd	i386,pc98,amd64
 arcmsr	i386,amd64
 asr	i386
 ath	i386,pc98,amd64,sparc64
-aue	i386,pc98,ia64,amd64,powerpc
+aue	i386,pc98,amd64,powerpc
 axe	i386,pc98,amd64,powerpc
 bce	i386,amd64
-bge	i386,pc98,sparc64,ia64,amd64
+bge	i386,pc98,sparc64,amd64
 bktr	i386,pc98
 bt	i386,amd64
 bxe	i386,amd64
-cdce	i386,pc98,ia64,amd64,powerpc
-ciss	i386,ia64,amd64
+cdce	i386,pc98,amd64,powerpc
+ciss	i386,amd64
 ce	i386,pc98
 cm	i386
 cnw	i386,pc98,amd64
 cp	i386,pc98
 ct	pc98
 ctau	i386
-cue	i386,pc98,ia64,amd64,powerpc
+cue	i386,pc98,amd64,powerpc
 cx	i386
 cxgb	i386,amd64
-de	i386,pc98,ia64,amd64
-dpt	i386,ia64,amd64
+de	i386,pc98,amd64
+dpt	i386,amd64
 ed	i386,pc98
 ep	i386,pc98,amd64
 esp	sparc64
 ex	i386,amd64
 fe	i386,pc98,amd64
-fwohci	i386,sparc64,ia64,amd64,powerpc
+fwohci	i386,sparc64,amd64,powerpc
 hifn	i386,pc98,amd64
 hpt27xx	i386,amd64
 hptiop	i386,amd64
@@ -79,15 +79,15 @@ hptmv	i386,amd64
 hptrr	i386,amd64
 ida	i386
 ie	i386
-iir	i386,ia64,amd64
+iir	i386,amd64
 ips	i386,amd64
 isci	i386,amd64
 ixgb	i386,amd64
-kue	i386,pc98,ia64,amd64,powerpc
+kue	i386,pc98,amd64,powerpc
 lge	i386,pc98,amd64
-mfi	i386,ia64,amd64
-mlx	i386,ia64,amd64
-mly	i386,ia64,amd64
+mfi	i386,amd64
+mlx	i386,amd64
+mly	i386,amd64
 msk	i386,amd64
 mxge	i386,amd64
 my	i386,pc98
@@ -99,9 +99,9 @@ ng_ubt	i386,pc98,amd64
 nsp	i386,pc98
 nxge	i386,amd64
 oce	i386,amd64
-ohci	i386,pc98,ia64,amd64,powerpc
+ohci	i386,pc98,amd64,powerpc
 oltr	i386
-pcn	i386,pc98,ia64,amd64
+pcn	i386,pc98,amd64
 pst	i386
 qlxgb	amd64
 qlxgbe	amd64
@@ -113,7 +113,7 @@ rue	i386,pc98,amd64
 rum	i386,amd64
 run	i386,amd64
 safe	i386,pc98,amd64
-sbp	i386,sparc64,ia64,amd64
+sbp	i386,sparc64,amd64
 sfgxe	amd64
 sn	i386,amd64
 snc	pc98
@@ -160,7 +160,7 @@ ubser	i386,pc98,amd64
 ucycom	i386,pc98,amd64
 udav	i386,pc98,amd64
 uftdi	i386,pc98,amd64
-uhci	i386,pc98,ia64,amd64,powerpc
+uhci	i386,pc98,amd64,powerpc
 ulpt	i386,pc98,amd64,powerpc
 umass	i386,pc98,amd64,powerpc
 umodem	i386,pc98,amd64
@@ -170,7 +170,7 @@ urio	i386,pc98,amd64,powerpc
 uvisor	i386,pc98,amd64
 uvscom	i386,pc98,amd64
 vpo	i386
-vx	i386,pc98,ia64,amd64
+vx	i386,pc98,amd64
 vxge	i386,amd64
 wb	i386,pc98,amd64
 xe	i386,amd64

Modified: head/release/doc/share/xml/release.ent
==============================================================================
--- head/release/doc/share/xml/release.ent	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/release/doc/share/xml/release.ent	Mon Jul  7 00:27:09 2014	(r268351)
@@ -65,7 +65,6 @@
 <!ENTITY arch.amd64 "amd64">
 <!ENTITY arch.arm "arm">
 <!ENTITY arch.i386 "i386">
-<!ENTITY arch.ia64 "ia64">
 <!ENTITY arch.mips "mips">
 <!ENTITY arch.pc98 "pc98">
 <!ENTITY arch.powerpc "powerpc">

Modified: head/rescue/rescue/Makefile
==============================================================================
--- head/rescue/rescue/Makefile	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/rescue/rescue/Makefile	Mon Jul  7 00:27:09 2014	(r268351)
@@ -136,10 +136,6 @@ CRUNCH_PROGS_sbin+= bsdlabel
 CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
 .endif
 
-.if ${MACHINE_CPUARCH} == "ia64"
-CRUNCH_PROGS_sbin+= mca
-.endif
-
 .if ${MACHINE_CPUARCH} == "sparc64"
 CRUNCH_PROGS_sbin+= bsdlabel sunlabel
 .endif

Modified: head/sbin/bsdlabel/bsdlabel.8
==============================================================================
--- head/sbin/bsdlabel/bsdlabel.8	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/sbin/bsdlabel/bsdlabel.8	Mon Jul  7 00:27:09 2014	(r268351)
@@ -109,7 +109,7 @@ argument forces
 .Nm
 to use a layout suitable for a different architecture.
 Current valid values are
-.Cm i386 , amd64 , ia64 ,
+.Cm i386 , amd64 , 
 and
 .Cm pc98 .
 If this option is omitted,

Modified: head/sbin/bsdlabel/bsdlabel.c
==============================================================================
--- head/sbin/bsdlabel/bsdlabel.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/sbin/bsdlabel/bsdlabel.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -165,7 +165,6 @@ main(int argc, char *argv[])
 			case 'm':
 				if (!strcmp(optarg, "i386") ||
 				    !strcmp(optarg, "amd64") ||
-				    !strcmp(optarg, "ia64") ||
 				    !strcmp(optarg, "pc98")) {
 					labelsoffset = 1;
 					labeloffset = 0;

Modified: head/sbin/fdisk/fdisk.c
==============================================================================
--- head/sbin/fdisk/fdisk.c	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/sbin/fdisk/fdisk.c	Mon Jul  7 00:27:09 2014	(r268351)
@@ -507,7 +507,6 @@ print_part(const struct dos_partition *p
 static void
 init_boot(void)
 {
-#ifndef __ia64__
 	const char *fname;
 	int fdesc, n;
 	struct stat sb;
@@ -529,15 +528,6 @@ init_boot(void)
 		err(1, "%s", fname);
 	if (n != mboot.bootinst_size)
 		errx(1, "%s: short read", fname);
-#else
-	if (mboot.bootinst != NULL)
-		free(mboot.bootinst);
-	mboot.bootinst_size = secsize;
-	if ((mboot.bootinst = malloc(mboot.bootinst_size)) == NULL)
-		errx(1, "unable to allocate boot block buffer");
-	memset(mboot.bootinst, 0, mboot.bootinst_size);
-	le16enc(&mboot.bootinst[DOSMAGICOFFSET], DOSMAGIC);
-#endif
 }
 
 

Modified: head/share/dict/freebsd
==============================================================================
--- head/share/dict/freebsd	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/dict/freebsd	Mon Jul  7 00:27:09 2014	(r268351)
@@ -79,7 +79,6 @@ ISBN
 ISDN
 ISP
 Iomega
-Itanium
 JDK
 JRE
 JSP

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/examples/etc/make.conf	Mon Jul  7 00:27:09 2014	(r268351)
@@ -40,7 +40,6 @@
 #       (VIA CPUs)	c7, c3-2, c3
 #   AMD64 architecture:	amdfam10, opteron-sse3, athlon64-sse3, k8-sse3,
 #			opteron, athlon64, k8, core2, nocona
-#   Intel ia64 architecture:	itanium2, itanium
 #   SPARC-V9 architecture:	v9 (generic 64-bit V9), ultrasparc (default
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:

Modified: head/share/man/man4/acpi.4
==============================================================================
--- head/share/man/man4/acpi.4	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/man/man4/acpi.4	Mon Jul  7 00:27:09 2014	(r268351)
@@ -580,7 +580,7 @@ and
 .Xr iasl 8
 utilities and some ACPI knowledge.
 .Sh COMPATIBILITY
-ACPI is only found and supported on i386/ia32, ia64, and amd64.
+ACPI is only found and supported on i386/ia32 and amd64.
 .Sh SEE ALSO
 .Xr kenv 1 ,
 .Xr acpi_thermal 4 ,

Modified: head/share/man/man4/aout.4
==============================================================================
--- head/share/man/man4/aout.4	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/man/man4/aout.4	Mon Jul  7 00:27:09 2014	(r268351)
@@ -40,7 +40,7 @@ executable format was used before the re
 Since i386 was the only supported architecture at that time,
 .Xr a.out 5
 executables can only be activated on platforms that support
-execution of i386 code, such as i386, amd64 and (partially) ia64.
+execution of i386 code, such as i386 and amd64.
 .Pp
 To add kernel support for old syscalls and old syscall invocation methods,
 place the following options in the kernel configuration file:

Modified: head/share/man/man4/inet.4
==============================================================================
--- head/share/man/man4/inet.4	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/man/man4/inet.4	Mon Jul  7 00:27:09 2014	(r268351)
@@ -56,10 +56,9 @@ protocol.
 Internet addresses are four byte quantities, stored in
 network standard format (on little endian machines, such as the
 .Tn alpha ,
-.Tn amd64 ,
-.Tn i386
+.Tn amd64
 and
-.Tn ia64
+.Tn i386
 these are word and byte reversed).
 The include file
 .In netinet/in.h

Modified: head/share/man/man4/smp.4
==============================================================================
--- head/share/man/man4/smp.4	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/man/man4/smp.4	Mon Jul  7 00:27:09 2014	(r268351)
@@ -39,7 +39,7 @@ kernel implements symmetric multi-proces
 Support for multi-processor systems is present for all Tier-1
 architectures on
 .Fx .
-Currently, this includes amd64, i386, ia64, and sparc64.
+Currently, this includes amd64, i386 and sparc64.
 Support is enabled using
 .Cd options SMP .
 It is permissible to use the SMP kernel configuration on non-SMP equipped
@@ -158,6 +158,6 @@ in
 .Bsx .
 .Pp
 .Fx 5.0
-also introduced support for SMP on the ia64 and sparc64 architectures.
+also introduced support for SMP on the sparc64 architecture.
 .Sh AUTHORS
 .An Steve Passe Aq Mt fsmp@FreeBSD.org

Modified: head/share/man/man5/src.conf.5
==============================================================================
--- head/share/man/man5/src.conf.5	Mon Jul  7 00:12:18 2014	(r268350)
+++ head/share/man/man5/src.conf.5	Mon Jul  7 00:27:09 2014	(r268351)
@@ -1,7 +1,7 @@
 .\" DO NOT EDIT-- this file is automatically generated.
-.\" from FreeBSD: head/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
+.\" from FreeBSD: stable/10/tools/build/options/makeman 255964 2013-10-01 07:22:04Z des
 .\" $FreeBSD$
-.Dd June 29, 2014
+.Dd July 4, 2014
 .Dt SRC.CONF 5
 .Os
 .Sh NAME
@@ -78,1071 +78,49 @@ The following list provides a name and s
 that can be used for source builds.
 .Bl -tag -width indent
 .It Va WITHOUT_ACCT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ACCT 223201 2011-06-17 20:47:44Z ed
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ACCT 223201 2011-06-17 20:47:44Z ed
 Set to not build process accounting tools such as
 .Xr accton 8
 and
 .Xr sa 8 .
 .It Va WITHOUT_ACPI
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ACPI 156932 2006-03-21 07:50:50Z ru
 Set to not build
 .Xr acpiconf 8 ,
 .Xr acpidump 8
 and related programs.
 .It Va WITHOUT_AMD
-.\" from FreeBSD: head/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_AMD 183242 2008-09-21 22:02:26Z sam
 Set to not build
 .Xr amd 8 ,
 and related programs.
 .It Va WITHOUT_APM
-.\" from FreeBSD: head/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_APM 183242 2008-09-21 22:02:26Z sam
 Set to not build
 .Xr apm 8 ,
 .Xr apmd 8
 and related programs.
 .It Va WITHOUT_ARM_EABI
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ARM_EABI 253396 2013-07-16 19:15:19Z andrew
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ARM_EABI 253396 2013-07-16 19:15:19Z andrew
 Set the ARM ABI to OABI.
 .It Va WITHOUT_ASSERT_DEBUG
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ASSERT_DEBUG 162215 2006-09-11 13:55:27Z ru
 Set to compile programs and libraries without the
 .Xr assert 3
 checks.
 .It Va WITHOUT_AT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_AT 183242 2008-09-21 22:02:26Z sam
 Set to not build
 .Xr at 1
 and related utilities.
 .It Va WITHOUT_ATM
-.\" from FreeBSD: head/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_ATM 156932 2006-03-21 07:50:50Z ru
 Set to not build
 programs and libraries related to ATM networking.
 .It Va WITHOUT_AUDIT
-.\" from FreeBSD: head/tools/build/options/WITHOUT_AUDIT 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_AUDIT 156932 2006-03-21 07:50:50Z ru
 Set to not build audit support into system programs.
 .It Va WITHOUT_AUTHPF
-.\" from FreeBSD: head/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru
+.\" from FreeBSD: stable/10/tools/build/options/WITHOUT_AUTHPF 156932 2006-03-21 07:50:50Z ru
 Set to not build
 .Xr authpf 8 .
-.It Va WITHOUT_BINUTILS
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS 266158 2014-05-15 16:51:45Z brooks
-Set to not build or install binutils (as, c++-filt, gconv,
-ld, nm, objcopy, objdump, readelf, size and strip) as part
-of the normal system build.
-The resulting system cannot build programs from source.
-.It Va WITHOUT_BINUTILS_BOOTSTRAP
-.\" from FreeBSD: head/tools/build/options/WITHOUT_BINUTILS_BOOTSTRAP 264660 2014-04-18 17:03:58Z imp
-Set to not build binutils (as, c++-filt, gconv,
-ld, nm, objcopy, objdump, readelf, size and strip)
-as part of the bootstrap process.
-.Bf -symbolic
-The option does not work for build targets unless some alternative
-toolchain is provided.
-.Ef

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407070027.s670R9aV016742>