diff options
author | marcel <marcel@FreeBSD.org> | 2014-07-07 00:27:09 +0000 |
---|---|---|
committer | marcel <marcel@FreeBSD.org> | 2014-07-07 00:27:09 +0000 |
commit | 9f28abd980752efcf77578cd494f1015083c2a2b (patch) | |
tree | 98db2559cee662a9de7212211dd5c69176b58254 /usr.sbin | |
parent | 43f783bfcf60b349841acd57895767177114e4ae (diff) | |
download | FreeBSD-src-9f28abd980752efcf77578cd494f1015083c2a2b.zip FreeBSD-src-9f28abd980752efcf77578cd494f1015083c2a2b.tar.gz |
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
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/Makefile.ia64 | 9 | ||||
-rw-r--r-- | usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c | 2 | ||||
-rw-r--r-- | usr.sbin/config/config.5 | 2 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchide/Makefile | 5 | ||||
-rw-r--r-- | usr.sbin/crunch/crunchide/exec_elf32.c | 4 | ||||
-rwxr-xr-x | usr.sbin/mergemaster/mergemaster.sh | 4 | ||||
-rw-r--r-- | usr.sbin/ntp/config.h | 8 | ||||
-rw-r--r-- | usr.sbin/pkg/elf_tables.h | 1 |
8 files changed, 8 insertions, 27 deletions
diff --git a/usr.sbin/Makefile.ia64 b/usr.sbin/Makefile.ia64 deleted file mode 100644 index 0a897b4..0000000 --- a/usr.sbin/Makefile.ia64 +++ /dev/null @@ -1,9 +0,0 @@ -# $FreeBSD$ - -.if ${MK_ACPI} != "no" -SUBDIR+= acpi -.endif -SUBDIR+= kgmon -SUBDIR+= mount_smbfs -SUBDIR:= ${SUBDIR:Nuathload} -SUBDIR+= zzz diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c index f8644f4..b8e66a6 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/bridge_sys.c @@ -584,7 +584,7 @@ bridge_get_basemac(const char *bif_name, u_char *mac, size_t mlen) /* * Not just casting because of alignment constraints - * on sparc64 and ia64. + * on sparc64. */ bcopy(ifa->ifa_addr, &sdl, sizeof(struct sockaddr_dl)); diff --git a/usr.sbin/config/config.5 b/usr.sbin/config/config.5 index 7513db1..dfc9fc8 100644 --- a/usr.sbin/config/config.5 +++ b/usr.sbin/config/config.5 @@ -182,8 +182,6 @@ The ARM architecture. The AMD x86-64 architecture. .It Cm i386 The Intel x86 based PC architecture. -.It Cm ia64 -The Intel IA64 architecture. .It Cm mips The MIPS architecture. .It Cm pc98 diff --git a/usr.sbin/crunch/crunchide/Makefile b/usr.sbin/crunch/crunchide/Makefile index c959a3e..e328aa4 100644 --- a/usr.sbin/crunch/crunchide/Makefile +++ b/usr.sbin/crunch/crunchide/Makefile @@ -12,9 +12,8 @@ CFLAGS+=-DNLIST_AOUT SRCS+= exec_aout.c .endif -.if ${TARGET_ARCH} == ia64 || ${TARGET_ARCH} == powerpc64 || \ - ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH} == amd64 || \ - ${TARGET_ARCH:Mmips64*} +.if ${TARGET_ARCH} == amd64 || ${TARGET_ARCH} == powerpc64 || \ + ${TARGET_ARCH} == sparc64 || ${TARGET_ARCH:Mmips64*} CFLAGS+=-DNLIST_ELF64 SRCS+= exec_elf64.c exec_elf64.o: exec_elf32.c diff --git a/usr.sbin/crunch/crunchide/exec_elf32.c b/usr.sbin/crunch/crunchide/exec_elf32.c index 752007f..e9bc227 100644 --- a/usr.sbin/crunch/crunchide/exec_elf32.c +++ b/usr.sbin/crunch/crunchide/exec_elf32.c @@ -186,10 +186,6 @@ ELFNAMEEND(check)(int fd, const char *fn) #endif case EM_MIPS: break; case /* EM_MIPS_RS3_LE */ EM_MIPS_RS4_BE: break; -#ifndef EM_IA_64 -#define EM_IA_64 50 -#endif - case EM_IA_64: break; #ifndef EM_PPC #define EM_PPC 20 #endif diff --git a/usr.sbin/mergemaster/mergemaster.sh b/usr.sbin/mergemaster/mergemaster.sh index a200088..9bf4f9f 100755 --- a/usr.sbin/mergemaster/mergemaster.sh +++ b/usr.sbin/mergemaster/mergemaster.sh @@ -760,7 +760,7 @@ CONFIRMED_UMASK=${NEW_UMASK:-0022} # Warn users who still have old rc files # for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 ia64 sparc64; do + serial syscons sysctl alpha amd64 i386 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then OLD_RC_PRESENT=1 break @@ -786,7 +786,7 @@ case "${OLD_RC_PRESENT}" in *) mkdir -p /var/tmp/mergemaster/old_rc for file in atm devfs diskless1 diskless2 network network6 pccard \ - serial syscons sysctl alpha amd64 i386 ia64 sparc64; do + serial syscons sysctl alpha amd64 i386 sparc64; do if [ -f "${DESTDIR}/etc/rc.${file}" ]; then mv ${DESTDIR}/etc/rc.${file} /var/tmp/mergemaster/old_rc/ fi diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 41622f1..d4b3685 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1176,7 +1176,7 @@ /* #undef SCO5_CLOCK */ /* The size of a `char*', as computed by sizeof. */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_CHARP 8 #else #define SIZEOF_CHARP 4 @@ -1186,7 +1186,7 @@ #define SIZEOF_INT 4 /* The size of a `long', as computed by sizeof. */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_LONG 8 #else #define SIZEOF_LONG 4 @@ -1199,7 +1199,7 @@ #define SIZEOF_SIGNED_CHAR 1 /* The size of a `time_t', as computed by sizeof. */ -#if defined(__alpha__) || defined(__ia64__) || defined(__sparc64__) || defined(__amd64__) +#if defined(__alpha__) || defined(__sparc64__) || defined(__amd64__) #define SIZEOF_TIME_T 8 #else #define SIZEOF_TIME_T 4 @@ -1227,8 +1227,6 @@ #define STR_SYSTEM "sparc64-undermydesk-freebsd" #elif defined(__amd64__) #define STR_SYSTEM "amd64-undermydesk-freebsd" -#elif defined(__ia64__) -#define STR_SYSTEM "ia64-undermydesk-freebsd" #else #define STR_SYSTEM "i386-undermydesk-freebsd" #endif diff --git a/usr.sbin/pkg/elf_tables.h b/usr.sbin/pkg/elf_tables.h index 0589ecf..55fd3bb 100644 --- a/usr.sbin/pkg/elf_tables.h +++ b/usr.sbin/pkg/elf_tables.h @@ -42,7 +42,6 @@ static struct _elf_corres mach_corres[] = { { EM_PPC, "powerpc" }, { EM_PPC64, "powerpc" }, { EM_SPARCV9, "sparc64" }, - { EM_IA_64, "ia64" }, { -1, NULL }, }; |