From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 57443 invoked by alias); 9 Dec 2016 22:47:28 -0000 Mailing-List: contact libabigail-help@sourceware.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Subscribe: Sender: libabigail-owner@sourceware.org Received: (qmail 57431 invoked by uid 89); 9 Dec 2016 22:47:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=H*RU:sk:dynamic, Hx-spam-relays-external:sk:dynamic, abigail, H*r:sk:libabig X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: mail-wm0-f50.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=to:from:subject:message-id:date:user-agent:mime-version; bh=L/1hQ8EpgoK0DvWwbvfQloXgIxf+aYWkAHv/9WRIGWk=; b=a8yCw4CupUEsqngnQSjj8L4h9So8le7l3CIBKbZBz4WyYq7iUyUNUxj1yivtVSmCpz pbUletuLyNnMFzvF7CpfiNC7GEfPmSMGGPAGd6qb3pf2GvjQaPs/p/luR+j9PabvpXEs PAiNd7SSlA4pHxz+KTO0B76gqV8IpihnArLqgMHHznduC0WzZJdqdEIahjxSO17mf1tj CjlRy2a5ijWZzwxv82Rap3milCzftFgcB13zt2SBt9qHUdlfBLeC6ktv5rFMwsL3FQtA 5y4KdSzECtKArEgiOkPekw9YQzqRi4TiVbESeDSfLCz105t1gJ0zCbYhwg/TKBL41y0h 025g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version; bh=L/1hQ8EpgoK0DvWwbvfQloXgIxf+aYWkAHv/9WRIGWk=; b=OsGHbnbMUQmVo0ET5NxAmR1K5hQG7hurwFkL5zfDpL3zKNzr9yFphYJJ2ws0oDTQ+D mlWGPvfwTqks9A6pU7zC0zVGZVkTAVoXIy6leh4Ks/xwAj4iGQhN/Z3tvmVKTaWAAln3 rxDeOAxRJYzMvw3DapsceE3qmGXk/Ue5EW8Gzu+5UMHFJ1ho7GZWNa/T940Gt+EtS9Kg UssQWKm4VekmH3/Jf2lGzQcQZxpv9gDApM9jmPv/P1BOjrq2uh0wHKVgk6Ea/ZQF5Sja Bfp+0eXO29UyuEn3LeDHAf2zXEf7pqqQOyPni3XPwnksUmrwKf+hxElckHTkE5Y3aHat awhw== X-Gm-Message-State: AKaTC00jibQqOx+wntCXVHrHAX78FbmnowigKoCIIBG8hlR0KSk/l/B5xK7cwxHvyF87eQ== X-Received: by 10.28.9.80 with SMTP id 77mr8953617wmj.68.1481323635675; Fri, 09 Dec 2016 14:47:15 -0800 (PST) To: libabigail@sourceware.org From: Ondrej Oprala Subject: [Patch] Bug 19272 - abipkgdiff doesn't report arch differences Message-ID: <35ead0e5-991f-5b27-0a1c-63cf15f1f42c@gmail.com> Date: Fri, 01 Jan 2016 00:00:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------82A1873736F58525F24A8730" X-SW-Source: 2016-q4/txt/msg00035.txt.bz2 This is a multi-part message in MIME format. --------------82A1873736F58525F24A8730 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 109 Hi Dodji, After a few months of silence, I finally picked out something from the BZ ;) Cheers, Ondrej --------------82A1873736F58525F24A8730 Content-Type: text/x-patch; name="0001-Bug-19272-abipkgdiff-doesn-t-report-arch-change.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Bug-19272-abipkgdiff-doesn-t-report-arch-change.patch" Content-length: 2966 >From 003408102c8875c7de40a6d0322820bf11ece522 Mon Sep 17 00:00:00 2001 From: Ondrej Oprala Date: Fri, 9 Dec 2016 23:01:58 +0100 Subject: [PATCH] Bug 19272 - abipkgdiff doesn't report arch change Previously, architecture change wasn't included in the incompatible changes check. Basically, this patch adds a call to corpus_diff::architecture_changed() wherever corpus_diff::soname_changed() is called. Also, abipkgdiff seemed to only start reporting differences if a compatible ABI change was found. * src/abg-comparison.cc (corpus_diff::has_incompatible_changes): Check for an architecture change and return true if there was one. * tools/abicompat.cc (perform_compat_check_in_normal_mode): Likewise. * tools/abipkgdiff.cc (pthread_routine_compare): Report differences for {in,}compatible changes alike. Signed-off-by: Ondrej Oprala --- src/abg-comparison.cc | 2 +- tools/abicompat.cc | 2 ++ tools/abipkgdiff.cc | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/abg-comparison.cc b/src/abg-comparison.cc index b57e7f0..320b74e 100644 --- a/src/abg-comparison.cc +++ b/src/abg-comparison.cc @@ -11953,7 +11953,7 @@ corpus_diff::has_incompatible_changes() const const diff_stats& stats = const_cast(this)-> apply_filters_and_suppressions_before_reporting(); - return (soname_changed() + return (soname_changed() || architecture_changed() || stats.net_num_func_removed() != 0 || (stats.num_func_with_virtual_offset_changes() != 0 // If all reports about functions with sub-type changes diff --git a/tools/abicompat.cc b/tools/abicompat.cc index 9891795..159ad5f 100644 --- a/tools/abicompat.cc +++ b/tools/abicompat.cc @@ -374,6 +374,7 @@ perform_compat_check_in_normal_mode(options& opts, changes->apply_filters_and_suppressions_before_reporting(); if (changes->soname_changed() + || changes->architecture_changed() || s.num_func_removed() != 0 || s.num_vars_removed() != 0 || s.num_func_syms_removed() != 0 @@ -395,6 +396,7 @@ perform_compat_check_in_normal_mode(options& opts, status |= abigail::tools_utils::ABIDIFF_ABI_CHANGE; bool abi_broke_for_sure = changes->soname_changed() + || changes->architecture_changed() || s.num_vars_removed() || s.num_func_removed() || s.num_var_syms_removed() diff --git a/tools/abipkgdiff.cc b/tools/abipkgdiff.cc index a5c3901..24aa06e 100644 --- a/tools/abipkgdiff.cc +++ b/tools/abipkgdiff.cc @@ -1236,7 +1236,8 @@ pthread_routine_compare(vector *args) a->opts, env, diff, ctxt); const string key = a->elf1.path; - if ((s & abigail::tools_utils::ABIDIFF_ABI_CHANGE) + if ((s & (abigail::tools_utils::ABIDIFF_ABI_CHANGE | + abigail::tools_utils::ABIDIFF_ABI_INCOMPATIBLE_CHANGE)) || (verbose && diff->has_changes())) { const string prefix = " "; -- 2.7.4 --------------82A1873736F58525F24A8730--