diff options
Diffstat (limited to 'lib/bind/isc')
| -rw-r--r-- | lib/bind/isc/Makefile | 20 | ||||
| -rw-r--r-- | lib/bind/isc/backtrace-emptytbl.c | 36 | ||||
| -rw-r--r-- | lib/bind/isc/isc/platform.h | 53 |
3 files changed, 102 insertions, 7 deletions
diff --git a/lib/bind/isc/Makefile b/lib/bind/isc/Makefile index 7648da5..f41f604 100644 --- a/lib/bind/isc/Makefile +++ b/lib/bind/isc/Makefile @@ -27,18 +27,26 @@ SRCS+= condition.c mutex.c \ .PATH: ${SRCDIR} SRCS+= inet_pton.c \ - assertions.c base32.c base64.c bitstring.c buffer.c \ - bufferlist.c commandline.c entropy.c error.c event.c \ - fsaccess.c hash.c heap.c hex.c hmacmd5.c hmacsha.c \ - httpd.c inet_aton.c inet_ntop.c iterated_hash.c \ + assertions.c backtrace.c base32.c base64.c bitstring.c \ + buffer.c bufferlist.c commandline.c error.c event.c \ + fsaccess.c hash.c \ + heap.c hex.c hmacmd5.c hmacsha.c \ + httpd.c inet_aton.c \ + inet_ntop.c \ + iterated_hash.c \ lex.c lfsr.c lib.c log.c \ md5.c mem.c mutexblock.c \ netaddr.c netscope.c ondestroy.c \ - parseint.c portset.c print.c quota.c radix.c random.c \ + parseint.c portset.c \ + print.c \ + quota.c radix.c random.c \ ratelimiter.c refcount.c region.c result.c rwlock.c \ serial.c sha1.c sha2.c sockaddr.c stats.c string.c strtoul.c \ symtab.c task.c taskpool.c timer.c version.c +.PATH: ${.CURDIR} +SRCS+= backtrace-emptytbl.c + CFLAGS+= -I${SRCDIR}/unix/include -I${SRCDIR}/pthreads/include CFLAGS+= -I${SRCDIR}/include -I${.CURDIR} CFLAGS+= -I${SRCDIR}/${ISC_ATOMIC_ARCH}/include @@ -51,6 +59,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/assertions.h \ ${SRCDIR}/include/isc/base32.h \ ${SRCDIR}/include/isc/base64.h \ + ${SRCDIR}/include/isc/bind9.h \ ${SRCDIR}/include/isc/bitstring.h \ ${SRCDIR}/include/isc/boolean.h \ ${SRCDIR}/include/isc/buffer.h \ @@ -84,6 +93,7 @@ INCS= ${SRCDIR}/include/isc/app.h \ ${SRCDIR}/include/isc/msgcat.h \ ${SRCDIR}/include/isc/msgs.h \ ${SRCDIR}/include/isc/mutexblock.h \ + ${SRCDIR}/include/isc/namespace.h \ ${SRCDIR}/include/isc/netaddr.h \ ${SRCDIR}/include/isc/netscope.h \ ${SRCDIR}/include/isc/ondestroy.h \ diff --git a/lib/bind/isc/backtrace-emptytbl.c b/lib/bind/isc/backtrace-emptytbl.c new file mode 100644 index 0000000..9c50d95 --- /dev/null +++ b/lib/bind/isc/backtrace-emptytbl.c @@ -0,0 +1,36 @@ +/* $FreeBSD$ */ + +/* + * Copyright (C) 2009 Internet Systems Consortium, Inc. ("ISC") + * + * Permission to use, copy, modify, and/or distribute this software for any + * purpose with or without fee is hereby granted, provided that the above + * copyright notice and this permission notice appear in all copies. + * + * THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH + * REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY + * AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT, + * INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM + * LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE + * OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +/* $Id: backtrace-emptytbl.c,v 1.3 2009-09-01 20:13:44 each Exp $ */ + +/*! \file */ + +/* + * This file defines an empty (default) symbol table used in backtrace.c + * If the application wants to have a complete symbol table, it should redefine + * isc__backtrace_symtable with the complete table in some way, and link the + * version of the library not including this definition + * (e.g. libisc-nosymbol.a). + */ + +#include <config.h> + +#include <isc/backtrace.h> + +const int isc__backtrace_nsymbols = 0; +const isc_backtrace_symmap_t isc__backtrace_symtable[] = { { NULL, "" } }; diff --git a/lib/bind/isc/isc/platform.h b/lib/bind/isc/isc/platform.h index 2ac5042..7dab495 100644 --- a/lib/bind/isc/isc/platform.h +++ b/lib/bind/isc/isc/platform.h @@ -1,6 +1,5 @@ /* $FreeBSD$ */ - /* * Copyright (C) 2004-2010 Internet Systems Consortium, Inc. ("ISC") * Copyright (C) 1999-2003 Internet Software Consortium. @@ -18,7 +17,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: platform.h.in,v 1.48.84.4 2010-06-03 23:47:49 tbox Exp $ */ +/* $Id: platform.h.in,v 1.56 2010-12-18 01:56:23 each Exp $ */ #ifndef ISC_PLATFORM_H #define ISC_PLATFORM_H 1 @@ -149,6 +148,11 @@ */ #undef ISC_PLATFORM_HAVEDEVPOLL +/*! \brief + * Define if we want to log backtrace + */ +#define ISC_PLATFORM_USEBACKTRACE 1 + /* *** Printing. ***/ @@ -218,6 +222,12 @@ /* + * Defined to <gssapi_krb5.h> or <gssapi/gssapi_krb5.h> for how to + * include the GSSAPI KRB5 header. + */ + + +/* * Defined to <krb5.h> or <krb5/krb5.h> for how to include * the KRB5 header. */ @@ -253,7 +263,14 @@ * If the "xadd" operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ +/* + * FreeBSD local modification, preserve this over upgrades + */ +#if defined (__i386__) || defined (__amd64__) || defined (__ia64__) #define ISC_PLATFORM_HAVEXADD 1 +#else +#undef ISC_PLATFORM_HAVEXADD +#endif /* * If the "xaddq" operation (64bit xadd) is available on this architecture, @@ -272,18 +289,39 @@ * If the "atomic swap" operation is available on this architecture, * ISC_PLATFORM_HAVEATOMICSTORE" will be defined. */ +/* + * FreeBSD local modification, preserve this over upgrades + */ +#if defined (__i386__) || defined (__amd64__) || defined (__ia64__) #define ISC_PLATFORM_HAVEATOMICSTORE 1 +#else +#undef ISC_PLATFORM_HAVEATOMICSTORE +#endif /* * If the "compare-and-exchange" operation is available on this architecture, * ISC_PLATFORM_HAVECMPXCHG will be defined. */ +/* + * FreeBSD local modification, preserve this over upgrades + */ +#if defined (__i386__) || defined (__amd64__) || defined (__ia64__) #define ISC_PLATFORM_HAVECMPXCHG 1 +#else +#undef ISC_PLATFORM_HAVECMPXCHG +#endif /* * Define if gcc ASM extension is available */ +/* + * FreeBSD local modification, preserve this over upgrades + */ +#if defined (__i386__) || defined (__amd64__) || defined (__ia64__) #define ISC_PLATFORM_USEGCCASM 1 +#else +#undef ISC_PLATFORM_USEGCCASM +#endif /* * Define if Tru64 style ASM syntax must be used. @@ -300,6 +338,17 @@ */ #define ISC_PLATFORM_HAVESTRINGSH 1 +/* + * Define if the hash functions must be provided by OpenSSL. + */ +#undef ISC_PLATFORM_OPENSSLHASH + +/* + * Defines for the noreturn attribute. + */ +#define ISC_PLATFORM_NORETURN_PRE +#define ISC_PLATFORM_NORETURN_POST __attribute__((noreturn)) + /*** *** Windows dll support. ***/ |
