summaryrefslogtreecommitdiff
path: root/usr/src
diff options
context:
space:
mode:
authorseizo <none@none>2005-10-04 11:51:33 -0700
committerseizo <none@none>2005-10-04 11:51:33 -0700
commite6cafd9189c9f5aceb474c07a1c61dcc5b1c4ae5 (patch)
tree8b1fa7425126e7ae01f0ccb3db21017f5497895c /usr/src
parentc2e7b48d563d0e56b74d853118918af352e75cbb (diff)
downloadillumos-joyent-e6cafd9189c9f5aceb474c07a1c61dcc5b1c4ae5.tar.gz
6309061 link_audit should use __asm__ with gcc
Diffstat (limited to 'usr/src')
-rw-r--r--usr/src/cmd/sgs/link_audit/common/who.h16
-rw-r--r--usr/src/cmd/sgs/packages/common/SUNWonld-README8
2 files changed, 16 insertions, 8 deletions
diff --git a/usr/src/cmd/sgs/link_audit/common/who.h b/usr/src/cmd/sgs/link_audit/common/who.h
index 868bd27506..c07b6e25ad 100644
--- a/usr/src/cmd/sgs/link_audit/common/who.h
+++ b/usr/src/cmd/sgs/link_audit/common/who.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.
*/
@@ -53,13 +53,13 @@ typedef struct objinfo {
caddr_t o_lpc; /* low PC */
caddr_t o_hpc; /* high PC */
int o_fd; /* file descriptor */
- Elf * o_elf; /* Elf pointer */
- Elf_Sym * o_syms; /* symbol table */
+ Elf *o_elf; /* Elf pointer */
+ Elf_Sym *o_syms; /* symbol table */
uint_t o_symcnt; /* # of symbols */
- const char * o_strs; /* symbol string table */
- Link_map * o_lmp;
+ const char *o_strs; /* symbol string table */
+ Link_map *o_lmp;
uint_t o_flags;
- struct objinfo * o_next;
+ struct objinfo *o_next;
} Objinfo;
#define FLG_OB_NOSYMS 0x0001 /* no symbols available for obj */
@@ -67,7 +67,11 @@ typedef struct objinfo {
#if defined(__sparc) || defined(__sparcv9)
+#if defined(__GNUC__)
+#define FLUSHWIN() __asm__("ta 3");
+#else /* !__GNUC__ */
#define FLUSHWIN() asm("ta 3");
+#endif
#define FRAME_PTR_INDEX 1
#define SKIP_FRAMES 0
#endif
diff --git a/usr/src/cmd/sgs/packages/common/SUNWonld-README b/usr/src/cmd/sgs/packages/common/SUNWonld-README
index 83f376d2b7..3453a7d37f 100644
--- a/usr/src/cmd/sgs/packages/common/SUNWonld-README
+++ b/usr/src/cmd/sgs/packages/common/SUNWonld-README
@@ -1500,8 +1500,6 @@ All the above change is incorporated in the following patches:
6301218 Matlab dumps core on startup when running on 112963-22 (D)
--------------------------------------------------------------------------------
All the above change is incorporated in the following patches:
- Solaris/SunOS 5.10_sparc patch T117461-06
- Solaris/SunOS 5.10_x86 patch T118345-08
Solaris/SunOS 5.9_sparc patch T112963-23
Solaris/SunOS 5.9_x86 patch T113986-19
Solaris/SunOS 5.8_sparc patch T109147-38
@@ -1524,3 +1522,9 @@ All the above change is incorporated in the following patches:
PSARC 2005/514 - AMD64 - large section support
6314743 Linker: incorrect resolution for R_AMD64_GOTPC32
6311865 Linker: x86 medium model; invalid ELF program header
+--------------------------------------------------------------------------------
+All the above change is incorporated in the following patches:
+ Solaris/SunOS 5.10_sparc patch T117461-XX
+ Solaris/SunOS 5.10_x86 patch T118345-XX
+--------------------------------------------------------------------------------
+6309061 link_audit should use __asm__ with gcc