diff options
Diffstat (limited to 'usr/src/uts/common/sys')
| -rw-r--r-- | usr/src/uts/common/sys/Makefile | 1 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/elf.h | 6 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/elf_ia64.h | 131 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/ieeefp.h | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/isa_defs.h | 56 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/kobj.h | 28 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/pci_impl.h | 2 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/systm.h | 4 | ||||
| -rw-r--r-- | usr/src/uts/common/sys/thread.h | 6 |
9 files changed, 5 insertions, 233 deletions
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 */ |