diff options
| author | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
|---|---|---|
| committer | Keith M Wesolowski <wesolows@foobazco.org> | 2014-08-20 20:04:47 +0000 |
| commit | 5f00496ef2e39b976b062f196ff01a99fd4864a4 (patch) | |
| tree | 20be9cbc8f4b7ed3e616ce23552728083801e846 /usr/src/head/link.h | |
| parent | af59b1a40df03681c1c8129aea7b1f5f52f2bcea (diff) | |
| parent | 86bb58aec7165f8a0303564575c65e5a2ad58bf1 (diff) | |
| download | illumos-joyent-release-20140821.tar.gz | |
[illumos-gate merge]20140821release-20140821
commit 86bb58aec7165f8a0303564575c65e5a2ad58bf1
5095 panic when adding a duplicate dbuf to dn_dbufs
commit 60a61f7adabc73a7a0cb70d200ac2a6735f4a6e8
5092 env files don't need to define LOCKNAME by default
5091 illumos.sh env file's LOCKNAME definition is busted
commit 5e3f545c431ec4bce3e1b52f3f81bc9befe501f2
4989 removal of ntfsprogs and parted
commit ba3594ba9b5dd4c846c472a8d657edcb7c8109ac
5066 remove support for non-ANSI compilation
5068 Remove SCCSID() macro from <macros.h>
commit d8ccf998f9c944b8cf27ed840c376f9b79ebce5c
5087 8-bit inline atomic {add,or,and} use wrong reg constraints on x86
Manifests:
usr/src/pkg/manifests/SUNWntfsprogs.mf (torch library)
usr/src/pkg/manifests/SUNWparted.mf (torch headers)
usr/src/pkg/manifests/system-file-system-ntfsprogs.mf
usr/src/pkg/manifests/system-storage-parted.mf
Diffstat (limited to 'usr/src/head/link.h')
| -rw-r--r-- | usr/src/head/link.h | 43 |
1 files changed, 1 insertions, 42 deletions
diff --git a/usr/src/head/link.h b/usr/src/head/link.h index b47273d265..13a3332ea9 100644 --- a/usr/src/head/link.h +++ b/usr/src/head/link.h @@ -19,6 +19,7 @@ * CDDL HEADER END */ /* + * Copyright 2014 Garrett D'Amore <garrett@damore.org> * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved. */ @@ -46,7 +47,6 @@ extern "C" { * 32bit, or not in the large file environment. */ #if !defined(_ILP32) || _FILE_OFFSET_BITS != 64 -#ifdef __STDC__ #include <libelf.h> extern uint_t ld_version(uint_t); extern void ld_input_done(uint_t *); @@ -73,27 +73,6 @@ extern void ld_section64(const char *, Elf64_Shdr *, Elf64_Word, Elf_Data *, Elf *); #endif /* (defined(_LP64) || defined(_LONGLONG_TYPE) */ -#else -extern void ld_version(); -extern void ld_input_done(); - -extern void ld_start(); -extern void ld_atexit(); -extern void ld_open(); -extern void ld_file(); -extern void ld_input_section(); -extern void ld_section(); - -#if defined(_LP64) || defined(_LONGLONG_TYPE) -extern void ld_start64(); -extern void ld_atexit64(); -extern void ld_open64(); -extern void ld_file64(); -extern void ld_input_section64(); -extern void ld_section64(); - -#endif /* (defined(_LP64) || defined(_LONGLONG_TYPE) */ -#endif /* __STDC__ */ #endif /* !defined(_ILP32) || _FILE_OFFSET_BITS != 64 */ /* @@ -224,7 +203,6 @@ typedef unsigned int uintptr_t; #endif -#ifdef __STDC__ extern uint_t la_version(uint_t); extern void la_activity(uintptr_t *, uint_t); extern void la_preinit(uintptr_t *); @@ -254,25 +232,7 @@ extern uintptr_t la_i86_pltenter(Elf32_Sym *, uint_t, uintptr_t *, extern uintptr_t la_pltexit(Elf32_Sym *, uint_t, uintptr_t *, uintptr_t *, uintptr_t); #endif /* _LP64 */ -#else /* __STDC__ */ -extern uint_t la_version(); -extern void la_preinit(); -extern uint_t la_objopen(); -extern uint_t la_objclose(); -extern int la_objfilter(); -#if defined(_LP64) -extern uintptr_t la_sparcv9_pltenter(); -extern uintptr_t la_pltexit64(); -extern uintptr_t la_symbind64(); -#else /* _ILP32 */ -extern uintptr_t la_sparcv8_pltenter(); -extern uintptr_t la_i86_pltenter(); -extern uintptr_t la_pltexit(); -extern uintptr_t la_symbind32(); -#endif /* _LP64 */ -#endif /* __STDC__ */ -#ifdef __STDC__ /* * The ElfW() macro is a GNU/Linux feature, provided as support for * the dl_phdr_info structure used by dl_phdr_iterate(), which also @@ -326,7 +286,6 @@ struct dl_phdr_info { extern int dl_iterate_phdr(int (*)(struct dl_phdr_info *, size_t, void *), void *); -#endif /* __STDC__ */ #endif /* _ASM */ #endif /* _KERNEL */ |