From patchwork Mon Oct 16 02:14:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 23583 Received: (qmail 18872 invoked by alias); 16 Oct 2017 02:14:22 -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 18862 invoked by uid 89); 16 Oct 2017 02:14:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, SPF_PASS autolearn=ham version=3.3.2 spammy=forgot X-HELO: sessmg22.ericsson.net Received: from sessmg22.ericsson.net (HELO sessmg22.ericsson.net) (193.180.251.58) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 16 Oct 2017 02:14:20 +0000 Received: from ESESSHC015.ericsson.se (Unknown_Domain [153.88.183.63]) by sessmg22.ericsson.net (Symantec Mail Security) with SMTP id 49.40.26775.9F514E95; Mon, 16 Oct 2017 04:14:17 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (153.88.183.145) by oa.msg.ericsson.com (153.88.183.63) with Microsoft SMTP Server (TLS) id 14.3.352.0; Mon, 16 Oct 2017 04:14:16 +0200 Received: from elxacz23q12.lan (192.222.251.162) by AM3PR07MB307.eurprd07.prod.outlook.com (2a01:111:e400:881b::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.77.5; Mon, 16 Oct 2017 02:14:13 +0000 From: Simon Marchi To: CC: Simon Marchi Subject: [pushed] Fix GDB build without expat Date: Sun, 15 Oct 2017 22:14:02 -0400 Message-ID: <1508120042-25620-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-ClientProxiedBy: BN6PR0101CA0031.prod.exchangelabs.com (2603:10b6:405:2a::44) To AM3PR07MB307.eurprd07.prod.outlook.com (2a01:111:e400:881b::15) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 325af28f-3e28-43a1-4f58-08d5143b98a3 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254152)(2017052603219)(201703131423075)(201703031133081)(201702281549075); SRVR:AM3PR07MB307; X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 3:8Py2fGjROxUVTNgfHht6K0CY5w7qiRx+8Wfbxn9MszENn2hpMqGJ65sirjVtU8C9B436YnG4NevunTV1B7BXvKKYb+ZdPhn2MJqGSFh/2r2Jw4A8QC/fa5pEyTnYao5fkYvdKrvWEv6Rxss696VJTPW3e3FboKSKaVhj1CGCXtmSVaTIHws1pEZuTGZLF8jzVsSRqBwpU1N6cIFG225sgAePG6zGamLAqex8iYBgxceWEJtK0S6MHSjMS3xmxyZ4; 25:TQCCZc77o+X4yHUKgRCHa198S+bXXBKnzWUjIcGywXP/+dv7/MqwoqxAhjHi3BRYa8qcpG+vjUtmDQ0znNNUMWAIYSnlGK2kyK4ghL9fCN4SX4hpsZ7toHdoEZp4hkps8fTYzefyQRacw02zGPuYBg3kOioRhJ8F1vXwfQ383KbBSg/gDdpBhCHdM5zQUxP3WCtzeT1TsRbtT5p18mDoHo75pIKvoSxy0QiqEkKp8Iwn8NJDEz3hGAmSasBmcb1Ul5IoOzTHGNuKZK/ojZhWJkkVnpcUUNZd3zc35urcbixMz2QoK//SgXuhfJ66T2p/mgTkZDTYlPjYhSOTrPCKO4RtcHgROn40NqRcAuCwEOE=; 31:mIgcqwBPLHSNw/+xltC/WZU7gL3Kgwk/Z+XmlgXidYRylY9gYdiIOpDpotwsTXbbSsZNiFpVrzVs4y2Ky5TeZMa+zOwx5vtQ3dyNuUttgFQ4o/U+dVYG2xAKR1UCFJ/193yyyM3OxMNWniJ+y/gyzLL1qD5J+Iu/zD1/a86V5yNODOWJAhzvc0NftvqEzCaXkUv+bZICQ7hDle2Qs2C0qJ3ewmJQ3wdFQhf2h5oGYpo= X-MS-TrafficTypeDiagnostic: AM3PR07MB307: X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 20:n6DLccH3i9rfN4FMwrPHiBbKInAl5ipz3GCT3w/vFUK8U1c5Ge6Z2CdyNpZPBYHBOJrggdVS3Z/ORW/5PWLRydqAkK0WzVmtUNVJ7WSx1EylS2GUGkTx6H6LjOCOG6eJ3sTfmmGF6gdDeSvV/FVYWg39KlKVnPNOBHLjHEw26zwb31mM+LVjYroi06ZViBR46ujVlhlK4G7qB96F8e89qZiUj2PTXlBBa+I7cPLhGejV15ncNiOhkOBL74EUs5Tdq2bPt5pZSZKG0Mw6/UtUrFs+cXh7Rs75SvCRNoGveONhXO1SnlOHA0TZlxxxqEreap0pVUVWhiOVW5y123d9QBX7U6e2Ng5ZVX/psDIW/zFUldtZueow+xq3kWyPdmk3Z2/EPsUXMZZWkTXfXoRsjuJ4iUB3ujZc8tQae8tETrlifb/Doo1ehVhtNOpykMDvTU+talKnPQu+Xaj3Qwky2PovilmbujusVnZh2r3MUP8qXfYNTMQ5dCGJhlIMzZB+; 4:IfY9JTtnRxHWuQLOScLdrnuHds5ZlNAT1jR4jXiD0yy1LqS0DeilybkRZjEZXjL+2r4RyeZ96pIGrM1WBWqMMW50yCYPZT1iMsJQq+7OCZ8n74e8nOWlbGv26Emfy4Mu2csQ2yq0pELdeV+hoEBCxiO7tDkCwjQLjkNPLIkRJ5gG9pTTgUNcAZ7dDaqbqjDyKag79g9w8AbrYnikMos7IdCmBLSNbgPiPBSk4Oj4U6Pj07ECKmDttTBQI/XUi05+SPe+wXijPe/NarARRt+wKCj8IcXjb3xKMeVRWX/tZtA= X-Exchange-Antispam-Report-Test: UriScan:(37575265505322); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(10201501046)(100000703101)(100105400095)(3002001)(93006095)(93001095)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123555025)(20161123560025)(20161123564025)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM3PR07MB307; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM3PR07MB307; X-Forefront-PRVS: 0462918D61 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(376002)(346002)(199003)(377424004)(189002)(54534003)(6116002)(3846002)(50226002)(53936002)(4326008)(107886003)(478600001)(101416001)(68736007)(105586002)(50986999)(6666003)(48376002)(316002)(25786009)(16586007)(16526018)(2351001)(2361001)(106356001)(33646002)(50466002)(6916009)(5660300001)(305945005)(86362001)(7736002)(6506006)(97736004)(69596002)(4001150100001)(6486002)(36756003)(66066001)(81156014)(81166006)(47776003)(21086003)(189998001)(6512007)(8936002)(2906002)(5003940100001)(8676002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM3PR07MB307; H:elxacz23q12.lan; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:3; LANG:en; Received-SPF: None (protection.outlook.com: ericsson.com does not designate permitted sender hosts) Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=simon.marchi@ericsson.com; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; AM3PR07MB307; 23:yuVjU2VKzmjnwqjqlPUn7mQTmVLwzNkXCjqNmhXAng?= =?us-ascii?Q?D4sek0+IlH6MbH+nQshr2A41lJ5JWPiRzKVRA1WPqgyFhIiE3P38TQFGwhQb?= =?us-ascii?Q?BRvAhBTnKdbHa5JXXWk9S/YW35bJYQdV5JqYhQ5AEKn9/E4p0Gdaw9jiv3V4?= =?us-ascii?Q?nsue9E5CkTyUQAM2SzDlr4+EU3AOM8t5YRL3Ol6N2SZi1fKVSFaeoukSmqjD?= =?us-ascii?Q?zD5+DJdTh0CZSap/czF4Mq5nfSSM6i2M1bWZ37HxD4UU+s3q0ljQshyUYc5T?= =?us-ascii?Q?1NHUvHLGsFQ4Dyx/Dhjg9AWfsF+TLrarf9vZnD8GaDEeXPU1EwkKgGDa4NnM?= =?us-ascii?Q?wCRcQHtVSPpjORuchchLQ3e8+pDBCmE5yy83XBa1RqBj+OE83q2kBaISlp7E?= =?us-ascii?Q?k/Ax2lv1fyiVsOn5dmuKkBHxauG6Yy1UsVYinI0uVvpbPZnb3l+g62xuTBzU?= =?us-ascii?Q?8HemDzL+jcUNkb5kcxEcDWJBSB/cv8qACee+1nwbKxfwJwj/35+9ZiQnfWz5?= =?us-ascii?Q?Ki6/gN0w8bqzORVveJkdAFAAzotjnAbXfBKThXq8bT6uuVkY9iHG5E3dR0bn?= =?us-ascii?Q?0VuUTy2DMpo7ERjWpP2qXbj0CqFe8Y6qeiUhoIrZQ86+yQe4Q/5zt6JhAWVf?= =?us-ascii?Q?eB9rtKnxdYNGHEEd8J9tDGBSBO902IEHMPzDYjkV79D/SxAaU5j7rL9c0zkb?= =?us-ascii?Q?5isdQb5IHcv+LbaEWHyAwXheuHWySPSNa2SEANsC/I95Hmx3dhrL7J1RGkfS?= =?us-ascii?Q?k/wdIGd3o0IgXgIbQ1MmYze8RdTJYrSsAepS4Qkd+FykpyP+xRtmc/dXDZUQ?= =?us-ascii?Q?U/ivJ4ryzP5c3NQBg9kRBihltM6x63DwXHcFCgIr92sYBJmrZ0BEtMLoBalx?= =?us-ascii?Q?GrtTk+kDUbt0G7OOgq5KGf3fI+N9+TCkx2psHX8Qy3DQCyQzm/iqe9/gFH8C?= =?us-ascii?Q?7RyhdqsEdCILj8pvvAI/gB6zqCyCugFT9CnEn78w5RzbXo12r7Klt/CODjLS?= =?us-ascii?Q?IDbGOwuxzTNQAZxT4atnc5mjWQJ5FnjcGLgMbE0KC67GZVDo+tNQCk+lKIME?= =?us-ascii?Q?S8DGXGIfwf1J7Uq+gFMYcdzAnuhm5TP3mFJmDvYWSYn89YS/tdxEA/4nKv8l?= =?us-ascii?Q?UYlLM6pkClYmjGDAuqccDBNtFEPuMn5US7/bEtQmyqMCWgdGF4XhSMKKmMlN?= =?us-ascii?Q?s32feXYEI9HG/GX4pU6BJlswdLukeOGSye?= X-Microsoft-Exchange-Diagnostics: 1; AM3PR07MB307; 6:o0tSd9BjJK1pp2cdinVMA6kWI8pmifNDFsJk5g8iVpfFforJQjgL9c9hookaHjTNxS/qrOxnN4cA9K6JHp0n3nzUPw5vqMo0VLUIgImVQYaFedkxiEhMEAnMd0BHw4mNtm1tGRDuqhTG6pmSXu7Ln43QNxXljHsLJLnQD4pTSJou7KM61y/ugNqt+VLOLo6LeMs/FR/dyRtC6gqo27OWzQvs6wM+eCmM5d/ilHCEdPmgoxqyycadyO1lJwO5hC0gT+4h9CZMT1t9rVfy3mpwYdy4EEjYTushNhUm5lGfYyah2C7g20RzXtJXi6vMW3RTCFyFqh1A/omPI4+33Dd9QA==; 5:sBNkyey4vJQh8U9HLYPnleu5NzZjdqoq8+dKBtMEGswpfaYL+XmfBOmMI81O9KxBGs0pPgcCFzs0/J1tCcs0Sx8BclpSzwIzyWNorCtn4+7kNbnBZrEy4JzV8XVZwqNNwN4/XOC5b7HwoeBs9o8oXQ==; 24:SJPu58TN22pe5TmGGkq5Czy9F6QsI9NvL1m0zaMcaE6B6L0WUgfB+OhxcEPL/751PsmDBMAQGNqUreaGZdUFkT0K/gf2VZqrejFSwUwDjpU=; 7:wV8WuHhD6tTkRpgQm+EcAgc9Oo51iwehhNFVsc4wHHr1AF0CH/neWM2hsZLHrgKOKDlkHpBxDAMJPHe1zn1iIwMbNfG+vkb5xDgeAxS4ud+6O7xhQxjpkwvchvqBc6hHA4rW62lW/OMlGkX/1buUL1KKrhiMlJIMZusO6UZNCfw0r2BwxipEgfOHTquROYt7PqJd1PtiuV6/HEdkzzWjb/oj4M/mkDfvDQTvpf1GqOc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Oct 2017 02:14:13.2696 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 92e84ceb-fbfd-47ab-be52-080c6b87953f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM3PR07MB307 X-OriginatorOrg: ericsson.com X-IsSubscribed: yes An earlier patch of mine changed parse_traceframe_info to make it return a unique_ptr. I forgot to update the version of the function used in an expat-less build, this patch fixes it. gdb/ChangeLog: * tracepoint.c (parse_traceframe_info): Return a unique_ptr (the !HAVE_LIBEXPAT version). --- gdb/ChangeLog | 5 +++++ gdb/tracepoint.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 25ae470..4ad642a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2017-10-15 Simon Marchi + + * tracepoint.c (parse_traceframe_info): Return a unique_ptr + (the !HAVE_LIBEXPAT version). + 2017-10-14 Simon Marchi * nat/linux-osdata.c (struct pid_pgid_entry) : Make diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c index 9dd8d87..9c07315 100644 --- a/gdb/tracepoint.c +++ b/gdb/tracepoint.c @@ -3958,7 +3958,7 @@ sdata_make_value (struct gdbarch *gdbarch, struct internalvar *var, #if !defined(HAVE_LIBEXPAT) -struct traceframe_info * +struct std::unique_ptr parse_traceframe_info (const char *tframe_info) { static int have_warned;