Date: Wed, 2 Jul 2014 22:34:07 +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: r268191 - head Message-ID: <201407022234.s62MY7ZT037482@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcel Date: Wed Jul 2 22:34:06 2014 New Revision: 268191 URL: http://svnweb.freebsd.org/changeset/base/268191 Log: Remove ia64 from the list of known architectures and add an entry to UPDATING. This is the first step towards the removal of ia64 from head. A buildworld for ia64 will now yield: % make buildworld make[1]: "/usr/src/Makefile.inc1" line 151: Unknown target ia64:ia64. While here, trim the ia64-specific additions from ObsoleteFiles.inc Discussed at: BSDcan Modified: head/Makefile head/Makefile.inc1 head/ObsoleteFiles.inc head/UPDATING Modified: head/Makefile ============================================================================== --- head/Makefile Wed Jul 2 22:25:48 2014 (r268190) +++ head/Makefile Wed Jul 2 22:34:06 2014 (r268191) @@ -82,7 +82,7 @@ # # See src/UPDATING `COMMON ITEMS' for more complete information. # -# If TARGET=machine (e.g. ia64, sparc64, ...) is specified you can +# If TARGET=machine (e.g. powerpc, sparc64, ...) is specified you can # cross build world for other machine types using the buildworld target, # and once the world is built you can cross build a kernel using the # buildkernel target. @@ -361,7 +361,7 @@ kernel-toolchains: # existing system is. # .if make(universe) || make(universe_kernels) || make(tinderbox) || make(targets) -TARGETS?=amd64 arm i386 ia64 mips pc98 powerpc sparc64 +TARGETS?=amd64 arm i386 mips pc98 powerpc sparc64 TARGET_ARCHES_arm?= arm armeb armv6 armv6hf TARGET_ARCHES_mips?= mipsel mips mips64el mips64 mipsn32 TARGET_ARCHES_powerpc?= powerpc powerpc64 Modified: head/Makefile.inc1 ============================================================================== --- head/Makefile.inc1 Wed Jul 2 22:25:48 2014 (r268190) +++ head/Makefile.inc1 Wed Jul 2 22:34:06 2014 (r268191) @@ -140,7 +140,7 @@ SRCRELDATE!= awk '/^\#define[[:space:]]* VERSION= FreeBSD ${REVISION}-${BRANCH:C/-p[0-9]+$//} ${TARGET_ARCH} ${SRCRELDATE} .endif -KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 +KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm armv6hf/arm i386 i386/pc98 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 .if ${TARGET} == ${TARGET_ARCH} _t= ${TARGET} .else Modified: head/ObsoleteFiles.inc ============================================================================== --- head/ObsoleteFiles.inc Wed Jul 2 22:25:48 2014 (r268190) +++ head/ObsoleteFiles.inc Wed Jul 2 22:34:06 2014 (r268191) @@ -1179,9 +1179,6 @@ OLD_FILES+=usr/include/xmmintrin.h .if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "i386" || ${TARGET_ARCH} == "arm" OLD_FILES+=usr/include/mmintrin.h .endif -.if ${TARGET_ARCH} == "ia64" -OLD_FILES+=usr/include/ia64intrin.h -.endif .if ${TARGET_ARCH} == "powerpc" OLD_FILES+=usr/include/altivec.h OLD_FILES+=usr/include/ppc-asm.h @@ -1199,10 +1196,6 @@ OLD_FILES+=usr/include/machine/rm7000.h OLD_FILES+=usr/include/machine/defs.h OLD_FILES+=usr/include/machine/queue.h .endif -# 20100326: [ia64] removed <machine/nexusvar.h> -.if ${TARGET_ARCH} == "ia64" -OLD_FILES+=usr/include/machine/nexusvar.h -.endif # 20100326: gcpio removal OLD_FILES+=usr/bin/gcpio OLD_FILES+=usr/share/info/cpio.info.gz @@ -1216,11 +1209,6 @@ OLD_FILES+=usr/share/man/man3/regexp.3.g OLD_FILES+=usr/share/man/man3/regsub.3.gz # 20100303: actual removal of utmp.h OLD_FILES+=usr/include/utmp.h -# 20100227: [ia64] removed <machine/sapicreg.h> and <machine/sapicvar.h> -.if ${TARGET_ARCH} == "ia64" -OLD_FILES+=usr/include/machine/sapicreg.h -OLD_FILES+=usr/include/machine/sapicvar.h -.endif # 20100208: man pages moved .if ${TARGET_ARCH} == "i386" OLD_FILES+=usr/share/man/man4/i386/alpm.4.gz @@ -1913,14 +1901,6 @@ OLD_FILES+=usr/share/man/man8/arlcontrol OLD_FILES+=sbin/sunlabel OLD_FILES+=usr/share/man/man8/sunlabel.8.gz .endif -# 20080703: bsdlabel & fdisk removed on ia64 -.if ${TARGET_ARCH} == "ia64" -OLD_FILES+=sbin/bsdlabel -OLD_FILES+=usr/share/man/man8/bsdlabel.8.gz -OLD_FILES+=usr/share/man/man8/disklabel.8.gz -OLD_FILES+=sbin/fdisk -OLD_FILES+=usr/share/man/man8/fdisk.8.gz -.endif # 20080701: wpa_supplicant.conf moved to share/examples/etc/ OLD_FILES+=usr/share/examples/wpa_supplicant/wpa_supplicant.conf OLD_DIRS+=usr/share/examples/wpa_supplicant @@ -2129,12 +2109,6 @@ OLD_FILES+=usr/include/sys/_elf_solaris. OLD_FILES+=usr/share/man/man3/pmc_x86_get_msr.3.gz # 20071108: Removed very crunch OLDCARD support file OLD_FILES+=etc/defaults/pccard.conf -# 20071104: Removed bsdlabel, fdisk and gpt from rescue on ia64. -.if ${TARGET_ARCH} == "ia64" -OLD_FILES+=rescue/bsdlabel -OLD_FILES+=rescue/fdisk -OLD_FILES+=rescue/gpt -.endif # 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd OLD_FILES+=etc/rc.d/nfslocking # 20070930: rename of cached to nscd @@ -2795,10 +2769,6 @@ OLD_FILES+=usr/share/man/man8/mount_std. OLD_FILES+=usr/share/man/man4/uhidev.4.gz # 20061106: archive_write_prepare.3 removed OLD_FILES+=usr/share/man/man3/archive_write_prepare.3.gz -.if ${TARGET_ARCH} == "ia64" -# 20061104: skiload.help removed -OLD_FILES+=boot/skiload.help -.endif # 20061018: pccardc removed OLD_FILES+=usr/sbin/pccardc usr/share/man/man8/pccardc.8.gz # 20060930: demangle.h from contrib/libstdc++/include/ext/ Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Jul 2 22:25:48 2014 (r268190) +++ head/UPDATING Wed Jul 2 22:34:06 2014 (r268191) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 11 disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20140702: + The Itanium architecture (ia64) has been removed from the list of + known architectures. This is the first step in the removal of the + architecture. + 20140701: Commit r268115 has added NFSv4.1 server support, merged from projects/nfsv4.1-server. Since this includes changes to the
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407022234.s62MY7ZT037482>