From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 65960 invoked by alias); 17 Feb 2017 17:07:26 -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 65950 invoked by uid 89); 17 Feb 2017 17:07:25 -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=-24.4 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=Company, company X-Spam-Status: No, score=-24.4 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: EUR01-DB5-obe.outbound.protection.outlook.com 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=H3tpfQgfxbNNmkuw+vP1oHGyEqP+wVroYN4H2E/W4pw=; b=tJatr7vQuX8LsmguQ3zkAOUfsgfCr5uHALq52dbcDTQUyWVat11XDDPyrpkwUp8MMsibn9r3mgOSgv6WFZR6Nf0BDOWDDdKXVd2D26mmOkwCs7C8Evk40LeYt3Tw+8swOgmSZQrPtAehJWbzIzLFC9bRPobqRNYTr3KFV/Mrh0o= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=ulf.hermann@qt.io; From: Ulf Hermann Subject: [PATCH] Make the replacement mempcpy a function To: elfutils-devel@sourceware.org Message-ID: Date: Fri, 17 Feb 2017 17:07:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Icedove/45.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Originating-IP: [62.220.2.194] X-ClientProxiedBy: DB6P191CA0008.EURP191.PROD.OUTLOOK.COM (2603:10a6:6:28::18) To DB5PR0201MB1863.eurprd02.prod.outlook.com (2603:10a6:0:32::21) X-MS-Office365-Filtering-Correlation-Id: 0f1aa5bc-4560-436c-a47b-08d4575769fe X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:DB5PR0201MB1863; X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1863;3:kFolgHL8UY+aL9AZnRd91Pl5lvzWTuKzi9bVu+38XNonYBsBjY1y/BsxI+cownRK9/exMAiqRKJc7GwF5sfpXs1qPE1sKowqahkoRJVwZIYD3Xs1NsEjAdXbCFyxpu5KMrteBJAGGU1mzIOu8fqrtUUiw1DMXwpMIHgDldG1+3giqfu2Kq4cdaKyc7gi5DJx2rZ4HULOxQA7klBNqSUR9yTQb0Ky6GIdlMy7z/AJ9Pg9wbRlMPRiLw9SAjcNY0W0gHXCm+BH31j4syfczrzbCw==;25:PwTKSNgFHvwW8gRx8YVYWZo2hZEzGISgT6dZ7x/uosTXFzdhlVeFMTATc6nxdyTh5JbCpX8DTRqZ50+HuXVvr8VVwKMNrGx2hoIUiZcG6pOSQXvmkgu5rGf5IK78PeuI8ybgmP3nK4ZR36B+pCbo+LRTZxO+aWV6NbJF+yo1uVce+9nVi5PxdsUh/HCKEFoCJJBqLGWnwDJQMCbkFwD7Fc5s5WeCShL6pLOAytfpDieyOwKMHJtpT3d1q1nDmEikyaHtsTanO5Q911hdk9HV2VMnwLuhB/S4p+WKNyWnSNH1Mt9B8vLQIGolQm/uH/ck2hYadcuFZT4GisBvwP1gflpJUwYk4r5p6EaSySnLbZFKnmGid8UgQV46YeWBSqDrWjKV/l3KFhVVMcyhkD6FPXVsBB1gbbRBgVW+5ETIZmSeWIdgi8TwHGAeZ1lcZUWrDnBvR2XxQQXPDsrxkuSedw== X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1863;31:BZmBwMLcyBY7Wn/K6/mVjutldF1MtnOxXzfkEOlTtRe9oDI0YHlkT0hCtFOwQVrvou4fqp8ubGkCkqjy0x7p8ACIO0evPNsw14lBnKZziM5e7Wzod0CQpdcpFaCkx/e6L0vSM3XKAVFpBbU/Q65/BDxFtCjB/xBuDj/xtamtj3swKZBZ8sa+J7WglljKZOtAhdK2GE04ClElEBLm4QiM9+pdjI/GieRf0Oj5m6aG6JigcOxbksplc+gPTweQDDpe/jK8wVEwj301XGZGKUxAycfqK+vJ93EbUOrHw9UO+94=;20:KGn37qv6g88MJDagw8iSq7SknU4+bwDJWC31h9amWwW4ulhj49QZSUdDBiaz82eZZSlU/YZi+dIWuFOqKqn7esJ8oMPMg7n9CNG+AEfkYBMFKlroEYaH6secLpttMA0Pj8YbrNRaXtJ9aCjP2zU/sehRBeNC2k26L1fytrC/iyRDxkI5br6bc6MJVo5UTgxVNyJIZSr6ORLomxH+OP3dEYgOayv3zLBBAbxKRbtavttas9nT4rjS/qswuLov+DWK X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(250305191791016)(22074186197030); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041248)(20161123564025)(20161123558025)(20161123560025)(20161123555025)(20161123562025)(6072148);SRVR:DB5PR0201MB1863;BCL:0;PCL:0;RULEID:;SRVR:DB5PR0201MB1863; X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1863;4:N4N2Q7f/rVzr2dcHE9m6R8Yg7P27rPTSkS9DYp3jrWShL+EhJN0zMr3Hbczg5PLLuTqoiw2QUKYAKvfzNudba4EnO2CFOZIEPPz7o7vTNK3QFJdfb5m8aWDoYsyBnJuRX1Hf8ofRiuJcdiIzplkWOYZApB0pPptjxodyIFuVAo6/phZYLVV7Ex+cN56R6qi3lLicEhPViZ3c5YFm4CNffy9q3IDbXrqfCSzcVXibO7IIgQhVA+RP2FXpU9PuyYJLF+KWprIZH2gAmSuevR0fD55tEfc0IH+eRPAsfFWcwKEx/ZhDXgRfDLQm6vlYCsC43Gp3txwUabcHmguaS1sBAGPwg3ndCvKCLzKFAPHTrq8cIILAyiLmAtfJ98KPkSX24RILHkuxg8o2obgSg1ih5Qoa3MUEHZHQzbXzUEAqJNLj/I0Op8qN7Hjkh0GfAFUcsLkDARBsONnCU3FL8nGwFBZQI2Hh462qyUfTcFlhUubzyeqfStqgntn0xQ3iRprENzp/lT8WUDIfZXXdQO3ChP7i1dtLDzfMVxUVfXKdjDtfYVCrEes8s8DjNTyrm8DEmAj7TCRJ0LeZ+SSlpQCs9OJVsyJ3pXklPEPS6tqxSG5s6YCzVwZGjG7UfuQyLr+qOHvV4aa/MPg1ktJBeeoetvqWg+N6mtbUml/+6bDavMQvHIyIZPHkR1mnJGR/4lHs X-Forefront-PRVS: 02213C82F8 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(7916002)(39450400003)(199003)(54534003)(189002)(377424004)(50986999)(74482002)(54356999)(77096006)(6916009)(6116002)(450100001)(50466002)(6486002)(23676002)(3846002)(33646002)(81156014)(101416001)(36756003)(8676002)(97736004)(81166006)(105586002)(83506001)(7736002)(42186005)(2906002)(106356001)(305945005)(31686004)(2361001)(47776003)(64126003)(189998001)(2351001)(66066001)(53936002)(230700001)(575784001)(31696002)(86362001)(5890100001)(92566002)(38730400002)(68736007)(110136004)(6306002)(4001350100001)(5660300001)(2004002);DIR:OUT;SFP:1102;SCL:1;SRVR:DB5PR0201MB1863;H:[10.9.78.69];FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; Received-SPF: None (protection.outlook.com: qt.io does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtEQjVQUjAyMDFNQjE4NjM7MjM6RjVURUloV3RObnhKSUZMMWdWNHpSMjM1?= =?utf-8?B?OEhLaGZsQmxuK3NmV2V6cU45NXVDendiZUZGV1RSTWVYdnJiQ2Zkd0o2Zjht?= =?utf-8?B?VEZKZTU3czh5aVZWR3NBeEpkNXBXVWk4bm8yTWZ3Rmp5akpTd2VsUlUvRktY?= =?utf-8?B?NVk1dmNSU0JCMU83WC93Rjlibmo4L0VSUWhHWkpEeDBDTzRJUXRIZkFvSzJm?= =?utf-8?B?WHBNdSs5TnAzWFJXcm5CVHNGTkVXb0R6eWhpOUVnL2dTaUV3djVZOEpHdUR0?= =?utf-8?B?cFdFbWNsbjhXdm1YSXdQT3VaamtWTGNibGdVY0ZkZmhQSC82czZqUFA1ejdv?= =?utf-8?B?NThxTDZISGpXMFJLNFA3V2p4TW52Y3dxdUVuTXBsQXJ6S28zWTJ3VjBCa280?= =?utf-8?B?MjY4S0VJbTVsYUpWMVhkcFNFUUhjTm5kUkkwZ2NCV0VZVmh5MjYxZHplbmxs?= =?utf-8?B?QklvV3dubWhZMytKZzBkYmpvNnZGY1NBbVJzQVM3OUltNkdFMVc2ajVTazZW?= =?utf-8?B?T24rRUtWWUVIa0ZMVFJVMlFlcEVzdW53bUo1bU5uRmI3aHBibEZocTNOcXla?= =?utf-8?B?RlhqRFRId2xSbkRPd1JwN1RqcWQwZFRmb09WTTg3ZlFzS2k2S2F5RjFRS3Ex?= =?utf-8?B?elhOaXdUV244QmxmT3JtN0xUcWQwVTZseVJSMmUxa2lEdjY2YzBJcXBWNEJF?= =?utf-8?B?SUpGOElDTE9SY0RTZEhDRUt3MTVQOEtTZEZyei9QMThOVFdlWU42eGdReEFl?= =?utf-8?B?WUQyS2NVamlPVUM3Z2ZGLzBPNnZmd04rWlByclFka2UxbUR6MmZrRVYrT0Jy?= =?utf-8?B?cUdyaVlWZmFJVlVucENkYUF3ek8xYUlXVWtHWDh2MjlkMnVKR2NscVNXbDFJ?= =?utf-8?B?NXlnNzBjN0R5V0VHc0dDeUJObHcyU05ZU2V6aEdxbVBUemNTT2FmNWtVemlk?= =?utf-8?B?WEpIRFVRRWlrelNHdmwrdDVHRHFITm15TEhmd2FVMkk2aVVMbjZiaFF5dGpj?= =?utf-8?B?dmdGdGwvUmtUdlJXNkd0SW9LVUNLSGlKR3RueS90UFl5T3hWY2Izci9iRkg4?= =?utf-8?B?WERudlBubDE3alY5bkQ0eEloQVd1dU5oazFMR3pNYURZRUF4ZGtVWjdYOFVB?= =?utf-8?B?T3FYZHlYK2t0Ym8yVVRtTy95NW02RlBYazY0TmtFK2YyQzE2aWxuYlFhSGth?= =?utf-8?B?aU4rN3hPWjlqcTl5QThRQ0NRNEpFZTM3L05Sc0tCbjMzRkgrU01uY1dzZUNR?= =?utf-8?B?SUJyNzN0T3UvcXdQM1dlOWR6dW5QaVN2ZHlpc0h6WU1WWjNwbnNtdWVYblhG?= =?utf-8?B?WG1SRjcrUnZpUGs1WXlDZ0UzYnQ1UnppK2FmOWhaaDdxbDFuUExrd21KbFdQ?= =?utf-8?B?azg2bUsxUkNGLzYvYk13ZUZveHBLRCtjQUphNCt3YnhnTzJiWUljRWdiN3hP?= =?utf-8?B?UXAwS0VNQUdWZUM4YVczQTh5VUtxL0gvbDVtZi8zMzVlWEpDS2JNbEVHbFY1?= =?utf-8?B?b05mSzh4MU8rWWdZcGgzRVVCTEV1WktMeXhvYWU0K3I1Z2VEUnZpbTRRL21Q?= =?utf-8?B?eFV5cnJEQ2k0K3RjdHVUdlVxZTViQzVHV09OdE1MM1U1RFRLRzRiUG0rSENB?= =?utf-8?B?eWM3bG9xNHZEWUdlc3pybEtiYk45QityTEc0UGY3c1dpVTFkL0UrSjk3RVpL?= =?utf-8?B?clh3c21LUUZzYWppVHd4MzhwRUptYWI5VE9RVVVDRU5seTRwMGIwSUxCZi8r?= =?utf-8?Q?OrV2Mjky17S3z7jrbnJ/Mek7CUlRQvgIwem2Dwo=3D?= X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1863;6:Yv2t+PWpmOVOwHTfBQJMJpuTkmkLLsFlhDSMs+89ciSfB6t6ivSYlLEDA4EPhp3FuiigkILULL+3D8yzlAMsEfyy304pAH08zSdI4jGWr/xe0Sm3cbU4Z3petdsTDsEL9rq8aOvh7r2hl7weVeeZw/mVIm0ag3iAPE/yhB8Bsnl/b4kaEmJLHAraf5j/fL1fOwr4e/wkChVXS2wG3igvVpsvBJuUNbKigMJP2e9eeqEL8N7NtWcXIkbKMerrfB0phvkj+nkrZDxht9YWa77OvQVDWlIEKyFYReeInt12zZ0O7KhpwgHN5/QD0QjQ1CjjvWAHGRJONKQfvWkj5hLothUhMH6H/REbByEMC2WePOgsL8qqNzAu7iQ3CYDxqO8scfCnBoEaJRAx+RZAfCyX0w==;5:ZP5IqOVM+Q/fY1/dNdf1gtfhyvFbRp3oaWclnKKx1D+kL35tS7fpvjuaGOez20cWk5vIcD0J+5lebJn+QtssILhHpXMiq7F8i+k/4foGsv1sTOlW9mKfs1hC4qDzf2Qiew2G6o21aJoY/xDoAeJynY7RiF4cgAukhnqPoRDjZJc=;24:c/0V7190DTGEjG+KClxuxGnbFB9izqZPwLW8u5cl7AqqZ/IAnN/pHonjpzyhwD4rPEx/ZHqpDSoKiRqwqa5RJk4MU1Tk+DMEFpVlXirYuYQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DB5PR0201MB1863;7:reVAkquMiar75bV82PJrmugC7ICn2GWQ1wtYAtnCJtr4LkLF+tot0SWiA2u3V4y0vpn7paqvlBO4aDkRfmsGsnoQ1R4sbGzEpow83+eWIehgefKacCBd61Mg4JiU+VeY0wqmfVcbhVOzqoFGwFYOODSs1gDb0au+NqJ6C9fU5xFCwEsQxTCojmKcF28sV/nUcjiGdVr8/y++W2SI/oqqfdRTzzhpxw69QSkKQHAellA+aAtRB+lAh0/wHoYrMg17IoOyCc8f5wnhy7+HkUVgN19y81VoH4/uH4yvq9AwSBeTd4dbzGbfT/al4UTEHZeqZ/w3ZXS+TNwWUjWfv8iKNw== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Feb 2017 17:07:11.6868 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB5PR0201MB1863 X-SW-Source: 2017-q1/txt/msg00062.txt.bz2 This way we don't have to evaluate the 'n' argument twice. We now need to link libeu.a into some tests, though. The system.h include was accidentally dropped from elfcompress.c and findtextrel.c, but is actually necessary when mempcpy is only available from libeu. Signed-off-by: Ulf Hermann --- ChangeLog | 4 ++++ configure.ac | 1 + lib/ChangeLog | 7 +++++++ lib/Makefile.am | 4 ++++ lib/mempcpy.c | 41 +++++++++++++++++++++++++++++++++++++++++ lib/system.h | 3 +-- src/ChangeLog | 5 +++++ src/elfcompress.c | 1 + src/findtextrel.c | 2 +- tests/ChangeLog | 4 ++++ tests/Makefile.am | 20 ++++++++++---------- 11 files changed, 79 insertions(+), 13 deletions(-) create mode 100644 lib/mempcpy.c diff --git a/ChangeLog b/ChangeLog index 48185c3..15b36dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-02-17 Ulf Hermann + + * configure.ac: Define HAVE_MEMPCPY if mempcpy is available. + 2017-02-15 Ulf Hermann * configure.ac: Add check for mempcpy. diff --git a/configure.ac b/configure.ac index 3c35dac..303bf4d 100644 --- a/configure.ac +++ b/configure.ac @@ -288,6 +288,7 @@ AC_CHECK_DECLS([powerof2],[],[],[#include ]) AC_CHECK_DECLS([mempcpy],[],[], [#define _GNU_SOURCE #include ]) +AM_CONDITIONAL(HAVE_MEMPCPY, [test "x$ac_cv_have_decl_mempcpy" = "xyes"]) AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])]) diff --git a/lib/ChangeLog b/lib/ChangeLog index 84290f7..dcd20e1 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2017-02-17 Ulf Hermann + + * system.h: Make mempcpy a function. + * mempcpy.c: New file. + * Makefile.am (libeu_a_SOURCES): Add mempcpy.c if mempcpy is not + available from libc. + 2017-02-16 Ulf Hermann * Makefile.am (libeu_a_SOURCES): Remove version.c, add printversion.c diff --git a/lib/Makefile.am b/lib/Makefile.am index 7a65eb9..63738fd 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -41,6 +41,10 @@ noinst_HEADERS = fixedsizehash.h libeu.h system.h dynamicsizehash.h list.h \ md5.h sha1.h eu-config.h color.h printversion.h EXTRA_DIST = dynamicsizehash.c +if !HAVE_MEMPCPY +libeu_a_SOURCES += mempcpy.c +endif + if !GPROF xmalloc_CFLAGS = -ffunction-sections endif diff --git a/lib/mempcpy.c b/lib/mempcpy.c new file mode 100644 index 0000000..aff8d54 --- /dev/null +++ b/lib/mempcpy.c @@ -0,0 +1,41 @@ +/* Implementation of mempcpy, using memcpy + Copyright (C) 2017 The Qt Company Ltd. + This file is part of elfutils. + + This file is free software; you can redistribute it and/or modify + it under the terms of either + + * the GNU Lesser General Public License as published by the Free + Software Foundation; either version 3 of the License, or (at + your option) any later version + + or + + * the GNU General Public License as published by the Free + Software Foundation; either version 2 of the License, or (at + your option) any later version + + or both in parallel, as here. + + elfutils is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received copies of the GNU General Public License and + the GNU Lesser General Public License along with this program. If + not, see . */ + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "system.h" +#include + +void * +mempcpy(void *dest, const void *src, size_t n) +{ + return (char *) memcpy (dest, src, n) + n; +} + diff --git a/lib/system.h b/lib/system.h index 2d05702..6ddbb2d 100644 --- a/lib/system.h +++ b/lib/system.h @@ -68,8 +68,7 @@ #endif #if !HAVE_DECL_MEMPCPY -#define mempcpy(dest, src, n) \ - ((void *) ((char *) memcpy (dest, src, n) + (size_t) n)) +void *mempcpy(void *dest, const void *src, size_t n); #endif /* A special gettext function we use if the strings are too short. */ diff --git a/src/ChangeLog b/src/ChangeLog index 0601198..d26169b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2017-02-17 Ulf Hermann + + * elfcompress.c: Include system.h. + * findtextrel.c: Likewise. + 2017-02-16 Ulf Hermann * addr2line.c: Include printversion.h diff --git a/src/elfcompress.c b/src/elfcompress.c index 8e0d5c5..cf85820 100644 --- a/src/elfcompress.c +++ b/src/elfcompress.c @@ -36,6 +36,7 @@ #include #include "libeu.h" #include "printversion.h" +#include "system.h" /* Name and version of program. */ ARGP_PROGRAM_VERSION_HOOK_DEF = print_version; diff --git a/src/findtextrel.c b/src/findtextrel.c index 8f1e239..5382abd 100644 --- a/src/findtextrel.c +++ b/src/findtextrel.c @@ -37,7 +37,7 @@ #include #include - +#include struct segments { diff --git a/tests/ChangeLog b/tests/ChangeLog index 222bb6e..7b15ec5 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,7 @@ +2017-02-15 Ulf Hermann + + * Makefile.am: Link asm tests and elfstrmerge against libeu.a. + 2017-02-13 Ulf Hermann * Makefile.am: Add test for unwinding with frame pointers on aarch64 diff --git a/tests/Makefile.am b/tests/Makefile.am index d120ed9..1dc85f9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -432,15 +432,15 @@ funcretval_LDADD = $(libdw) $(argp_LDADD) allregs_LDADD = $(libdw) $(argp_LDADD) find_prologues_LDADD = $(libdw) $(argp_LDADD) #show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) -asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl -asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) -ldl +asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst3_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst4_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst5_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl +asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libeu) -ldl dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(argp_LDADD) -ldl rdwrmmap_LDADD = $(libelf) dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) -ldl @@ -488,7 +488,7 @@ elfstrtab_LDADD = $(libelf) dwfl_proc_attach_LDADD = $(libdw) dwfl_proc_attach_LDFLAGS = -pthread $(AM_LDFLAGS) elfshphehdr_LDADD =$(libelf) -elfstrmerge_LDADD = $(libdw) $(libelf) +elfstrmerge_LDADD = $(libdw) $(libelf) $(libeu) dwelfgnucompressed_LDADD = $(libelf) $(libdw) elfgetchdr_LDADD = $(libelf) $(libdw) elfgetzdata_LDADD = $(libelf) -- 2.1.4