From patchwork Wed Jan 7 17:36:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 4553 Received: (qmail 8124 invoked by alias); 7 Jan 2015 17:36:41 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8040 invoked by uid 89); 7 Jan 2015 17:36:40 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Wed, 07 Jan 2015 17:36:39 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id t07HacqI023795 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Wed, 7 Jan 2015 12:36:38 -0500 Received: from host2.jankratochvil.net (ovpn-116-60.ams2.redhat.com [10.36.116.60]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t07HaY4Y007683 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO) for ; Wed, 7 Jan 2015 12:36:37 -0500 Date: Wed, 7 Jan 2015 18:36:34 +0100 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch] Fix jit-reader.h for multilib Message-ID: <20150107173634.GA13295@host2.jankratochvil.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes Hi, I got reported jit-reader.h is not multi-lib safe: multi-lib safety means that files with the same pathname (which is /usr/include, contrary to /usr/lib vs. /usr/lib64 for example). The patch will make it on x86_64 also 'unsigned long long'. OK for check-in? Thanks, Jan gdb/ChangeLog 2015-01-07 Jan Kratochvil * configure: Regenerate. * configure.ac (TARGET_PTR): Try "unsigned long long" first. diff --git a/gdb/configure.ac b/gdb/configure.ac index ec776d7..c02ace9 100644 --- a/gdb/configure.ac +++ b/gdb/configure.ac @@ -648,10 +648,12 @@ AC_CHECK_SIZEOF(unsigned long long) AC_CHECK_SIZEOF(unsigned long) AC_CHECK_SIZEOF(unsigned __int128) -if test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then - TARGET_PTR="unsigned long" -elif test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then +# Try to keep TARGET_PTR the same across archs so that jit-reader.h file +# content is the same for multilib distributions. +if test "x${ac_cv_sizeof_unsigned_long_long}" = "x8"; then TARGET_PTR="unsigned long long" +elif test "x${ac_cv_sizeof_unsigned_long}" = "x8"; then + TARGET_PTR="unsigned long" elif test "x${ac_cv_sizeof_unsigned___int128}" = "x16"; then TARGET_PTR="unsigned __int128" else --- /usr/include/gdb/jit-reader.h on x86_64 2015-01-07 11:54:27.705802129 -0500 +++ /usr/include/gdb/jit-reader.h on i686 2015-01-07 11:54:46.853774165 -0500 @@ -56,7 +56,7 @@ extern "C" { /* Represents an address on the target system. */ -typedef unsigned long GDB_CORE_ADDR; +typedef unsigned long long GDB_CORE_ADDR; /* Return status codes. */