From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 6F0D03852C61; Wed, 23 Nov 2022 14:50:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6F0D03852C61 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1669215012; bh=W13n+hqb7I+kg067CcZfZgnlLtxWJu5MkiXedQirn2A=; h=From:To:Subject:Date:From; b=J7hJR7NBdjOk8NpwfPCD7bO5MvbSlE5A1Z/M+rnFJl4ssRHq4lo8Rq84b3CwpZMxg Lc4cAuD2ux01tGXDozHizEYlzjSh93Y1cfvF6W0tN/G5ygt1czqJ2Dfn7x5jHTOzWR QT1ir1yhhLXe9g/Zpr7rCZ32JlNDl+QPS6SRS/uY= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Szabolcs Nagy To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: use getauxptr in iconv/tst-gconv-init-failure test X-Act-Checkin: glibc X-Git-Author: Szabolcs Nagy X-Git-Refname: refs/heads/arm/morello/main X-Git-Oldrev: a05a3def727285eb498f329b16baa3f52d26df79 X-Git-Newrev: e0bde778546db86042bdf4f4b8eca7f38d01a02e Message-Id: <20221123145012.6F0D03852C61@sourceware.org> Date: Wed, 23 Nov 2022 14:50:12 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e0bde778546db86042bdf4f4b8eca7f38d01a02e commit e0bde778546db86042bdf4f4b8eca7f38d01a02e Author: Szabolcs Nagy Date: Tue Oct 11 16:24:05 2022 +0100 cheri: use getauxptr in iconv/tst-gconv-init-failure test On CHERI targets getauxval cannot return a valid pointer. Diff: --- iconv/tst-gconv-init-failure.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iconv/tst-gconv-init-failure.c b/iconv/tst-gconv-init-failure.c index b29c5db6b8..b86958ab90 100644 --- a/iconv/tst-gconv-init-failure.c +++ b/iconv/tst-gconv-init-failure.c @@ -31,13 +31,13 @@ static void activate_test_gconv_modules (void) { - unsigned long ptr = getauxval (AT_EXECFN); - if (ptr == 0) + const char *ptr = getauxptr (AT_EXECFN); + if (ptr == NULL) { printf ("warning: AT_EXECFN not support, cannot run test\n"); exit (EXIT_UNSUPPORTED); } - char *test_program_directory = dirname (xstrdup ((const char *) ptr)); + char *test_program_directory = dirname (xstrdup (ptr)); TEST_VERIFY (setenv ("GCONV_PATH", test_program_directory, 1) == 0); free (test_program_directory); }