aboutsummaryrefslogtreecommitdiff
path: root/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
diff options
context:
space:
mode:
authorJohn Birrell <jb@FreeBSD.org>2008-04-26 03:47:34 +0000
committerJohn Birrell <jb@FreeBSD.org>2008-04-26 03:47:34 +0000
commit0f497243593650e2a6a533b0c4330dde128f8aab (patch)
tree3a56ee41f4a10f552cb957106e0cec68cafaa045 /cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
parent9f1fe401d93a3361cc7f0bf5c0948cc6a0060f32 (diff)
downloadsrc-0f497243593650e2a6a533b0c4330dde128f8aab.tar.gz
src-0f497243593650e2a6a533b0c4330dde128f8aab.zip
Apply FreeBSD changes.
Notes
Notes: svn path=/head/; revision=178540
Diffstat (limited to 'cddl/contrib/opensolaris/cmd/sgs/include/sgs.h')
-rw-r--r--cddl/contrib/opensolaris/cmd/sgs/include/sgs.h15
1 files changed, 12 insertions, 3 deletions
diff --git a/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h b/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
index a1ec44b2cce9..9c37af2a1d4a 100644
--- a/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
+++ b/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h
@@ -35,7 +35,6 @@
#pragma ident "%Z%%M% %I% %E% SMI"
-
#ifdef __cplusplus
extern "C" {
#endif
@@ -49,7 +48,11 @@ extern "C" {
#ifndef _ASM
#include <sys/types.h>
+#if defined(sun)
#include <sys/machelf.h>
+#else
+#include <elf.h>
+#endif
#include <stdlib.h>
#include <libelf.h>
#include <assert.h>
@@ -66,8 +69,14 @@ extern "C" {
#ifndef _ASM
-extern const char link_ver_string[]; /* Linker version id */
- /* see libconv/{plat}/vernote.s */
+/*
+ * link_ver_string[] contains a version string for use by the link-editor
+ * and all other linker components. It is found in libconv, and is
+ * generated by sgs/libconv/common/bld_vernote.ksh. That script produces
+ * libconv/{plat}/vernote.s, which is in turn assembled/linked into
+ * libconv.
+ */
+extern const char link_ver_string[];
/*
* Macro to round to next double word boundary.
*/