upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-15 17:28:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'ondrej/bump-clang-dependency-to-llvm-12' into 'main'

Browse source 
Change the LLVM tools version to 12

See merge request isc-projects/bind9!5174
This commit is contained in:
Ondřej Surý 2021-06-13 08:51:12 +00:00
commit b68121adbf
5 changed files with 25 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.gitlab-ci.yml
View file

@ -13,16 +13,16 @@ variables:
TEST_PARALLEL_JOBS: 6
CONFIGURE: ./configure
CLANG: clang-11
SCAN_BUILD: scan-build-11
ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-11/bin/llvm-symbolizer
CLANG_FORMAT: clang-format-11
CLANG: clang-12
SCAN_BUILD: scan-build-12
ASAN_SYMBOLIZER_PATH: /usr/lib/llvm-12/bin/llvm-symbolizer
CLANG_FORMAT: clang-format-12
CFLAGS_COMMON: -fno-omit-frame-pointer -fno-optimize-sibling-calls -O1 -g -Wall -Wextra
# Pass run-time flags to AddressSanitizer to get core dumps on error.
ASAN_OPTIONS_COMMON: abort_on_error=1:disable_coredump=0:unmap_shadow_on_exit=1
TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-11/bin/llvm-symbolizer"
TSAN_OPTIONS_COMMON: "disable_coredump=0 second_deadlock_stack=1 history_size=7 log_exe_name=true log_path=tsan external_symbolizer_path=/usr/lib/llvm-12/bin/llvm-symbolizer"
TARBALL_EXTENSION: xz

9
lib/dns/include/dns/rpz.h
View file

@ -96,10 +96,11 @@ typedef uint64_t dns_rpz_zbits_t;
* Mask of the specified and higher numbered policy zones
* Avoid hassles with (1<<33) or (1<<65)
*/
#define DNS_RPZ_ZMASK(n) \
((dns_rpz_zbits_t)( \
(((n) >= DNS_RPZ_MAX_ZONES - 1) ? 0 : (1ULL << ((n) + 1))) - \
1))
#define DNS_RPZ_ZMASK(n) \
((dns_rpz_zbits_t)((((n) >= DNS_RPZ_MAX_ZONES - 1) \
? 0 \
: (1ULL << ((n) + 1))) - \
1))
/*
* The trigger counter type.

6
lib/dns/message.c
View file

@ -1578,9 +1578,9 @@ getsection(isc_buffer_t *source, dns_message_t *msg, dns_decompress_t *dctx,
msg->opt = rdataset;
rdataset = NULL;
free_rdataset = false;
ercode = (dns_rcode_t)(
(msg->opt->ttl & DNS_MESSAGE_EDNSRCODE_MASK) >>
20);
ercode = (dns_rcode_t)((msg->opt->ttl &
DNS_MESSAGE_EDNSRCODE_MASK) >>
20);
msg->rcode |= ercode;
dns_message_puttempname(msg, &name);
free_name = false;

16
lib/dns/rbtdb.c
View file

@ -6848,8 +6848,10 @@ addrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
RDATASET_ATTR_SET(newheader, RDATASET_ATTR_RESIGN);
newheader->resign = (isc_stdtime_t)(
dns_time64_from32(rdataset->resign) >> 1);
newheader->resign =
(isc_stdtime_t)(dns_time64_from32(
rdataset->resign) >>
1);
newheader->resign_lsb = rdataset->resign & 0x1;
} else {
newheader->resign = 0;
@ -7058,8 +7060,9 @@ subtractrdataset(dns_db_t *db, dns_dbnode_t *node, dns_dbversion_t *version,
newheader->node = rbtnode;
if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
RDATASET_ATTR_SET(newheader, RDATASET_ATTR_RESIGN);
newheader->resign = (isc_stdtime_t)(
dns_time64_from32(rdataset->resign) >> 1);
newheader->resign =
(isc_stdtime_t)(dns_time64_from32(rdataset->resign) >>
1);
newheader->resign_lsb = rdataset->resign & 0x1;
} else {
newheader->resign = 0;
@ -7468,8 +7471,9 @@ loading_addrdataset(void *arg, const dns_name_t *name,
if ((rdataset->attributes & DNS_RDATASETATTR_RESIGN) != 0) {
RDATASET_ATTR_SET(newheader, RDATASET_ATTR_RESIGN);
newheader->resign = (isc_stdtime_t)(
dns_time64_from32(rdataset->resign) >> 1);
newheader->resign =
(isc_stdtime_t)(dns_time64_from32(rdataset->resign) >>
1);
newheader->resign_lsb = rdataset->resign & 0x1;
} else {
newheader->resign = 0;

4
lib/isc/include/isc/stdatomic.h
View file

@ -185,10 +185,10 @@ typedef uintmax_t atomic_uintmax_t;
fail) \
({ \
__typeof__(obj) __v; \
_Bool __r; \
_Bool __r; \
__v = (__typeof__(obj))__sync_val_compare_and_swap( \
obj, *(expected), desired); \
__r = ((__typeof__(obj)) * (expected) == __v); \
__r = ((__typeof__(obj))*(expected) == __v); \
*(expected) = __v; \
__r; \
})