diff options
Diffstat (limited to 'usr/src/cmd')
-rw-r--r-- | usr/src/cmd/sgs/dump/common/util.c | 209 | ||||
-rw-r--r-- | usr/src/cmd/sgs/packages/Makefile | 6 | ||||
-rw-r--r-- | usr/src/cmd/sgs/packages/inc.flg | 3 | ||||
-rw-r--r-- | usr/src/cmd/stat/common/dsr.c | 4 |
4 files changed, 6 insertions, 216 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 { |