From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6770 invoked by alias); 17 Nov 2004 16:06:57 -0000 Mailing-List: contact gdb-patches-help@sources.redhat.com; run by ezmlm Precedence: bulk List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sources.redhat.com Received: (qmail 6189 invoked from network); 17 Nov 2004 16:06:27 -0000 Received: from unknown (HELO cam-admin0.cambridge.arm.com) (193.131.176.58) by sourceware.org with SMTP; 17 Nov 2004 16:06:27 -0000 Received: from pc960.cambridge.arm.com (pc960.cambridge.arm.com [10.1.205.4]) by cam-admin0.cambridge.arm.com (8.12.10/8.12.10) with ESMTP id iAHG5cso022240; Wed, 17 Nov 2004 16:05:38 GMT Received: from pc960.cambridge.arm.com (localhost.localdomain [127.0.0.1]) by pc960.cambridge.arm.com (8.12.8/8.12.8) with ESMTP id iAHG6KgK022885; Wed, 17 Nov 2004 16:06:20 GMT Received: (from rearnsha@localhost) by pc960.cambridge.arm.com (8.12.8/8.12.8/Submit) id iAHG6KQd022883; Wed, 17 Nov 2004 16:06:20 GMT X-Authentication-Warning: pc960.cambridge.arm.com: rearnsha set sender to rearnsha@gcc.gnu.org using -f Subject: Re: ARM Simulator build broken From: Richard Earnshaw To: Hans-Peter Nilsson Cc: gdb-patches@sources.redhat.com In-Reply-To: <1100703804.22014.42.camel@pc960.cambridge.arm.com> References: <200411161535.iAGFZUN2014411@ignucius.se.axis.com> <1100703804.22014.42.camel@pc960.cambridge.arm.com> Content-Type: multipart/mixed; boundary="=-MuBoLkHkWF4hBFkrCft8" Organization: GNU Message-Id: <1100707579.22014.47.camel@pc960.cambridge.arm.com> Mime-Version: 1.0 Date: Wed, 17 Nov 2004 16:06:00 -0000 X-SW-Source: 2004-11/txt/msg00354.txt.bz2 --=-MuBoLkHkWF4hBFkrCft8 Content-Type: text/plain Content-Transfer-Encoding: 7bit Content-length: 1728 On Wed, 2004-11-17 at 15:03, Richard Earnshaw wrote: > On Tue, 2004-11-16 at 15:35, Hans-Peter Nilsson wrote: > > > From: Richard Earnshaw > > > Cc: gdb-patches@sources.redhat.com > > > > > Here's my proposed patch: > > > > > > Richard Earnshaw > > > > > > * Make-common.in (sim_basics_headers): New. > > > (sim_main_headers): Move basics headers and sub-dependencies > > > to sim_basics_headers). Add the dependencies through that. > > > (sim-load.c): Depend on sim_basics_headers not > > > sim_main_headers. > > > > > > OK? > > > > I was preparing almost the same patch, just naming the macro > > sim_basics_h_headers! > > > > BTW, you shouldn't have edited out sim-arange.c, a gcc -MM says > > it's actually included from sim-basics.h (and from looking at > > the code). For the same reason sim-assert.h should be in > > sim_basics_headers. Maybe all files should use the > > $(sim-assert_h) et al macros. > > The list of headers I used was the list directly in sim-basics.h. I > only moved existing includes from sim_main_headers and then added > further ones at the first level that were obviously missing. So if it's > wrong now it was wrong before. > > The best way to do all this is to define a series of macros > sim-basics_h, sim-assert-h etc, and for each of these to list the macros > that form the direct dependencies. > > But that's a fair bit of work... :-( ... and it needs active > maintenance to keep it up to date. > > R. Attached is a revised version of the patch that implements this for sim-*.h. Really further work should be done so that the C files depend on the correct headers rather than all depending on sim_main_headers. R. --=-MuBoLkHkWF4hBFkrCft8 Content-Disposition: attachment; filename=sim2.patch Content-Transfer-Encoding: base64 Content-Type: text/x-patch; name=sim2.patch; charset=ISO-8859-15 Content-length: 6048 SW5kZXg6IE1ha2UtY29tbW9uLmluDQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 DQpSQ1MgZmlsZTogL2N2cy9zcmMvc3JjL3NpbS9jb21tb24vTWFrZS1jb21t b24uaW4sdg0KcmV0cmlldmluZyByZXZpc2lvbiAxLjE0DQpkaWZmIC1wIC1y MS4xNCBNYWtlLWNvbW1vbi5pbg0KKioqIE1ha2UtY29tbW9uLmluCTE2IE5v diAyMDA0IDA3OjAyOjI2IC0wMDAwCTEuMTQNCi0tLSBNYWtlLWNvbW1vbi5p bgkxNyBOb3YgMjAwNCAxNjowMjoxNyAtMDAwMA0KKioqKioqKioqKioqKioq IHN0YW1wLXR2YWxzOiBnZW50bWFwDQoqKiogMjk4LDM0MSAqKioqDQogIA0K ICBzaW1fbWFpbl9oZWFkZXJzID0gXA0KICAJc2ltLW1haW4uaCBcDQohIAkk KHNyY2NvbSkvc2ltLWFzc2VydC5oIFwNCiEgCSQoc3JjY29tKS9zaW0tYmFz ZS5oIFwNCiEgCSQoc3JjY29tKS9zaW0tYmFzaWNzLmggXA0KISAJJChzcmNj b20pL3NpbS1jb25maWcuaCBcDQohIAkkKHNyY2NvbSkvc2ltLWNwdS5oIFwN CiEgCSQoc3JjY29tKS9zaW0tZW5naW5lLmggXA0KISAJJChzcmNjb20pL3Np bS1ldmVudHMuaCBcDQohIAkkKHNyY2NvbSkvc2ltLWlubGluZS5oIFwNCiEg CSQoc3JjY29tKS9zaW0tbWVtb3B0LmggXA0KISAJJChzcmNjb20pL3NpbS1t b2RlbC5oIFwNCiEgCSQoc3JjY29tKS9zaW0tbW9kdWxlLmggXA0KISAJJChz cmNjb20pL3NpbS1wcm9maWxlLmggXA0KISAJJChzcmNjb20pL3NpbS1zaWdu YWwuaCBcDQohIAkkKHNyY2NvbSkvc2ltLXRyYWNlLmggXA0KISAJJChzcmNj b20pL3NpbS11dGlscy5oIFwNCiEgCSQoc3JjY29tKS9zaW0td2F0Y2guaCBc DQohIAl0Y29uZmlnLmggXA0KICAJJChTSU1fRVhUUkFfREVQUykNCiAgDQog ICMgRXhwb3J0ZWQgdmVyc2lvbiBvZiBzaW1fbWFpbl9oZWFkZXJzLg0KICBT SU1fTUFJTl9ERVBTID0gXA0KICAJJChzaW1fbWFpbl9oZWFkZXJzKQ0KICAN CiAgc2ltLWFzc2VydF9oID0gJChzcmNjb20pL3NpbS1hc3NlcnQuaA0KISBz aW0tZW5kaWFuX2ggPSAkKHNyY2NvbSkvc2ltLWVuZGlhbi5oDQohIHNpbS1u LWVuZGlhbl9oID0gJChzcmNjb20pL3NpbS1uLWVuZGlhbi5oDQohIHNpbS1h cmFuZ2VfaCA9ICQoc3JjY29tKS9zaW0tYXJhbmdlLmgNCiEgc2ltLWJpdHNf aCA9ICQoc3JjY29tKS9zaW0tYml0cy5oDQogIHNpbS1jb25maWdfaCA9ICQo c3JjY29tKS9zaW0tY29uZmlnLmgNCi0gc2ltLW4tYml0c19oID0gJChzcmNj b20pL3NpbS1uLWJpdHMuaA0KICBzaW0tY29yZV9oID0gJChzcmNjb20pL3Np bS1jb3JlLmgNCiEgc2ltLW4tY29yZV9oID0gJChzcmNjb20pL3NpbS1uLWNv cmUuaA0KICBzaW0tZW5naW5lX2ggPSAkKHNyY2NvbSkvc2ltLWVuZ2luZS5o DQogIHNpbS1ldmVudHNfaCA9ICQoc3JjY29tKS9zaW0tZXZlbnRzLmgNCiAg c2ltLWZwdV9oID0gJChzcmNjb20pL3NpbS1mcHUuaA0KICBzaW0taW9faCA9 ICQoc3JjY29tKS9zaW0taW8uaA0KICBzaW0tb3B0aW9uc19oID0gJChzcmNj b20pL3NpbS1vcHRpb25zLmgNCiAgc2ltLXNpZ25hbF9oID0gJChzcmNjb20p L3NpbS1zaWduYWwuaA0KICANCiAgaHctYWxsb2NfaCA9ICQoc3JjY29tKS9o dy1hbGxvYy5oDQogIGh3LWJhc2VfaCA9ICQoc3JjY29tKS9ody1iYXNlLmgN Ci0tLSAyOTgsMzc0IC0tLS0NCiAgDQogIHNpbV9tYWluX2hlYWRlcnMgPSBc DQogIAlzaW0tbWFpbi5oIFwNCiEgCSQoc2ltLWFzc2VydF9oKSBcDQohIAkk KHNpbS1iYXNlX2gpIFwNCiEgCSQoc2ltLWNwdV9oKSBcDQohIAkkKHNpbS1l bmdpbmVfaCkgXA0KISAJJChzaW0tZXZlbnRzX2gpIFwNCiEgCSQoc2ltLW1l bW9wdF9oKSBcDQohIAkkKHNpbS1tb2RlbF9oKSBcDQohIAkkKHNpbS1tb2R1 bGVfaCkgXA0KISAJJChzaW0tcHJvZmlsZV9oKSBcDQohIAkkKHNpbS10cmFj ZV9oKSBcDQohIAkkKHNpbS13YXRjaF9oKSBcDQohIAkkKHNpbS1iYXNpY3Nf aCkgXA0KICAJJChTSU1fRVhUUkFfREVQUykNCiAgDQogICMgRXhwb3J0ZWQg dmVyc2lvbiBvZiBzaW1fbWFpbl9oZWFkZXJzLg0KICBTSU1fTUFJTl9ERVBT ID0gXA0KICAJJChzaW1fbWFpbl9oZWFkZXJzKQ0KICANCisgc2ltLWFsdV9o ID0gJChzcmNjb20pL3NpbS1hbHUuaA0KKyBzaW0tYXJhbmdlX2ggPSAkKHNy Y2NvbSkvc2ltLWFyYW5nZS5oIFwNCisgCQkkKHNyY2NvbSkvc2ltLWFyYW5n ZS5jDQogIHNpbS1hc3NlcnRfaCA9ICQoc3JjY29tKS9zaW0tYXNzZXJ0LmgN CiEgc2ltLWJhc2VfaCA9ICQoc3JjY29tKS9zaW0tYmFzZS5oIFwNCiEgCQkk KHNpbS1tb2R1bGVfaCkgXA0KISAJCSQoc2ltLXRyYWNlX2gpIFwNCiEgCQkk KHNpbS1jb3JlX2gpIFwNCiEgCQkkKHNpbS1ldmVudHNfaCkgXA0KISAJCSQo c2ltLXByb2ZpbGVfaCkgXA0KISAJCSQoc2ltLW1vZGVsX2gpIFwNCiEgCQkk KHNpbS1pb19oKSBcDQohIAkJJChzaW0tZW5naW5lX2gpIFwNCiEgCQkkKHNp bS13YXRjaF9oKSBcDQohIAkJJChzaW0tbWVtb3B0X2gpIFwNCiEgCQkkKHNp bS1jcHVfaCkNCiEgc2ltLWJhc2ljc19oID0gJChzcmNjb20pL3NpbS1iYXNp Y3MuaCBcDQohIAkJY2NvbmZpZ19oIFwNCiEgCQl0Y29uZmlnX2ggXA0KISAJ CSQoc2ltLWNvbmZpZ19oKSBcDQohIAkJJChzaW0taW5saW5lX2gpIFwNCiEg CQkkKHNpbS10eXBlc19oKSBcDQohIAkJJChzaW0tYml0c19oKSBcDQohIAkJ JChzaW0tZW5kaWFuX2gpIFwNCiEgCQkkKHNpbS1zaWduYWxfaCkgXA0KISAJ CSQoc2ltLWFyYW5nZV9oKSBcDQohIAkJJChzaW0tdXRpbHNfaCkNCiEgc2lt LWJpdHNfaCA9ICQoc3JjY29tKS9zaW0tYml0cy5oIFwNCiEgCQkkKHNyY2Nv bSkvc2ltLWJpdHMuYw0KICBzaW0tY29uZmlnX2ggPSAkKHNyY2NvbSkvc2lt LWNvbmZpZy5oDQogIHNpbS1jb3JlX2ggPSAkKHNyY2NvbSkvc2ltLWNvcmUu aA0KISBzaW0tY3B1X2ggPSAkKHNyY2NvbSkvc2ltLWNwdS5oDQohIHNpbS1l bmRpYW5faCA9ICQoc3JjY29tKS9zaW0tZW5kaWFuLmggXA0KISAJCSQoc3Jj Y29tKS9zaW0tZW5kaWFuLmMNCiAgc2ltLWVuZ2luZV9oID0gJChzcmNjb20p L3NpbS1lbmdpbmUuaA0KICBzaW0tZXZlbnRzX2ggPSAkKHNyY2NvbSkvc2lt LWV2ZW50cy5oDQogIHNpbS1mcHVfaCA9ICQoc3JjY29tKS9zaW0tZnB1LmgN Cisgc2ltLWh3X2ggPSAkKHNyY2NvbSkvc2ltLWh3LmgNCisgc2ltLWlubGlu ZV9oID0gJChzcmNjb20pL3NpbS1pbmxpbmUuaA0KICBzaW0taW9faCA9ICQo c3JjY29tKS9zaW0taW8uaA0KKyBzaW0tbWVtb3B0X2ggPSAkKHNyY2NvbSkv c2ltLW1lbW9wdC5oDQorIHNpbS1tb2RlbF9oID0gJChzcmNjb20pL3NpbS1t b2RlbC5oDQorIHNpbS1tb2R1bGVfaCA9ICQoc3JjY29tKS9zaW0tbW9kdWxl LmgNCisgc2ltLW4tYml0c19oID0gJChzcmNjb20pL3NpbS1uLWJpdHMuaA0K KyBzaW0tbi1jb3JlX2ggPSAkKHNyY2NvbSkvc2ltLW4tY29yZS5oDQorIHNp bS1uLWVuZGlhbl9oID0gJChzcmNjb20pL3NpbS1uLWVuZGlhbi5oDQogIHNp bS1vcHRpb25zX2ggPSAkKHNyY2NvbSkvc2ltLW9wdGlvbnMuaA0KKyBzaW0t cHJvZmlsZV9oID0gJChzcmNjb20pL3NpbS1wcm9maWxlLmgNCiAgc2ltLXNp Z25hbF9oID0gJChzcmNjb20pL3NpbS1zaWduYWwuaA0KKyBzaW0tdHJhY2Vf aCA9ICQoc3JjY29tKS9zaW0tdHJhY2UuaA0KKyBzaW0tdHlwZXNfaCA9ICQo c3JjY29tKS9zaW0tdHlwZXMuaA0KKyBzaW0tdXRpbHNfaCA9ICQoc3JjY29t KS9zaW0tdXRpbHMuaA0KKyBzaW0td2F0Y2hfaCA9ICQoc3JjY29tKS9zaW0t d2F0Y2guaA0KICANCiAgaHctYWxsb2NfaCA9ICQoc3JjY29tKS9ody1hbGxv Yy5oDQogIGh3LWJhc2VfaCA9ICQoc3JjY29tKS9ody1iYXNlLmgNCioqKioq KioqKioqKioqKiBzaW0tdXRpbHMubzogJChzcmNjb20pL3NpbS11dGlscy5j ICQoc2ltDQoqKiogNDczLDQ3OSAqKioqDQogIHNpbS13YXRjaC5vOiAkKHNy Y2NvbSkvc2ltLXdhdGNoLmMgJChzaW1fbWFpbl9oZWFkZXJzKQ0KICAJJChD QykgLWMgJChzcmNjb20pL3NpbS13YXRjaC5jICQoQUxMX0NGTEFHUykNCiAg DQohIHNpbS1sb2FkLm86ICQoc3JjY29tKS9zaW0tbG9hZC5jICQoY2FsbGJh Y2tfaCkgJChzaW1fbWFpbl9oZWFkZXJzKSAkKHJlbW90ZV9zaW1faCkNCiAg CSQoQ0MpIC1jICQoc3JjY29tKS9zaW0tbG9hZC5jICQoQUxMX0NGTEFHUykN CiAgDQogIA0KLS0tIDUwNiw1MTIgLS0tLQ0KICBzaW0td2F0Y2gubzogJChz cmNjb20pL3NpbS13YXRjaC5jICQoc2ltX21haW5faGVhZGVycykNCiAgCSQo Q0MpIC1jICQoc3JjY29tKS9zaW0td2F0Y2guYyAkKEFMTF9DRkxBR1MpDQog IA0KISBzaW0tbG9hZC5vOiAkKHNyY2NvbSkvc2ltLWxvYWQuYyAkKGNhbGxi YWNrX2gpICQoc2ltX2Jhc2ljc19oKSAkKHJlbW90ZV9zaW1faCkNCiAgCSQo Q0MpIC1jICQoc3JjY29tKS9zaW0tbG9hZC5jICQoQUxMX0NGTEFHUykNCiAg DQogIA0K --=-MuBoLkHkWF4hBFkrCft8--