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

Merge branch '1725-drop-function-wrapping' into 'main'

Browse source 
Drop function wrapping as it is redundant for now

Closes #1725

See merge request isc-projects/bind9!4174
This commit is contained in:
Michał Kępień 2020-09-28 07:11:48 +00:00
commit b8b3ddb02f
14 changed files with 28 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.top
View file

@ -11,6 +11,13 @@ AM_CPPFLAGS = \
-include $(top_builddir)/config.h \
-I$(srcdir)/include
AM_LDFLAGS =
if HOST_MACOS
AM_LDFLAGS += \
-Wl,-flat_namespace
endif HOST_MACOS
if HAVE_GSSAPI
AM_CPPFLAGS += \
$(GSSAPI_CFLAGS)

42
configure.ac
View file

@ -150,6 +150,10 @@ AX_CHECK_COMPILE_FLAG([-Werror -fno-delete-null-pointer-checks],
AX_CHECK_COMPILE_FLAG([-fdiagnostics-show-option],
[STD_CFLAGS="$STD_CFLAGS -fdiagnostics-show-option"])
host_macos=no
AS_CASE([$host],[*-darwin*],[host_macos=yes])
AM_CONDITIONAL([HOST_MACOS], [test "$host_macos" = "yes"])
#
# Change defaults for developers if not explicity set.
# Needs to be before the option is tested.
@ -1354,44 +1358,6 @@ AC_SUBST([CMOCKA_LIBS])
AM_CONDITIONAL([HAVE_CMOCKA], [test "$with_cmocka" = "yes"])
#
# Check for -Wl,--wrap= support
#
LD_WRAP_TESTS=false
AC_MSG_CHECKING([for linker support for --wrap option])
AX_SAVE_FLAGS([wrap])
LDFLAGS="-Wl,--wrap,exit"
AC_RUN_IFELSE(
[AC_LANG_PROGRAM([[#include <stdlib.h>
void __real_exit (int status);
void __wrap_exit (int status) { __real_exit (0); }
]],
[[exit (1);]])],
[LD_WRAP_TESTS=true
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
AX_RESTORE_FLAGS([wrap])
AM_CONDITIONAL([HAVE_LD_WRAP], [test "$LD_WRAP_TESTS" = "true"])
WRAP_INTERPOSE=
AC_MSG_CHECKING([for linker support for '-z interpose' option])
AX_SAVE_FLAGS([interpose])
LDFLAGS="-Wl,-z,interpose"
AC_LINK_IFELSE(
[AC_LANG_PROGRAM([],[])],
[WRAP_INTERPOSE="-Wl,-z,interpose"
AC_MSG_RESULT([yes])],
[AC_MSG_RESULT([no])])
AX_RESTORE_FLAGS([interpose])
AC_SUBST([WRAP_INTERPOSE])
WRAP_NAME=''
AS_CASE([$host],[*-darwin*],[WRAP_NAME='${WRAP_NAME}'])
AC_SUBST([WRAP_NAME])
#
# Check for i18n
#

2
fuzz/Makefile.am
View file

@ -5,7 +5,7 @@ AM_CPPFLAGS += \
$(LIBDNS_CFLAGS) \
-DFUZZDIR=\"$(abs_srcdir)\"
AM_LDFLAGS = \
AM_LDFLAGS += \
$(FUZZ_LDFLAGS)
LDADD = \

1
lib/bind9/Makefile.am
View file

@ -27,6 +27,7 @@ libbind9_la_LIBADD = \
$(LIBISCCFG_LIBS)
libbind9_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libbind9_VERSION_INFO)
EXTRA_DIST = api

1
lib/dns/Makefile.am
View file

@ -287,6 +287,7 @@ libdns_la_CPPFLAGS = \
$(LIBLTDL_CFLAGS)
libdns_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libdns_VERSION_INFO)
libdns_la_LIBADD = \

1
lib/irs/Makefile.am
View file

@ -23,6 +23,7 @@ libirs_la_LIBADD = \
$(LIBISCCFG_LIBS)
libirs_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libirs_VERSION_INFO)

1
lib/isc/Makefile.am
View file

@ -227,6 +227,7 @@ libisc_la_CPPFLAGS = \
$(ZLIB_CFLAGS)
libisc_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libisc_VERSION_INFO)
libisc_la_LIBADD = \

