From patchwork Mon Dec 12 12:32:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wilco Dijkstra X-Patchwork-Id: 18386 Received: (qmail 5424 invoked by alias); 12 Dec 2016 12:32:19 -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 5399 invoked by uid 89); 12 Dec 2016 12:32:18 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, KAM_LOTSOFHASH, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=no version=3.3.2 spammy=taught, accompanied, ulrich, drepper X-HELO: EUR01-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: Mon, 12 Dec 2016 12:32:04 +0000 Message-ID: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Wilco.Dijkstra@arm.com; x-ms-office365-filtering-correlation-id: 03a0478e-7d1e-4213-55dc-08d4228ae191 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:AM5PR0802MB2612; x-microsoft-exchange-diagnostics: 1; AM5PR0802MB2612; 7:wSRqDXPcum+dxsRe/PQwjN5eKfvGy29JncPZxS2ms7DTx8tuNfRhz+dQP4KMbhcxXLrjhtyH7CAGI9lFYkebeGhTC4YJJAYTskSLmQQB+CKDRGXB65IEMneaiqN6CZD8F0tywe71GUCJhiWSrxm9v7ooEV1prRGLtrDZs0w2L/J1Da4j+K6l0bU8v88j210N//eeY8i1Og1tOVtfk44o0ti46GC/fDJfOFo991u6fZIk4KfsMxSmRIezt3YIMShJMMqqQ6/KpVu2lEcVJNRXnu0ko90671Y3YZ2BfpMz4hirJ9lJU1/Zp62uBNe1f9al0hhIvRg7UMB6Cxagx8QLTmlncKrWV/f6PzFIBW95sjviWykgCA36h68hrEetZy2cDCprNrRvjkizMOn+q0C454PuZpg0W+xOIgueItxY9ZV6qHWKyNpfGdG+vyEAdniiM8DFKH6CBdIcGkm6RJ3PcA== 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:(6040375)(601004)(2401047)(8121501046)(5005006)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123560025)(20161123558021)(20161123562025)(20161123555025)(6072148); SRVR:AM5PR0802MB2612; BCL:0; PCL:0; RULEID:; SRVR:AM5PR0802MB2612; x-forefront-prvs: 0154C61618 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(6009001)(7916002)(39840400002)(39450400003)(39860400002)(39850400002)(39410400002)(189002)(199003)(54534003)(377424004)(66066001)(106116001)(8936002)(81156014)(8676002)(81166006)(97736004)(4001150100001)(6436002)(3660700001)(3280700002)(189998001)(110136003)(6916009)(5660300001)(7696004)(9686002)(2501003)(106356001)(105586002)(2351001)(4326007)(7736002)(54356999)(122556002)(50986999)(2906002)(575784001)(86362001)(76576001)(101416001)(450100001)(38730400001)(77096006)(6506006)(5640700002)(3846002)(305945005)(102836003)(2900100001)(68736007)(92566002)(6116002)(33656002)(74316002)(21314002)(2004002); DIR:OUT; SFP:1101; SCL:1; SRVR:AM5PR0802MB2612; H:AM5PR0802MB2610.eurprd08.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: arm.com does not designate permitted sender hosts) spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-originalarrivaltime: 12 Dec 2016 12:32:04.9200 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM5PR0802MB2612 After patches [1-5] there is no longer a need for string2.h. Move the remaining defines for __bzero and __stpcpy to string.h (these are needed as otherwise elf/localplt fails) and remove all mention of string2.h. [1] https://sourceware.org/ml/libc-alpha/2016-12/msg00361.html [2] https://sourceware.org/ml/libc-alpha/2016-12/msg00362.html [3] https://sourceware.org/ml/libc-alpha/2016-11/msg00660.html [4] https://sourceware.org/ml/libc-alpha/2016-11/msg00853.html [5] https://sourceware.org/ml/libc-alpha/2016-11/msg00843.html ChangeLog: 2015-12-12 Wilco Dijkstra * string/Makefile: Remove bits/string2.h * string/string.h: Add define for __bcopy and __stpcpy. * string/string-inlines.c: Update comment. * string/bits/string2.h: Remove file. diff --git a/string/Makefile b/string/Makefile index 69d3f802fbaed773cac5d93c1f132d539ce5ecb4..a28fb0824ea4170483aa43cc1c3038a5bb8be2db 100644 --- a/string/Makefile +++ b/string/Makefile @@ -24,7 +24,7 @@ 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/string.h bits/string3.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 e24309d38dafa5cb191b22231694b016d2ec3629..0000000000000000000000000000000000000000 --- a/string/bits/string2.h +++ /dev/null @@ -1,61 +0,0 @@ -/* Machine-independant string function optimizations. - Copyright (C) 1997-2016 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 - -/* 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 6d0c0c51b3027f99d26aace85523d7f337df8308..9db66a94d55b0874660e4b36d478c91db423c446 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 b103e64912fe1904098e229ccb845bb2c5c10835..ad97f7e4014e082f03e61f043103e587f71b777b 100644 --- a/string/string.h +++ b/string/string.h @@ -615,19 +615,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 @@ -653,6 +645,16 @@ __mempcpy_inline (void *__restrict __dest, # endif #endif +#ifdef __USE_MISC +# define __bzero(s, n) __builtin_memset (s, '\0', n) +#endif + +#ifdef __USE_XOPEN2K8 +# ifndef __stpcpy +# define __stpcpy(dest, src) __builtin_stpcpy (dest, src) +# endif +#endif + __END_DECLS #endif /* string.h */