From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26603 invoked by alias); 27 Apr 2017 15:09:10 -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 26410 invoked by uid 89); 27 Apr 2017 15:09:07 -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.3 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=5518 X-Spam-Status: No, score=-25.3 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=zVhZ65Q4ETOLAWpy9MugX0hxVT8qMnlKIfHpizuuCsI=; b=tGFNgeiX7/7K80KWfSWCogJzaK0A8WbeLqiIdjQb6XYJ0ACwjESJKOYCucHh63ZnBl0PEeFVZTfRhWWFCrQWsFLh6cpKPRwBhtPaAbz2tijDybhnUAnxEMetN8/EerkmzPfC2LbEIsaFPn8N/5VdmwuHLnxbBGBKw93drR7DR38= Authentication-Results: sourceware.org; dkim=none (message not signed) header.d=none;sourceware.org; dmarc=none action=none header.from=qt.io; From: Ulf Hermann Subject: [PATCH] Drop handrolled or #ifdef'ed libc replacements To: Message-ID: <7d422b17-2db8-809c-484d-1621c15001a2@qt.io> Date: Thu, 27 Apr 2017 16:04:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.8.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: VI1PR0902CA0024.eurprd09.prod.outlook.com (2603:10a6:800:d7::34) To AMSPR02MB230.eurprd02.prod.outlook.com (2a01:111:e400:8022::17) X-MS-Office365-Filtering-Correlation-Id: 040220e1-81a3-4902-61ec-08d48d7f56ff X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(201703131423075)(201703031133081);SRVR:AMSPR02MB230; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;3:xBNbHu1LMlt06G5GrtE89pKsios3C22oRFqWAtKMxY/7CYfEE2IR/NRKeul3LYRKX5HsGMifS1LDC8mMKct7+gfK04d3cfuWCio7cvaa2RtOBCHBsK98HUqkXYSDJT8kBjwskaa1MedmYZlP6NrHBC1efhF7jLfuhi/a1HSJG2p9OMoh9AsMN0DSOUGNHhHmPU9MtmsEZ680WOTn+gSR2UPBUYwOd0ExzLKLH2oFfeoeJsp3/mcGih32PW+URLu+GHLnIqgfUJj7SihxTqHhqtD5XbUKwFSt5i1D8xS4L8oJVD2IYOIgO+5kWm0EYJNCssCEpe+SvL2hId9SbUhtDQ==;25:B16oTbmM//jsTxP5FqbAwZ/a7df/1cZI6RxK34Ib5kv6prHYOYxljc9ANuea/S9Enfz9iA8jYpkpP8CcBfV8tCgQNwogQCM0dsZpC3BGeo5zd4EBcuOigmMdmRirONWGgOPlJHERhoO8ApgCpaaHnOcNR/EWGwcrPj6pTz9uodHh8HrshjhKXLr7TAgLZPSEgt/k6pXLzOFI4ypOJ3d6RoCUfnxbg+esuQDAWperTUGSkT4WFzmmJsYVjtAKLR0Ch7Oq/+qDm+PlzdkNfCPpgK+OTDahYYs4UmOeVS0iiwMqlYXn67vMN018ZmDsWsi3KM2z+ds9dtxvnbuWh//d+l/9hm5yIFz8iizPc7Q7PGRmHElnhVOZHSmRY93OhN/cWc4P6Yf1FdwpoE0thse/e1OdP3KFALgDQEs7s+p/i9ZogLLZiplEWzv1If5Ku8v3l5MJD2b2LEe7lueF66KEsw== X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;31:SKg48+tJ7C9dydA3jwUXX7CMvkR/EUUSY0YtgfAfqMBFOJ3Z+ZlyukMNd945lh3mAGMAFMoQ0wbqTesfmjb1YciebfrdWbuImjt3S8B/OCVBMzn1Nxb7/PLMbZ2hWmKJBqpR3dHJjjx0FG+tiyfX44L+q9l999U1D4bjGXzDhpw9layU1o7RbyNsw6L+b7pK/nb5sS5wxORKBHB6aoNBPRLGCl+64fFvmMxO+HEgcWVa9IhYwSnDiAuR9LT6EXV+;20:CHGgT9WeANWNrDzrcQJro5P9muER77qTOYMIhihskisoTRXKWKw21kW7+/VXOikg3OCcyMhyqan3JOGRFRtWQvOCLhh/Z8LYj9p+TAO6Gc6InEXOGiyL1LxKL1OkkAvFrZGOrDs3EmcmvQf2/XSHwlIeCE7sO7+7BukIPMsXtjC8VO7vjBWEYkPDH59QiqUAjMUN4RD7PWk5kT6dzBZFi5/HeeVZ9Cs7VHrnwN5Mifpd/BnpBePx2uW2CxxVoOEb X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(788757137089); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(93006095)(93001095)(10201501046)(3002001)(6041248)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123558100)(20161123562025)(20161123555025)(6072148);SRVR:AMSPR02MB230;BCL:0;PCL:0;RULEID:;SRVR:AMSPR02MB230; X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;4:XXRziSJHP9pPcTZgdDRrcr6sENIkbkQu+p2UypK35m8atmNXujP939HmTTi8+dj3StdTlFLFRSv5bNs9aFc1tQG8CfWX9hLFOqd4ecBkZp6WZQ67Vf2lYbJDMA3wH6Yj3wi4QzcDvgPgLjt197F4rqiE+wXVinuBQrzC6MOhEovIeOqdnCfOX3Hp1OPDtkHxb6f9KmPHGeCAk8Iu5IFQQ2qNgSMqGTzOmPS1fY8L2cgxmWiA+o/2TuVLX1WrcKzrstYyigLNN60jG6F6REex2Pb8SJPYYySNmWUPjNNWGPpi8uFBE9/EqhVa54YupiJsRR2x/u4X0bC2xjTU8I2LrmIWGtMZzYK0qAfC9G/HSXmBh/w8sYbAGevqCQRU1wFtyq4qSEfHwO1tEvsIHIONUDe+SZIIY8A9+Q9IsuY0XneeET4yblu5KJi6JdBRv5NEr+FMmPnJMJUIt7rJ0QvblhzdEEcTzuubV/vJkNr1WtRJsqBUBkqZGT3qvU1SPVHyyL2p6ERrNer13y6NKUl42mG9tsbZwoa855k1/m1wK4rEUy8mjrdhK3FQtBxjSmSWygDPDJ8U+zb5V5kVlwqJIurROcL9VNmv4KYqhjPtGD2uVShX4nq+lm8z3WLwmb74zStOkeIs2hxEapWPh4kOZqc1Nwh6S+45FAruJlahU3Gpq4gsGtvM8EQgsKuXDa8vprYvd2EdDA1OemgMrldx4nD4x1NG2Bz+RtWXuy9lTsjBWwAr0nT5Uz6wCgfaqp0bpxyE19dV/9SFv8iXbpXVV22JDw4PBhN2CEApl7NjanGDeTRkv87omS9V8+hltWGLraOMLP5CT1GKzZyUHojkTA== X-Forefront-PRVS: 029097202E X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6049001)(6009001)(39830400002)(39410400002)(39400400002)(39450400003)(377424004)(25786009)(305945005)(65826007)(6486002)(77096006)(5660300001)(74482002)(36756003)(2351001)(65956001)(65806001)(66066001)(110136004)(38730400002)(86362001)(575784001)(31696002)(6666003)(189998001)(64126003)(3846002)(8676002)(6116002)(47776003)(6916009)(54356999)(50986999)(81166006)(33646002)(50466002)(53936002)(23676002)(2906002)(230700001)(31686004)(42186005);DIR:OUT;SFP:1102;SCL:1;SRVR:AMSPR02MB230;H:[10.9.78.56];FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?utf-8?B?MTtBTVNQUjAyTUIyMzA7MjM6SVFVMFZwaS9iaUJXd3ZTZW83WXhjcVd0QzBr?= =?utf-8?B?RGluRWlxV0VqV1p2R1c0bDlhNFo1ZW1MYTlTTlplZ0orVE9WM2hva3N6Z3V2?= =?utf-8?B?NU84ODBYUTBOYVlOS094RUZyMUs2dWZIaVpCandrOXV5OHhCZXI2NkpvdmVw?= =?utf-8?B?Nm9wUWg3bFg5RWxob2VXbTNlV1RqRDg0TFlzL3dKVDNWa1Mrc05VSUhSUEEx?= =?utf-8?B?M1JBbzh4ejl1Ukhoc1N2aFYwcXZZNGtNQjJKbjJGcUJITzJhYUZNMVdlTW5R?= =?utf-8?B?SUl4QlpKVHBUZkNGb2dpdFBJZ2xQMHhXN2pQdzNkUmpSWW9PSTRRVkhJTUJJ?= =?utf-8?B?Snk2Zmc3aU8zZHEvQlh6cHBxTllOb2xmbVdnZE5EdGt5Y0pTQnQwWTFkZGVJ?= =?utf-8?B?cUFyYlhvYmovM0w4eU1BNzFadzY5ZE1OeUh5ZXkvUFVmcEF0V2FtdHRMNWxV?= =?utf-8?B?dTZZUmpRVEp3dHZla2hmWmZmOHUvN0JjWkRRZUc3QTJmK0tUVU14QTZWZEY1?= =?utf-8?B?QnBjU2plRWN1ZUV2VHZlMFVXMjFKK2FGUngrZGlCOG82bDBoWHFzY3dFT2w2?= =?utf-8?B?RU5tWVJjd2JpTnI4cDdjWFdReFZUV0k3YXZLVW1uOFlFYVlEWjdxd29IcVNK?= =?utf-8?B?QVdrRnlrcmJRT2VaVGVEOWN3UVY3aklsSDArSEgwWmYrZXVpT1d1OTdIbDFx?= =?utf-8?B?UFBDR2FkRWRDd2FSQUxnamwya0RaVld2OXZFWjBmb01EZ1N4dFgrcjBWSmN6?= =?utf-8?B?SXpxd0lFWnFWWUEzczMvS2N3ejA3TW8yMTd4c29OUXRCVjlESjVOV3B1VXYr?= =?utf-8?B?R3E5N2VUQmNkMDVHTmNzb25oa1dRTm9IYlhIR0owR05vbnlzZHNQUWtScVhs?= =?utf-8?B?TnZKQThCK0VuNG11Zkl4bzFkMHdXMSs1RkIrdDA5dGJBbkVvS1U3dlQ2M2hT?= =?utf-8?B?VWJZNkxCYjNJdzV2YzNmREFHZUFCYUI4eFNhZGxHR0N4VFlKYXNJQ1dpeEI1?= =?utf-8?B?cjluaVV3TVZ3bnlZaXh4aEFmbVlzbWF2OEdVMVZyWmlxRTdYZk4yNzJDd3pC?= =?utf-8?B?RG1KZW9oYWRacWsvWk40TXNDWUl2Wkl0bUpNbVpuSDNDZFRtWTJHQlI1WjZQ?= =?utf-8?B?eXV0OFVUVkwrWllQNVcyVzBtaHArNXpsQnhsampEQVFFdFhOclNoMjM0cStj?= =?utf-8?B?SmovWGsvakZjMWlMeDJHeFM0MDl6YlpwYldjMFNaazUwOXgzZUNBbzlkNWJ1?= =?utf-8?B?ejQ5SEU0dDhySlYzODJFWFplYVJMZUFFdU52VXFuZy82bC8ramdNL1c1dU93?= =?utf-8?B?ZXpQbDBJOE5Dd1V2RDZaaDVCbTdCaGMvb1JFMVY2djZwMmlWMU5CMms4aUtE?= =?utf-8?B?L0hjejM1YXZPc3ZUTTVxdWtjWlVPaG5DWmY2bndkVndwcmVIeXhLNUdld000?= =?utf-8?B?b1ZtRVRIS1VMb2NzcG4vZnJQMytxek1zR1ZFdjJWWE9OL2hsU09mdFB1TnYr?= =?utf-8?B?YldnPT0=?= X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;6:xSJIbhSWQRHVGpxq0gZRUY3GgexK0x7QA4izP0Sy5anocGs6mKEBPCdKCOLt0KVcPk8yefQdf8jLs6vrTS3bJikgPJRDRUcVXgvB1xBcFneSvVD2Pkmb0eF7fQhcWOyjWbdXN2EjDknwlqI3n4ewdtDRmp6TVq6tISHqZm78Vwg+KHkjKlfKKVAwwb9XnWhZnf/TrYnjykVjucO0ME0P0gzrChwz8MqrzkwEVVp7YyVzcGGu4Z8mIR2gfn5IPH+lMIaNk9KknFDf/4a2aZffMYerbTNApCR0aoqeCk6FpiYMxN1kdYncCQvJK2ZBIiJCYx7yKSOkCWBLjvXjJFMv82zzSfC2PTt2qj9QCdYhEFSSDGo2TlgB4Aae53P2HOVH3nR1l/O/uu48QayW/II28vPqLt7zVL534U0v8y7+ZG9E0Vr3K3sZTyFulVHn+dcoanzphEptousumNfW9THjhY2Z5HuJ9xx8lA8va7BsXQxdiSuO1qiW9Ct1/KxnOZKhkTlypZ8S57g8Hh0pj44jIA==;5:r7ZAf4Mc6b6n5laeA3jvwTkH+3TmLz8oWZBShYDfJ+JScKX52KxwJNo5dQS7ogj75a/T9WjiPsb7lqxtgQM6iyfrzxCQBXs2iulH8Nhcqpg21Hgq2UpGObzAjxbDorKipOUeUCEv9pXfugU2wisFjfxlJyj4RrgWuTlAeyEeAt8=;24:eEisu3LbBLStM7bD9wqWYZsxD7VVy4oO/8F7oWFPq3zK/eGxqx8RrWcRPRgI1sywmnknVwtesnbV7+bN7hEgTFFP/5nt+lpCCCmQ7KrFWPk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;AMSPR02MB230;7:mVjfss65ZMe8Vx2tIBxhJwTMSOKUuOs2qIYgK7pVgF9WClivBqZ0LKod/Ilq0r3MaJvPhdStXb8+XDGHtuTKxYAZv7vcCH7jDapbi9Ag33mJaglCJDin2Aph1XHIZPsSyh9LWJfa6wxz9JO1vXbi+PWc+R22JHP7ZDalFXhj1PsHVbGOuU4lEBwUZW3B9Hv88xcUOaeDBsUhxRBC4GF88OwJjuq4sbbEMsyy3Wd2kqOTIRREFmzAIQKjx0+MRKf3WEjQJY9stPqPMaYYm4Skpzaq+XrYU4yKBhCVXtOcjVHZThn2y50KSWcJpDOPet37IgxB75xqqeBQtaqQWI4LXw== X-OriginatorOrg: qt.io X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Apr 2017 15:09:02.4616 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: AMSPR02MB230 X-SW-Source: 2017-q2/txt/msg00108.txt.bz2 mempcpy, memrchr, rawmemchr, and argp are provided by gnulib now. We don't need to define them locally and we don't need to search for an external libargp. Signed-off-by: Ulf Hermann --- ChangeLog | 4 ++++ configure.ac | 31 ------------------------------- lib/ChangeLog | 5 +++++ lib/system.h | 5 ----- lib/xstrndup.c | 2 +- libasm/ChangeLog | 4 ++++ libasm/disasm_str.c | 2 +- libdw/ChangeLog | 4 ++++ libdw/Makefile.am | 2 +- libdwfl/ChangeLog | 4 ++++ libdwfl/linux-kernel-modules.c | 1 - libebl/ChangeLog | 5 +++++ libebl/eblmachineflagname.c | 1 - libebl/eblopenbackend.c | 1 - libelf/ChangeLog | 5 +++++ libelf/elf_getarsym.c | 8 -------- libelf/elf_strptr.c | 11 ----------- src/ChangeLog | 4 ++++ src/Makefile.am | 30 +++++++++++++++--------------- tests/ChangeLog | 5 +++++ tests/Makefile.am | 32 ++++++++++++++++---------------- tests/elfstrmerge.c | 1 - 22 files changed, 74 insertions(+), 93 deletions(-) diff --git a/ChangeLog b/ChangeLog index a2a0f63..6fe525c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-04-27 Ulf Hermann + + * configure.ac: Drop checks for memrchr, rawmemchr, mempcpy, argp. + 2017-04-21 Ulf Hermann * .gitignore: Add generated gnulib headers. diff --git a/configure.ac b/configure.ac index a5aea7f..a48b13e 100644 --- a/configure.ac +++ b/configure.ac @@ -290,13 +290,7 @@ zip_LIBS="$LIBS" LIBS="$save_LIBS" AC_SUBST([zip_LIBS]) -AC_CHECK_DECLS([memrchr, rawmemchr],[],[], - [#define _GNU_SOURCE - #include ]) AC_CHECK_DECLS([powerof2],[],[],[#include ]) -AC_CHECK_DECLS([mempcpy],[],[], - [#define _GNU_SOURCE - #include ]) AC_CHECK_LIB([stdc++], [__cxa_demangle], [dnl AC_DEFINE([USE_DEMANGLE], [1], [Defined if demangling is enabled])]) @@ -369,31 +363,6 @@ CFLAGS="$old_CFLAGS"]) AM_CONDITIONAL(HAVE_IMPLICIT_FALLTHROUGH_WARNING, [test "x$ac_cv_implicit_fallthrough" != "xno"]) -dnl Check if we have argp available from our libc -AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [#include ], - [int argc=1; char *argv[]={"test"}; argp_parse(0,argc,&argv,0,0,0); return 0;] - )], - [libc_has_argp="true"], - [libc_has_argp="false"] -) - -dnl If our libc doesn't provide argp, then test for libargp -if test "$libc_has_argp" = "false" ; then - AC_MSG_WARN("libc does not have argp") - AC_CHECK_LIB([argp], [argp_parse], [have_argp="true"], [have_argp="false"]) - - if test "$have_argp" = "false"; then - AC_MSG_ERROR("no libargp found") - else - argp_LDADD="-largp" - fi -else - argp_LDADD="" -fi -AC_SUBST([argp_LDADD]) - dnl Check if we have for EM_BPF disassembly. AC_CHECK_HEADERS(linux/bpf.h) AM_CONDITIONAL(HAVE_LINUX_BPF_H, [test "x$ac_cv_header_linux_bpf_h" = "xyes"]) diff --git a/lib/ChangeLog b/lib/ChangeLog index 8cac7af..82c009e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,8 @@ +2017-04-27 Ulf Hermann + + * system.h: Drop mempcpy replacement. + * xstrndup.c: Don't include system.h. + 2017-04-20 Ulf Hermann * crc32.c: include config.h. diff --git a/lib/system.h b/lib/system.h index 9203335..ffa2bc7 100644 --- a/lib/system.h +++ b/lib/system.h @@ -63,11 +63,6 @@ #define powerof2(x) (((x) & ((x) - 1)) == 0) #endif -#if !HAVE_DECL_MEMPCPY -#define mempcpy(dest, src, n) \ - ((void *) ((char *) memcpy (dest, src, n) + (size_t) n)) -#endif - /* A special gettext function we use if the strings are too short. */ #define sgettext(Str) \ ({ const char *__res = strrchr (gettext (Str), '|'); \ diff --git a/lib/xstrndup.c b/lib/xstrndup.c index a257aa9..d43e3b9 100644 --- a/lib/xstrndup.c +++ b/lib/xstrndup.c @@ -33,7 +33,7 @@ #include #include #include "libeu.h" -#include "system.h" + /* Return a newly allocated copy of STRING. */ char * diff --git a/libasm/ChangeLog b/libasm/ChangeLog index ef183a6..80aa7de 100644 --- a/libasm/ChangeLog +++ b/libasm/ChangeLog @@ -1,3 +1,7 @@ +2017-02-27 Ulf Hermann + + * disasm_str.c: Don't include system.h + 2017-02-21 Ulf Hermann * Makefile.am: Link libasm agaist libgnu.a if requested. diff --git a/libasm/disasm_str.c b/libasm/disasm_str.c index c14e6d5..5b0bb29 100644 --- a/libasm/disasm_str.c +++ b/libasm/disasm_str.c @@ -31,7 +31,7 @@ #endif #include -#include + #include "libasmP.h" diff --git a/libdw/ChangeLog b/libdw/ChangeLog index 8052b5b..6e11181 100644 --- a/libdw/ChangeLog +++ b/libdw/ChangeLog @@ -1,3 +1,7 @@ +2017-02-27 Ulf Hermann + + * Makefile.am: Remove argp_LDADD. + 2017-02-21 Ulf Hermann * Makefile.am: Link libdw agaist libgnu.a if requested. diff --git a/libdw/Makefile.am b/libdw/Makefile.am index 2c3efca..8843062 100644 --- a/libdw/Makefile.am +++ b/libdw/Makefile.am @@ -118,7 +118,7 @@ libdw.so$(EXEEXT): $(srcdir)/libdw.map libdw_pic.a ../libdwelf/libdwelf_pic.a \ -Wl,--enable-new-dtags,-rpath,$(pkglibdir) \ -Wl,--version-script,$<,--no-undefined \ -Wl,--whole-archive $(filter-out $<,$^) -Wl,--no-whole-archive\ - -ldl -lz $(argp_LDADD) $(zip_LIBS) $(libgnu) + -ldl -lz $(zip_LIBS) $(libgnu) @$(textrel_check) $(AM_V_at)ln -fs $@ $@.$(VERSION) diff --git a/libdwfl/ChangeLog b/libdwfl/ChangeLog index a1ed675..a7e6e30 100644 --- a/libdwfl/ChangeLog +++ b/libdwfl/ChangeLog @@ -1,3 +1,7 @@ +2017-04-27 Ulf Hermann + + * linux-kernel-modules.c: Don't include system.h. + 2017-04-20 Ulf Hermann * derelocate.c (compare_secrefs): Compare by end address and then by diff --git a/libdwfl/linux-kernel-modules.c b/libdwfl/linux-kernel-modules.c index 6c6c603..5f132b4 100644 --- a/libdwfl/linux-kernel-modules.c +++ b/libdwfl/linux-kernel-modules.c @@ -37,7 +37,6 @@ #endif #include -#include #include "libdwflP.h" #include diff --git a/libebl/ChangeLog b/libebl/ChangeLog index 506915b..0605083 100644 --- a/libebl/ChangeLog +++ b/libebl/ChangeLog @@ -1,3 +1,8 @@ +2017-04-27 Ulf Hermann + + * eblmachineflagname.c: Don't include system.h. + * eblopenbackend.c: Likewise. + 2017-04-20 Ulf Hermann * libebl.h: Use __pure_attribute__. diff --git a/libebl/eblmachineflagname.c b/libebl/eblmachineflagname.c index 5f44077..6079a61 100644 --- a/libebl/eblmachineflagname.c +++ b/libebl/eblmachineflagname.c @@ -33,7 +33,6 @@ #include #include -#include #include diff --git a/libebl/eblopenbackend.c b/libebl/eblopenbackend.c index f3a65cf..aa75b95 100644 --- a/libebl/eblopenbackend.c +++ b/libebl/eblopenbackend.c @@ -39,7 +39,6 @@ #include #include -#include #include diff --git a/libelf/ChangeLog b/libelf/ChangeLog index d9ac7c6..9165634 100644 --- a/libelf/ChangeLog +++ b/libelf/ChangeLog @@ -1,3 +1,8 @@ +2017-04-27 Ulf Hermann + + * elf_getarsym.c: Don't replace rawmemchr. + * elf_strptr.c: Don't replace memrchr. + 2017-04-21 Ulf Hermann * Makefile.am: Link libelf agaist libgnu.a if requested. diff --git a/libelf/elf_getarsym.c b/libelf/elf_getarsym.c index d5f0ba4..65c67cc 100644 --- a/libelf/elf_getarsym.c +++ b/libelf/elf_getarsym.c @@ -297,15 +297,7 @@ elf_getarsym (Elf *elf, size_t *ptr) arsym[cnt].as_off = (*u32)[cnt]; arsym[cnt].as_hash = _dl_elf_hash (str_data); -#if HAVE_DECL_RAWMEMCHR str_data = rawmemchr (str_data, '\0') + 1; -#else - char c; - do { - c = *str_data; - str_data++; - } while (c); -#endif } /* At the end a special entry. */ diff --git a/libelf/elf_strptr.c b/libelf/elf_strptr.c index e72a3a3..cb4ed42 100644 --- a/libelf/elf_strptr.c +++ b/libelf/elf_strptr.c @@ -55,18 +55,7 @@ get_zdata (Elf_Scn *strscn) static bool validate_str (const char *str, size_t from, size_t to) { -#if HAVE_DECL_MEMRCHR return memrchr (&str[from], '\0', to - from) != NULL; -#else - do { - if (to <= from) - return false; - - to--; - } while (str[to]); - - return true; -#endif } char * diff --git a/src/ChangeLog b/src/ChangeLog index 59a8059..c5805c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2017-04-27 Ulf Hermann + + * Makefile.am: Drop argp_LDADD. + 2017-04-21 Ulf Hermann * Makefile.am: Link tools agaist libgnu.a if requested. diff --git a/src/Makefile.am b/src/Makefile.am index d53dd5b..aca4b1c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -72,22 +72,22 @@ ranlib_no_Wstack_usage = yes ar_no_Wstack_usage = yes unstrip_no_Wstack_usage = yes -readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -ldl -nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -ldl \ +readelf_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) -ldl +nm_LDADD = $(libdw) $(libebl) $(libelf) $(libeu) $(libgnu) -ldl \ $(demanglelib) -size_LDADD = $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(argp_LDADD) -ldl -elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -ldl -findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) $(demanglelib) -elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -ldl -objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -ldl -ranlib_LDADD = libar.a $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -strings_LDADD = $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -ar_LDADD = libar.a $(libelf) $(libeu) $(libgnu) $(argp_LDADD) -unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(argp_LDADD) -ldl -stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(argp_LDADD) -ldl $(demanglelib) -elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) $(argp_LDADD) +size_LDADD = $(libelf) $(libeu) $(libgnu) +strip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) -ldl +elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) -ldl +findtextrel_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) +addr2line_LDADD = $(libdw) $(libelf) $(libeu) $(libgnu) $(demanglelib) +elfcmp_LDADD = $(libebl) $(libelf) $(libeu) $(libgnu) -ldl +objdump_LDADD = $(libasm) $(libebl) $(libelf) $(libeu) $(libgnu) -ldl +ranlib_LDADD = libar.a $(libelf) $(libeu) $(libgnu) +strings_LDADD = $(libelf) $(libeu) $(libgnu) +ar_LDADD = libar.a $(libelf) $(libeu) $(libgnu) +unstrip_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) -ldl +stack_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) -ldl $(demanglelib) +elfcompress_LDADD = $(libebl) $(libelf) $(libdw) $(libeu) $(libgnu) installcheck-binPROGRAMS: $(bin_PROGRAMS) bad=0; pid=$$$$; list="$(bin_PROGRAMS)"; for p in $$list; do \ diff --git a/tests/ChangeLog b/tests/ChangeLog index fddf352..d2a14c2 100644 --- a/tests/ChangeLog +++ b/tests/ChangeLog @@ -1,3 +1,8 @@ +2017-04-27 Ulf Hermann + + * Makefile.am: Drop argp_LDADD. + * elfstrmerge.c: Don't include system.h. + 2017-04-21 Ulf Hermann * Makefile.am: Link test programs agaist libgnu.a if requested. diff --git a/tests/Makefile.am b/tests/Makefile.am index 5376250..69d1fcd 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -426,12 +426,12 @@ get_lines_LDADD = $(libdw) $(libelf) $(libgnu) get_files_LDADD = $(libdw) $(libelf) $(libgnu) get_aranges_LDADD = $(libdw) $(libelf) $(libgnu) allfcts_LDADD = $(libdw) $(libelf) $(libgnu) -line2addr_LDADD = $(libdw) $(libgnu) $(argp_LDADD) -addrscopes_LDADD = $(libdw) $(libgnu) $(argp_LDADD) -funcscopes_LDADD = $(libdw) $(libgnu) $(argp_LDADD) -funcretval_LDADD = $(libdw) $(libgnu) $(argp_LDADD) -allregs_LDADD = $(libdw) $(libgnu) $(argp_LDADD) -find_prologues_LDADD = $(libdw) $(libgnu) $(argp_LDADD) +line2addr_LDADD = $(libdw) $(libgnu) +addrscopes_LDADD = $(libdw) $(libgnu) +funcscopes_LDADD = $(libdw) $(libgnu) +funcretval_LDADD = $(libdw) $(libgnu) +allregs_LDADD = $(libdw) $(libgnu) +find_prologues_LDADD = $(libdw) $(libgnu) #show_ciefde_LDADD = ../libdwarf/libdwarf.so $(libelf) asm_tst1_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl asm_tst2_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl @@ -442,31 +442,31 @@ asm_tst6_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl asm_tst7_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl asm_tst8_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl asm_tst9_LDADD = $(libasm) $(libebl) $(libelf) $(libdw) $(libgnu) -ldl -dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) $(argp_LDADD) -ldl +dwflmodtest_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl rdwrmmap_LDADD = $(libelf) $(libgnu) dwfl_bug_addr_overflow_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl arls_LDADD = $(libelf) $(libgnu) dwfl_bug_fd_leak_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl dwfl_bug_report_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl dwfl_bug_getmodules_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl -dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) $(argp_LDADD) -ldl +dwfl_addr_sect_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl dwarf_getmacros_LDADD = $(libdw) $(libgnu) dwarf_ranges_LDADD = $(libdw) $(libgnu) dwarf_getstring_LDADD = $(libdw) $(libgnu) -addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) $(argp_LDADD) -ldl +addrcfi_LDADD = $(libdw) $(libebl) $(libelf) $(libgnu) -ldl test_flag_nobits_LDADD = $(libelf) $(libgnu) rerequest_tag_LDADD = $(libdw) $(libgnu) alldts_LDADD = $(libdw) $(libelf) $(libgnu) md5_sha1_test_LDADD = $(libeu) $(libgnu) typeiter_LDADD = $(libdw) $(libelf) $(libgnu) typeiter2_LDADD = $(libdw) $(libelf) $(libgnu) -low_high_pc_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) +low_high_pc_LDADD = $(libdw) $(libelf) $(libgnu) test_elf_cntl_gelf_getshdr_LDADD = $(libelf) $(libgnu) -dwflsyms_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) -dwfllines_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) +dwflsyms_LDADD = $(libdw) $(libelf) $(libgnu) +dwfllines_LDADD = $(libdw) $(libelf) $(libgnu) dwfl_report_elf_align_LDADD = $(libdw) $(libgnu) -varlocs_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) -backtrace_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) +varlocs_LDADD = $(libdw) $(libelf) $(libgnu) +backtrace_LDADD = $(libdw) $(libelf) $(libgnu) # backtrace-child-biarch also uses those *_CFLAGS and *_LDLAGS variables: backtrace_child_CFLAGS = -fPIE backtrace_child_LDFLAGS = -pie -pthread @@ -481,8 +481,8 @@ deleted_LDADD = ./deleted-lib.so $(libgnu) deleted_lib_so_LDFLAGS = -shared -rdynamic deleted_lib_so_CFLAGS = -fPIC -fasynchronous-unwind-tables deleted_lib_so_LDADD = $(libgnu) -aggregate_size_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) -peel_type_LDADD = $(libdw) $(libelf) $(libgnu) $(argp_LDADD) +aggregate_size_LDADD = $(libdw) $(libelf) $(libgnu) +peel_type_LDADD = $(libdw) $(libelf) $(libgnu) vdsosyms_LDADD = $(libdw) $(libelf) $(libgnu) getsrc_die_LDADD = $(libdw) $(libelf) $(libgnu) strptr_LDADD = $(libelf) $(libgnu) diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c index 8d5b53c..c2c3fb9 100644 --- a/tests/elfstrmerge.c +++ b/tests/elfstrmerge.c @@ -29,7 +29,6 @@ #include #include -#include #include #include ELFUTILS_HEADER(dwelf) #include "elf-knowledge.h" -- 2.1.4