public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Szabolcs Nagy <nsz@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/arm/morello/main] cheri: use getauxptr in iconv/tst-gconv-init-failure test Date: Wed, 23 Nov 2022 14:50:12 +0000 (GMT) [thread overview] Message-ID: <20221123145012.6F0D03852C61@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=e0bde778546db86042bdf4f4b8eca7f38d01a02e commit e0bde778546db86042bdf4f4b8eca7f38d01a02e Author: Szabolcs Nagy <szabolcs.nagy@arm.com> 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); }
next reply other threads:[~2022-11-23 14:50 UTC|newest] Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-11-23 14:50 Szabolcs Nagy [this message] -- strict thread matches above, loose matches on Subject: below -- 2022-10-27 14:00 Szabolcs Nagy 2022-10-26 15:21 Szabolcs Nagy 2022-10-12 14:15 Szabolcs Nagy
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20221123145012.6F0D03852C61@sourceware.org \ --to=nsz@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).