diff options
Diffstat (limited to 'usr/src')
31 files changed, 36 insertions, 560 deletions
diff --git a/usr/src/cmd/sgs/dump/common/util.c b/usr/src/cmd/sgs/dump/common/util.c index 5a3f6543b9..5a4c7a4e9c 100644 --- a/usr/src/cmd/sgs/dump/common/util.c +++ b/usr/src/cmd/sgs/dump/common/util.c @@ -26,7 +26,7 @@ #pragma ident "%Z%%M% %I% %E% SMI" /* - * Copyright 1999-2002 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -545,213 +545,6 @@ print_reloc_type(int machine, int type) break; } break; - case EM_IA_64: /* Intel IA64 */ - switch (type) { - case (R_IA_64_NONE): - (void) printf(Fmtrel, - "R_IA_64_NONE"); - break; - case (R_IA_64_IMM14): - (void) printf(Fmtrel, - "R_IA_64_IMM14"); - break; - case (R_IA_64_IMM22): - (void) printf(Fmtrel, - "R_IA_64_IMM22"); - break; - case (R_IA_64_IMM64): - (void) printf(Fmtrel, - "R_IA_64_IMM64"); - break; - case (R_IA_64_DIR32MSB): - (void) printf(Fmtrel, - "R_IA_64_DIR32MSB"); - break; - case (R_IA_64_DIR32LSB): - (void) printf(Fmtrel, - "R_IA_64_DIR32LSB"); - break; - case (R_IA_64_DIR64MSB): - (void) printf(Fmtrel, - "R_IA_64_DIR64MSB"); - break; - case (R_IA_64_DIR64LSB): - (void) printf(Fmtrel, - "R_IA_64_DIR64LSB"); - break; - case (R_IA_64_GPREL22): - (void) printf(Fmtrel, - "R_IA_64_GPREL22"); - break; - case (R_IA_64_GPREL64I): - (void) printf(Fmtrel, - "R_IA_64_GPREL64I"); - break; - case (R_IA_64_GPREL64MSB): - (void) printf(Fmtrel, - "R_IA_64_GPREL64MSB"); - break; - case (R_IA_64_GPREL64LSB): - (void) printf(Fmtrel, - "R_IA_64_GPREL64LSB"); - break; - case (R_IA_64_LTOFF22): - (void) printf(Fmtrel, - "R_IA_64_LTOFF22"); - break; - case (R_IA_64_LTOFF64I): - (void) printf(Fmtrel, - "R_IA_64_LTOFF64I"); - break; - case (R_IA_64_PLTOFF22): - (void) printf(Fmtrel, - "R_IA_64_PLTOFF22"); - break; - case (R_IA_64_PLTOFF64I): - (void) printf(Fmtrel, - "R_IA_64_PLTOFF64I"); - break; - case (R_IA_64_PLTOFF64MSB): - (void) printf(Fmtrel, - "R_IA_64_PLTOFF64MSB"); - break; - case (R_IA_64_PLTOFF64LSB): - (void) printf(Fmtrel, - "R_IA_64_PLTOFF64LSB"); - break; - case (R_IA_64_FPTR64I): - (void) printf(Fmtrel, - "R_IA_64_FPTR64I"); - break; - case (R_IA_64_FPTR32MSB): - (void) printf(Fmtrel, - "R_IA_64_FPTR32MSB"); - break; - case (R_IA_64_FPTR32LSB): - (void) printf(Fmtrel, - "R_IA_64_FPTR32LSB"); - break; - case (R_IA_64_FPTR64MSB): - (void) printf(Fmtrel, - "R_IA_64_FPTR64MSB"); - break; - case (R_IA_64_FPTR64LSB): - (void) printf(Fmtrel, - "R_IA_64_FPTR64LSB"); - break; - case (R_IA_64_PCREL21B): - (void) printf(Fmtrel, - "R_IA_64_PCREL21B"); - break; - case (R_IA_64_PCREL21M): - (void) printf(Fmtrel, - "R_IA_64_PCREL21M"); - break; - case (R_IA_64_PCREL21F): - (void) printf(Fmtrel, - "R_IA_64_PCREL21F"); - break; - case (R_IA_64_PCREL32MSB): - (void) printf(Fmtrel, - "R_IA_64_PCREL32MSB"); - break; - case (R_IA_64_PCREL32LSB): - (void) printf(Fmtrel, - "R_IA_64_PCREL32LSB"); - break; - case (R_IA_64_PCREL64MSB): - (void) printf(Fmtrel, - "R_IA_64_PCREL64MSB"); - break; - case (R_IA_64_PCREL64LSB): - (void) printf(Fmtrel, - "R_IA_64_PCREL64LSB"); - break; - case (R_IA_64_LTOFF_FPTR22): - (void) printf(Fmtrel, - "R_IA_64_LTOFF_FPTR22"); - break; - case (R_IA_64_LTOFF_FPTR64I): - (void) printf(Fmtrel, - "R_IA_64_LTOFF_FPTR64I"); - break; - case (R_IA_64_SEGREL32MSB): - (void) printf(Fmtrel, - "R_IA_64_SEGREL32MSB"); - break; - case (R_IA_64_SEGREL32LSB): - (void) printf(Fmtrel, - "R_IA_64_SEGREL32LSB"); - break; - case (R_IA_64_SEGREL64MSB): - (void) printf(Fmtrel, - "R_IA_64_SEGREL64MSB"); - break; - case (R_IA_64_SEGREL64LSB): - (void) printf(Fmtrel, - "R_IA_64_SEGREL64LSB"); - break; - case (R_IA_64_SECREL32MSB): - (void) printf(Fmtrel, - "R_IA_64_SECREL32MSB"); - break; - case (R_IA_64_SECREL32LSB): - (void) printf(Fmtrel, - "R_IA_64_SECREL32LSB"); - break; - case (R_IA_64_SECREL64MSB): - (void) printf(Fmtrel, - "R_IA_64_SECREL64MSB"); - break; - case (R_IA_64_SECREL64LSB): - (void) printf(Fmtrel, - "R_IA_64_SECREL64LSB"); - break; - case (R_IA_64_REL32MSB): - (void) printf(Fmtrel, - "R_IA_64_REL32MSB"); - break; - case (R_IA_64_REL32LSB): - (void) printf(Fmtrel, - "R_IA_64_REL32LSB"); - break; - case (R_IA_64_REL64MSB): - (void) printf(Fmtrel, - "R_IA_64_REL64MSB"); - break; - case (R_IA_64_REL64LSB): - (void) printf(Fmtrel, - "R_IA_64_REL64LSB"); - break; - case (R_IA_64_LTV32MSB): - (void) printf(Fmtrel, - "R_IA_64_LTV32MSB"); - break; - case (R_IA_64_LTV32LSB): - (void) printf(Fmtrel, - "R_IA_64_LTV32LSB"); - break; - case (R_IA_64_LTV64MSB): - (void) printf(Fmtrel, - "R_IA_64_LTV64MSB"); - break; - case (R_IA_64_LTV64LSB): - (void) printf(Fmtrel, - "R_IA_64_LTV64LSB"); - break; - case (R_IA_64_IPLTMSB): - (void) printf(Fmtrel, - "R_IA_64_IPLTMSB"); - break; - case (R_IA_64_IPLTLSB): - (void) printf(Fmtrel, - "R_IA_64_IPLTLSB"); - break; - default: - (void) printf(Fmtreld, type); - break; - } - break; default: (void) printf(Fmtreld, type); break; diff --git a/usr/src/cmd/sgs/packages/Makefile b/usr/src/cmd/sgs/packages/Makefile index ab3029ab3a..80940ddd0b 100644 --- a/usr/src/cmd/sgs/packages/Makefile +++ b/usr/src/cmd/sgs/packages/Makefile @@ -22,7 +22,7 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # # cmd/sgs/packages/Makefile @@ -152,9 +152,7 @@ $(VAR_SPEC_ON) $(ROOT)/usr/include/apptrace_impl.h $(ROOT)/usr/include/sys/link.h \ $(ROOT)/usr/include/sys/note.h \ $(ROOT)/usr/include/sys/systeminfo.h -$(VAR_SPEC_ON) @ cd $(SRC)/uts/common/sys; pwd; $(MAKE) \ -$(VAR_SPEC_ON) $(ROOT)/usr/include/sys/elf_ia64.h - @ cd $(SRC)/uts/$(M32)/sys; pwd; $(MAKE) \ +$(VAR_SPEC_ON) @ cd $(SRC)/uts/$(M32)/sys; pwd; $(MAKE) \ $(ROOT)/usr/include/sys/machelf.h $(VAR_SPEC_ON) @ cd $(SRC)/lib/abi; pwd; $(MAKE) spec @ cd ../tools/$(MACH); pwd; $(MAKE) sgsmsg piglatin diff --git a/usr/src/cmd/sgs/packages/inc.flg b/usr/src/cmd/sgs/packages/inc.flg index 341f6a6e30..f96252306d 100644 --- a/usr/src/cmd/sgs/packages/inc.flg +++ b/usr/src/cmd/sgs/packages/inc.flg @@ -23,7 +23,7 @@ # # ident "%Z%%M% %I% %E% SMI" # -# Copyright 2004 Sun Microsystems, Inc. All rights reserved. +# Copyright 2005 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # @@ -81,7 +81,6 @@ echo_file usr/src/uts/common/sys/auxv_SPARC.h echo_file usr/src/uts/common/sys/elf.h echo_file usr/src/uts/common/sys/elf_386.h echo_file usr/src/uts/common/sys/elf_amd64.h -echo_file usr/src/uts/common/sys/elf_ia64.h echo_file usr/src/uts/common/sys/elf_M32.h echo_file usr/src/uts/common/sys/elf_SPARC.h echo_file usr/src/uts/common/sys/elf_notes.h diff --git a/usr/src/cmd/stat/common/dsr.c b/usr/src/cmd/stat/common/dsr.c index bbbfaeec3e..bc4208c82a 100644 --- a/usr/src/cmd/stat/common/dsr.c +++ b/usr/src/cmd/stat/common/dsr.c @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -345,7 +345,7 @@ insert_dlist_ent(disk_list_t *n, disk_list_t **hd) */ if (n->devtype == DISK || n->devtype == OSA_DISK) { n->flags = SLICES_OK; -#if defined(i386) || defined(__ia64) +#if defined(__i386) n->flags |= PARTITIONS_OK; #endif } else { diff --git a/usr/src/head/arpa/nameser_compat.h b/usr/src/head/arpa/nameser_compat.h index fc773d7397..7df7b90bb0 100644 --- a/usr/src/head/arpa/nameser_compat.h +++ b/usr/src/head/arpa/nameser_compat.h @@ -85,7 +85,7 @@ extern "C" { #define PDP_ENDIAN 3412 /* LSB first in word, MSW first in long (pdp) */ #if defined(vax) || defined(ns32000) || defined(sun386) || defined(i386) || \ - defined(__i386) || defined(__ia64) || defined(__amd64) || \ + defined(__i386) || defined(__amd64) || \ defined(MIPSEL) || defined(_MIPSEL) || defined(BIT_ZERO_ON_RIGHT) || \ defined(__alpha__) || defined(__alpha) || \ (defined(__Lynx__) && defined(__x86__)) diff --git a/usr/src/lib/libc_db/common/thread_db.c b/usr/src/lib/libc_db/common/thread_db.c index 19b7d21ada..7759b68a20 100644 --- a/usr/src/lib/libc_db/common/thread_db.c +++ b/usr/src/lib/libc_db/common/thread_db.c @@ -151,9 +151,6 @@ td_read_uberdata(td_thragent_t *ta_p) if (ta_p->model == PR_MODEL_NATIVE) { uberdata_t uberdata; -#ifdef __ia64 - int i; -#endif if (ps_pdread(ph_p, ta_p->uberdata_addr, &uberdata, sizeof (uberdata)) != PS_OK) @@ -168,18 +165,6 @@ td_read_uberdata(td_thragent_t *ta_p) if (ps_pdread(ph_p, (psaddr_t)uberdata.tdb.tdb_events, ta_p->tdb_events, sizeof (ta_p->tdb_events)) != PS_OK) return (TD_DBERR); -#ifdef __ia64 - /* - * Deal with stupid ia64 function descriptors. - * We have to go indirect to get the actual function address. - */ - for (i = 0; i < TD_MAX_EVENT_NUM - TD_MIN_EVENT_NUM + 1; i++) { - psaddr_t addr; - if (ps_pdread(ph_p, ta_p->tdb_events[i], - &addr, sizeof (addr)) == PS_OK) - ta_p->tdb_events[i] = addr; - } -#endif /* __ia64 */ } else { #if defined(_LP64) && defined(_SYSCALL32) diff --git a/usr/src/pkgdefs/SUNWhea/prototype_com b/usr/src/pkgdefs/SUNWhea/prototype_com index 1e1b851ee5..6a3484b4f7 100644 --- a/usr/src/pkgdefs/SUNWhea/prototype_com +++ b/usr/src/pkgdefs/SUNWhea/prototype_com @@ -608,7 +608,6 @@ f none usr/include/sys/elf_386.h 644 root bin f none usr/include/sys/elf_M32.h 644 root bin f none usr/include/sys/elf_SPARC.h 644 root bin f none usr/include/sys/elf_amd64.h 644 root bin -f none usr/include/sys/elf_ia64.h 644 root bin f none usr/include/sys/elf_notes.h 644 root bin f none usr/include/sys/elftypes.h 644 root bin f none usr/include/sys/epm.h 644 root bin diff --git a/usr/src/psm/stand/boot/common/readfile.c b/usr/src/psm/stand/boot/common/readfile.c index 7d1f60ac0f..d5d51f76a7 100644 --- a/usr/src/psm/stand/boot/common/readfile.c +++ b/usr/src/psm/stand/boot/common/readfile.c @@ -134,9 +134,9 @@ typedef struct { } a_un; } auxv64_t; -#if defined(__sparcv9) || defined(__ia64) +#if defined(__sparcv9) extern int client_isLP64; -#endif /* __sparcv9 || __ia64 */ +#endif /* __sparcv9 */ static uint64_t read_elf64(int, int, Elf64_Ehdr *); static Elf64_Addr iload64(char *, Elf64_Phdr *, Elf64_Phdr *, auxv64_t **); @@ -749,9 +749,9 @@ read_elf64(int fd, int print, Elf64_Ehdr *elfhdrp) /* Initialize pointers so we won't free bogus ones on elf64error */ allphdrs = NULL; nhdr = NULL; -#if defined(__sparcv9) || defined(__ia64) +#if defined(__sparcv9) client_isLP64 = 1; -#endif /* __sparcv9 || __ia64 */ +#endif /* __sparcv9 */ if (verbosemode) printf("Elf64 client\n"); @@ -1518,18 +1518,15 @@ char *fname; static char mod_path[MOD_MAXPATH]; size_t len; extern char *impl_arch_name; -#if defined(__sparcv9) || defined(__ia64) || defined(BOOTAMD64) +#if defined(__sparcv9) || defined(BOOTAMD64) #ifdef __sparcv9 char *isastr = "/sparcv9"; #endif /* __sparcv9 */ -#ifdef __ia64 - char *isastr = "/ia64"; -#endif /* __ia64 */ #ifdef BOOTAMD64 char *isastr = "/amd64"; #endif /* BOOTAMD64 */ size_t isalen = strlen(isastr); -#endif /* __sparcv9 || __ia64 || BOOTAMD64 */ +#endif /* __sparcv9 || BOOTAMD64 */ if (p == NULL) { /* strchr could not find a "/" */ @@ -1545,17 +1542,17 @@ char *fname; (void) strncpy(mod_path, fname, len); mod_path[len] = 0; -#if defined(__sparcv9) || defined(__ia64) || defined(BOOTAMD64) +#if defined(__sparcv9) || defined(BOOTAMD64) len = strlen(mod_path); if ((len > isalen) && (strcmp(&mod_path[len - isalen], isastr) == 0)) { mod_path[len - isalen] = '\0'; -#if defined(__sparcv9) || defined(__ia64) +#if defined(__sparcv9) if ((client_isLP64 == 0) && verbosemode) printf("Assuming LP64 %s client.\n", isastr); client_isLP64 = 1; -#endif /* __sparcv9 || __ia64 */ +#endif /* __sparcv9 */ } -#endif /* __sparcv9 || __ia64 || BOOTAMD64 */ +#endif /* __sparcv9 || BOOTAMD64 */ mod_path_uname_m(mod_path, impl_arch_name); (void) strcat(mod_path, " "); (void) strcat(mod_path, MOD_DEFPATH); diff --git a/usr/src/uts/common/conf/param.c b/usr/src/uts/common/conf/param.c index 266426f1d6..9abf7b0f8a 100644 --- a/usr/src/uts/common/conf/param.c +++ b/usr/src/uts/common/conf/param.c @@ -109,9 +109,7 @@ const unsigned long _mmu_pagemask = (unsigned long)MMU_PAGEMASK; uintptr_t _kernelbase = (uintptr_t)KERNELBASE; uintptr_t _userlimit = (uintptr_t)USERLIMIT; uintptr_t _userlimit32 = (uintptr_t)USERLIMIT32; -#if !defined(__ia64) const uintptr_t _argsbase = (uintptr_t)ARGSBASE; -#endif const unsigned int _diskrpm = (unsigned int)DISKRPM; const unsigned long _pgthresh = (unsigned long)PGTHRESH; const unsigned int _maxslp = (unsigned int)MAXSLP; @@ -498,17 +496,6 @@ char architecture_32[] = "i386"; char hw_serial[11] = "0"; char hw_provider[SYS_NMLN] = ""; -#elif defined(__ia64) - -/* - * On ia64 machines, read hw_serial, hw_provider and srpc_domain from - * /etc/bootrc at boot time. - */ -char architecture[] = "ia64"; -char architecture_32[] = "i386"; -char hw_serial[11] = "0"; -char hw_provider[SYS_NMLN] = ""; - #elif defined(__amd64) /* diff --git a/usr/src/uts/common/disp/thread.c b/usr/src/uts/common/disp/thread.c index 0b10f33dc9..6cc6b08098 100644 --- a/usr/src/uts/common/disp/thread.c +++ b/usr/src/uts/common/disp/thread.c @@ -282,9 +282,6 @@ thread_create( kthread_t *t; extern struct classfuncs sys_classfuncs; turnstile_t *ts; -#if defined(__ia64) - size_t regstksize; -#endif /* * Every thread keeps a turnstile around in case it needs to block. @@ -325,11 +322,6 @@ thread_create( cmn_err(CE_PANIC, "thread_create: proposed stack size" " too small to hold thread."); #ifdef STACK_GROWTH_DOWN -#if defined(__ia64) - /* "stksize / 2" may need to be adjusted */ - stksize = stksize / 2; /* needs to match below */ - regstksize = stksize; -#endif stksize -= SA(sizeof (kthread_t) + PTR24_ALIGN - 1); stksize &= -PTR24_ALIGN; /* make thread aligned */ t = (kthread_t *)(stk + stksize); @@ -340,10 +332,6 @@ thread_create( #endif t->t_stk = stk + stksize; t->t_stkbase = stk; -#if defined(__ia64) - t->t_regstk = stk + regstksize; - t->t_stksize = regstksize * 2; /* needs to match above */ -#endif #else /* stack grows to larger addresses */ stksize -= SA(sizeof (kthread_t)); t = (kthread_t *)(stk); @@ -366,16 +354,8 @@ thread_create( * upon entry to the kernel */ #ifdef STACK_GROWTH_DOWN -#if defined(__ia64) - /* "stksize / 2" may need to be adjusted */ - t->t_stk = stk + (stksize / 2); /* grows down */ - t->t_regstk = t->t_stk; /* grows up from same place */ - t->t_stkbase = stk; - t->t_stksize = stksize; -#else t->t_stk = stk + stksize; t->t_stkbase = stk; -#endif #else t->t_stk = stk; /* 3b2-like */ t->t_stkbase = stk + stksize; diff --git a/usr/src/uts/common/exec/elf/elf.c b/usr/src/uts/common/exec/elf/elf.c index 52e81174da..f334acb324 100644 --- a/usr/src/uts/common/exec/elf/elf.c +++ b/usr/src/uts/common/exec/elf/elf.c @@ -1509,9 +1509,6 @@ top: #if defined(__sparc) ehdr->e_ident[EI_DATA] = ELFDATA2MSB; ehdr->e_machine = EM_SPARCV9; -#elif defined(__ia64) - ehdr->e_ident[EI_DATA] = ELFDATA2LSB; - ehdr->e_machine = EM_IA_64; #elif defined(__amd64) ehdr->e_ident[EI_DATA] = ELFDATA2LSB; ehdr->e_machine = EM_AMD64; diff --git a/usr/src/uts/common/krtld/reloc.h b/usr/src/uts/common/krtld/reloc.h index df9afd5840..cc44c4ee8c 100644 --- a/usr/src/uts/common/krtld/reloc.h +++ b/usr/src/uts/common/krtld/reloc.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -139,7 +139,7 @@ extern const Rel_entry reloc_table[]; /* * Functions. */ -#if defined(__i386) || defined(__ia64) || defined(__amd64) +#if defined(__i386) || defined(__amd64) extern int do_reloc(unsigned char, unsigned char *, Xword *, const char *, const char *); #elif defined(__sparc) diff --git a/usr/src/uts/common/os/sysent.c b/usr/src/uts/common/os/sysent.c index f2d0444965..fff7f4cc74 100644 --- a/usr/src/uts/common/os/sysent.c +++ b/usr/src/uts/common/os/sysent.c @@ -21,7 +21,7 @@ */ /* ONC_PLUS EXTRACT START */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -381,7 +381,7 @@ typedef int64_t (*llfcn_t)(); /* for casting one-word returns */ #define IF_i386(true, false) false #endif -#if defined(__i386) || defined(__ia64) || defined(__amd64) +#if defined(__i386) || defined(__amd64) #define IF_x86(true, false) true #else #define IF_x86(true, false) false diff --git a/usr/src/uts/common/sys/Makefile b/usr/src/uts/common/sys/Makefile index 0587c797d3..0a9b39a113 100644 --- a/usr/src/uts/common/sys/Makefile +++ b/usr/src/uts/common/sys/Makefile @@ -192,7 +192,6 @@ CHKHDRS= \ elf_386.h \ elf_M32.h \ elf_SPARC.h \ - elf_ia64.h \ elf_notes.h \ elf_amd64.h \ elftypes.h \ diff --git a/usr/src/uts/common/sys/elf.h b/usr/src/uts/common/sys/elf.h index b73bfbb2c9..4154354bcb 100644 --- a/usr/src/uts/common/sys/elf.h +++ b/usr/src/uts/common/sys/elf.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -736,10 +736,6 @@ int elfheadcheck(unsigned char, Elf32_Half, Elf32_Word); #include <sys/elf_386.h> #endif -#if defined(ELF_TARGET_ALL) || defined(ELF_TARGET_IA64) -#include <sys/elf_ia64.h> -#endif - #if defined(ELF_TARGET_ALL) || defined(ELF_TARGET_AMD64) #include <sys/elf_amd64.h> #endif diff --git a/usr/src/uts/common/sys/elf_ia64.h b/usr/src/uts/common/sys/elf_ia64.h deleted file mode 100644 index 5aa3f3c77d..0000000000 --- a/usr/src/uts/common/sys/elf_ia64.h +++ /dev/null @@ -1,131 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* - * Copyright (c) 1998-1999 by Sun Microsystems, Inc. - * All rights reserved. - */ - -#ifndef _SYS_ELF_IA64_H -#define _SYS_ELF_IA64_H - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifdef __cplusplus -extern "C" { -#endif - -#define EF_IA_64_MASKOS 0x0000000f /* reserved for OS values */ -#define EF_IA_64_ABI64 0x00000010 /* object uses LP64 model */ -#define EF_IA_64_ARCH 0xff000000 /* arch. version ident */ - -/* - * processor specific program headers - */ -#define PT_IA_64_ARCHEXT 0x70000000 -#define PT_IA_64_UNWIND 0x70000001 /* stack unwind tables */ - -#define PF_IA_64_NORECOV 0x80000000 - -#define R_IA_64_NONE 0 /* relocation type */ -#define R_IA_64_IMM14 0x21 -#define R_IA_64_IMM22 0x22 -#define R_IA_64_IMM64 0x23 -#define R_IA_64_DIR32MSB 0x24 -#define R_IA_64_DIR32LSB 0x25 -#define R_IA_64_DIR64MSB 0x26 -#define R_IA_64_DIR64LSB 0x27 -#define R_IA_64_GPREL22 0x2a -#define R_IA_64_GPREL64I 0x2b -#define R_IA_64_GPREL64MSB 0x2e -#define R_IA_64_GPREL64LSB 0x2f -#define R_IA_64_LTOFF22 0x32 -#define R_IA_64_LTOFF64I 0x33 -#define R_IA_64_PLTOFF22 0x3a -#define R_IA_64_PLTOFF64I 0x3b -#define R_IA_64_PLTOFF64MSB 0x3e -#define R_IA_64_PLTOFF64LSB 0x3f -#define R_IA_64_FPTR64I 0x43 -#define R_IA_64_FPTR32MSB 0x44 -#define R_IA_64_FPTR32LSB 0x45 -#define R_IA_64_FPTR64MSB 0x46 -#define R_IA_64_FPTR64LSB 0x47 -#define R_IA_64_PCREL21B 0x49 -#define R_IA_64_PCREL21M 0x4a -#define R_IA_64_PCREL21F 0x4b -#define R_IA_64_PCREL32MSB 0x4c -#define R_IA_64_PCREL32LSB 0x4d -#define R_IA_64_PCREL64MSB 0x4e -#define R_IA_64_PCREL64LSB 0x4f -#define R_IA_64_LTOFF_FPTR22 0x52 -#define R_IA_64_LTOFF_FPTR64I 0x53 -#define R_IA_64_SEGREL32MSB 0x5c -#define R_IA_64_SEGREL32LSB 0x5d -#define R_IA_64_SEGREL64MSB 0x5e -#define R_IA_64_SEGREL64LSB 0x5f -#define R_IA_64_SECREL32MSB 0x64 -#define R_IA_64_SECREL32LSB 0x65 -#define R_IA_64_SECREL64MSB 0x66 -#define R_IA_64_SECREL64LSB 0x67 -#define R_IA_64_REL32MSB 0x6c -#define R_IA_64_REL32LSB 0x6d -#define R_IA_64_REL64MSB 0x6e -#define R_IA_64_REL64LSB 0x6f -#define R_IA_64_LTV32MSB 0x70 -#define R_IA_64_LTV32LSB 0x71 -#define R_IA_64_LTV64MSB 0x72 -#define R_IA_64_LTV64LSB 0x73 -#define R_IA_64_IPLTMSB 0x80 -#define R_IA_64_IPLTLSB 0x81 -#define R_IA_64_NUM 0x82 - -#define ELF_IA_64_MAXPGSZ 0x100000 /* maximum page size */ - -#define SHF_ORDERED 0x40000000 -#define SHF_EXCLUDE 0x80000000 - -#define SHN_BEFORE 0xff00 -#define SHN_AFTER 0xff01 - -/* - * processor specific sh_type's - */ -#define SHT_IA_64_EXT 0x70000000 -#define SHT_IA_64_UNWIND 0x70000001 - -/* - * processor specific sh_flags - */ -#define SHF_IA_64_SHORT 0x10000000 -#define SHF_IA_64_NORECOV 0x20000000 - -/* - * Processor specific DT entries - */ -#define DT_IA_64_PLT_RESERVE 0x70000000 - - - -#ifdef __cplusplus -} -#endif - -#endif /* _SYS_ELF_IA64_H */ diff --git a/usr/src/uts/common/sys/ieeefp.h b/usr/src/uts/common/sys/ieeefp.h index 6ae619a436..9b47e6ce47 100644 --- a/usr/src/uts/common/sys/ieeefp.h +++ b/usr/src/uts/common/sys/ieeefp.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -103,7 +103,7 @@ enum fp_trap_enable_type { /* trap enable bits according to bit number */ fp_trap_inexact = 5 }; -#endif /* __i386 || __ia64 || __amd64 */ +#endif /* __i386 || __amd64 */ enum fp_class_type { /* floating-point classes */ fp_zero = 0, diff --git a/usr/src/uts/common/sys/isa_defs.h b/usr/src/uts/common/sys/isa_defs.h index 54ffff00d3..e394354c4d 100644 --- a/usr/src/uts/common/sys/isa_defs.h +++ b/usr/src/uts/common/sys/isa_defs.h @@ -213,64 +213,10 @@ extern "C" { #endif /* - * The feature test macro __ia64 is generic for all processors implementing - * the Intel ia64 instruction set. - */ -#if defined(__ia64) || defined(__ia64__) -#if !defined(__ia64) -#define __ia64 -#endif - -/* - * Define the appropriate "processor characteristics" - */ -#define _LITTLE_ENDIAN -#define _STACK_GROWS_DOWNWARD /* sort of */ -#define _LONG_LONG_LTOH -#define _BIT_FIELDS_LTOH -#define _IEEE_754 -#define _CHAR_IS_SIGNED -#define _CHAR_ALIGNMENT 1 -#define _SHORT_ALIGNMENT 2 -#define _INT_ALIGNMENT 4 -#define _FLOAT_ALIGNMENT 4 -#define _LONG_ALIGNMENT 8 -#define _LONG_LONG_ALIGNMENT 8 -#define _DOUBLE_ALIGNMENT 8 -#define _LONG_DOUBLE_ALIGNMENT 16 -#define _POINTER_ALIGNMENT 8 -#define _MAX_ALIGNMENT 16 -#define _ALIGNMENT_REQUIRED 1 - -/* - * Different alignment constraints for the i386 ABI in compatibility mode - */ -#define _LONG_LONG_ALIGNMENT_32 4 - -/* - * Define the appropriate "implementation choices". - */ -#if !defined(_LP64) -#define _LP64 -#endif -#if !defined(_I32LPx) && defined(_KERNEL) -#define _I32LPx -#endif -#define _MULTI_DATAMODEL -#define _SUNOS_VTOC_16 -#define _DMA_USES_PHYSADDR -#define _FIRMWARE_NEEDS_FDISK -#define _CONSOLE_OUTPUT_VIA_SOFTWARE -#define __i386_COMPAT -#define _PSM_MODULES -#define _RTC_CONFIG -#define _HAVE_CPUID_INSN - -/* * The following set of definitions characterize Solaris on AMD's * 64-bit systems. */ -#elif defined(__x86_64) || defined(__amd64) +#if defined(__x86_64) || defined(__amd64) #if !defined(__amd64) #define __amd64 /* preferred guard */ diff --git a/usr/src/uts/common/sys/kobj.h b/usr/src/uts/common/sys/kobj.h index 4051cef88e..c2f8b2f9cb 100644 --- a/usr/src/uts/common/sys/kobj.h +++ b/usr/src/uts/common/sys/kobj.h @@ -50,33 +50,7 @@ struct module_list { typedef unsigned short symid_t; /* symbol table index */ typedef unsigned char *reloc_dest_t; -#if defined(__ia64) -typedef struct kobj_funcdesc { - char *kf_name; /* function name */ - Elf64_Addr kf_faddr; /* function address */ - Elf64_Addr kf_gp; /* GP for module */ - struct kobj_funcdesc *kf_next; /* next FD in chain */ -} kobj_funcdesc; - -typedef struct { - char *m_sdata; /* address of ia64 small data */ - char *m_gotaddr; /* starting address of */ - /* GOT table */ - char *m_gotend; /* tail of filled in */ - /* GOT table */ - unsigned long m_gotcnt; /* number of GOT entries */ - size_t m_sdatasize; /* size of small data + */ - /* got table */ - uint_t m_fdhsize; /* # of hash buckets for */ - /* FD list */ - kobj_funcdesc **m_fdbuckets; /* head of FD bucket's */ - kobj_funcdesc *m_fdchains; /* head of FD hash list */ - kobj_funcdesc *m_fdfree; /* next free FD bucket */ - char *m_fstrtab; /* strtab for func descs */ -} module_mach; -#else typedef void module_mach; -#endif struct module { int total_allocated; @@ -206,8 +180,6 @@ extern int kobj_filbuf(struct _buf *); extern void kobj_sync(void); #if defined(__i386) || defined(__sparc) || defined(__amd64) extern void kobj_vmem_init(vmem_t **, vmem_t **); -#elif defined(__ia64) -extern void kobj_vmem_init(vmem_t **, vmem_t **, vmem_t **); #else #error "ISA not supported" #endif diff --git a/usr/src/uts/common/sys/pci_impl.h b/usr/src/uts/common/sys/pci_impl.h index fb76c5eb09..e5fb73d135 100644 --- a/usr/src/uts/common/sys/pci_impl.h +++ b/usr/src/uts/common/sys/pci_impl.h @@ -52,7 +52,7 @@ extern "C" { #define PCI_MECHANISM_UNKNOWN -1 #define PCI_MECHANISM_NONE 0 -#if defined(__i386) || defined(__ia64) || defined(__amd64) +#if defined(__i386) || defined(__amd64) #define PCI_MECHANISM_1 1 #define PCI_MECHANISM_2 2 #else diff --git a/usr/src/uts/common/sys/systm.h b/usr/src/uts/common/sys/systm.h index 6576e0b657..36ef678d4a 100644 --- a/usr/src/uts/common/sys/systm.h +++ b/usr/src/uts/common/sys/systm.h @@ -81,10 +81,6 @@ extern caddr_t s_text; /* start of kernel text segment */ extern caddr_t e_text; /* end of kernel text segment */ extern caddr_t s_data; /* start of kernel text segment */ extern caddr_t e_data; /* end of kernel text segment */ -#if defined(__ia64) -extern caddr_t s_sdata; /* start of kernel small data segment */ -extern caddr_t e_sdata; /* end of kernel small data segment */ -#endif /* __ia64 */ extern pgcnt_t availrmem; /* Available resident (not swapable) */ /* memory in pages. */ diff --git a/usr/src/uts/common/sys/thread.h b/usr/src/uts/common/sys/thread.h index 4966fb3516..805812e8f0 100644 --- a/usr/src/uts/common/sys/thread.h +++ b/usr/src/uts/common/sys/thread.h @@ -107,9 +107,6 @@ typedef struct _kthread { struct _kthread *t_link; /* dispq, sleepq, and free queue link */ caddr_t t_stk; /* base of stack (kernel sp value to use) */ -#if defined(__ia64) - caddr_t t_regstk; /* base of register stack (initial bsp value) */ -#endif void (*t_startpc)(void); /* PC where thread started */ struct cpu *t_bound_cpu; /* cpu bound to, or NULL if not bound */ short t_affinitycnt; /* nesting level of kernel affinity-setting */ @@ -277,9 +274,6 @@ typedef struct _kthread { struct copyops *t_copyops; /* copy in/out ops vector */ caddr_t t_stkbase; /* base of the the stack */ -#if defined(__ia64) - size_t t_stksize; /* size of the the stack */ -#endif struct page *t_red_pp; /* if non-NULL, redzone is mapped */ struct _afd t_activefd; /* active file descriptor table */ diff --git a/usr/src/uts/intel/sys/archsystm.h b/usr/src/uts/intel/sys/archsystm.h index 4127e669ab..99a8d89cc5 100644 --- a/usr/src/uts/intel/sys/archsystm.h +++ b/usr/src/uts/intel/sys/archsystm.h @@ -129,11 +129,7 @@ extern uint_t cpu_hwcap_flags; extern uint_t cpu_freq; extern uint64_t cpu_freq_hz; -#ifdef __ia64 -extern caddr_t ia64devmap(pfn_t, pgcnt_t, uint_t); -#else extern caddr_t i86devmap(pfn_t, pgcnt_t, uint_t); -#endif extern page_t *page_numtopp_alloc(pfn_t pfnum); extern void hwblkclr(void *, size_t); diff --git a/usr/src/uts/intel/sys/asm_linkage.h b/usr/src/uts/intel/sys/asm_linkage.h index 707f72a9bb..6dcc9c4f9f 100644 --- a/usr/src/uts/intel/sys/asm_linkage.h +++ b/usr/src/uts/intel/sys/asm_linkage.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,10 +33,6 @@ #include <ia32/sys/asm_linkage.h> /* XX64 x86/sys/asm_linkage.h */ -#elif defined(__ia64) - -#include <ia64/sys/asm_linkage.h> - #endif #endif /* _SYS_ASM_LINKAGE_H */ diff --git a/usr/src/uts/intel/sys/machelf.h b/usr/src/uts/intel/sys/machelf.h index 65133b8804..dec2e89db5 100644 --- a/usr/src/uts/intel/sys/machelf.h +++ b/usr/src/uts/intel/sys/machelf.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,9 +33,7 @@ extern "C" { #endif -#if defined(__ia64) -#include <sys/elf_ia64.h> -#elif defined(__amd64) +#if defined(__amd64) #include <sys/elf_amd64.h> #elif defined(__i386) #include <sys/elf_386.h> diff --git a/usr/src/uts/intel/sys/procfs_isa.h b/usr/src/uts/intel/sys/procfs_isa.h index 44a8b4dd1a..b7a6cc3582 100644 --- a/usr/src/uts/intel/sys/procfs_isa.h +++ b/usr/src/uts/intel/sys/procfs_isa.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -77,7 +77,7 @@ typedef uchar_t instr_t; * kernel view of the ia32 register set */ typedef uchar_t instr32_t; -#if defined(__ia64) || defined(__amd64) +#if defined(__amd64) #define NPRGREG32 _NGREG32 #define prgreg32_t greg32_t #define prgregset32_t gregset32_t diff --git a/usr/src/uts/intel/sys/promimpl.h b/usr/src/uts/intel/sys/promimpl.h index 9a4076ff55..699598925e 100644 --- a/usr/src/uts/intel/sys/promimpl.h +++ b/usr/src/uts/intel/sys/promimpl.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -42,11 +42,6 @@ #include <sys/types.h> #include <sys/promif.h> -#ifdef __ia64 -/* XXX Merced -- these includes are for the ia64 simulator */ -#include <sys/types_ia64.h> -#include <sys/ssc.h> -#endif #include <sys/dditypes.h> #include <sys/ddidmareq.h> #include <sys/ddi_impldefs.h> diff --git a/usr/src/uts/intel/sys/psw.h b/usr/src/uts/intel/sys/psw.h index b38da2a703..8b84f5ff3a 100644 --- a/usr/src/uts/intel/sys/psw.h +++ b/usr/src/uts/intel/sys/psw.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,10 +33,6 @@ #include <ia32/sys/psw.h> /* XX64 x86/sys/psw.h */ -#elif defined(__ia64) - -#include <ia64/sys/psw.h> - #endif #endif /* _SYS_PSW_H */ diff --git a/usr/src/uts/intel/sys/pte.h b/usr/src/uts/intel/sys/pte.h index 4b7a6a8ddc..09c009d421 100644 --- a/usr/src/uts/intel/sys/pte.h +++ b/usr/src/uts/intel/sys/pte.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,10 +33,6 @@ #include <ia32/sys/pte.h> /* XX64 x86/sys/pte.h */ -#elif defined(__ia64) - -#include <ia64/sys/pte.h> - #endif #endif /* _SYS_PTE_H */ diff --git a/usr/src/uts/intel/sys/stack.h b/usr/src/uts/intel/sys/stack.h index cb7e7cd576..5521acfc8f 100644 --- a/usr/src/uts/intel/sys/stack.h +++ b/usr/src/uts/intel/sys/stack.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,10 +33,6 @@ #include <ia32/sys/stack.h> /* XX64 x86/sys/stack.h */ -#elif defined(__ia64) - -#include <ia64/sys/stack.h> - #endif #endif /* _SYS_STACK_H */ diff --git a/usr/src/uts/intel/sys/trap.h b/usr/src/uts/intel/sys/trap.h index c87f40b9d5..d412386176 100644 --- a/usr/src/uts/intel/sys/trap.h +++ b/usr/src/uts/intel/sys/trap.h @@ -20,7 +20,7 @@ * CDDL HEADER END */ /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2005 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -33,10 +33,6 @@ #include <ia32/sys/trap.h> /* XX64 x86/sys/trap.h */ -#elif defined(__ia64) - -#include <ia64/sys/trap.h> - #endif #endif /* _SYS_TRAP_H */ |