From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22475 invoked by alias); 3 Jan 2013 16:12:43 -0000 Received: (qmail 22466 invoked by uid 22791); 3 Jan 2013 16:12:41 -0000 X-SWARE-Spam-Status: No, hits=-7.8 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_DNSWL_HI,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from mail4-relais-sop.national.inria.fr (HELO mail4-relais-sop.national.inria.fr) (192.134.164.105) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 03 Jan 2013 16:12:35 +0000 Received: from stedding.saclay.inria.fr ([193.55.250.194]) by mail4-relais-sop.national.inria.fr with ESMTP/TLS/DHE-RSA-AES128-SHA; 03 Jan 2013 17:12:32 +0100 Received: from glisse (helo=localhost) by stedding.saclay.inria.fr with local-esmtp (Exim 4.80) (envelope-from ) id 1TqnPE-00035q-Ha; Thu, 03 Jan 2013 17:12:32 +0100 Date: Thu, 03 Jan 2013 16:12:00 -0000 From: Marc Glisse To: Tom Tromey cc: gcc-patches@gcc.gnu.org Subject: Re: extern "C" fixes for sunCC In-Reply-To: <87lica6zkz.fsf@fleche.redhat.com> Message-ID: References: <87lica6zkz.fsf@fleche.redhat.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: MULTIPART/MIXED; BOUNDARY="8323329-144264979-1357229552=:11808" Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org X-SW-Source: 2013-01/txt/msg00122.txt.bz2 This message is in MIME format. The first part should be readable text, while the remaining parts are likely unreadable without MIME-aware tools. --8323329-144264979-1357229552=:11808 Content-Type: TEXT/PLAIN; format=flowed; charset=US-ASCII Content-length: 1110 On Thu, 3 Jan 2013, Tom Tromey wrote: >>>>>> "Marc" == Marc Glisse writes: > > Marc> libcpp/ > Marc> * line-map.c (get_combined_adhoc_loc): Cast to extern "C" type. > > Yucky. Yes, there is a discussion of what is necessary for a real fix (and an alternate hack) in the PR: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50177 Do you prefer an other approach? > Marc> line_map_realloc reallocator > Marc> - = set->reallocator ? set->reallocator : xrealloc; > Marc> + = set->reallocator ? set->reallocator > Marc> + : (line_map_realloc) xrealloc; > > The indentation is wrong here, and it needs extra parens, per the GNU > coding standards. > > I think it should have a comment as well. Like this? (I'll test if approved, but I am not sure what was wrong with the indentation and parentheses so it may be wrong again) Reformatting the patch, I noticed that I only fixed one of the 3 occurences, so here are all 3. * line-map.c (get_combined_adhoc_loc): Cast from extern "C" type. (new_linemap): Likewise. (linemap_enter_macro): Likewise. -- Marc Glisse --8323329-144264979-1357229552=:11808 Content-Type: TEXT/PLAIN; charset=US-ASCII; name=p1 Content-Transfer-Encoding: BASE64 Content-ID: Content-Description: Content-Disposition: inline; filename=p1 Content-length: 4803 SW5kZXg6IGxpbmUtbWFwLmMNCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0t LSBsaW5lLW1hcC5jCShyZXZpc2lvbiAxOTQ3OTYpDQorKysgbGluZS1tYXAu Ywkod29ya2luZyBjb3B5KQ0KQEAgLTExNSwyMiArMTE1LDI0IEBAIGdldF9j b21iaW5lZF9hZGhvY19sb2MgKHN0cnVjdCBsaW5lX21hcHMNCiAgIGxiLmRh dGEgPSBkYXRhOw0KICAgc2xvdCA9IChzdHJ1Y3QgbG9jYXRpb25fYWRob2Nf ZGF0YSAqKikNCiAgICAgICBodGFiX2ZpbmRfc2xvdCAoc2V0LT5sb2NhdGlv bl9hZGhvY19kYXRhX21hcC5odGFiLCAmbGIsIElOU0VSVCk7DQogICBpZiAo KnNsb3QgPT0gTlVMTCkNCiAgICAgew0KICAgICAgIGlmIChzZXQtPmxvY2F0 aW9uX2FkaG9jX2RhdGFfbWFwLmN1cnJfbG9jID49DQogCSAgc2V0LT5sb2Nh dGlvbl9hZGhvY19kYXRhX21hcC5hbGxvY2F0ZWQpDQogCXsNCiAJICBjaGFy ICpvcmlnX2RhdGEgPSAoY2hhciAqKSBzZXQtPmxvY2F0aW9uX2FkaG9jX2Rh dGFfbWFwLmRhdGE7DQogCSAgbG9uZyBsb25nIG9mZnNldDsNCi0JICBsaW5l X21hcF9yZWFsbG9jIHJlYWxsb2NhdG9yDQotCSAgICAgID0gc2V0LT5yZWFs bG9jYXRvciA/IHNldC0+cmVhbGxvY2F0b3IgOiB4cmVhbGxvYzsNCisJICAv KiBDYXN0IGF3YXkgZXh0ZXJuICJDIiBmcm9tIHRoZSB0eXBlIG9mIHhyZWFs bG9jLiAgKi8NCisJICBsaW5lX21hcF9yZWFsbG9jIHJlYWxsb2NhdG9yID0g c2V0LT5yZWFsbG9jYXRvcg0KKwkJCQkJID8gc2V0LT5yZWFsbG9jYXRvcg0K KwkJCQkJIDogKChsaW5lX21hcF9yZWFsbG9jKSB4cmVhbGxvYyk7DQogDQog CSAgaWYgKHNldC0+bG9jYXRpb25fYWRob2NfZGF0YV9tYXAuYWxsb2NhdGVk ID09IDApDQogCSAgICBzZXQtPmxvY2F0aW9uX2FkaG9jX2RhdGFfbWFwLmFs bG9jYXRlZCA9IDEyODsNCiAJICBlbHNlDQogCSAgICBzZXQtPmxvY2F0aW9u X2FkaG9jX2RhdGFfbWFwLmFsbG9jYXRlZCAqPSAyOw0KIAkgIHNldC0+bG9j YXRpb25fYWRob2NfZGF0YV9tYXAuZGF0YSA9IChzdHJ1Y3QgbG9jYXRpb25f YWRob2NfZGF0YSAqKQ0KIAkgICAgICByZWFsbG9jYXRvciAoc2V0LT5sb2Nh dGlvbl9hZGhvY19kYXRhX21hcC5kYXRhLA0KIAkJCSAgIHNldC0+bG9jYXRp b25fYWRob2NfZGF0YV9tYXAuYWxsb2NhdGVkDQogCQkJICAgKiBzaXplb2Yg KHN0cnVjdCBsb2NhdGlvbl9hZGhvY19kYXRhKSk7DQogCSAgb2Zmc2V0ID0g KGNoYXIgKikgKHNldC0+bG9jYXRpb25fYWRob2NfZGF0YV9tYXAuZGF0YSkg LSBvcmlnX2RhdGE7DQpAQCAtMjEwLDIyICsyMTIsMjQgQEAgbmV3X2xpbmVt YXAgKHN0cnVjdCBsaW5lX21hcHMgKnNldCwNCiAgIC8qIERlcGVuZGluZyBv biB0aGlzIHZhcmlhYmxlLCBhIG1hY3JvIG1hcCB3b3VsZCBiZSBhbGxvY2F0 ZWQgaW4gYQ0KICAgICAgZGlmZmVyZW50IG1lbW9yeSBsb2NhdGlvbiB0aGFu IGFuIG9yZGluYXJ5IG1hcC4gICovDQogICBib29sIG1hY3JvX21hcF9wID0g KHJlYXNvbiA9PSBMQ19FTlRFUl9NQUNSTyk7DQogICBzdHJ1Y3QgbGluZV9t YXAgKnJlc3VsdDsNCiANCiAgIGlmIChMSU5FTUFQU19VU0VEIChzZXQsIG1h Y3JvX21hcF9wKSA9PSBMSU5FTUFQU19BTExPQ0FURUQgKHNldCwgbWFjcm9f bWFwX3ApKQ0KICAgICB7DQogICAgICAgLyogV2UgcmFuIG91dCBvZiBhbGxv Y2F0ZWQgbGluZSBtYXBzLiBMZXQncyBhbGxvY2F0ZSBtb3JlLiAgKi8NCiAg ICAgICB1bnNpZ25lZCBhbGxvY19zaXplOw0KIA0KLSAgICAgIGxpbmVfbWFw X3JlYWxsb2MgcmVhbGxvY2F0b3INCi0JPSBzZXQtPnJlYWxsb2NhdG9yID8g c2V0LT5yZWFsbG9jYXRvciA6IHhyZWFsbG9jOw0KKyAgICAgIC8qIENhc3Qg YXdheSBleHRlcm4gIkMiIGZyb20gdGhlIHR5cGUgb2YgeHJlYWxsb2MuICAq Lw0KKyAgICAgIGxpbmVfbWFwX3JlYWxsb2MgcmVhbGxvY2F0b3IgPSBzZXQt PnJlYWxsb2NhdG9yDQorCQkJCSAgICAgPyBzZXQtPnJlYWxsb2NhdG9yDQor CQkJCSAgICAgOiAoKGxpbmVfbWFwX3JlYWxsb2MpIHhyZWFsbG9jKTsNCiAg ICAgICBsaW5lX21hcF9yb3VuZF9hbGxvY19zaXplX2Z1bmMgcm91bmRfYWxs b2Nfc2l6ZSA9DQogCXNldC0+cm91bmRfYWxsb2Nfc2l6ZTsNCiANCiAgICAg ICAvKiBXZSBhcmUgZ29pbmcgdG8gZXhlY3V0ZSBzb21lIGRhbmNlIHRvIHRy eSB0byByZWR1Y2UgdGhlDQogCSBvdmVyaGVhZCBvZiB0aGUgbWVtb3J5IGFs bG9jYXRvciwgaW4gY2FzZSB3ZSBhcmUgdXNpbmcgdGhlDQogCSBnZ2MtcGFn ZS5jIG9uZS4NCiAJIA0KIAkgVGhlIGFjdHVhbCBzaXplIG9mIG1lbW9yeSB3 ZSBhcmUgZ29pbmcgdG8gZ2V0IGJhY2sgZnJvbSB0aGUNCiAJIGFsbG9jYXRv ciBpcyB0aGUgc21hbGxlc3QgcG93ZXIgb2YgMiB0aGF0IGlzIGdyZWF0ZXIg dGhhbiB0aGUNCiAJIHNpemUgd2UgcmVxdWVzdGVkLiAgU28gbGV0J3MgY29u c2lkZXIgdGhhdCBzaXplIHRoZW4uICAqLw0KQEAgLTQyMywyMiArNDI3LDI0 IEBAIGxpbmVtYXBfdHJhY2tzX21hY3JvX2V4cGFuc2lvbl9sb2NzX3AgKHMN CiAgICBsb2NhdGlvbnMsIHRoaXMgZnVuY3Rpb24gcmV0dXJucyBOVUxMLiAg SW4gdGhhdCBjYXNlLCBjYWxsZXJzIG9mDQogICAgdGhpcyBmdW5jdGlvbiBj YW5ub3QgZW5jb2RlIHtsaW5lLGNvbHVtbn0gcGFpcnMgaW50byBsb2NhdGlv bnMgb2YNCiAgICBtYWNybyB0b2tlbnMgYW55bW9yZS4gICovDQogDQogY29u c3Qgc3RydWN0IGxpbmVfbWFwICoNCiBsaW5lbWFwX2VudGVyX21hY3JvIChz dHJ1Y3QgbGluZV9tYXBzICpzZXQsIHN0cnVjdCBjcHBfaGFzaG5vZGUgKm1h Y3JvX25vZGUsDQogCQkgICAgIHNvdXJjZV9sb2NhdGlvbiBleHBhbnNpb24s IHVuc2lnbmVkIGludCBudW1fdG9rZW5zKQ0KIHsNCiAgIHN0cnVjdCBsaW5l X21hcCAqbWFwOw0KICAgc291cmNlX2xvY2F0aW9uIHN0YXJ0X2xvY2F0aW9u Ow0KLSAgbGluZV9tYXBfcmVhbGxvYyByZWFsbG9jYXRvcg0KLSAgICA9IHNl dC0+cmVhbGxvY2F0b3IgPyBzZXQtPnJlYWxsb2NhdG9yIDogeHJlYWxsb2M7 DQorICAvKiBDYXN0IGF3YXkgZXh0ZXJuICJDIiBmcm9tIHRoZSB0eXBlIG9m IHhyZWFsbG9jLiAgKi8NCisgIGxpbmVfbWFwX3JlYWxsb2MgcmVhbGxvY2F0 b3IgPSBzZXQtPnJlYWxsb2NhdG9yDQorCQkJCSA/IHNldC0+cmVhbGxvY2F0 b3INCisJCQkJIDogKChsaW5lX21hcF9yZWFsbG9jKSB4cmVhbGxvYyk7DQog DQogICBzdGFydF9sb2NhdGlvbiA9IExJTkVNQVBTX01BQ1JPX0xPV0VTVF9M T0NBVElPTiAoc2V0KSAtIG51bV90b2tlbnM7DQogDQogICBpZiAoc3RhcnRf bG9jYXRpb24gPD0gc2V0LT5oaWdoZXN0X2xpbmUNCiAgICAgICB8fCBzdGFy dF9sb2NhdGlvbiA+IExJTkVNQVBTX01BQ1JPX0xPV0VTVF9MT0NBVElPTiAo c2V0KSkNCiAgICAgLyogV2UgcmFuIG91dCBvZiBtYWNybyBtYXAgc3BhY2Uu ICAgKi8NCiAgICAgcmV0dXJuIE5VTEw7DQogDQogICBtYXAgPSBuZXdfbGlu ZW1hcCAoc2V0LCBMQ19FTlRFUl9NQUNSTyk7DQogDQo= --8323329-144264979-1357229552=:11808--