svn commit: r211728 - in user/imp/tbemd: cddl/lib/libzpool
contrib/top gnu/usr.bin lib lib/libc/gen lib/libc/include
lib/libc/stdlib lib/libthr lib/libthr/thread libexec/rtld-elf
libexec/rtld-elf/a...
Warner Losh
imp at FreeBSD.org
Tue Aug 24 00:17:06 UTC 2010
Author: imp
Date: Tue Aug 24 00:17:05 2010
New Revision: 211728
URL: http://svn.freebsd.org/changeset/base/211728
Log:
merge head at 211727 to loop back changes
Added:
user/imp/tbemd/lib/libc/gen/elf_utils.c
- copied unchanged from r211727, head/lib/libc/gen/elf_utils.c
user/imp/tbemd/tools/build/options/WITH_BSD_GREP
- copied unchanged from r211727, head/tools/build/options/WITH_BSD_GREP
Deleted:
user/imp/tbemd/tools/build/options/WITH_GNU_GREP
Modified:
user/imp/tbemd/cddl/lib/libzpool/Makefile
user/imp/tbemd/gnu/usr.bin/Makefile
user/imp/tbemd/lib/Makefile
user/imp/tbemd/lib/libc/gen/Makefile.inc
user/imp/tbemd/lib/libc/gen/Symbol.map
user/imp/tbemd/lib/libc/gen/dlfcn.c
user/imp/tbemd/lib/libc/include/libc_private.h
user/imp/tbemd/lib/libc/stdlib/atexit.c
user/imp/tbemd/lib/libthr/pthread.map
user/imp/tbemd/lib/libthr/thread/thr_fork.c
user/imp/tbemd/lib/libthr/thread/thr_private.h
user/imp/tbemd/libexec/rtld-elf/Symbol.map
user/imp/tbemd/libexec/rtld-elf/amd64/Makefile.inc
user/imp/tbemd/libexec/rtld-elf/i386/Makefile.inc
user/imp/tbemd/libexec/rtld-elf/rtld.c
user/imp/tbemd/share/mk/bsd.own.mk
user/imp/tbemd/sys/dev/ed/if_ed.c
user/imp/tbemd/sys/dev/xl/if_xl.c
user/imp/tbemd/sys/dev/xl/if_xlreg.h
user/imp/tbemd/sys/sys/link_elf.h
user/imp/tbemd/sys/sys/param.h
user/imp/tbemd/usr.bin/Makefile
Directory Properties:
user/imp/tbemd/ (props changed)
user/imp/tbemd/cddl/contrib/opensolaris/ (props changed)
user/imp/tbemd/contrib/bind9/ (props changed)
user/imp/tbemd/contrib/ee/ (props changed)
user/imp/tbemd/contrib/expat/ (props changed)
user/imp/tbemd/contrib/file/ (props changed)
user/imp/tbemd/contrib/gdb/ (props changed)
user/imp/tbemd/contrib/gdtoa/ (props changed)
user/imp/tbemd/contrib/gnu-sort/ (props changed)
user/imp/tbemd/contrib/groff/ (props changed)
user/imp/tbemd/contrib/less/ (props changed)
user/imp/tbemd/contrib/libpcap/ (props changed)
user/imp/tbemd/contrib/llvm/ (props changed)
user/imp/tbemd/contrib/llvm/tools/clang/ (props changed)
user/imp/tbemd/contrib/ncurses/ (props changed)
user/imp/tbemd/contrib/netcat/ (props changed)
user/imp/tbemd/contrib/ntp/ (props changed)
user/imp/tbemd/contrib/one-true-awk/ (props changed)
user/imp/tbemd/contrib/openbsm/ (props changed)
user/imp/tbemd/contrib/openpam/ (props changed)
user/imp/tbemd/contrib/pf/ (props changed)
user/imp/tbemd/contrib/sendmail/ (props changed)
user/imp/tbemd/contrib/tcpdump/ (props changed)
user/imp/tbemd/contrib/tcsh/ (props changed)
user/imp/tbemd/contrib/top/ (props changed)
user/imp/tbemd/contrib/top/install-sh (props changed)
user/imp/tbemd/contrib/tzcode/stdtime/ (props changed)
user/imp/tbemd/contrib/tzcode/zic/ (props changed)
user/imp/tbemd/contrib/tzdata/ (props changed)
user/imp/tbemd/contrib/wpa/ (props changed)
user/imp/tbemd/crypto/openssh/ (props changed)
user/imp/tbemd/crypto/openssl/ (props changed)
user/imp/tbemd/lib/libc/ (props changed)
user/imp/tbemd/lib/libc/stdtime/ (props changed)
user/imp/tbemd/lib/libutil/ (props changed)
user/imp/tbemd/lib/libz/ (props changed)
user/imp/tbemd/sbin/ (props changed)
user/imp/tbemd/sbin/ipfw/ (props changed)
user/imp/tbemd/share/zoneinfo/ (props changed)
user/imp/tbemd/sys/ (props changed)
user/imp/tbemd/sys/amd64/include/xen/ (props changed)
user/imp/tbemd/sys/cddl/contrib/opensolaris/ (props changed)
user/imp/tbemd/sys/contrib/dev/acpica/ (props changed)
user/imp/tbemd/sys/contrib/pf/ (props changed)
user/imp/tbemd/sys/contrib/x86emu/ (props changed)
user/imp/tbemd/sys/dev/xen/xenpci/ (props changed)
user/imp/tbemd/usr.bin/csup/ (props changed)
user/imp/tbemd/usr.bin/procstat/ (props changed)
user/imp/tbemd/usr.sbin/zic/ (props changed)
Modified: user/imp/tbemd/cddl/lib/libzpool/Makefile
==============================================================================
--- user/imp/tbemd/cddl/lib/libzpool/Makefile Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/cddl/lib/libzpool/Makefile Tue Aug 24 00:17:05 2010 (r211728)
@@ -11,8 +11,8 @@
# LIST_SRCS
.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/uts/common/os
# ATOMIC_SRCS
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "ia64"
-.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_CPUARCH}
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "ia64" || ${MACHINE_ARCH} == "sparc64" || ${MACHINE_ARCH} == "powerpc64"
+.PATH: ${.CURDIR}/../../../sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}
ATOMIC_SRCS= opensolaris_atomic.S
.else
.PATH: ${.CURDIR}/../../../sys/cddl/compat/opensolaris/kern
Modified: user/imp/tbemd/gnu/usr.bin/Makefile
==============================================================================
--- user/imp/tbemd/gnu/usr.bin/Makefile Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/gnu/usr.bin/Makefile Tue Aug 24 00:17:05 2010 (r211728)
@@ -28,6 +28,10 @@ _groff= groff
.endif
.endif
+.if ${MK_BSD_GREP} != "yes"
+_grep= grep
+.endif
+
.if ${MK_CVS} != "no"
_cvs= cvs
.endif
@@ -36,10 +40,6 @@ _cvs= cvs
_dtc= dtc
.endif
-.if ${MK_GNU_GREP} != "no"
-_grep= grep
-.endif
-
.if ${MK_INFO} != "no"
_texinfo= texinfo
.endif
Modified: user/imp/tbemd/lib/Makefile
==============================================================================
--- user/imp/tbemd/lib/Makefile Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/Makefile Tue Aug 24 00:17:05 2010 (r211728)
@@ -187,6 +187,7 @@ _libsmb= libsmb
.if ${MK_NCP} != "no"
_libncp= libncp
.endif
+.endif
.if ${MACHINE_CPUARCH} == "powerpc"
_libsmb= libsmb
Modified: user/imp/tbemd/lib/libc/gen/Makefile.inc
==============================================================================
--- user/imp/tbemd/lib/libc/gen/Makefile.inc Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libc/gen/Makefile.inc Tue Aug 24 00:17:05 2010 (r211728)
@@ -10,7 +10,7 @@ SRCS+= __getosreldate.c __xuname.c \
alarm.c arc4random.c assert.c aux.c basename.c check_utility_compat.c \
clock.c closedir.c confstr.c \
crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
- dlfcn.c drand48.c erand48.c err.c errlst.c errno.c \
+ dlfcn.c drand48.c elf_utils.c erand48.c err.c errlst.c errno.c \
exec.c fdevname.c feature_present.c fmtcheck.c fmtmsg.c fnmatch.c \
fpclassify.c frexp.c fstab.c ftok.c fts.c fts-compat.c ftw.c \
getbootfile.c getbsize.c \
Modified: user/imp/tbemd/lib/libc/gen/Symbol.map
==============================================================================
--- user/imp/tbemd/lib/libc/gen/Symbol.map Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libc/gen/Symbol.map Tue Aug 24 00:17:05 2010 (r211728)
@@ -446,10 +446,12 @@ FBSDprivate_1.0 {
_spinlock;
_spinlock_debug;
_spinunlock;
+ _rtld_addr_phdr;
_rtld_atfork_pre;
_rtld_atfork_post;
_rtld_error; /* for private use */
_rtld_thread_init; /* for private use */
+ __elf_phdr_match_addr;
_err;
_warn;
__fmtcheck;
Modified: user/imp/tbemd/lib/libc/gen/dlfcn.c
==============================================================================
--- user/imp/tbemd/lib/libc/gen/dlfcn.c Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libc/gen/dlfcn.c Tue Aug 24 00:17:05 2010 (r211728)
@@ -157,3 +157,11 @@ void
_rtld_atfork_post(int *locks)
{
}
+
+#pragma weak _rtld_addr_phdr
+int
+_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
+{
+
+ return (0);
+}
Copied: user/imp/tbemd/lib/libc/gen/elf_utils.c (from r211727, head/lib/libc/gen/elf_utils.c)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/lib/libc/gen/elf_utils.c Tue Aug 24 00:17:05 2010 (r211728, copy of r211727, head/lib/libc/gen/elf_utils.c)
@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2010 Konstantin Belousov <kib at freebsd.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Neither the name of the author nor the names of any co-contributors
+ * may be used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <link.h>
+
+int
+__elf_phdr_match_addr(struct dl_phdr_info *phdr_info, void *addr)
+{
+ const Elf_Phdr *ph;
+ int i;
+
+ for (i = 0; i < phdr_info->dlpi_phnum; i++) {
+ ph = &phdr_info->dlpi_phdr[i];
+ if (ph->p_type != PT_LOAD || (ph->p_flags & PF_X) == 0)
+ continue;
+ if (phdr_info->dlpi_addr + ph->p_vaddr <= (uintptr_t)addr &&
+ (uintptr_t)addr + sizeof(addr) < phdr_info->dlpi_addr +
+ ph->p_vaddr + ph->p_memsz)
+ break;
+ }
+ return (i != phdr_info->dlpi_phnum);
+}
Modified: user/imp/tbemd/lib/libc/include/libc_private.h
==============================================================================
--- user/imp/tbemd/lib/libc/include/libc_private.h Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libc/include/libc_private.h Tue Aug 24 00:17:05 2010 (r211728)
@@ -214,5 +214,7 @@ extern int __sys_fcntl(int, int, ...);
int _execvpe(const char *, char * const *, char * const *);
int _elf_aux_info(int aux, void *buf, int buflen);
+struct dl_phdr_info;
+int __elf_phdr_match_addr(struct dl_phdr_info *, void *);
#endif /* _LIBC_PRIVATE_H_ */
Modified: user/imp/tbemd/lib/libc/stdlib/atexit.c
==============================================================================
--- user/imp/tbemd/lib/libc/stdlib/atexit.c Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libc/stdlib/atexit.c Tue Aug 24 00:17:05 2010 (r211728)
@@ -37,6 +37,7 @@ static char sccsid[] = "@(#)atexit.c 8.2
__FBSDID("$FreeBSD$");
#include "namespace.h"
+#include <link.h>
#include <stddef.h>
#include <stdlib.h>
#include <unistd.h>
@@ -120,7 +121,7 @@ atexit(void (*func)(void))
int error;
fn.fn_type = ATEXIT_FN_STD;
- fn.fn_ptr.std_func = func;;
+ fn.fn_ptr.std_func = func;
fn.fn_arg = NULL;
fn.fn_dso = NULL;
@@ -139,7 +140,7 @@ __cxa_atexit(void (*func)(void *), void
int error;
fn.fn_type = ATEXIT_FN_CXA;
- fn.fn_ptr.cxa_func = func;;
+ fn.fn_ptr.cxa_func = func;
fn.fn_arg = arg;
fn.fn_dso = dso;
@@ -147,6 +148,9 @@ __cxa_atexit(void (*func)(void *), void
return (error);
}
+#pragma weak __pthread_cxa_finalize
+void __pthread_cxa_finalize(const struct dl_phdr_info *);
+
/*
* Call all handlers registered with __cxa_atexit for the shared
* object owning 'dso'. Note: if 'dso' is NULL, then all remaining
@@ -155,18 +159,28 @@ __cxa_atexit(void (*func)(void *), void
void
__cxa_finalize(void *dso)
{
+ struct dl_phdr_info phdr_info;
struct atexit *p;
struct atexit_fn fn;
- int n;
+ int n, has_phdr;
+
+ if (dso != NULL)
+ has_phdr = _rtld_addr_phdr(dso, &phdr_info);
+ else
+ has_phdr = 0;
_MUTEX_LOCK(&atexit_mutex);
for (p = __atexit; p; p = p->next) {
for (n = p->ind; --n >= 0;) {
if (p->fns[n].fn_type == ATEXIT_FN_EMPTY)
continue; /* already been called */
- if (dso != NULL && dso != p->fns[n].fn_dso)
- continue; /* wrong DSO */
fn = p->fns[n];
+ if (dso != NULL && dso != fn.fn_dso) {
+ /* wrong DSO ? */
+ if (!has_phdr || !__elf_phdr_match_addr(
+ &phdr_info, fn.fn_ptr.cxa_func))
+ continue;
+ }
/*
Mark entry to indicate that this particular handler
has already been called.
@@ -185,4 +199,7 @@ __cxa_finalize(void *dso)
_MUTEX_UNLOCK(&atexit_mutex);
if (dso == NULL)
_MUTEX_DESTROY(&atexit_mutex);
+
+ if (&__pthread_cxa_finalize != NULL)
+ __pthread_cxa_finalize(&phdr_info);
}
Modified: user/imp/tbemd/lib/libthr/pthread.map
==============================================================================
--- user/imp/tbemd/lib/libthr/pthread.map Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libthr/pthread.map Tue Aug 24 00:17:05 2010 (r211728)
@@ -192,6 +192,7 @@ FBSDprivate_1.0 {
__poll;
__pthread_cond_timedwait;
__pthread_cond_wait;
+ __pthread_cxa_finalize;
__pthread_mutex_init;
__pthread_mutex_lock;
__pthread_mutex_timedlock;
Modified: user/imp/tbemd/lib/libthr/thread/thr_fork.c
==============================================================================
--- user/imp/tbemd/lib/libthr/thread/thr_fork.c Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libthr/thread/thr_fork.c Tue Aug 24 00:17:05 2010 (r211728)
@@ -59,6 +59,7 @@
#include "namespace.h"
#include <errno.h>
+#include <link.h>
#include <string.h>
#include <stdlib.h>
#include <unistd.h>
@@ -94,6 +95,27 @@ _pthread_atfork(void (*prepare)(void), v
return (0);
}
+void
+__pthread_cxa_finalize(struct dl_phdr_info *phdr_info)
+{
+ struct pthread *curthread;
+ struct pthread_atfork *af, *af1;
+
+ _thr_check_init();
+
+ curthread = _get_curthread();
+ THR_UMUTEX_LOCK(curthread, &_thr_atfork_lock);
+ TAILQ_FOREACH_SAFE(af, &_thr_atfork_list, qe, af1) {
+ if (__elf_phdr_match_addr(phdr_info, af->prepare) ||
+ __elf_phdr_match_addr(phdr_info, af->parent) ||
+ __elf_phdr_match_addr(phdr_info, af->child)) {
+ TAILQ_REMOVE(&_thr_atfork_list, af, qe);
+ free(af);
+ }
+ }
+ THR_UMUTEX_UNLOCK(curthread, &_thr_atfork_lock);
+}
+
__weak_reference(_fork, fork);
pid_t _fork(void);
Modified: user/imp/tbemd/lib/libthr/thread/thr_private.h
==============================================================================
--- user/imp/tbemd/lib/libthr/thread/thr_private.h Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/lib/libthr/thread/thr_private.h Tue Aug 24 00:17:05 2010 (r211728)
@@ -740,6 +740,9 @@ _thr_check_init(void)
_libpthread_init(NULL);
}
+struct dl_phdr_info;
+void __pthread_cxa_finalize(struct dl_phdr_info *phdr_info);
+
__END_DECLS
#endif /* !_THR_PRIVATE_H */
Modified: user/imp/tbemd/libexec/rtld-elf/Symbol.map
==============================================================================
--- user/imp/tbemd/libexec/rtld-elf/Symbol.map Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/libexec/rtld-elf/Symbol.map Tue Aug 24 00:17:05 2010 (r211728)
@@ -27,4 +27,5 @@ FBSDprivate_1.0 {
_rtld_free_tls;
_rtld_atfork_pre;
_rtld_atfork_post;
+ _rtld_addr_phdr;
};
Modified: user/imp/tbemd/libexec/rtld-elf/amd64/Makefile.inc
==============================================================================
--- user/imp/tbemd/libexec/rtld-elf/amd64/Makefile.inc Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/libexec/rtld-elf/amd64/Makefile.inc Tue Aug 24 00:17:05 2010 (r211728)
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
CFLAGS+= -elf
LDFLAGS+= -elf
# Uncomment this to build the dynamic linker as an executable instead
Modified: user/imp/tbemd/libexec/rtld-elf/i386/Makefile.inc
==============================================================================
--- user/imp/tbemd/libexec/rtld-elf/i386/Makefile.inc Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/libexec/rtld-elf/i386/Makefile.inc Tue Aug 24 00:17:05 2010 (r211728)
@@ -1,3 +1,5 @@
+# $FreeBSD$
+
CFLAGS+= -elf
LDFLAGS+= -elf
# Uncomment this to build the dynamic linker as an executable instead
Modified: user/imp/tbemd/libexec/rtld-elf/rtld.c
==============================================================================
--- user/imp/tbemd/libexec/rtld-elf/rtld.c Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/libexec/rtld-elf/rtld.c Tue Aug 24 00:17:05 2010 (r211728)
@@ -147,6 +147,8 @@ static int rtld_verify_object_versions(
static void object_add_name(Obj_Entry *, const char *);
static int object_match_name(const Obj_Entry *, const char *);
static void ld_utrace_log(int, void *, void *, size_t, int, const char *);
+static void rtld_fill_dl_phdr_info(const Obj_Entry *obj,
+ struct dl_phdr_info *phdr_info);
void r_debug_state(struct r_debug *, struct link_map *);
@@ -220,6 +222,7 @@ static func_ptr_type exports[] = {
(func_ptr_type) &dl_iterate_phdr,
(func_ptr_type) &_rtld_atfork_pre,
(func_ptr_type) &_rtld_atfork_post,
+ (func_ptr_type) &_rtld_addr_phdr,
NULL
};
@@ -2261,6 +2264,24 @@ dlvsym(void *handle, const char *name, c
}
int
+_rtld_addr_phdr(const void *addr, struct dl_phdr_info *phdr_info)
+{
+ const Obj_Entry *obj;
+ int lockstate;
+
+ lockstate = rlock_acquire(rtld_bind_lock);
+ obj = obj_from_addr(addr);
+ if (obj == NULL) {
+ _rtld_error("No shared object contains address");
+ rlock_release(rtld_bind_lock, lockstate);
+ return (0);
+ }
+ rtld_fill_dl_phdr_info(obj, phdr_info);
+ rlock_release(rtld_bind_lock, lockstate);
+ return (1);
+}
+
+int
dladdr(const void *addr, Dl_info *info)
{
const Obj_Entry *obj;
@@ -2362,6 +2383,21 @@ dlinfo(void *handle, int request, void *
return (error);
}
+static void
+rtld_fill_dl_phdr_info(const Obj_Entry *obj, struct dl_phdr_info *phdr_info)
+{
+
+ phdr_info->dlpi_addr = (Elf_Addr)obj->relocbase;
+ phdr_info->dlpi_name = STAILQ_FIRST(&obj->names) ?
+ STAILQ_FIRST(&obj->names)->name : obj->path;
+ phdr_info->dlpi_phdr = obj->phdr;
+ phdr_info->dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
+ phdr_info->dlpi_tls_modid = obj->tlsindex;
+ phdr_info->dlpi_tls_data = obj->tlsinit;
+ phdr_info->dlpi_adds = obj_loads;
+ phdr_info->dlpi_subs = obj_loads - obj_count;
+}
+
int
dl_iterate_phdr(__dl_iterate_hdr_callback callback, void *param)
{
@@ -2375,16 +2411,7 @@ dl_iterate_phdr(__dl_iterate_hdr_callbac
error = 0;
for (obj = obj_list; obj != NULL; obj = obj->next) {
- phdr_info.dlpi_addr = (Elf_Addr)obj->relocbase;
- phdr_info.dlpi_name = STAILQ_FIRST(&obj->names) ?
- STAILQ_FIRST(&obj->names)->name : obj->path;
- phdr_info.dlpi_phdr = obj->phdr;
- phdr_info.dlpi_phnum = obj->phsize / sizeof(obj->phdr[0]);
- phdr_info.dlpi_tls_modid = obj->tlsindex;
- phdr_info.dlpi_tls_data = obj->tlsinit;
- phdr_info.dlpi_adds = obj_loads;
- phdr_info.dlpi_subs = obj_loads - obj_count;
-
+ rtld_fill_dl_phdr_info(obj, &phdr_info);
if ((error = callback(&phdr_info, sizeof phdr_info, param)) != 0)
break;
@@ -3665,6 +3692,10 @@ fetch_ventry(const Obj_Entry *obj, unsig
return NULL;
}
+/*
+ * Overrides for libc_pic-provided functions.
+ */
+
int
__getosreldate(void)
{
@@ -3684,3 +3715,11 @@ __getosreldate(void)
osreldate = osrel;
return (osreldate);
}
+
+/*
+ * No unresolved symbols for rtld.
+ */
+void
+__pthread_cxa_finalize(struct dl_phdr_info *a)
+{
+}
Modified: user/imp/tbemd/share/mk/bsd.own.mk
==============================================================================
--- user/imp/tbemd/share/mk/bsd.own.mk Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/share/mk/bsd.own.mk Tue Aug 24 00:17:05 2010 (r211728)
@@ -419,9 +419,9 @@ MK_${var}:= yes
BIND_LIBS \
BIND_SIGCHASE \
BIND_XML \
+ BSD_GREP \
${_clang_no} \
FDT \
- GNU_GREP \
HESIOD \
IDEA
.if defined(WITH_${var}) && defined(WITHOUT_${var})
Modified: user/imp/tbemd/sys/dev/ed/if_ed.c
==============================================================================
--- user/imp/tbemd/sys/dev/ed/if_ed.c Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/sys/dev/ed/if_ed.c Tue Aug 24 00:17:05 2010 (r211728)
@@ -1476,9 +1476,12 @@ ed_pio_write_mbufs(struct ed_softc *sc,
}
} else {
/* NE2000s are a pain */
- unsigned char *data;
+ uint8_t *data;
int len, wantbyte;
- unsigned char savebyte[2];
+ union {
+ uint16_t w;
+ uint8_t b[2];
+ } saveword;
wantbyte = 0;
@@ -1488,9 +1491,9 @@ ed_pio_write_mbufs(struct ed_softc *sc,
data = mtod(m, caddr_t);
/* finish the last word */
if (wantbyte) {
- savebyte[1] = *data;
+ saveword.b[1] = *data;
ed_asic_outw(sc, ED_NOVELL_DATA,
- *(u_short *)savebyte);
+ saveword.w);
data++;
len--;
wantbyte = 0;
@@ -1504,7 +1507,7 @@ ed_pio_write_mbufs(struct ed_softc *sc,
}
/* save last byte, if necessary */
if (len == 1) {
- savebyte[0] = *data;
+ saveword.b[0] = *data;
wantbyte = 1;
}
}
@@ -1512,7 +1515,7 @@ ed_pio_write_mbufs(struct ed_softc *sc,
}
/* spit last byte */
if (wantbyte)
- ed_asic_outw(sc, ED_NOVELL_DATA, *(u_short *)savebyte);
+ ed_asic_outw(sc, ED_NOVELL_DATA, saveword.w);
}
/*
Modified: user/imp/tbemd/sys/dev/xl/if_xl.c
==============================================================================
--- user/imp/tbemd/sys/dev/xl/if_xl.c Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/sys/dev/xl/if_xl.c Tue Aug 24 00:17:05 2010 (r211728)
@@ -246,6 +246,7 @@ static int xl_watchdog(struct xl_softc *
static int xl_shutdown(device_t);
static int xl_suspend(device_t);
static int xl_resume(device_t);
+static void xl_setwol(struct xl_softc *);
#ifdef DEVICE_POLLING
static int xl_poll(struct ifnet *ifp, enum poll_cmd cmd, int count);
@@ -1145,10 +1146,10 @@ static int
xl_attach(device_t dev)
{
u_char eaddr[ETHER_ADDR_LEN];
- u_int16_t xcvr[2];
+ u_int16_t sinfo2, xcvr[2];
struct xl_softc *sc;
struct ifnet *ifp;
- int media;
+ int media, pmcap;
int unit, error = 0, rid, res;
uint16_t did;
@@ -1405,6 +1406,18 @@ xl_attach(device_t dev)
else
sc->xl_type = XL_TYPE_90X;
+ /* Check availability of WOL. */
+ if ((sc->xl_caps & XL_CAPS_PWRMGMT) != 0 &&
+ pci_find_extcap(dev, PCIY_PMG, &pmcap) == 0) {
+ sc->xl_pmcap = pmcap;
+ sc->xl_flags |= XL_FLAG_WOL;
+ sinfo2 = 0;
+ xl_read_eeprom(sc, (caddr_t)&sinfo2, XL_EE_SOFTINFO2, 1, 0);
+ if ((sinfo2 & XL_SINFO2_AUX_WOL_CON) == 0 && bootverbose)
+ device_printf(dev,
+ "No auxiliary remote wakeup connector!\n");
+ }
+
/* Set the TX start threshold for best performance. */
sc->xl_tx_thresh = XL_MIN_FRAMELEN;
@@ -1419,6 +1432,8 @@ xl_attach(device_t dev)
ifp->if_capabilities |= IFCAP_HWCSUM;
#endif
}
+ if ((sc->xl_flags & XL_FLAG_WOL) != 0)
+ ifp->if_capabilities |= IFCAP_WOL_MAGIC;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
ifp->if_capabilities |= IFCAP_POLLING;
@@ -1635,7 +1650,6 @@ xl_detach(device_t dev)
/* These should only be active if attach succeeded */
if (device_is_attached(dev)) {
XL_LOCK(sc);
- xl_reset(sc);
xl_stop(sc);
XL_UNLOCK(sc);
taskqueue_drain(taskqueue_swi, &sc->xl_task);
@@ -2246,7 +2260,6 @@ xl_intr(void *arg)
}
if (status & XL_STAT_ADFAIL) {
- xl_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
}
@@ -2318,7 +2331,6 @@ xl_poll_locked(struct ifnet *ifp, enum p
}
if (status & XL_STAT_ADFAIL) {
- xl_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
}
@@ -2754,6 +2766,9 @@ xl_init_locked(struct xl_softc *sc)
*/
xl_stop(sc);
+ /* Reset the chip to a known state. */
+ xl_reset(sc);
+
if (sc->xl_miibus == NULL) {
CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_RESET);
xl_wait(sc);
@@ -2765,6 +2780,15 @@ xl_init_locked(struct xl_softc *sc)
if (sc->xl_miibus != NULL)
mii = device_get_softc(sc->xl_miibus);
+ /*
+ * Clear WOL status and disable all WOL feature as WOL
+ * would interfere Rx operation under normal environments.
+ */
+ if ((sc->xl_flags & XL_FLAG_WOL) != 0) {
+ XL_SEL_WIN(7);
+ CSR_READ_2(sc, XL_W7_BM_PME);
+ CSR_WRITE_2(sc, XL_W7_BM_PME, 0);
+ }
/* Init our MAC address */
XL_SEL_WIN(2);
for (i = 0; i < ETHER_ADDR_LEN; i++) {
@@ -3187,6 +3211,9 @@ xl_ioctl(struct ifnet *ifp, u_long comma
if ((mask & IFCAP_RXCSUM) != 0 &&
(ifp->if_capabilities & IFCAP_RXCSUM) != 0)
ifp->if_capenable ^= IFCAP_RXCSUM;
+ if ((mask & IFCAP_WOL_MAGIC) != 0 &&
+ (ifp->if_capabilities & IFCAP_WOL_MAGIC) != 0)
+ ifp->if_capenable ^= IFCAP_WOL_MAGIC;
XL_UNLOCK(sc);
break;
default:
@@ -3236,7 +3263,6 @@ xl_watchdog(struct xl_softc *sc)
device_printf(sc->xl_dev,
"no carrier - transceiver cable problem?\n");
- xl_reset(sc);
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
@@ -3330,16 +3356,8 @@ xl_stop(struct xl_softc *sc)
static int
xl_shutdown(device_t dev)
{
- struct xl_softc *sc;
-
- sc = device_get_softc(dev);
- XL_LOCK(sc);
- xl_reset(sc);
- xl_stop(sc);
- XL_UNLOCK(sc);
-
- return (0);
+ return (xl_suspend(dev));
}
static int
@@ -3351,6 +3369,7 @@ xl_suspend(device_t dev)
XL_LOCK(sc);
xl_stop(sc);
+ xl_setwol(sc);
XL_UNLOCK(sc);
return (0);
@@ -3367,7 +3386,6 @@ xl_resume(device_t dev)
XL_LOCK(sc);
- xl_reset(sc);
if (ifp->if_flags & IFF_UP) {
ifp->if_drv_flags &= ~IFF_DRV_RUNNING;
xl_init_locked(sc);
@@ -3377,3 +3395,34 @@ xl_resume(device_t dev)
return (0);
}
+
+static void
+xl_setwol(struct xl_softc *sc)
+{
+ struct ifnet *ifp;
+ u_int16_t cfg, pmstat;
+
+ if ((sc->xl_flags & XL_FLAG_WOL) == 0)
+ return;
+
+ ifp = sc->xl_ifp;
+ XL_SEL_WIN(7);
+ /* Clear any pending PME events. */
+ CSR_READ_2(sc, XL_W7_BM_PME);
+ cfg = 0;
+ if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0)
+ cfg |= XL_BM_PME_MAGIC;
+ CSR_WRITE_2(sc, XL_W7_BM_PME, cfg);
+ /* Enable RX. */
+ if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0)
+ CSR_WRITE_2(sc, XL_COMMAND, XL_CMD_RX_ENABLE);
+ /* Request PME. */
+ pmstat = pci_read_config(sc->xl_dev,
+ sc->xl_pmcap + PCIR_POWER_STATUS, 2);
+ if ((ifp->if_capenable & IFCAP_WOL_MAGIC) != 0)
+ pmstat |= PCIM_PSTAT_PMEENABLE;
+ else
+ pmstat &= ~PCIM_PSTAT_PMEENABLE;
+ pci_write_config(sc->xl_dev,
+ sc->xl_pmcap + PCIR_POWER_STATUS, pmstat, 2);
+}
Modified: user/imp/tbemd/sys/dev/xl/if_xlreg.h
==============================================================================
--- user/imp/tbemd/sys/dev/xl/if_xlreg.h Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/sys/dev/xl/if_xlreg.h Tue Aug 24 00:17:05 2010 (r211728)
@@ -81,6 +81,17 @@
#define XL_CAPS_100MBPS 0x1000
#define XL_CAPS_PWRMGMT 0x2000
+/*
+ * Bits in the software information 2 word
+ */
+#define XL_SINFO2_FIXED_BCAST_RX_BUG 0x0002
+#define XL_SINFO2_FIXED_ENDEC_LOOP_BUG 0x0004
+#define XL_SINFO2_AUX_WOL_CON 0x0008
+#define XL_SINFO2_PME_PULSED 0x0010
+#define XL_SINFO2_FIXED_MWI_BUG 0x0020
+#define XL_SINFO2_WOL_AFTER_PWR_LOSS 0x0040
+#define XL_SINFO2_AUTO_RST_TO_D0 0x0080
+
#define XL_PACKET_SIZE 1540
#define XL_MAX_FRAMELEN (ETHER_MAX_LEN + ETHER_VLAN_ENCAP_LEN)
@@ -408,7 +419,12 @@
#define XL_W7_BM_LEN 0x06
#define XL_W7_BM_STATUS 0x0B
#define XL_W7_BM_TIMEr 0x0A
+#define XL_W7_BM_PME 0x0C
+#define XL_BM_PME_WAKE 0x0001
+#define XL_BM_PME_MAGIC 0x0002
+#define XL_BM_PME_LINKCHG 0x0004
+#define XL_BM_PME_WAKETIMER 0x0008
/*
* bus master control registers
*/
@@ -577,6 +593,7 @@ struct xl_mii_frame {
#define XL_FLAG_NO_XCVR_PWR 0x0080
#define XL_FLAG_USE_MMIO 0x0100
#define XL_FLAG_NO_MMIO 0x0200
+#define XL_FLAG_WOL 0x0400
#define XL_NO_XCVR_PWR_MAGICBITS 0x0900
@@ -599,6 +616,7 @@ struct xl_softc {
u_int16_t xl_caps;
u_int8_t xl_stats_no_timeout;
u_int16_t xl_tx_thresh;
+ int xl_pmcap;
int xl_if_flags;
struct xl_list_data xl_ldata;
struct xl_chain_data xl_cdata;
Modified: user/imp/tbemd/sys/sys/link_elf.h
==============================================================================
--- user/imp/tbemd/sys/sys/link_elf.h Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/sys/sys/link_elf.h Tue Aug 24 00:17:05 2010 (r211728)
@@ -92,6 +92,7 @@ __BEGIN_DECLS
typedef int (*__dl_iterate_hdr_callback)(struct dl_phdr_info *, size_t, void *);
extern int dl_iterate_phdr(__dl_iterate_hdr_callback, void *);
+int _rtld_addr_phdr(const void *, struct dl_phdr_info *);
__END_DECLS
Modified: user/imp/tbemd/sys/sys/param.h
==============================================================================
--- user/imp/tbemd/sys/sys/param.h Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/sys/sys/param.h Tue Aug 24 00:17:05 2010 (r211728)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 900016 /* Master, propagated to newvers */
+#define __FreeBSD_version 900017 /* Master, propagated to newvers */
#ifndef LOCORE
#include <sys/types.h>
Copied: user/imp/tbemd/tools/build/options/WITH_BSD_GREP (from r211727, head/tools/build/options/WITH_BSD_GREP)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/tools/build/options/WITH_BSD_GREP Tue Aug 24 00:17:05 2010 (r211728, copy of r211727, head/tools/build/options/WITH_BSD_GREP)
@@ -0,0 +1,2 @@
+.\" $FreeBSD$
+Build BSD-licensed grep instead of GNU grep.
Modified: user/imp/tbemd/usr.bin/Makefile
==============================================================================
--- user/imp/tbemd/usr.bin/Makefile Mon Aug 23 22:58:13 2010 (r211727)
+++ user/imp/tbemd/usr.bin/Makefile Tue Aug 24 00:17:05 2010 (r211728)
@@ -222,6 +222,10 @@ SUBDIR+= bluetooth
SUBDIR+= cpio
.endif
+.if ${MK_BSD_GREP} != "no"
+_grep= grep
+.endif
+
.if ${MK_CALENDAR} != "no"
SUBDIR+= calendar
.endif
@@ -230,10 +234,6 @@ SUBDIR+= calendar
_clang= clang
.endif
-.if ${MK_GNU_GREP} != "yes"
-_grep= grep
-.endif
-
.if ${MK_HESIOD} != "no"
SUBDIR+= hesinfo
.endif
More information about the svn-src-user
mailing list