From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1944) id 78FB83882150; Wed, 26 Oct 2022 15:21:51 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 78FB83882150 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1666797711; bh=6eeqpcTzKMsqhS9d2s3ELCkYgSCxUY7uXZIlI0slyI0=; h=From:To:Subject:Date:From; b=HNQ6hkE7wjfeBcq7qG8SmI7dl92FTla11a3HeTexWYtN5f3D9ulU/bBgpLdJkM/CC PxZb8j41/N04+AszSqC8q+8Pkt/17iyVwK8VH0iiArUELrsRGJ49uk5RilaQyTmfXO JU1xE0Cith8tvGdc3A1B+d/8ToquoIwdh7D9KM8c= 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: 25309006c00fbac6a589a47b399cdb07fba6852c X-Git-Newrev: 491eaa3cd25836d4ab8f49a048d697d3d5d46685 Message-Id: <20221026152151.78FB83882150@sourceware.org> Date: Wed, 26 Oct 2022 15:21:51 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=491eaa3cd25836d4ab8f49a048d697d3d5d46685 commit 491eaa3cd25836d4ab8f49a048d697d3d5d46685 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); }