From patchwork Thu Dec 11 20:13:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 420244 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 99CEF1400A0 for ; Fri, 12 Dec 2014 07:17:28 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:from:date:subject:to:mime-version :content-type; q=dns; s=default; b=VKNDizwXLU0Sedbjcx8BfIfmTz6AD 23637oc5Zioc1ZIadgwIzAjjE2kxcTHX595+cVhbkgF5U5WcA00wKtQTZUvwimWW LqTs6MgAh0gDKfRXGDAMZAzw75C3ykpZZ3fuUc4al96uc/gOWRMUKos9gkKsZriC EkFPx+UVzY73zE= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:message-id:from:date:subject:to:mime-version :content-type; s=default; bh=tp5Ghlsg0GkUlJp20h1j2BTRG0k=; b=XUz 7qfe2+wVbAoiouD8ffWVVY1k4Spnjd1/pj/8WhLb76FcsfrDBc091OAiPFQVlv4K o9TU/yuFVUWMlyCz1yVb8DtrwknItq90vb63xSpHhvrQjQGJ3YYljRGW5o9y5JDf 9KINoJo/JWzRLqT5fetXVsarD9Bn863hq5cm0y5A= Received: (qmail 15921 invoked by alias); 11 Dec 2014 20:17:22 -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 15910 invoked by uid 89); 11 Dec 2014 20:17:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.6 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: USMAMAIL.TILERA.COM Message-ID: <201412112017.sBBKHCFC023406@farm-0002.internal.tilera.com> From: Chris Metcalf Date: Thu, 11 Dec 2014 15:13:48 -0500 Subject: [COMMITTED] tile: add inhibit_loop_to_libcall to string functions To: MIME-Version: 1.0 Without this, on gcc 4.8.2 the built glibc crashes when memcpy or memset are invoked, since they call themselves recursively. See commit 85c2e6110c9a01ec for the generic inhibit_loop_to_libcall. --- ChangeLog | 7 +++++++ sysdeps/tile/tilegx/memcpy.c | 2 +- sysdeps/tile/tilegx/memset.c | 2 +- sysdeps/tile/tilepro/memset.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 61ac73d..de2e7cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2014-12-11 Chris Metcalf + + * sysdeps/tile/tilegx/memset.c (__memcpy): Add + inhibit_loop_to_libcall to avoid recursive calls. + * sysdeps/tile/tilegx/memcpy.c (__memcpy): Likewise. + * sysdeps/tile/tilepro/memcpy.c (__memcpy): Likewise. + 2014-12-11 Adhemerval Zanella * include/sys/socket.h (__sendmmsg): Add __USE_GNU guards on function diff --git a/sysdeps/tile/tilegx/memcpy.c b/sysdeps/tile/tilegx/memcpy.c index 5d5df19..abcaf4d 100644 --- a/sysdeps/tile/tilegx/memcpy.c +++ b/sysdeps/tile/tilegx/memcpy.c @@ -25,7 +25,7 @@ /* How many cache lines ahead should we prefetch? */ #define PREFETCH_LINES_AHEAD 3 -void * +void * inhibit_loop_to_libcall __memcpy (void *__restrict dstv, const void *__restrict srcv, size_t n) { char *__restrict dst1 = (char *) dstv; diff --git a/sysdeps/tile/tilegx/memset.c b/sysdeps/tile/tilegx/memset.c index d41b205..b794bf2 100644 --- a/sysdeps/tile/tilegx/memset.c +++ b/sysdeps/tile/tilegx/memset.c @@ -21,7 +21,7 @@ #include #include "string-endian.h" -void * +void * inhibit_loop_to_libcall __memset (void *s, int c, size_t n) { uint64_t *out64; diff --git a/sysdeps/tile/tilepro/memset.c b/sysdeps/tile/tilepro/memset.c index 85d6b81..d248634 100644 --- a/sysdeps/tile/tilepro/memset.c +++ b/sysdeps/tile/tilepro/memset.c @@ -20,7 +20,7 @@ #include #include -void * +void * inhibit_loop_to_libcall __memset (void *s, int c, size_t n) { uint32_t *out32;