From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 103404 invoked by alias); 18 Aug 2017 15:04:00 -0000 Mailing-List: contact elfutils-devel-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: elfutils-devel-owner@sourceware.org Received: (qmail 102641 invoked by uid 89); 18 Aug 2017 15:03:59 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.99.2 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 spammy=4.2 X-Spam-Status: No, score=-25.9 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on sourceware.org X-Spam-Level: X-HELO: EUR03-AM5-obe.outbound.protection.outlook.com Received: from mail-eopbgr30112.outbound.protection.outlook.com (HELO EUR03-AM5-obe.outbound.protection.outlook.com) (40.107.3.112) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 18 Aug 2017 15:03:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qtcompany.onmicrosoft.com; s=selector1-qt-io; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=IPT977Bhsr5S8DGIeA5SKqZIYY31CPJI8jy5IOA9qnM=; b=gIdXPRBCivhlI1wm4vSy2Yyu/omVEYk+e6QcilYr/HZrlY4ZM0rJHXJLQ6e4J7PYLIvS2Ht3joRjupnLKWH87Tjr1zaJa9i0onNSOdiHwwLk7WJQ8ukmI7Q/KfcucJNqUF8C5+J88tnT6IeQ6aLnxSkEwP2rly7QrMzlKBjZP6o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ulf.hermann@qt.io; Received: from [10.9.78.66] (62.220.2.194) by DB5PR0201MB1831.eurprd02.prod.outlook.com (2603:10a6:0:32::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1362.18; Fri, 18 Aug 2017 15:03:53 +0000 From: Ulf Hermann Subject: [PATCH v2] On non-linux systems, don't use native signal numbers To: elfutils-devel@sourceware.org Message-ID: <971f8f10-adb9-a569-964c-c81c2202900b@qt.io> Date: Fri, 18 Aug 2017 15:04:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: HE1PR06CA0139.eurprd06.prod.outlook.com (2603:10a6:7:16::26) To DB5PR0201MB1831.eurprd02.prod.outlook.com (2603:10a6:0:32::13) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 86463639-6a21-4ff9-0253-08d4e64a57c9 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095);SRVR:DB5PR0201MB1831; X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1831;3:WVEfenDkPMmy9d60NwMjGPGcrOP5kvCprpnVwuplUKRFUSMUnAeuQnWh6E6orobc3pCAr2DGtY9JMvSnXmVJv7B4QiMM+qlZYTZ0XVqpSBUHpBzyG6GYDYacOpq2d927dHr9CVfoiVlmhtE/Kg5thnj57cTqaEkBAGz8GBAF9jkgX+zWg4bg9vGi8UvE22Nf9AqvqrzUIimGNYIudJr8vF0B6pTk96iDPa+rC6pZAJG2JrmFXZLOTCDob27takmz;25:H2OWZyaPm72H7JqjnjT4QBKGx8xKfBf64LafjvPWQ3yvYMKILTPXWcTS+Za4AQNLMPRTzs9cZAJ00ucWEz/S85DgfH7DQy/aqBaIgGysRRzseXNGmQyu3OD4xt23FUbbMji1svzXH73ui7cqgHJ9Od8bl0hamtnzPDoYGe567PEASlufPSqTHCjXfFKGvGfg4mpU3SmPhxrgZwkspJMjjuCNzo1PgNQYiJS2F3pbrCe1+wzlWnKidbjEvKt9JO8c0PFpNFZ0QUPGAM9ro8VltJfF7QZy6MoXfJjqKhOK+CVzN/XITHMP1/kKqc2lx07GTbO4QauWS5tsCHt6mZ33Jg==;31:HxI5cinZE9X57Mvz4ZKNDq4KjB2zfvVENg7iBFyCKFRsvLC9ZeiqV41ExhRxhL8wdjVdGoF3yHBPzmOoXWFSe3fxtTK9Z2NXfcripM3EZljJoi5pN5b0HZ3GQ8O26k7Y+9picNGqosGmapyn4Qn7j8rnRgPr5raRGenn6o0pWau6N7dIc6Ya+uTzHchmqnJGz0fsHyXQFHLvvtoRm8Ue3bHnE3Gfh6SN1OMqw5Ai9wo= X-MS-TrafficTypeDiagnostic: DB5PR0201MB1831: X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1831;20:wECNZez//nnPSarKv/El0MPnyV7xn+Ov+aEeNOigAkh4UY/syuu8BaUd9nW9uKLPJG9zikUZQszWB0nywlTAbAa1Opj8MebUbH6alqYePCTSJRWHIYaWOt5M0i8sx2krd4hlBa6tls0ZYZdqbLwB7btOLu8QNPDfim23fIRM6FYUGBQH5h9wb8N6l4VA1c3KsdrxrLUcMLCO+TCrO9LRX8oTQj2qjGYOXhT1xO4sB61pmo2L5rrEt3ZYtxBdyLMmCFX0ngpm0kVRF5yJx1JqvGeZ4IVSXVdbMrK12Yt9rjlX3l+sxNQmNNeRQapW+Qq7mZUX/K4ru5w/KK02BovnaLxcGmvCaZCgcxboL6Ptn/6Hu71Clk67TrWAcCCIg81brC4GYYdh/t/GMPyfwD7BD5/5U9vhORd7d9TY6dtcDu1I6/xr6FasgCpuhMqfmQYnqMmxhE13e4q7gWFIKyWAJj7rCHQrjbcgcGBgOX137jq+sN3MA2ympzK1+0x5Vyd1;4:NADcveSmsf89UGjDaMBXfZebDbtpKGBeI/RtvG3BgRFY04Xji3p3xGOTG2V1zqznCyfoo3xOj5b1PKgQ5ebBT0kM5pVuQ4RKHxa328TMAh28ZSuZ+lj8nmB4ESbQQlpG/RXnT0Y18idgsQVJcNDnR23C5UWvI03cKbabofbUKvUmdaBODOIRMg7u5T4bJTjeuYT+Gd7SKSfCFQCa5OwYZ+HBYSbGwhWzF5yV1UtObGOyAbddbw8QkKI4r9ijcPyM X-Exchange-Antispam-Report-Test: UriScan:; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(100000703101)(100105400095)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123564025)(20161123555025)(20161123558100)(20161123562025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DB5PR0201MB1831;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DB5PR0201MB1831; X-Forefront-PRVS: 040359335D X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(7370300001)(4630300001)(6009001)(6049001)(39830400002)(377424004)(189002)(54534003)(199003)(50466002)(83506001)(3846002)(77096006)(6486002)(106356001)(2351001)(105586002)(230700001)(5660300001)(478600001)(65826007)(7736002)(2361001)(31696002)(305945005)(97736004)(4001350100001)(2906002)(8676002)(6116002)(33646002)(42186005)(6916009)(81166006)(81156014)(64126003)(74482002)(66066001)(7350300001)(189998001)(36756003)(65956001)(65806001)(54356999)(68736007)(23676002)(50986999)(25786009)(110136004)(86362001)(47776003)(53936002)(31686004)(101416001);DIR:OUT;SFP:1102;SCL:1;SRVR:DB5PR0201MB1831;H:[10.9.78.66];FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; Received-SPF: None (protection.outlook.com: qt.io does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjVQUjAyMDFNQjE4MzE7MjM6ck5ZVlFsUlFObUcrT1AvNTJYMTZFODht?= =?utf-8?B?WmN3bis3blRueGlIZHJBcGVTdGU0dUdqRmZjM2luL0NKOUQvQXlBVENaZFFi?= =?utf-8?B?SFo2SWM2MHZEY0UzcTE3UWhTTWp4YzFqKzhsVmx0OXRRTkNxeUF0QmNiZFpq?= =?utf-8?B?N2t6WVJDY1BPa01iZkZlOVpzWXNBRFU0NmRjanJZSkprbk4vWjUzZ2h1RFZ5?= =?utf-8?B?dG5IRVUvWFJ3aDR4M0FsdFR2LzRwQlYxbzJGNlRpQnlFM2pHd3J4b2U0dXhF?= =?utf-8?B?dkZXb1JJYmJ3dk5tNTR3MzhRN2hsV1czZ3dTQ2l5UmxYL2N3ZnZPc1Awdmxi?= =?utf-8?B?OE1vZ3JHNEQ5MmdaM3k4MUJHYktWR0t3UmVoVVZ0SDFvVC9tQXIxejBsd29y?= =?utf-8?B?d1FHd2ZsNkNNeXlrQ01LV0s1YXNjQUhrVGxZcHlEU0NOeEhXTHV4VU9EeUtL?= =?utf-8?B?Z1JrTUJ1c1VYb3Y2UTZNMHNTdmNUVmN3UVpnc3AxNHMrc093Nk5zVlZWYnhu?= =?utf-8?B?QzhRTzdjV0tTc1YzWHlycHpwcmFTL0NIV29aTWdTeGR2ams3REpPZ3crSVUr?= =?utf-8?B?NitBT1RYbTZHbkN1VFBNd2VYNXE4Qy93L0k0ZWx3Q3F5d3lTZVlCN2NHRWpq?= =?utf-8?B?QTAzeTN6QW1HSzYvNllCeThIcTc2a1RuQWZQK0VOa1N4NWFzSlQ5a0F6OVcy?= =?utf-8?B?UXMzNFViSE5BdHlmV2l2UjRjZDIyUWFHKzZCMlRZbkVyZDJZOGRvRE1FSi9q?= =?utf-8?B?V0hzM3ozWFZJbitHQ3laWmZvbHFPampMeDdLdExMSXFjenRkU3FkT2s2NTFp?= =?utf-8?B?ODBMak9hYmN2QTltL1dmM2o4YnNjem9DaUxILzZ4dExVSzZLcnlxU08zRHZa?= =?utf-8?B?cTczbS9hRnp5d0V5S0pFUU1qcTJ1ZS9Va1FTOE5EeFBlR2Vhb1pDaTdubnRN?= =?utf-8?B?NG1EUGJYdHhzdUxWclY2cVY0bldzZXRXdGdGWlM5NUV4M0Vha3RWWE92WXdC?= =?utf-8?B?SFJ4bm1hQnRRdUFTczRvUXliSzllb25Vb3V3Zmw4UWRLQUhLME5kY05UVUtC?= =?utf-8?B?ekQvSzJYVUoyOVl1bGxWMzV5b084dGF4TmNHNnpjN1VFdkxiRkhYeHNiTjRo?= =?utf-8?B?TmF3SWVYZElsbG5VeENuZUZjUm1NdldvVGpJV2hwckdHTW44YjMxVzQwSGdV?= =?utf-8?B?bkRJdlJ1Uk1KWHpJQnJkUXlzdnp0NXRZdkI1YVc2dGVvTDZiMnh0TG10YmZL?= =?utf-8?B?ZTViTkkxcWorS2VRdjNOZlJYQUk0WFZGS1pyMnJpM2JZSkhUL1dxZFptT1VH?= =?utf-8?B?bnZwS2ppeFllUE5ST09zdjBTd0U0dHJuanF4ajB4bzhOODNuWitYbW1DTjl5?= =?utf-8?B?N0NYTHUrTWZzR2JsZ3h2OUpqY09WVFBpY2dzbFU2RUwrUmhmVEFkbmxhaEsr?= =?utf-8?B?dHl0ZEk1dHpramRLc3lYL21nejBNQncvQWxCQ0k2S1BSbS9aWmYzZTY2b2Va?= =?utf-8?B?K3Q4dnVJclYvZDZHTUt1QitldWRnK0IxMUErcTRKamticmo4SUwrL2RVRFhV?= =?utf-8?B?TjEzeVduWmNUdDhqNi9STHJWVXdwcmcrRGU1TWJocXAxSDFUU09pb1BxOW52?= =?utf-8?B?MVB6MFp4Tk9YZU1ZZkVtbzRodjBScWNDWGxVZW1nZ2pXK01oNGhNSVNOWTZW?= =?utf-8?B?OUxVRDAxZlgxanA1NXdKK3lDY3NQaHNXSnRNcHlneTlHSVFaRzZBTUZsZWlk?= =?utf-8?Q?xhQqkzpMVyeMM3eYaN8BN5tYPlksge7IdlrVOy4=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1831;6:oJTcA//MWsXeHH59mh9Bd1VA+g1meDmO3UVsLf7uayGFHD3+g5gdlTDzSz0YN+Whaxb+Z22+rS4W896eYWtRQxb7CMLCmQdiPFomHHNeaf/dsqEPMiPtEfO6cNdDbzS8ayX1qM3fn142laQeBuooXtlYfhDPuTTTd4XIqOykw+jC5JalDbUUt85n/6oryfd9F3BOGQLVURtk1q56NfXThFJ+XB0B8A+MIS7U+rYrIv6+Jkl0wrnt2NXuEZB6UWGdPr/1UvyY44zSKkQZ/cXG4LDTkOujshWq0uCTGPJDfbuXsr7kobZJoXb9O2tN8UW4NiZiHA6MoZDCERXIiFxvFQ==;5:wX/vq+F2ArnsiOaJ59PFfnTRjGQcJzx9jv0sbhkgvLLqbJI6o+7ccocaCOO8fqt1+TEJFPVK6FnJlLBikQHIPckKn2PAGt8qqiOK0dBl8Tad0pCz/RF09ErDb4sezfysmoeP5d/zNgzPuYcohKN59A==;24:NxfNDBmWoeStISdB/y7YD4oKW+HQkF5C08gAZKrMTJe7ZCbSZVXS8yDgxmjwMCMRfWkrUyo/AQuTnhLr8viFS6h53x4t75Qy2Jccp0vd1zQ=;7:ou7eOqUUw//3avVAiBba5OTaawXCd+BJoo+j596Q/hi83vJIEfIU4bhMC4bLjDLHxorXBAda/BrkO40sLj1Deecs3hzYO009rGxZED3Tl+ke6+hnAsLRXffjmu+yM/8+a+9d+P4jGocN1yHuSnX9h/FvFF9PVu5BGJJQmddsq5Mu6+cC25AlHSxOZ6NpfaWtOGx0RumjYkHxDgYOl3s6+CiI7VTY1ronZs6gT9t+oUU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Aug 2017 15:03:53.7873 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR0201MB1831 X-IsSubscribed: yes X-SW-Source: 2017-q3/txt/msg00084.txt.bz2 We assume core files from linux systems, so we should use the linux version of the signals when reading them. Other OS might have different signal numbers. (v1 was a malformed patch) Signed-off-by: Ulf Hermann --- src/ChangeLog | 4 ++++ src/readelf.c | 24 +++++++++++++++++++----- 2 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 54ba767e..8aa57051 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2017-08-18 Ulf Hermann + + * readelf.c: Hardcode the signal numbers for non-linux systems. + 2017-07-26 Mark Wielaard * readelf.c (print_debug_macro_section): Accept either version 4 or diff --git a/src/readelf.c b/src/readelf.c index 73be474b..5e2f3fc2 100644 --- a/src/readelf.c +++ b/src/readelf.c @@ -57,6 +57,20 @@ #include "../libdw/known-dwarf.h" +#ifdef __linux__ +#define CORE_SIGILL SIGILL +#define CORE_SIGBUS SIGBUS +#define CORE_SIGFPE SIGFPE +#define CORE_SIGSEGV SIGSEGV +#define CORE_SI_USER SI_USER +#else +/* We want the linux version of those as that is what shows up in the core files. */ +#define CORE_SIGILL 4 /* Illegal instruction (ANSI). */ +#define CORE_SIGBUS 7 /* BUS error (4.2 BSD). */ +#define CORE_SIGFPE 8 /* Floating-point exception (ANSI). */ +#define CORE_SIGSEGV 11 /* Segmentation violation (ANSI). */ +#define CORE_SI_USER 0 /* Sent by kill, sigsend. */ +#endif /* Name and version of program. */ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; @@ -9335,10 +9349,10 @@ handle_siginfo_note (Elf *core, GElf_Word descsz, GElf_Off desc_pos) if (si_code > 0) switch (si_signo) { - case SIGILL: - case SIGFPE: - case SIGSEGV: - case SIGBUS: + case CORE_SIGILL: + case CORE_SIGFPE: + case CORE_SIGSEGV: + case CORE_SIGBUS: { uint64_t addr; if (! buf_read_ulong (core, &ptr, end, &addr)) @@ -9349,7 +9363,7 @@ handle_siginfo_note (Elf *core, GElf_Word descsz, GElf_Off desc_pos) default: ; } - else if (si_code == SI_USER) + else if (si_code == CORE_SI_USER) { int pid, uid; if (! buf_read_int (core, &ptr, end, &pid) -- 2.11.0