From patchwork Fri Jun 2 14:56:40 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 20741 Received: (qmail 18265 invoked by alias); 2 Jun 2017 14:56:43 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 16702 invoked by uid 89); 2 Jun 2017 14:56:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.2 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LOTSOFHASH, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 spammy=dramatically, 19463, 50111, taught X-HELO: EUR03-VE1-obe.outbound.protection.outlook.com From: Wilco Dijkstra To: "libc-alpha@sourceware.org" CC: nd Subject: [GLIBC][PATCH] Remove string/bits/string2.h header Date: Fri, 2 Jun 2017 14:56:40 +0000 Message-ID: authentication-results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=arm.com; x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; AM5PR0802MB2611; 7:VmKci5jDDcQxLJ4GyuNFWki8sOnGcxYvcnIRemRZ8m3q1U5m9bTMvDmaB0mKj2saro656QdQg3znS3oPzikVU7eDsKAax1pgKGMpnvqh4+hUuihCfDtjLhLpg+3YI+/OkpTzKauRN01kOKjlHoT/aJZsxMIY7T4QncbE2iNI7DfakQ3tODcGuhsnP7e8aYyazUPXWmDAj4AGmjdZhdvaCTBy3gM3DPPuNRth/aZLm9Ys7Z9pugseXVj+C3628B2FdfgzrQB6ArLMn4v5EHhxHoDWyW4RDB8Jsrce6cJzHT+ZOnZtK44x8NCvHCY6vJrVL+2kdMYYbJ61f18rKBVqVQ== x-ms-traffictypediagnostic: AM5PR0802MB2611: x-ms-office365-filtering-correlation-id: 8560eb0c-f134-4aad-a71f-08d4a9c793e7 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(2017030254075)(48565401081)(201703131423075)(201703031133081); SRVR:AM5PR0802MB2611; nodisclaimer: True x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(250305191791016)(180628864354917)(22074186197030); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703101)(100105400095)(10201501046)(93006095)(93001095)(3002001)(6055026)(6041248)(20161123560025)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123562025)(20161123564025)(6072148)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:AM5PR0802MB2611; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:AM5PR0802MB2611; x-forefront-prvs: 03264AEA72 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(39400400002)(39850400002)(39860400002)(39450400003)(39410400002)(39840400002)(54534003)(377424004)(5640700003)(50986999)(2351001)(2501003)(5250100002)(81166006)(8676002)(33656002)(66066001)(3660700001)(2906002)(3280700002)(102836003)(110136004)(7736002)(4326008)(305945005)(14454004)(189998001)(25786009)(53936002)(38730400002)(478600001)(8936002)(6436002)(6506006)(6916009)(55016002)(575784001)(3846002)(6306002)(86362001)(2900100001)(5660300001)(9686003)(6116002)(54356999)(72206003)(7696004)(966005)(99286003)(74316002)(21314002)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0802MB2611; H:AM5PR0802MB2610.eurprd08.prod.outlook.com; FPR:; SPF:None; MLV:sfv; LANG:en; spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Jun 2017 14:56:40.7819 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2611 After https://sourceware.org/ml/libc-alpha/2017-06/msg00027.html there is no longer a need for string2.h, so remove it and all mention of string2.h. Move the redirects for __bzero and __stpcpy to include/string.h since they are still required until all internal uses have been renamed. This fixes several linknamespace/localplt failures when building with -Os. Passes GLIBC tests, fewer localplt/linknamespace failures with -Os. ChangeLog: 2016-06-02 Wilco Dijkstra [BZ #15105] [BZ #19463] * include/string.h: Add internal redirects for __bzero and __stpcpy. * string/Makefile: Remove bits/string2.h * string/string.h: Update comment. * string/string-inlines.c: Update comment. * string/bits/string2.h: Remove file. diff --git a/include/string.h b/include/string.h index ce71674086d9a3512486f813fe718547776cd3da..9ef8102dd68fc58a8e45de537f6b27cf73768e1f 100644 --- a/include/string.h +++ b/include/string.h @@ -162,6 +162,12 @@ extern __typeof (mempcpy) mempcpy __asm__ ("__mempcpy"); extern __typeof (stpcpy) stpcpy __asm__ ("__stpcpy"); #endif +/* Redirect internal calls to builtins. */ +#define __bzero(s, n) __builtin_memset (s, '\0', n) +#ifndef __stpcpy +# define __stpcpy(dest, src) __builtin_stpcpy (dest, src) +#endif + extern void *__memcpy_chk (void *__restrict __dest, const void *__restrict __src, size_t __len, size_t __destlen) __THROW; diff --git a/string/Makefile b/string/Makefile index f317d02a8c7f41f7c343944df6fc9a65c83b8098..8d0d6b08733e7d59eca818376c2850abcfad1601 100644 --- a/string/Makefile +++ b/string/Makefile @@ -24,8 +24,8 @@ include ../Makeconfig headers := string.h strings.h memory.h endian.h bits/endian.h \ argz.h envz.h byteswap.h bits/byteswap.h bits/byteswap-16.h \ - bits/string.h bits/string2.h bits/string3.h \ - bits/strings_fortified.h bits/uintn-identity.h + bits/string.h bits/string3.h bits/strings_fortified.h \ + bits/uintn-identity.h routines := strcat strchr strcmp strcoll strcpy strcspn \ strverscmp strdup strndup \ diff --git a/string/bits/string2.h b/string/bits/string2.h deleted file mode 100644 index 591533658dcef1dbde3d0579c795b72b8ef72f43..0000000000000000000000000000000000000000 --- a/string/bits/string2.h +++ /dev/null @@ -1,68 +0,0 @@ -/* Machine-independant string function optimizations. - Copyright (C) 1997-2017 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Ulrich Drepper , 1997. - - The GNU C Library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - . */ - -#ifndef _STRING_H -# error "Never use directly; include instead." -#endif - -#ifndef __NO_STRING_INLINES - -/* Unlike the definitions in the header the - definitions contained here are not optimized down to assembler - level. Those optimizations are not always a good idea since this - means the code size increases a lot. Instead the definitions here - optimize some functions in a way which do not dramatically - increase the code size and which do not use assembler. The main - trick is to use GCC's `__builtin_constant_p' function. - - Every function XXX which has a defined version in - must be accompanied by a symbol _HAVE_STRING_ARCH_XXX - to make sure we don't get redefinitions. - - We must use here macros instead of inline functions since the - trick won't work with the latter. */ - -#ifndef __STRING_INLINE -# ifdef __cplusplus -# define __STRING_INLINE inline -# else -# define __STRING_INLINE __extern_inline -# endif -#endif - -/* Dereferencing a pointer arg to run sizeof on it fails for the void - pointer case, so we use this instead. - Note that __x is evaluated twice. */ -#define __string2_1bptr_p(__x) \ - ((size_t)(const void *)((__x) + 1) - (size_t)(const void *)(__x) == 1) - -/* Set N bytes of S to 0. */ -#define __bzero(s, n) __builtin_memset (s, '\0', n) - -/* Copy SRC to DEST, returning pointer to final NUL byte. */ -#ifndef __stpcpy -# define __stpcpy(dest, src) __builtin_stpcpy (dest, src) -#endif - - -#ifndef _FORCE_INLINES -# undef __STRING_INLINE -#endif - -#endif /* No string inlines. */ diff --git a/string/string-inlines.c b/string/string-inlines.c index 68aa7d072aca32367708e73a891772e332ddb18d..c8eca1e23031a39c05535d9ec8fae41f9c96bbbf 100644 --- a/string/string-inlines.c +++ b/string/string-inlines.c @@ -15,9 +15,8 @@ License along with the GNU C Library; if not, see . */ -/* and declare some extern inline - functions. These functions are declared additionally here if - inlining is not possible. */ +/* may declare some extern inline functions. + These functions are defined here if inlining is not possible. */ #undef __USE_STRING_INLINES #define __USE_STRING_INLINES diff --git a/string/string.h b/string/string.h index 8eed67d77d5555e5d2beb5fed6866d55c010572f..d1a274628fabb4a6bd97bfb094556bdf69872426 100644 --- a/string/string.h +++ b/string/string.h @@ -501,19 +501,11 @@ extern char *basename (const char *__filename) __THROW __nonnull ((1)); __USE_STRING_INLINES is defined before including this header. - - machine-independent optimizations which do not increase the - code size significantly and which optimize mainly situations - where one or more arguments are compile-time constants. - These optimizations are used always when the compiler is - taught to optimize. - One can inhibit all optimizations by defining __NO_STRING_INLINES. */ /* Get the machine-dependent optimizations (if any). */ # include -/* These are generic optimizations which do not add too much inline code. */ -# include # endif # if __USE_FORTIFY_LEVEL > 0 && defined __fortify_function