diff options
| author | raf <none@none> | 2008-06-06 14:02:15 -0700 |
|---|---|---|
| committer | raf <none@none> | 2008-06-06 14:02:15 -0700 |
| commit | 7257d1b4d25bfac0c802847390e98a464fd787ac (patch) | |
| tree | c73fc17df920bc2ca9438c25fea3529890296afd /usr/src/cmd/sgs/libelf | |
| parent | 455903679f53d12d92035adc60bc7c3d95e6b6a2 (diff) | |
| download | illumos-joyent-7257d1b4d25bfac0c802847390e98a464fd787ac.tar.gz | |
PSARC 2008/309 expunge synonyms.h
6700179 expunge synonyms.h
--HG--
rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h
rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c
rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h
rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h
rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h
rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c
rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c
rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c
rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c
rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c
rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c
rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h
rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c
rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c
rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg
rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h
rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h
rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h
rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh
rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c
rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c
Diffstat (limited to 'usr/src/cmd/sgs/libelf')
42 files changed, 281 insertions, 639 deletions
diff --git a/usr/src/cmd/sgs/libelf/common/ar.c b/usr/src/cmd/sgs/libelf/common/ar.c index f01e2b1427..9cfa68ad4f 100644 --- a/usr/src/cmd/sgs/libelf/common/ar.c +++ b/usr/src/cmd/sgs/libelf/common/ar.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,19 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1988 AT&T - * - * All Rights Reserved - * + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* - * Copyright (c) 1999 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright (c) 1988 AT&T + * All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <ar.h> #include <stdlib.h> #include <memory.h> @@ -100,7 +97,7 @@ static const char fmag[] = ARFMAG; * Returns the converted integer of the string being scaned. */ unsigned long -_elf_number(char * p, char * end, int base) +_elf_number(char *p, char *end, int base) { register unsigned c; register unsigned long n = 0; @@ -125,7 +122,7 @@ _elf_number(char * p, char * end, int base) * Converts ascii file representation to the binary memory values. */ Member * -_elf_armem(Elf * elf, char * file, size_t fsz) +_elf_armem(Elf *elf, char *file, size_t fsz) { register struct ar_hdr *f = (struct ar_hdr *)file; register Member *m; @@ -167,7 +164,7 @@ _elf_armem(Elf * elf, char * file, size_t fsz) l->m_next = 0; l->m_free = (Memident *)(l + 1); l->m_end = (Memident *)((uintptr_t)l->m_free + - (sizeof (Memident) * MEMIDENTNO)); + (sizeof (Memident) * MEMIDENTNO)); if (elf->ed_memlist == 0) elf->ed_memlist = l; @@ -205,7 +202,7 @@ _elf_armem(Elf * elf, char * file, size_t fsz) register unsigned long j; j = _elf_number(&f->ar_name[1], - &f->ar_name[ARSZ(ar_name)], 10); + &f->ar_name[ARSZ(ar_name)], 10); if (j < elf->ed_arstrsz) m->m_hdr.ar_name = elf->ed_arstr + j; else { @@ -224,18 +221,18 @@ _elf_armem(Elf * elf, char * file, size_t fsz) } m->m_hdr.ar_date = (time_t)_elf_number(f->ar_date, - &f->ar_date[ARSZ(ar_date)], 10); + &f->ar_date[ARSZ(ar_date)], 10); /* LINTED */ m->m_hdr.ar_uid = (uid_t)_elf_number(f->ar_uid, - &f->ar_uid[ARSZ(ar_uid)], 10); + &f->ar_uid[ARSZ(ar_uid)], 10); /* LINTED */ m->m_hdr.ar_gid = (gid_t)_elf_number(f->ar_gid, - &f->ar_gid[ARSZ(ar_gid)], 10); + &f->ar_gid[ARSZ(ar_gid)], 10); /* LINTED */ m->m_hdr.ar_mode = (mode_t)_elf_number(f->ar_mode, - &f->ar_mode[ARSZ(ar_mode)], 8); + &f->ar_mode[ARSZ(ar_mode)], 8); m->m_hdr.ar_size = (off_t)_elf_number(f->ar_size, - &f->ar_size[ARSZ(ar_size)], 10); + &f->ar_size[ARSZ(ar_size)], 10); return (m); } @@ -260,11 +257,11 @@ _elf_armem(Elf * elf, char * file, size_t fsz) void _elf_arinit(Elf * elf) { - char * base = elf->ed_ident; - register char * end = base + elf->ed_fsz; - register struct ar_hdr * a; - register char * hdr = base + SARMAG; - register char * mem; + char *base = elf->ed_ident; + register char *end = base + elf->ed_fsz; + register struct ar_hdr *a; + register char *hdr = base + SARMAG; + register char *mem; int j; size_t sz = SARMAG; @@ -298,7 +295,7 @@ _elf_arinit(Elf * elf) sz) != OK_YES) return; if (elf->ed_vm == 0) { - char * nmem; + char *nmem; if ((nmem = malloc(sz)) == 0) { _elf_seterr(EMEM_ARSTR, errno); return; diff --git a/usr/src/cmd/sgs/libelf/common/begin.c b/usr/src/cmd/sgs/libelf/common/begin.c index 48cc7942a5..d4e3639207 100644 --- a/usr/src/cmd/sgs/libelf/common/begin.c +++ b/usr/src/cmd/sgs/libelf/common/begin.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,24 +18,19 @@ * * CDDL HEADER END */ + /* - * Copyright (c) 1988 AT&T - * All Rights Reserved - * + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright (c) 1988 AT&T + * All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.13 */ - -#pragma weak elf_begin = _elf_begin -#pragma weak elf_memory = _elf_memory - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <ar.h> #include <stdlib.h> #include <memory.h> @@ -138,7 +132,7 @@ _elf_regular(int fd, unsigned flags) /* initialize regular file */ Elf * _elf_config(Elf * elf) { - char * base; + char *base; unsigned encode; ELFRWLOCKINIT(&elf->ed_rwlock); @@ -202,7 +196,7 @@ _elf_config(Elf * elf) } Elf * -elf_memory(char * image, size_t sz) +elf_memory(char *image, size_t sz) { Elf *elf; unsigned work; @@ -325,7 +319,7 @@ elf_begin(int fd, Elf_Cmd cmd, Elf *ref) case ELF_C_IMAGE: if (ref) { - char * image; + char *image; size_t imagesz; ELFRLOCK(ref); if ((image = ref->ed_wrimage) == 0) { diff --git a/usr/src/cmd/sgs/libelf/common/checksum.c b/usr/src/cmd/sgs/libelf/common/checksum.c index 2bb2d8041f..780c1f2c16 100644 --- a/usr/src/cmd/sgs/libelf/common/checksum.c +++ b/usr/src/cmd/sgs/libelf/common/checksum.c @@ -18,8 +18,9 @@ * * CDDL HEADER END */ + /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -31,7 +32,6 @@ #pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <errno.h> #include <libelf.h> #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/clscook.c b/usr/src/cmd/sgs/libelf/common/clscook.c index 66c5150cbe..f43d9a688c 100644 --- a/usr/src/cmd/sgs/libelf/common/clscook.c +++ b/usr/src/cmd/sgs/libelf/common/clscook.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,15 +18,15 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + #pragma ident "%Z%%M% %I% %E% SMI" /* @@ -36,8 +35,6 @@ * comment in cook.c for more info. */ - -#include "syn.h" #include <string.h> #include <ar.h> #include <stdlib.h> diff --git a/usr/src/cmd/sgs/libelf/common/cntl.c b/usr/src/cmd/sgs/libelf/common/cntl.c index 581287f559..f3b59b1671 100644 --- a/usr/src/cmd/sgs/libelf/common/cntl.c +++ b/usr/src/cmd/sgs/libelf/common/cntl.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,26 +18,21 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ - -#pragma weak elf_cntl = _elf_cntl +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" - int elf_cntl(Elf * elf, Elf_Cmd cmd) { diff --git a/usr/src/cmd/sgs/libelf/common/cook.c b/usr/src/cmd/sgs/libelf/common/cook.c index 8e130b75b1..746a2285b5 100644 --- a/usr/src/cmd/sgs/libelf/common/cook.c +++ b/usr/src/cmd/sgs/libelf/common/cook.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,18 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.10 */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ + +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <string.h> #include <ar.h> #include <stdlib.h> diff --git a/usr/src/cmd/sgs/libelf/common/data.c b/usr/src/cmd/sgs/libelf/common/data.c index 2d3b108cd6..95b4401354 100644 --- a/usr/src/cmd/sgs/libelf/common/data.c +++ b/usr/src/cmd/sgs/libelf/common/data.c @@ -19,22 +19,19 @@ * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3 */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <libelf.h> #include "decl.h" - /* * Global data * _elf_byte Fill byte for file padding. See elf_fill(). diff --git a/usr/src/cmd/sgs/libelf/common/end.c b/usr/src/cmd/sgs/libelf/common/end.c index 2b59b6e6bd..134c8ac25e 100644 --- a/usr/src/cmd/sgs/libelf/common/end.c +++ b/usr/src/cmd/sgs/libelf/common/end.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,29 +18,23 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.11 */ - -#pragma weak elf_end = _elf_end - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <ar.h> #include <stdlib.h> #include "libelf.h" #include "decl.h" #include "member.h" - int elf_end(Elf * elf) { diff --git a/usr/src/cmd/sgs/libelf/common/error.c b/usr/src/cmd/sgs/libelf/common/error.c index 5b5a3d4d1b..21433d05eb 100644 --- a/usr/src/cmd/sgs/libelf/common/error.c +++ b/usr/src/cmd/sgs/libelf/common/error.c @@ -20,23 +20,19 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.16 */ +#pragma ident "%Z%%M% %I% %E% SMI" - -#pragma weak elf_errmsg = _elf_errmsg -#pragma weak elf_errno = _elf_errno - -#include "syn.h" #include <thread.h> #include <pthread.h> #include <stdlib.h> #include <string.h> #include <stdio.h> #include <libelf.h> +#include <libintl.h> #include "msg.h" #include "decl.h" @@ -94,13 +90,11 @@ thr_keycreate_once(thread_key_t *keyp, void (*destructor)(void *)) #endif /* NATIVE_BUILD */ -extern char *_dgettext(const char *, const char *); - const char * _libelf_msg(Msg mid) { - return (_dgettext(MSG_ORIG(MSG_SUNW_OST_SGS), MSG_ORIG(mid))); + return (dgettext(MSG_ORIG(MSG_SUNW_OST_SGS), MSG_ORIG(mid))); } diff --git a/usr/src/cmd/sgs/libelf/common/fill.c b/usr/src/cmd/sgs/libelf/common/fill.c index 6a76876da7..bc310148d4 100644 --- a/usr/src/cmd/sgs/libelf/common/fill.c +++ b/usr/src/cmd/sgs/libelf/common/fill.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,18 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma weak elf_fill = _elf_fill +#pragma ident "%Z%%M% %I% %E% SMI" #include <libelf.h> -#include "syn.h" #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/flag.c b/usr/src/cmd/sgs/libelf/common/flag.c index 3cb47244c5..173d517242 100644 --- a/usr/src/cmd/sgs/libelf/common/flag.c +++ b/usr/src/cmd/sgs/libelf/common/flag.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,26 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ - -#pragma weak elf_flagdata = _elf_flagdata -#pragma weak elf_flagehdr = _elf_flagehdr -#pragma weak elf_flagelf = _elf_flagelf -#pragma weak elf_flagphdr = _elf_flagphdr -#pragma weak elf_flagscn = _elf_flagscn -#pragma weak elf_flagshdr = _elf_flagshdr +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/getarhdr.c b/usr/src/cmd/sgs/libelf/common/getarhdr.c index 6398a11afe..4b48e153d1 100644 --- a/usr/src/cmd/sgs/libelf/common/getarhdr.c +++ b/usr/src/cmd/sgs/libelf/common/getarhdr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,18 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.7 */ - -#pragma weak elf_getarhdr = _elf_getarhdr +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" #include <ar.h> -#include "syn.h" #include "libelf.h" #include "decl.h" #include "member.h" diff --git a/usr/src/cmd/sgs/libelf/common/getarsym.c b/usr/src/cmd/sgs/libelf/common/getarsym.c index 66f353fcbf..0163ef06ae 100644 --- a/usr/src/cmd/sgs/libelf/common/getarsym.c +++ b/usr/src/cmd/sgs/libelf/common/getarsym.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ - -#pragma weak elf_getarsym = _elf_getarsym - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <stdlib.h> #include <errno.h> #include <libelf.h> @@ -62,7 +56,7 @@ static Elf_Void *arsym _((Byte *, size_t, size_t *)); Elf_Void * -arsym(Byte * off, size_t sz, size_t * e) +arsym(Byte *off, size_t sz, size_t *e) { char *endstr = (char *)off + sz; register char *str; @@ -127,11 +121,11 @@ arsym(Byte * off, size_t sz, size_t * e) Elf_Arsym * -elf_getarsym(Elf * elf, size_t * ptr) +elf_getarsym(Elf *elf, size_t *ptr) { - Byte * as; + Byte *as; size_t sz; - Elf_Arsym * rc; + Elf_Arsym *rc; if (ptr != 0) *ptr = 0; diff --git a/usr/src/cmd/sgs/libelf/common/getbase.c b/usr/src/cmd/sgs/libelf/common/getbase.c index 08bcb9557b..44d6c9eb15 100644 --- a/usr/src/cmd/sgs/libelf/common/getbase.c +++ b/usr/src/cmd/sgs/libelf/common/getbase.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ - -#pragma weak elf_getbase = _elf_getbase +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/getdata.c b/usr/src/cmd/sgs/libelf/common/getdata.c index 67e4dd549c..52ff4c0761 100644 --- a/usr/src/cmd/sgs/libelf/common/getdata.c +++ b/usr/src/cmd/sgs/libelf/common/getdata.c @@ -18,23 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.16 */ - - -#pragma weak elf_getdata = _elf_getdata - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <stdlib.h> #include <assert.h> #include <errno.h> @@ -265,9 +259,9 @@ _elf_locked_getdata(Elf_Scn * scn, Elf_Data * data) if (d->db_data.d_size <= src.d_size) { d->db_data.d_buf = (Elf_Void *)(elf->ed_ident + - d->db_off); + d->db_off); if (((uintptr_t)d->db_data.d_buf - % ALIGN(elf)[d->db_data.d_type]) == 0) { + % ALIGN(elf)[d->db_data.d_type]) == 0) { break; } else { /* Failure: Restore NULL buffer pointer */ d->db_data.d_buf = 0; diff --git a/usr/src/cmd/sgs/libelf/common/getehdr.c b/usr/src/cmd/sgs/libelf/common/getehdr.c index 4b47241bf8..d20a93651f 100644 --- a/usr/src/cmd/sgs/libelf/common/getehdr.c +++ b/usr/src/cmd/sgs/libelf/common/getehdr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,23 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8 */ - - -#pragma weak elf32_getehdr = _elf32_getehdr - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/getident.c b/usr/src/cmd/sgs/libelf/common/getident.c index 516e89b315..b51c2dc5d2 100644 --- a/usr/src/cmd/sgs/libelf/common/getident.c +++ b/usr/src/cmd/sgs/libelf/common/getident.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,29 +18,26 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.8 */ - -#pragma weak elf_getident = _elf_getident +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" char * -elf_getident(Elf * elf, size_t * ptr) +elf_getident(Elf *elf, size_t *ptr) { size_t sz = 0; - char * id = 0; + char *id = 0; if (elf != 0) { ELFRLOCK(elf) diff --git a/usr/src/cmd/sgs/libelf/common/getphdr.c b/usr/src/cmd/sgs/libelf/common/getphdr.c index cff8839f63..0e0aaf67d3 100644 --- a/usr/src/cmd/sgs/libelf/common/getphdr.c +++ b/usr/src/cmd/sgs/libelf/common/getphdr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.10 */ - -#pragma weak elf32_getphdr = _elf32_getphdr - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/getscn.c b/usr/src/cmd/sgs/libelf/common/getscn.c index f5090ab86c..2416f2cfb4 100644 --- a/usr/src/cmd/sgs/libelf/common/getscn.c +++ b/usr/src/cmd/sgs/libelf/common/getscn.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,20 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.10 */ - -#pragma weak elf_getscn = _elf_getscn +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/getshdr.c b/usr/src/cmd/sgs/libelf/common/getshdr.c index 76dad9da5a..910bad0852 100644 --- a/usr/src/cmd/sgs/libelf/common/getshdr.c +++ b/usr/src/cmd/sgs/libelf/common/getshdr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,19 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma weak elf32_getshdr = _elf32_getshdr +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/hash.c b/usr/src/cmd/sgs/libelf/common/hash.c index 45dbc464ce..f7d57f4e80 100644 --- a/usr/src/cmd/sgs/libelf/common/hash.c +++ b/usr/src/cmd/sgs/libelf/common/hash.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,28 +18,22 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 2000 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ - -#pragma weak elf_hash = _elf_hash - - -#include "syn.h" +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" /* * The elf_hash() routine as defined by the gABI */ unsigned long -elf_hash(const char * ename) +elf_hash(const char *ename) { unsigned int hval = 0; diff --git a/usr/src/cmd/sgs/libelf/common/input.c b/usr/src/cmd/sgs/libelf/common/input.c index 8a4b950346..b9dcaac864 100644 --- a/usr/src/cmd/sgs/libelf/common/input.c +++ b/usr/src/cmd/sgs/libelf/common/input.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,19 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <unistd.h> #include <stdlib.h> #include <memory.h> @@ -274,7 +271,7 @@ _elf_inmap(Elf * elf) void -_elf_unmap(char * p, size_t sz) +_elf_unmap(char *p, size_t sz) { if (p == 0 || sz == 0) return; diff --git a/usr/src/cmd/sgs/libelf/common/kind.c b/usr/src/cmd/sgs/libelf/common/kind.c index 0c9c31421b..e4f22addde 100644 --- a/usr/src/cmd/sgs/libelf/common/kind.c +++ b/usr/src/cmd/sgs/libelf/common/kind.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ - -#pragma weak elf_kind = _elf_kind +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/llib-lelf b/usr/src/cmd/sgs/libelf/common/llib-lelf index 291282b513..2f6c6db9e2 100644 --- a/usr/src/cmd/sgs/libelf/common/llib-lelf +++ b/usr/src/cmd/sgs/libelf/common/llib-lelf @@ -18,8 +18,6 @@ * * CDDL HEADER END */ -/* LINTLIBRARY */ -/* PROTOLIB1 */ /* * Copyright 2008 Sun Microsystems, Inc. All rights reserved. @@ -28,6 +26,9 @@ #pragma ident "%Z%%M% %I% %E% SMI" +/* LINTLIBRARY */ +/* PROTOLIB1 */ + /* * Generic interface definition for usr/src/lib/libelf. */ @@ -41,21 +42,13 @@ * Elf32 Symbols */ size_t elf32_fsize(Elf_Type, size_t, uint_t); -size_t _elf32_fsize(Elf_Type, size_t, uint_t); Elf32_Ehdr * elf32_getehdr(Elf *); -Elf32_Ehdr * _elf32_getehdr(Elf *); Elf32_Phdr * elf32_getphdr(Elf *); -Elf32_Phdr * _elf32_getphdr(Elf *); Elf32_Shdr * elf32_getshdr(Elf_Scn *); -Elf32_Shdr * _elf32_getshdr(Elf_Scn *); Elf32_Ehdr * elf32_newehdr(Elf *); -Elf32_Ehdr * _elf32_newehdr(Elf *); Elf32_Phdr * elf32_newphdr(Elf *, size_t); -Elf32_Phdr * _elf32_newphdr(Elf *, size_t); Elf_Data * elf32_xlatetof(Elf_Data *, const Elf_Data *, uint_t); -Elf_Data * _elf32_xlatetof(Elf_Data *, const Elf_Data *, uint_t); Elf_Data * elf32_xlatetom(Elf_Data *, const Elf_Data *, uint_t); -Elf_Data * _elf32_xlatetom(Elf_Data *, const Elf_Data *, uint_t); /* @@ -111,73 +104,41 @@ GElf_Xword _gelf_getdyndtflags_1(Elf *); * Class-Independent Elf Symbols */ Elf * elf_begin(int, Elf_Cmd, Elf *); -Elf * _elf_begin(int, Elf_Cmd, Elf *); int elf_cntl(Elf *, Elf_Cmd); -int _elf_cntl(Elf *, Elf_Cmd); int elf_end(Elf *); -int _elf_end(Elf *); const char * elf_errmsg(int); -const char * _elf_errmsg(int); int elf_errno(void); -int _elf_errno(void); void elf_fill(int); -void _elf_fill(int); uint_t elf_flagdata(Elf_Data *, Elf_Cmd, uint_t); -uint_t _elf_flagdata(Elf_Data *, Elf_Cmd, uint_t); uint_t elf_flagehdr(Elf *, Elf_Cmd, uint_t); -uint_t _elf_flagehdr(Elf *, Elf_Cmd, uint_t); uint_t elf_flagelf(Elf *, Elf_Cmd, uint_t); -uint_t _elf_flagelf(Elf *, Elf_Cmd, uint_t); uint_t elf_flagphdr(Elf *, Elf_Cmd, uint_t); -uint_t _elf_flagphdr(Elf *, Elf_Cmd, uint_t); uint_t elf_flagscn(Elf_Scn *, Elf_Cmd, uint_t); -uint_t _elf_flagscn(Elf_Scn *, Elf_Cmd, uint_t); uint_t elf_flagshdr(Elf_Scn *, Elf_Cmd, uint_t); -uint_t _elf_flagshdr(Elf_Scn *, Elf_Cmd, uint_t); Elf_Arhdr * elf_getarhdr(Elf *); -Elf_Arhdr * _elf_getarhdr(Elf *); Elf_Arsym * elf_getarsym(Elf *, size_t *); -Elf_Arsym * _elf_getarsym(Elf *, size_t *); off_t elf_getbase(Elf *); -off_t _elf_getbase(Elf *); Elf_Data * elf_getdata(Elf_Scn *, Elf_Data *); -Elf_Data * _elf_getdata(Elf_Scn *, Elf_Data *); char * elf_getident(Elf *, size_t *); -char * _elf_getident(Elf *, size_t *); int elf_getphnum(Elf *, size_t *); int elf_getshnum(Elf *, size_t *); int elf_getshstrndx(Elf *, size_t *); Elf_Scn * elf_getscn(Elf *elf, size_t); -Elf_Scn * _elf_getscn(Elf *elf, size_t); ulong_t elf_hash(const char *); -ulong_t _elf_hash(const char *); Elf_Kind elf_kind(Elf *); -Elf_Kind _elf_kind(Elf *); Elf * elf_memory(char *, size_t); -Elf * _elf_memory(char *, size_t); size_t elf_ndxscn(Elf_Scn *); -size_t _elf_ndxscn(Elf_Scn *); Elf_Data * elf_newdata(Elf_Scn *); -Elf_Data * _elf_newdata(Elf_Scn *); Elf_Scn * elf_newscn(Elf *); -Elf_Scn * _elf_newscn(Elf *); Elf_Cmd elf_next(Elf *); -Elf_Cmd _elf_next(Elf *); Elf_Scn * elf_nextscn(Elf *, Elf_Scn *); -Elf_Scn * _elf_nextscn(Elf *, Elf_Scn *); size_t _elf_outsync(int, char *, size_t, uint_t); size_t elf_rand(Elf *, size_t); -size_t _elf_rand(Elf *, size_t); Elf_Data * elf_rawdata(Elf_Scn *, Elf_Data *); -Elf_Data * _elf_rawdata(Elf_Scn *, Elf_Data *); char * elf_rawfile(Elf *, size_t *); -char * _elf_rawfile(Elf *, size_t *); char * elf_strptr(Elf *, size_t, size_t); -char * _elf_strptr(Elf *, size_t, size_t); off_t elf_update(Elf *, Elf_Cmd); -off_t _elf_update(Elf *, Elf_Cmd); uint_t elf_version(uint_t); -uint_t _elf_version(uint_t); int nlist(const char *, struct nlist *); diff --git a/usr/src/cmd/sgs/libelf/common/mapfile-common b/usr/src/cmd/sgs/libelf/common/mapfile-common index 036ca3ec6a..3c94d62341 100644 --- a/usr/src/cmd/sgs/libelf/common/mapfile-common +++ b/usr/src/cmd/sgs/libelf/common/mapfile-common @@ -18,7 +18,6 @@ # # CDDL HEADER END # - # # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. @@ -144,47 +143,7 @@ SUNWprivate_1.1 { global: _elf_getxoff; _elf_outsync; - _elf_begin = NODYNSORT; - _elf_memory = NODYNSORT; - _elf_cntl = NODYNSORT; - _elf_end = NODYNSORT; - _elf_errno = NODYNSORT; - _elf_errmsg = NODYNSORT; - _elf_fill = NODYNSORT; - _elf_flagdata = NODYNSORT; - _elf_flagehdr = NODYNSORT; - _elf_flagelf = NODYNSORT; - _elf_flagphdr = NODYNSORT; - _elf_flagscn = NODYNSORT; - _elf_flagshdr = NODYNSORT; - _elf_getarhdr = NODYNSORT; - _elf_getarsym = NODYNSORT; - _elf_getbase = NODYNSORT; - _elf_getdata = NODYNSORT; - _elf32_getehdr = NODYNSORT; - _elf_getident = NODYNSORT; - _elf32_getphdr = NODYNSORT; - _elf_getscn = NODYNSORT; - _elf32_getshdr = NODYNSORT; - _elf_hash = NODYNSORT; _elf_sys_encoding; - _elf_kind = NODYNSORT; - _elf_ndxscn = NODYNSORT; - _elf_newdata = NODYNSORT; - _elf32_newehdr = NODYNSORT; - _elf32_newphdr = NODYNSORT; - _elf_newscn = NODYNSORT; - _elf_next = NODYNSORT; - _elf_nextscn = NODYNSORT; - _elf_rand = NODYNSORT; - _elf_rawdata = NODYNSORT; - _elf_rawfile = NODYNSORT; - _elf_strptr = NODYNSORT; _elf_swap_wrimage; - _elf_update = NODYNSORT; - _elf32_fsize = NODYNSORT; - _elf32_xlatetof = NODYNSORT; - _elf32_xlatetom = NODYNSORT; - _elf_version = NODYNSORT; _gelf_getdyndtflags_1; }; diff --git a/usr/src/cmd/sgs/libelf/common/ndxscn.c b/usr/src/cmd/sgs/libelf/common/ndxscn.c index 0942abd121..c37abfeb4f 100644 --- a/usr/src/cmd/sgs/libelf/common/ndxscn.c +++ b/usr/src/cmd/sgs/libelf/common/ndxscn.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ - -#pragma weak elf_ndxscn = _elf_ndxscn - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/newdata.c b/usr/src/cmd/sgs/libelf/common/newdata.c index c0921396a7..dfca71ffdc 100644 --- a/usr/src/cmd/sgs/libelf/common/newdata.c +++ b/usr/src/cmd/sgs/libelf/common/newdata.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ - -#pragma weak elf_newdata = _elf_newdata - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/newehdr.c b/usr/src/cmd/sgs/libelf/common/newehdr.c index fe85f1ad73..1e7807804b 100644 --- a/usr/src/cmd/sgs/libelf/common/newehdr.c +++ b/usr/src/cmd/sgs/libelf/common/newehdr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#if !defined(_ELF64) -#pragma weak elf32_newehdr = _elf32_newehdr -#endif +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <stdlib.h> #include <errno.h> #include "decl.h" @@ -60,7 +54,7 @@ #define ELFCLASS ELFCLASS32 #define _elf_ehdr_init _elf32_ehdr_init -#define elf_newehdr _elf32_newehdr +#define elf_newehdr elf32_newehdr #define getehdr elf32_getehdr #endif /* ELF64 */ @@ -69,7 +63,6 @@ Ehdr * elf_newehdr(Elf * elf) { - register Ehdr *eh; if (elf == 0) diff --git a/usr/src/cmd/sgs/libelf/common/newphdr.c b/usr/src/cmd/sgs/libelf/common/newphdr.c index 6148923d8f..095a52d278 100644 --- a/usr/src/cmd/sgs/libelf/common/newphdr.c +++ b/usr/src/cmd/sgs/libelf/common/newphdr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#if !defined(_ELF64) -#pragma weak elf32_newphdr = _elf32_newphdr -#endif +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <stdlib.h> #include <memory.h> #include <errno.h> diff --git a/usr/src/cmd/sgs/libelf/common/newscn.c b/usr/src/cmd/sgs/libelf/common/newscn.c index aac275280e..e765d0badb 100644 --- a/usr/src/cmd/sgs/libelf/common/newscn.c +++ b/usr/src/cmd/sgs/libelf/common/newscn.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ - -#pragma weak elf_newscn = _elf_newscn +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/next.c b/usr/src/cmd/sgs/libelf/common/next.c index 08dc32cf44..307a7d0719 100644 --- a/usr/src/cmd/sgs/libelf/common/next.c +++ b/usr/src/cmd/sgs/libelf/common/next.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.5 */ - -#pragma weak elf_next = _elf_next +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/nextscn.c b/usr/src/cmd/sgs/libelf/common/nextscn.c index 7c9bbb3ab8..f967498b5d 100644 --- a/usr/src/cmd/sgs/libelf/common/nextscn.c +++ b/usr/src/cmd/sgs/libelf/common/nextscn.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ - -#pragma weak elf_nextscn = _elf_nextscn +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" diff --git a/usr/src/cmd/sgs/libelf/common/output.c b/usr/src/cmd/sgs/libelf/common/output.c index 305a677ffd..a167a50675 100644 --- a/usr/src/cmd/sgs/libelf/common/output.c +++ b/usr/src/cmd/sgs/libelf/common/output.c @@ -20,16 +20,17 @@ */ /* + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. + */ + +/* * Copyright (c) 1988 AT&T * All Rights Reserved - * - * Copyright 2006 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3 */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <sys/mman.h> #include <stdio.h> #include <stdlib.h> diff --git a/usr/src/cmd/sgs/libelf/common/rand.c b/usr/src/cmd/sgs/libelf/common/rand.c index 4565ca1ea9..b0f264c3de 100644 --- a/usr/src/cmd/sgs/libelf/common/rand.c +++ b/usr/src/cmd/sgs/libelf/common/rand.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ - -#pragma weak elf_rand = _elf_rand +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" diff --git a/usr/src/cmd/sgs/libelf/common/rawdata.c b/usr/src/cmd/sgs/libelf/common/rawdata.c index 37858f469c..9feec06e17 100644 --- a/usr/src/cmd/sgs/libelf/common/rawdata.c +++ b/usr/src/cmd/sgs/libelf/common/rawdata.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,22 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1999 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.3 */ - -#pragma weak elf_rawdata = _elf_rawdata - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <stdlib.h> #include "libelf.h" #include "decl.h" @@ -122,7 +116,7 @@ elf_rawdata(Elf_Scn * scn, Elf_Data * data) return (rc); } raw->db_buf = (Elf_Void *)_elf_read(elf->ed_fd, - elf->ed_baseoff + d->db_off, d->db_fsz); + elf->ed_baseoff + d->db_off, d->db_fsz); if (raw->db_buf == 0) { free(raw); READUNLOCKS(elf, scn) diff --git a/usr/src/cmd/sgs/libelf/common/rawfile.c b/usr/src/cmd/sgs/libelf/common/rawfile.c index 583d93d072..b695b7f726 100644 --- a/usr/src/cmd/sgs/libelf/common/rawfile.c +++ b/usr/src/cmd/sgs/libelf/common/rawfile.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,28 +18,23 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.4 */ - -#pragma weak elf_rawfile = _elf_rawfile - +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" char * -elf_rawfile(Elf * elf, size_t * ptr) +elf_rawfile(Elf *elf, size_t *ptr) { register size_t sz; char *p = 0; diff --git a/usr/src/cmd/sgs/libelf/common/rawput.c b/usr/src/cmd/sgs/libelf/common/rawput.c index 523b546a87..d01ae0a272 100644 --- a/usr/src/cmd/sgs/libelf/common/rawput.c +++ b/usr/src/cmd/sgs/libelf/common/rawput.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,19 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.2 */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <stdlib.h> #include <unistd.h> #include <errno.h> diff --git a/usr/src/cmd/sgs/libelf/common/strptr.c b/usr/src/cmd/sgs/libelf/common/strptr.c index 3242415352..05b00a17dc 100644 --- a/usr/src/cmd/sgs/libelf/common/strptr.c +++ b/usr/src/cmd/sgs/libelf/common/strptr.c @@ -2,9 +2,8 @@ * CDDL HEADER START * * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. + * Common Development and Distribution License (the "License"). + * You may not use this file except in compliance with the License. * * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE * or http://www.opensolaris.org/os/licensing. @@ -19,21 +18,17 @@ * * CDDL HEADER END */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - /* - * Copyright (c) 1998 by Sun Microsystems, Inc. - * All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" /* SVr4.0 1.6 */ - -#pragma weak elf_strptr = _elf_strptr +/* Copyright (c) 1988 AT&T */ +/* All Rights Reserved */ +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include "libelf.h" #include "decl.h" #include "msg.h" @@ -42,9 +37,9 @@ char * elf_strptr(Elf * elf, size_t ndx, size_t off) { - Elf_Scn * s; - Elf_Data * d; - char * rc; + Elf_Scn *s; + Elf_Data *d; + char *rc; if (elf == 0) return (0); diff --git a/usr/src/cmd/sgs/libelf/common/syn.h b/usr/src/cmd/sgs/libelf/common/syn.h deleted file mode 100644 index b764176a87..0000000000 --- a/usr/src/cmd/sgs/libelf/common/syn.h +++ /dev/null @@ -1,92 +0,0 @@ -/* - * CDDL HEADER START - * - * The contents of this file are subject to the terms of the - * Common Development and Distribution License, Version 1.0 only - * (the "License"). You may not use this file except in compliance - * with the License. - * - * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE - * or http://www.opensolaris.org/os/licensing. - * See the License for the specific language governing permissions - * and limitations under the License. - * - * When distributing Covered Code, include this CDDL HEADER in each - * file and include the License file at usr/src/OPENSOLARIS.LICENSE. - * If applicable, add the following below this CDDL HEADER, with the - * fields enclosed by brackets "[]" replaced with your own identifying - * information: Portions Copyright [yyyy] [name of copyright owner] - * - * CDDL HEADER END - */ -/* Copyright (c) 1988 AT&T */ -/* All Rights Reserved */ - - -/* - * Copyright 2004 Sun Microsystems, Inc. All rights reserved. - * Use is subject to license terms. - */ - -#pragma ident "%Z%%M% %I% %E% SMI" - -#ifndef SYN_DOT_H -#define SYN_DOT_H - -/* - * Synonyms for ANSI C. - * Line profiling currently pulls libelf into the a.out file. - * These definitions let that happen without polluting the - * user's name space with elf... symbols. Instead, the libelf - * names that appear are _elf.... Names without a leading - * underscore will be weak symbols. - */ - - -#if !defined(__lint) - -#define elf_begin _elf_begin -#define elf_cntl _elf_cntl -#define elf_end _elf_end -#define elf_errmsg _elf_errmsg -#define elf_errmsg_r _elf_errmsg_r -#define elf_errno _elf_errno -#define elf_fill _elf_fill -#define elf_flagdata _elf_flagdata -#define elf_flagehdr _elf_flagehdr -#define elf_flagelf _elf_flagelf -#define elf_flagphdr _elf_flagphdr -#define elf_flagscn _elf_flagscn -#define elf_flagshdr _elf_flagshdr -#define elf32_fsize _elf32_fsize -#define elf_getarhdr _elf_getarhdr -#define elf_getarsym _elf_getarsym -#define elf_getbase _elf_getbase -#define elf_getdata _elf_getdata -#define elf32_getehdr _elf32_getehdr -#define elf_getident _elf_getident -#define elf32_getphdr _elf32_getphdr -#define elf_getscn _elf_getscn -#define elf32_getshdr _elf32_getshdr -#define elf_hash _elf_hash -#define elf_kind _elf_kind -#define elf_memory _elf_memory -#define elf_ndxscn _elf_ndxscn -#define elf_newdata _elf_newdata -#define elf32_newehdr _elf32_newehdr -#define elf32_newphdr _elf32_newphdr -#define elf_newscn _elf_newscn -#define elf_nextscn _elf_nextscn -#define elf_next _elf_next -#define elf_rand _elf_rand -#define elf_rawdata _elf_rawdata -#define elf_rawfile _elf_rawfile -#define elf_strptr _elf_strptr -#define elf_update _elf_update -#define elf_version _elf_version -#define elf32_xlatetof _elf32_xlatetof -#define elf32_xlatetom _elf32_xlatetom - -#endif /* !__lint */ - -#endif /* SYN_DOT_H */ diff --git a/usr/src/cmd/sgs/libelf/common/update.c b/usr/src/cmd/sgs/libelf/common/update.c index d9390de4ab..18d6281077 100644 --- a/usr/src/cmd/sgs/libelf/common/update.c +++ b/usr/src/cmd/sgs/libelf/common/update.c @@ -20,21 +20,17 @@ */ /* - * Copyright (c) 1988 AT&T - * All Rights Reserved - * - * * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ -#pragma ident "%Z%%M% %I% %E% SMI" +/* + * Copyright (c) 1988 AT&T + * All Rights Reserved + */ -#if !defined(_ELF64) -#pragma weak elf_update = _elf_update -#endif +#pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <memory.h> #include <malloc.h> #include <limits.h> diff --git a/usr/src/cmd/sgs/libelf/common/xlate.m4 b/usr/src/cmd/sgs/libelf/common/xlate.m4 index f7cd3beddd..2c3bbab191 100644 --- a/usr/src/cmd/sgs/libelf/common/xlate.m4 +++ b/usr/src/cmd/sgs/libelf/common/xlate.m4 @@ -20,18 +20,12 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#pragma weak elf32_fsize = _elf32_fsize -#pragma weak elf_version = _elf_version -#pragma weak elf32_xlatetof = _elf32_xlatetof -#pragma weak elf32_xlatetom = _elf32_xlatetom - -#include "syn.h" #include <memory.h> #include <libelf.h> #include <link.h> diff --git a/usr/src/cmd/sgs/libelf/common/xlate64.m4 b/usr/src/cmd/sgs/libelf/common/xlate64.m4 index c1cede3f13..26375f2bb6 100644 --- a/usr/src/cmd/sgs/libelf/common/xlate64.m4 +++ b/usr/src/cmd/sgs/libelf/common/xlate64.m4 @@ -20,13 +20,12 @@ */ /* - * Copyright 2007 Sun Microsystems, Inc. All rights reserved. + * Copyright 2008 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ #pragma ident "%Z%%M% %I% %E% SMI" -#include "syn.h" #include <memory.h> #include <libelf.h> #include <link.h> |