From patchwork Wed May 13 16:20:17 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 472012 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 DDBEC140663 for ; Thu, 14 May 2015 02:20:29 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=sourceware.org header.i=@sourceware.org header.b=OICMnrCP; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:mime-version:date:message-id:subject:from:to :content-type; q=dns; s=default; b=AhRtl65FdLFRuHMLwgCXY0b4MfVtv Iv9Tk0eIKB//PkuNV/Z9AofbSYGOAyRxnZMQ9xBvBhRR3Tz4eeqgGkxVLfijvDV0 SlPxSE7QgCpplL1c/e5ePffLmI1KpyRlV/Ybcf1xoI/4atlHqIIFo4Ni8WQj7CA6 YSbYFArvtg2G7A= 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:mime-version:date:message-id:subject:from:to :content-type; s=default; bh=PZHFyhIVnokiVfdn6t3ZLslKjI0=; b=OIC MnrCPrJlb3QWh2KU2OD2qYTFqjy7imk3Gva6PBQQjAb+MImDLBieoPHTCS8hinTE lvaFQYJS0gO6zIq0DVrytq8PneF+nw8sj/UlnPoOiIrPjJmne4o++TaZeVh/9lc9 vlduCTKZbhY0eju8PTtrsxG3VuEud55UJE7Bo/I4= Received: (qmail 1840 invoked by alias); 13 May 2015 16:20: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 1682 invoked by uid 89); 13 May 2015 16:20:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=0.8 required=5.0 tests=AWL, BAYES_50, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: mail-oi0-f54.google.com MIME-Version: 1.0 X-Received: by 10.60.59.106 with SMTP id y10mr16716913oeq.45.1431534018120; Wed, 13 May 2015 09:20:18 -0700 (PDT) Date: Wed, 13 May 2015 09:20:17 -0700 Message-ID: Subject: [committed, PATCH] BZ #18409: Remove a trailing `\' in make-syscalls.sh From: "H.J. Lu" To: GNU C Library , Adhemerval Zanella commit c14874927b499ddfdbb03745bb32bfc778b8595f Author: Roland McGrath Date: Tue May 22 16:00:50 2012 -0700 syscalls.list support for vDSO IFUNCs, use it for x32 gettimeofday and time. added \$(foreach p,\$(sysd-rules-targets),\$(objpfx)\$(patsubst %,\$p,$file).os): \\ \$(..)sysdeps/unix/make-syscalls.sh\ \$(make-target-directory) to sysdeps/unix/make-syscalls.sh which generates #### CALL=gettimeofday NUMBER=(0x40000000 + 96) ARGS=i:pP SOURCE=- ifeq (,$(filter gettimeofday,$(unix-syscalls))) unix-syscalls += gettimeofday $(foreach p,$(sysd-rules-targets),$(foreach o,$(object-suffixes-noshared),$(objpfx)$(patsubst %,$p,gettimeofday)$o)): \ $(..)sysdeps/unix/make-syscalls.sh $(make-target-directory) (echo '#define SYSCALL_NAME gettimeofday'; \ echo '#define SYSCALL_NARGS 2'; \ echo '#define SYSCALL_SYMBOL __gettimeofday'; \ echo '#include '; \ echo 'weak_alias (__gettimeofday, gettimeofday)'; \ echo 'libc_hidden_weak (gettimeofday)'; \ ) | $(compile-syscall) $(foreach p,$(patsubst %gettimeofday,%,$(basename $(@F))),$($(p)CPPFLAGS)) $(foreach p,$(sysd-rules-targets),$(objpfx)$(patsubst %,$p,gettimeofday).os): \ $(..)sysdeps/unix/make-syscalls.sh $(make-target-directory) ^^^^^^^^^ Missing newline (echo '#include '; \ echo 'extern void *__gettimeofday_ifunc (void) __asm ("__gettimeofday");'; \ echo 'void *'; \ echo '__gettimeofday_ifunc (void)'; \ echo '{'; \ echo ' PREPARE_VERSION_KNOWN (symver, LINUX_2_6);'; \ echo ' return _dl_vdso_vsym ("__vdso_gettimeofday", &symver);'; \ echo '}'; \ echo 'asm (".type __gettimeofday, %gnu_indirect_function");'; \ echo 'asm (".globl __GI___gettimeofday\n"'; \ echo ' "__GI___gettimeofday = __gettimeofday");'; \ echo 'weak_alias (__gettimeofday, gettimeofday)'; \ echo 'libc_hidden_weak (gettimeofday)'; \ ) | $(compile-stdin.c) $(foreach p,$(patsubst %gettimeofday,%,$(basename $(@F))),$($(p)CPPFLAGS)) endif This only affected x32. I checked in this patch after tested on x32. Adhemerval, can you check if your problem with dash in https://sourceware.org/ml/libc-alpha/2015-04/msg00277.html is fixed by this? Thanks. From d9efd775ba51916b58b899d8b1c8501105a830de Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Wed, 13 May 2015 09:11:12 -0700 Subject: [PATCH] Remove a trailing `\' in make-syscalls.sh [BZ #18409] * sysdeps/unix/make-syscalls.sh: Remove a trailing `\'. --- ChangeLog | 5 +++++ NEWS | 2 +- sysdeps/unix/make-syscalls.sh | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1e4d6f8..dc7431b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-05-13 H.J. Lu + + [BZ #18409] + * sysdeps/unix/make-syscalls.sh: Remove a trailing `\'. + 2015-05-13 Szabolcs Nagy * sysdeps/aarch64/tls-macros.h (TLS_GD): Add "cc" to the clobber diff --git a/NEWS b/NEWS index f4fe47f..91027bd 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,7 @@ Version 2.22 18007, 18019, 18020, 18029, 18030, 18032, 18036, 18038, 18039, 18042, 18043, 18046, 18047, 18068, 18080, 18093, 18100, 18104, 18110, 18111, 18125, 18128, 18138, 18185, 18197, 18206, 18210, 18211, 18247, 18287, - 18319, 18333, 18346, 18397. + 18319, 18333, 18346, 18397, 18409. * Cache information can be queried via sysconf() function on s390 e.g. with _SC_LEVEL1_ICACHE_SIZE as argument. diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index e3596b6..910a22c 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -274,7 +274,7 @@ while read file srcfile caller syscall args strong weak; do vdso_symver=`echo "$vdso_symver" | sed 's/\./_/g'` echo "\ \$(foreach p,\$(sysd-rules-targets),\$(objpfx)\$(patsubst %,\$p,$file).os): \\ - \$(..)sysdeps/unix/make-syscalls.sh\ + \$(..)sysdeps/unix/make-syscalls.sh \$(make-target-directory) (echo '#include '; \\ echo 'extern void *${strong}_ifunc (void) __asm (\"${strong}\");'; \\ -- 1.9.3