From 4f3d158a74433c3c024dafc69833c832df533791 Mon Sep 17 00:00:00 2001 From: jb Date: Sat, 26 Apr 2008 03:47:34 +0000 Subject: Apply FreeBSD changes. --- cddl/contrib/opensolaris/cmd/sgs/include/alist.h | 4 ++++ cddl/contrib/opensolaris/cmd/sgs/include/debug.h | 11 ++++++++--- cddl/contrib/opensolaris/cmd/sgs/include/sgs.h | 15 ++++++++++++--- 3 files changed, 24 insertions(+), 6 deletions(-) (limited to 'cddl/contrib/opensolaris/cmd/sgs/include') diff --git a/cddl/contrib/opensolaris/cmd/sgs/include/alist.h b/cddl/contrib/opensolaris/cmd/sgs/include/alist.h index e92811f..c27160b 100644 --- a/cddl/contrib/opensolaris/cmd/sgs/include/alist.h +++ b/cddl/contrib/opensolaris/cmd/sgs/include/alist.h @@ -39,7 +39,11 @@ extern "C" { #endif #include +#if defined(sun) #include +#else +#include +#endif /* * An Alist implements array lists. The functionality is similar to diff --git a/cddl/contrib/opensolaris/cmd/sgs/include/debug.h b/cddl/contrib/opensolaris/cmd/sgs/include/debug.h index 1b733bb..0a42f8d 100644 --- a/cddl/contrib/opensolaris/cmd/sgs/include/debug.h +++ b/cddl/contrib/opensolaris/cmd/sgs/include/debug.h @@ -405,6 +405,7 @@ extern uintptr_t Dbg_setup(const char *, Dbg_desc *); #define Dbg_unused_file Dbg64_unused_file #define Dbg_unused_lcinterface Dbg64_unused_lcinterface +#define Dbg_unused_path Dbg64_unused_path #define Dbg_unused_sec Dbg64_unused_sec #define Dbg_unused_unref Dbg64_unused_unref @@ -607,6 +608,7 @@ extern uintptr_t Dbg_setup(const char *, Dbg_desc *); #define Dbg_unused_file Dbg32_unused_file #define Dbg_unused_lcinterface Dbg32_unused_lcinterface +#define Dbg_unused_path Dbg32_unused_path #define Dbg_unused_sec Dbg32_unused_sec #define Dbg_unused_unref Dbg32_unused_unref @@ -676,7 +678,7 @@ extern void Dbg_file_del_rescan(Lm_list *); extern void Dbg_file_delete(Rt_map *); extern void Dbg_file_dlclose(Lm_list *, const char *, int); extern void Dbg_file_dldump(Rt_map *, const char *, int); -extern void Dbg_file_dlopen(Rt_map *, const char *, int); +extern void Dbg_file_dlopen(Rt_map *, const char *, int *, int); extern void Dbg_file_elf(Lm_list *, const char *, ulong_t, ulong_t, ulong_t, ulong_t, const char *, Aliste); extern void Dbg_file_filtee(Lm_list *, const char *, const char *, int); @@ -708,7 +710,7 @@ extern void Dbg_libs_found(Lm_list *, const char *, int); extern void Dbg_libs_ignore(Lm_list *, const char *); extern void Dbg_libs_init(Lm_list *, List *, List *); extern void Dbg_libs_l(Lm_list *, const char *, const char *); -extern void Dbg_libs_path(Lm_list *, const char *, Half, const char *); +extern void Dbg_libs_path(Lm_list *, const char *, uint_t, const char *); extern void Dbg_libs_req(Lm_list *, const char *, const char *, const char *); extern void Dbg_libs_update(Lm_list *, List *, List *); @@ -805,7 +807,8 @@ extern void Dbg_syms_ar_resolve(Lm_list *, Xword, Elf_Arsym *, extern void Dbg_syms_ar_title(Lm_list *, const char *, int); extern void Dbg_syms_created(Lm_list *, const char *); extern void Dbg_syms_discarded(Lm_list *, Sym_desc *); -extern void Dbg_syms_dlsym(Rt_map *, const char *, const char *, int); +extern void Dbg_syms_dlsym(Rt_map *, const char *, int *, const char *, + int); extern void Dbg_syms_dup_sort_addr(Lm_list *, const char *, const char *, const char *, Addr); extern void Dbg_syms_entered(Ofl_desc *, Sym *, Sym_desc *); @@ -858,6 +861,8 @@ extern void Dbg_util_wait(Rt_map *, Rt_map *, int); extern void Dbg_unused_file(Lm_list *, const char *, int, uint_t); extern void Dbg_unused_lcinterface(Rt_map *, Rt_map *, int); +extern void Dbg_unused_path(Lm_list *, const char *, uint_t, uint_t, + const char *); extern void Dbg_unused_sec(Lm_list *, Is_desc *); extern void Dbg_unused_unref(Rt_map *, const char *); diff --git a/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h b/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h index a1ec44b..9c37af2 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 +#if defined(sun) #include +#else +#include +#endif #include #include #include @@ -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. */ -- cgit v1.1