1
lib/isccc/Makefile.am
View file

@ -35,6 +35,7 @@ libisccc_la_LIBADD = \
$(LIBISC_LIBS)
libisccc_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libisccc_VERSION_INFO)
if HAVE_CMOCKA

1
lib/isccfg/Makefile.am
View file

@ -32,6 +32,7 @@ libisccfg_la_LIBADD = \
$(LIBDNS_LIBS)
libisccfg_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libisccfg_VERSION_INFO)
if HAVE_CMOCKA

1
lib/ns/Makefile.am
View file

@ -51,6 +51,7 @@ libns_la_LIBADD = \
$(LIBDNS_LIBS)
libns_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(libns_VERSION_INFO)
if HAVE_CMOCKA

34
lib/ns/tests/Makefile.am
View file

@ -13,37 +13,17 @@ LDADD += \
$(LIBNS_LIBS)
check_LTLIBRARIES = libnstest.la
libnstest_la_SOURCES = nstest.c nstest.h
libnstest_la_SOURCES = \
nstest.c \
nstest.h
check_PROGRAMS = \
listenlist_test \
plugin_test
TESTS = $(check_PROGRAMS)
if HAVE_LD_WRAP
check_PROGRAMS += \
notify_test \
notify_test \
plugin_test \
query_test
notify_test_SOURCES = \
notify_test.c \
wrap.c
notify_test_LDFLAGS = \
$(LDFLAGS) \
-Wl,--wrap=isc_nmhandle_attach \
-Wl,--wrap=isc_nmhandle_detach
query_test_SOURCES = \
query_test.c \
wrap.c
query_test_LDFLAGS = \
$(LDFLAGS) \
-Wl,--wrap=isc_nmhandle_detach
endif
TESTS = $(check_PROGRAMS)
unit-local: check

9
lib/ns/tests/nstest.c
View file

@ -78,12 +78,7 @@ atomic_uint_fast32_t client_refs[32];
atomic_uintptr_t client_addrs[32];
void
__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp);
void
__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep);
void
__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
ns_client_t *client = (ns_client_t *)source;
int i;
@ -102,7 +97,7 @@ __wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
}
void
__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep) {
isc_nmhandle_detach(isc_nmhandle_t **handlep) {
isc_nmhandle_t *handle = *handlep;
ns_client_t *client = (ns_client_t *)handle;
int i;

47
lib/ns/tests/wrap.c
View file

@ -1,47 +0,0 @@
/*
* Copyright (C) Internet Systems Consortium, Inc. ("ISC")
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, you can obtain one at https://mozilla.org/MPL/2.0/.
*
* See the COPYRIGHT file distributed with this work for additional
* information regarding copyright ownership.
*/
/*! \file */
#include <inttypes.h>
#include <stdbool.h>
#include <stdlib.h>
#include <time.h>
#include <unistd.h>
#include <isc/mem.h>
#include <isc/netmgr.h>
#include <isc/util.h>
#include <dns/view.h>
#include <ns/client.h>
/*
* This overrides calls to isc_nmhandle_attach/detach(), sending them to
* __wrap_isc_nmhandle_attach/detach() instead, when libtool is in use
* and LD_WRAP can't be used.
*/
void
__wrap_isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp);
extern void
__wrap_isc_nmhandle_detach(isc_nmhandle_t **handlep);
void
isc_nmhandle_attach(isc_nmhandle_t *source, isc_nmhandle_t **targetp) {
__wrap_isc_nmhandle_attach(source, targetp);
}
void
isc_nmhandle_detach(isc_nmhandle_t **handlep) {
__wrap_isc_nmhandle_detach(handlep);
}

1
util/copyrights
View file

@ -2124,7 +2124,6 @@
./lib/ns/tests/plugin_test.c C 2019,2020
./lib/ns/tests/query_test.c C 2017,2018,2019,2020
./lib/ns/tests/testdata/notify/notify1.msg X 2017,2018,2019,2020
./lib/ns/tests/wrap.c C 2019,2020
./lib/ns/update.c C 2017,2018,2019,2020
./lib/ns/win32/DLLMain.c C 2017,2018,2019,2020
./lib/ns/win32/libns.def X 2017,2018,2019,2020