From 6383e5ab94a4f05ccc39974a64facbbb3af30de8 Mon Sep 17 00:00:00 2001 From: Denis Khalikov Date: Mon, 9 Apr 2018 11:13:46 +0300 Subject: [PATCH] [ASan] Revert commit related to ASan. Revert commit related to workaround, which was a temporary fix for bug into GCC pass. So, this bug was fixed on the compiler side and was related to ASan and ANHCOR sections. Change-Id: I26b92d17e33265abc7346bf04b0b31846d420cb1 --- include/net_connection_private.h | 9 +-------- packaging/capi-network-connection.spec | 1 - 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/include/net_connection_private.h b/include/net_connection_private.h index f38e454..8582d4c 100755 --- a/include/net_connection_private.h +++ b/include/net_connection_private.h @@ -43,13 +43,6 @@ extern "C" { #define TETHERING_BLUETOOTH_FEATURE "http://tizen.org/feature/network.tethering.bluetooth" #define ETHERNET_FEATURE "http://tizen.org/feature/network.ethernet" -#ifdef ADDRESS_SANITIZER -#define NO_SANITIZE \ - __attribute__((optimize(2))) __attribute__((no_sanitize_address)) -#else -#define NO_SANITIZE -#endif - typedef enum { CONNECTION_CELLULAR_SUBSCRIBER_1 = 0x00, CONNECTION_CELLULAR_SUBSCRIBER_2 = 0x01, @@ -188,7 +181,7 @@ int _connection_libnet_start_tcpdump(void); int _connection_libnet_stop_tcpdump(void); int _connection_libnet_get_tcpdump_state(gboolean *tcpdump_state); -void _connection_libnet_set_type_changed_cb(libnet_type_changed_cb callback) NO_SANITIZE; +void _connection_libnet_set_type_changed_cb(libnet_type_changed_cb callback); void _connection_libnet_set_ip_changed_cb(libnet_ip_changed_cb callback); void _connection_libnet_set_proxy_changed_cb(libnet_proxy_changed_cb callback); diff --git a/packaging/capi-network-connection.spec b/packaging/capi-network-connection.spec index 9545552..dee1b74 100755 --- a/packaging/capi-network-connection.spec +++ b/packaging/capi-network-connection.spec @@ -31,7 +31,6 @@ Network Connection library in Tizen C API (Development) %build -%{?asan: export CFLAGS+=' -DADDRESS_SANITIZER '} export CFLAGS+=' -Wno-unused-local-typedefs' MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'` cmake -DCMAKE_INSTALL_PREFIX=/usr -DFULLVER=%{version} -DMAJORVER=${MAJORVER} \ -- 2.7.4