From patchwork Wed Feb 7 18:31:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aurelien Jarno X-Patchwork-Id: 870588 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-90125-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="cJvTFxxR"; dkim-atps=neutral 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 3zc8zm2gTZz9s4q for ; Thu, 8 Feb 2018 05:31:32 +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:from:to:cc:subject:date:message-id; q=dns; s= default; b=miRRoYVot5WX3t0/8KXm8zlpYL2IgMuz7k2bin5jI0dJgpMBpNK1e aXtUt1GQT/UqDyrR0ct91FdiKO9hfvNai42aCVdlvA6BjuvzhwjXI9MigovP5DyL XH7oC4whRaZfyKO1RmKXaKxYoukBYY+LC9b4vBFFxRc2dWt06Zrn4k= 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:from:to:cc:subject:date:message-id; s=default; bh=9m0ey2NOvg4M/Q76pILeATpeGik=; b=cJvTFxxRqwgoALDxxDTavcO3MpNZ wznYvTvWi1bx+tKvoh3ZrR0sywkfXGCd6SXLjwtkCLbQcksHAcGs4NClJbSB3Jk6 +NfHG3m1dgK/H1QK7COQaHLeP4eIe4Mluz4ueufe3s4G6oJ0ysSnaW4ZCTJjfyLT 7OsvhxeVn5O/0RY= Received: (qmail 11719 invoked by alias); 7 Feb 2018 18:31:26 -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 11708 invoked by uid 89); 7 Feb 2018 18:31:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY, T_RP_MATCHES_RCVD, URIBL_RED autolearn=ham version=3.3.2 spammy=H*r:120, H*RU:120, Hx-spam-relays-external:120 X-HELO: hall.aurel32.net From: Aurelien Jarno To: libc-alpha@sourceware.org Cc: Aurelien Jarno Subject: [PATCH] Fix posix/tst-glob_lstat_compat on alpha [BZ #22818] Date: Wed, 7 Feb 2018 19:31:17 +0100 Message-Id: <20180207183117.5364-1-aurelien@aurel32.net> The tst-glob_lstat_compat test needs to run tests on the previous version of glob. On alpha, there are three versions of glob, GLIBC_2.0, GLIBC_2.1 and GLIBC_2.27, while on other architectures there are only the GLIBC_2.0 and GLIBC_2.27 version. Therefore on alpha the previous version is GLIBC_2.1 and not GLIBC_2.0. Changelog: [BZ #22818] * posix/tst-glob_lstat_compat.c [__alpha__] (glob): Access the GLIBC_2.1 version. Reviewed-by: Carlos O'Donell --- ChangeLog | 6 ++++++ posix/tst-glob_lstat_compat.c | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/ChangeLog b/ChangeLog index 56bdeea8537..8ecd00b1f91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-02-07 Aurelien Jarno + + [BZ #22818] + * posix/tst-glob_lstat_compat.c [__alpha__] (glob): Access + the GLIBC_2.1 version. + 2018-02-07 Joseph Myers * scripts/build-many-glibcs.py (Context.checkout): Default MPFR diff --git a/posix/tst-glob_lstat_compat.c b/posix/tst-glob_lstat_compat.c index c46bc9e5783..22cd1f02f96 100644 --- a/posix/tst-glob_lstat_compat.c +++ b/posix/tst-glob_lstat_compat.c @@ -35,7 +35,14 @@ #if TEST_COMPAT (libc, GLIBC_2_0, GLIBC_2_27) __typeof (glob) glob; +/* On alpha glob exists in version GLIBC_2_0, GLIBC_2_1, and GLIBC_2_27. + This test needs to access the version prior to GLIBC_2_27, which is + GLIBC_2_1 on alpha, GLIBC_2_0 elsewhere. */ +# ifdef __alpha__ +compat_symbol_reference (libc, glob, glob, GLIBC_2_1); +# else compat_symbol_reference (libc, glob, glob, GLIBC_2_0); +# endif /* Compat glob should not call gl_lstat since for some old binaries it might be unitialized (for instance GNUmake). Check if it is indeed