From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from simark.ca by simark.ca with LMTP id 84njHdstC2BZMgAAWB0awg (envelope-from ) for ; Fri, 22 Jan 2021 14:56:11 -0500 Received: by simark.ca (Postfix, from userid 112) id 6A13C1EF80; Fri, 22 Jan 2021 14:56:11 -0500 (EST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on simark.ca X-Spam-Level: X-Spam-Status: No, score=-1.1 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,MAILING_LIST_MULTI,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by simark.ca (Postfix) with ESMTPS id 1588F1E939 for ; Fri, 22 Jan 2021 14:56:10 -0500 (EST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 846E03893668; Fri, 22 Jan 2021 19:56:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 846E03893668 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1611345369; bh=z0/jkyBYwKLC/GX3zqJ2AqA0Jg30m6EBMzzDFhL0KRw=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=QSZ1qRcpLt6CiEXu21t0sKegu+Uk6gTtuqRpZq3igK5mBEcLIoYpmA8KonvVytyS1 HcDrMV/uF9fzH3E8gnCyyJgYcYB3DHDKV8ainUgND+4hmhOuP/wruqTY8fkZdfSroj f2ZA6pTgX/jDMNXglAks3NSCeOOmWTrlrq1iAovA= Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id 8FAE73893668 for ; Fri, 22 Jan 2021 19:56:05 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 8FAE73893668 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 10MJluGd046060; Fri, 22 Jan 2021 14:55:50 -0500 Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com with ESMTP id 36856a05j4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jan 2021 14:55:49 -0500 Received: from m0098396.ppops.net (m0098396.ppops.net [127.0.0.1]) by pps.reinject (8.16.0.36/8.16.0.36) with SMTP id 10MJmOMt050414; Fri, 22 Jan 2021 14:55:49 -0500 Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com with ESMTP id 36856a05hx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jan 2021 14:55:49 -0500 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.16.0.42/8.16.0.42) with SMTP id 10MJka2t013386; Fri, 22 Jan 2021 19:55:48 GMT Received: from b03cxnp08026.gho.boulder.ibm.com (b03cxnp08026.gho.boulder.ibm.com [9.17.130.18]) by ppma01dal.us.ibm.com with ESMTP id 367k0m7tup-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 22 Jan 2021 19:55:48 +0000 Received: from b03ledav003.gho.boulder.ibm.com (b03ledav003.gho.boulder.ibm.com [9.17.130.234]) by b03cxnp08026.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 10MJtl5Q23331198 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 22 Jan 2021 19:55:47 GMT Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 23F026A057; Fri, 22 Jan 2021 19:55:47 +0000 (GMT) Received: from b03ledav003.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 79A5C6A047; Fri, 22 Jan 2021 19:55:46 +0000 (GMT) Received: from gimli.ibmuc.com (unknown [9.85.175.20]) by b03ledav003.gho.boulder.ibm.com (Postfix) with ESMTP; Fri, 22 Jan 2021 19:55:46 +0000 (GMT) To: gdb-patches@sourceware.org Subject: [PATCHv2] gnulib: update to 776af40e0 Date: Fri, 22 Jan 2021 13:55:45 -0600 Message-Id: <20210122195545.2401220-1-murphyp@linux.ibm.com> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.343, 18.0.737 definitions=2021-01-22_14:2021-01-22, 2021-01-22 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 malwarescore=0 spamscore=0 mlxlogscore=999 mlxscore=0 priorityscore=1501 clxscore=1015 lowpriorityscore=0 suspectscore=0 impostorscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2009150000 definitions=main-2101220098 X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , From: "Paul E. Murphy via Gdb-patches" Reply-To: "Paul E. Murphy" Cc: "Paul E. Murphy" Errors-To: gdb-patches-bounces@sourceware.org Sender: "Gdb-patches" Changes generated by rerunning are left out as the resulting patch is too big for the mailing list. Likewise, tested compilation on x86 and ppc64le, and I do not have commit access, but I do have gnu copyright assignment. V2 updates: Apply suggested fixes from Simon Marchi and Christian Biesinger for unoptimized gcc builds and mingw. ---8<--- This fixes PR27184, a failure to compile gdb due to cdefs.h being out of sync with glibc on ppc64le targets which are compiled with -mabi=ieeelongdouble and glibc 2.32. Likewise, update usage of _GL_ATTRIBUTE_FORMAT_PRINTF to _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD. Likewise, disable newly added rpl_free gnulib api in gdbserver support libraries. Likewise, undefine read/write macros before redefining them on mingw targets. Likewise, wrap C++ usage of free with GNULIB_NAMESPACE namespace as needed. --- gdbserver/ChangeLog | 7 +++++++ gdbserver/Makefile.in | 2 +- gdbserver/remote-utils.cc | 4 ++++ gdbsupport/ChangeLog | 7 +++++++ gdbsupport/common-defs.h | 4 ++-- gdbsupport/common-utils.h | 6 +++++- gnulib/ChangeLog | 5 +++++ gnulib/update-gnulib.sh | 2 +- 8 files changed, 32 insertions(+), 5 deletions(-) diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog index 3323ecfbf89..8aa82967471 100644 --- a/gdbserver/ChangeLog +++ b/gdbserver/ChangeLog @@ -1,3 +1,10 @@ +2021-01-22 Paul E. Murphy + + * Makefile.in (UNDO_GNULIB_CFLAGS): disable + gnulib free replacement too. + * common-defs.h [USE_WIN32API](read, write): undefine + gnulib versions before defining these macros. + 2021-01-07 Tom de Vries * Makefile.in (LIBIBERTY_NORMAL, LIBIBERTY_NOASAN, LIBIBERTY_PIC): diff --git a/gdbserver/Makefile.in b/gdbserver/Makefile.in index a14d3a7bc18..8e174da8dcf 100644 --- a/gdbserver/Makefile.in +++ b/gdbserver/Makefile.in @@ -490,7 +490,7 @@ UST_CFLAGS = $(ustinc) -DCONFIG_UST_GDB_INTEGRATION # Undo gnulib replacements for the IPA shared library build. # The gnulib headers are still needed, but gnulib is not linked # into the IPA lib so replacement apis don't work. -UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r +UNDO_GNULIB_CFLAGS = -Drpl_strerror_r=strerror_r -Drpl_free=free # Note, we only build the IPA if -fvisibility=hidden is supported in # the first place. diff --git a/gdbserver/remote-utils.cc b/gdbserver/remote-utils.cc index cfdf1c1883c..4f63d73785d 100644 --- a/gdbserver/remote-utils.cc +++ b/gdbserver/remote-utils.cc @@ -102,6 +102,10 @@ static int remote_desc = -1; static int listen_desc = -1; #ifdef USE_WIN32API +/* gnulib wraps these as macros, undo them. */ +# undef read +# undef write + # define read(fd, buf, len) recv (fd, (char *) buf, len, 0) # define write(fd, buf, len) send (fd, (char *) buf, len, 0) #endif diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog index d973a6daa4f..f032f445693 100644 --- a/gdbsupport/ChangeLog +++ b/gdbsupport/ChangeLog @@ -1,3 +1,10 @@ +2021-01-22 Paul E. Murphy + + * common-defs.h (ATTRIBUTE_PRINTF): rename + _GL_ATTRIBUTE_FORMAT_PRINTF to _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD. + * common-utils.h (xfree): use GNULIB_NAMESPACE namespace when calling + free if this macro is defined. + 2021-01-08 Simon Marchi PR gdb/27157 diff --git a/gdbsupport/common-defs.h b/gdbsupport/common-defs.h index e5ece3baccc..5b644010cd9 100644 --- a/gdbsupport/common-defs.h +++ b/gdbsupport/common-defs.h @@ -105,10 +105,10 @@ /* This is defined by ansidecl.h, but we prefer gnulib's version. On MinGW, gnulib might enable __USE_MINGW_ANSI_STDIO, which may or not require use of attribute gnu_printf instead of printf. gnulib - checks that at configure time. Since _GL_ATTRIBUTE_FORMAT_PRINTF + checks that at configure time. Since _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD is compatible with ATTRIBUTE_PRINTF, simply use it. */ #undef ATTRIBUTE_PRINTF -#define ATTRIBUTE_PRINTF _GL_ATTRIBUTE_FORMAT_PRINTF +#define ATTRIBUTE_PRINTF _GL_ATTRIBUTE_FORMAT_PRINTF_STANDARD #if GCC_VERSION >= 3004 #define ATTRIBUTE_UNUSED_RESULT __attribute__ ((__warn_unused_result__)) diff --git a/gdbsupport/common-utils.h b/gdbsupport/common-utils.h index 4429f086fce..28c08ee9766 100644 --- a/gdbsupport/common-utils.h +++ b/gdbsupport/common-utils.h @@ -59,7 +59,11 @@ xfree (T *ptr) data type. Use operator delete instead."); if (ptr != NULL) - free (ptr); /* ARI: free */ +#ifdef GNULIB_NAMESPACE + GNULIB_NAMESPACE::free (ptr); /* ARI: free */ +#else + free (ptr); /* ARI: free */ +#endif } diff --git a/gnulib/ChangeLog b/gnulib/ChangeLog index 909df781797..8adb8156518 100644 --- a/gnulib/ChangeLog +++ b/gnulib/ChangeLog @@ -1,3 +1,8 @@ +2021-01-22 Paul E. Murphy + * update-gnulib.sh (GNULIB_COMMIT_SHA1): Bump to + 776af40e09b476a41073131a90022572f448c189. + * Makefile.in, config.in, configure, import/*: Re-generate. + 2020-10-09 Andrew Burgess * Makefile.gnulib.inc.in: New file. diff --git a/gnulib/update-gnulib.sh b/gnulib/update-gnulib.sh index e9b377ca475..02d045b5348 100755 --- a/gnulib/update-gnulib.sh +++ b/gnulib/update-gnulib.sh @@ -70,7 +70,7 @@ IMPORTED_GNULIB_MODULES="\ " # The gnulib commit ID to use for the update. -GNULIB_COMMIT_SHA1="4e3f2d4cfdba14e1d89479362061a9280f2f22b6" +GNULIB_COMMIT_SHA1="776af40e09b476a41073131a90022572f448c189" # The expected version number for the various auto tools we will # use after the import. -- 2.26.2