From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-qk1-x744.google.com (mail-qk1-x744.google.com [IPv6:2607:f8b0:4864:20::744]) by sourceware.org (Postfix) with ESMTPS id 2B70E3857C6F for ; Thu, 8 Oct 2020 18:04:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 2B70E3857C6F Received: by mail-qk1-x744.google.com with SMTP id a23so7902503qkg.13 for ; Thu, 08 Oct 2020 11:04:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:references:from:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=e9Wl/plgSXP3QZ+AnO9peDPAV8IIPLU3Z/X8dIJ+S58=; b=OBzBYT8FbDR5SnOLRDqs0EFbqPLLZYhVjGVa/DDSkJGjLQje6bXxNyn03FgwIaR0d/ CAo1AlicZ3AlXrnsPfb0J8mgPltTnGw5Rk6ExRkVfDSEEKFp1+xwFB5gNpGqtIILYsFj gjrHnOr3IT5Ag19122ToPw4n/LOgiV7NNWcZbtDpmZhIj27JNynQ9lCWmp3sGKRVSwun kcj2NtTjVluB9FcWIJBcZ9lGit2+suFJ6pcm2nJXj3siVuowruuACv0JYj1YbdeVT799 yOJB7HJW1GbKY/mdqM+ZnP5+P1kSVngM6koa0Bs9TI0Vm9y7D8HYXo1GeYWUQHQDaQZY cI8w== X-Gm-Message-State: AOAM532kd+OYRW5gtfZsGLhhEtxMZ7fG08nLlBj+4cS1IHWnxBa3gNaH nau2LgwXmdqG4xGELD4qryfpbMbqCSAgOw== X-Google-Smtp-Source: ABdhPJzbhVaCfq0stDyBUJa+mAi1tA2+w5BjFcEceoOM2AaUHWUR+HArawx/JQE2K9160OKvqO5AiA== X-Received: by 2002:a05:620a:12f3:: with SMTP id f19mr9672929qkl.110.1602180285201; Thu, 08 Oct 2020 11:04:45 -0700 (PDT) Received: from [192.168.1.4] ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id i126sm4142189qkd.71.2020.10.08.11.04.43 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 08 Oct 2020 11:04:44 -0700 (PDT) To: libc-alpha@sourceware.org References: From: Adhemerval Zanella Autocrypt: addr=adhemerval.zanella@linaro.org; prefer-encrypt=mutual; keydata= mQINBFcVGkoBEADiQU2x/cBBmAVf5C2d1xgz6zCnlCefbqaflUBw4hB/bEME40QsrVzWZ5Nq 8kxkEczZzAOKkkvv4pRVLlLn/zDtFXhlcvQRJ3yFMGqzBjofucOrmdYkOGo0uCaoJKPT186L NWp53SACXguFJpnw4ODI64ziInzXQs/rUJqrFoVIlrPDmNv/LUv1OVPKz20ETjgfpg8MNwG6 iMizMefCl+RbtXbIEZ3TE/IaDT/jcOirjv96lBKrc/pAL0h/O71Kwbbp43fimW80GhjiaN2y WGByepnkAVP7FyNarhdDpJhoDmUk9yfwNuIuESaCQtfd3vgKKuo6grcKZ8bHy7IXX1XJj2X/ BgRVhVgMHAnDPFIkXtP+SiarkUaLjGzCz7XkUn4XAGDskBNfbizFqYUQCaL2FdbW3DeZqNIa nSzKAZK7Dm9+0VVSRZXP89w71Y7JUV56xL/PlOE+YKKFdEw+gQjQi0e+DZILAtFjJLoCrkEX w4LluMhYX/X8XP6/C3xW0yOZhvHYyn72sV4yJ1uyc/qz3OY32CRy+bwPzAMAkhdwcORA3JPb kPTlimhQqVgvca8m+MQ/JFZ6D+K7QPyvEv7bQ7M+IzFmTkOCwCJ3xqOD6GjX3aphk8Sr0dq3 4Awlf5xFDAG8dn8Uuutb7naGBd/fEv6t8dfkNyzj6yvc4jpVxwARAQABtElBZGhlbWVydmFs IFphbmVsbGEgTmV0dG8gKExpbmFybyBWUE4gS2V5KSA8YWRoZW1lcnZhbC56YW5lbGxhQGxp bmFyby5vcmc+iQI3BBMBCAAhBQJXFRpKAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJ EKqx7BSnlIjv0e8P/1YOYoNkvJ+AJcNUaM5a2SA9oAKjSJ/M/EN4Id5Ow41ZJS4lUA0apSXW NjQg3VeVc2RiHab2LIB4MxdJhaWTuzfLkYnBeoy4u6njYcaoSwf3g9dSsvsl3mhtuzm6aXFH /Qsauav77enJh99tI4T+58rp0EuLhDsQbnBic/ukYNv7sQV8dy9KxA54yLnYUFqH6pfH8Lly sTVAMyi5Fg5O5/hVV+Z0Kpr+ZocC1YFJkTsNLAW5EIYSP9ftniqaVsim7MNmodv/zqK0IyDB GLLH1kjhvb5+6ySGlWbMTomt/or/uvMgulz0bRS+LUyOmlfXDdT+t38VPKBBVwFMarNuREU2 69M3a3jdTfScboDd2ck1u7l+QbaGoHZQ8ZNUrzgObltjohiIsazqkgYDQzXIMrD9H19E+8fw kCNUlXxjEgH/Kg8DlpoYJXSJCX0fjMWfXywL6ZXc2xyG/hbl5hvsLNmqDpLpc1CfKcA0BkK+ k8R57fr91mTCppSwwKJYO9T+8J+o4ho/CJnK/jBy1pWKMYJPvvrpdBCWq3MfzVpXYdahRKHI ypk8m4QlRlbOXWJ3TDd/SKNfSSrWgwRSg7XCjSlR7PNzNFXTULLB34sZhjrN6Q8NQZsZnMNs TX8nlGOVrKolnQPjKCLwCyu8PhllU8OwbSMKskcD1PSkG6h3r0AquQINBFcVGkoBEACgAdbR Ck+fsfOVwT8zowMiL3l9a2DP3Eeak23ifdZG+8Avb/SImpv0UMSbRfnw/N81IWwlbjkjbGTu oT37iZHLRwYUFmA8fZX0wNDNKQUUTjN6XalJmvhdz9l71H3WnE0wneEM5ahu5V1L1utUWTyh VUwzX1lwJeV3vyrNgI1kYOaeuNVvq7npNR6t6XxEpqPsNc6O77I12XELic2+36YibyqlTJIQ V1SZEbIy26AbC2zH9WqaKyGyQnr/IPbTJ2Lv0dM3RaXoVf+CeK7gB2B+w1hZummD21c1Laua +VIMPCUQ+EM8W9EtX+0iJXxI+wsztLT6vltQcm+5Q7tY+HFUucizJkAOAz98YFucwKefbkTp eKvCfCwiM1bGatZEFFKIlvJ2QNMQNiUrqJBlW9nZp/k7pbG3oStOjvawD9ZbP9e0fnlWJIsj 6c7pX354Yi7kxIk/6gREidHLLqEb/otuwt1aoMPg97iUgDV5mlNef77lWE8vxmlY0FBWIXuZ yv0XYxf1WF6dRizwFFbxvUZzIJp3spAao7jLsQj1DbD2s5+S1BW09A0mI/1DjB6EhNN+4bDB SJCOv/ReK3tFJXuj/HbyDrOdoMt8aIFbe7YFLEExHpSk+HgN05Lg5TyTro8oW7TSMTk+8a5M kzaH4UGXTTBDP/g5cfL3RFPl79ubXwARAQABiQIfBBgBCAAJBQJXFRpKAhsMAAoJEKqx7BSn lIjvI/8P/jg0jl4Tbvg3B5kT6PxJOXHYu9OoyaHLcay6Cd+ZrOd1VQQCbOcgLFbf4Yr+rE9l mYsY67AUgq2QKmVVbn9pjvGsEaz8UmfDnz5epUhDxC6yRRvY4hreMXZhPZ1pbMa6A0a/WOSt AgFj5V6Z4dXGTM/lNManr0HjXxbUYv2WfbNt3/07Db9T+GZkpUotC6iknsTA4rJi6u2ls0W9 1UIvW4o01vb4nZRCj4rni0g6eWoQCGoVDk/xFfy7ZliR5B+3Z3EWRJcQskip/QAHjbLa3pml xAZ484fVxgeESOoaeC9TiBIp0NfH8akWOI0HpBCiBD5xaCTvR7ujUWMvhsX2n881r/hNlR9g fcE6q00qHSPAEgGr1bnFv74/1vbKtjeXLCcRKk3Ulw0bY1OoDxWQr86T2fZGJ/HIZuVVBf3+ gaYJF92GXFynHnea14nFFuFgOni0Mi1zDxYH/8yGGBXvo14KWd8JOW0NJPaCDFJkdS5hu0VY 7vJwKcyHJGxsCLU+Et0mryX8qZwqibJIzu7kUJQdQDljbRPDFd/xmGUFCQiQAncSilYOcxNU EMVCXPAQTteqkvA+gNqSaK1NM9tY0eQ4iJpo+aoX8HAcn4sZzt2pfUB9vQMTBJ2d4+m/qO6+ cFTAceXmIoFsN8+gFN3i8Is3u12u8xGudcBPvpoy4OoG Subject: Re: [PATCH 15/28] elf: Do not pass GLRO(dl_platform), GLRO(dl_platformlen) to _dl_important_hwcaps Message-ID: <1dc9cd14-cc76-ca73-1d2e-43d9d0a262c5@linaro.org> Date: Thu, 8 Oct 2020 15:04:42 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, NICE_REPLY_A, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2020 18:04:47 -0000 LGTM, thanks. Reviewed-by: Adhemerval Zanella On 01/10/2020 13:33, Florian Weimer via Libc-alpha wrote: > In the current code, the function can easily obtain the information > on its own. > --- > elf/dl-hwcaps.c | 11 +++++------ > elf/dl-load.c | 3 +-- > sysdeps/generic/ldsodefs.h | 12 ++++++------ > 3 files changed, 12 insertions(+), 14 deletions(-) > > diff --git a/elf/dl-hwcaps.c b/elf/dl-hwcaps.c > index 6df9efb255..44dbac099f 100644 > --- a/elf/dl-hwcaps.c > +++ b/elf/dl-hwcaps.c > @@ -28,13 +28,12 @@ > > /* Return an array of useful/necessary hardware capability names. */ > const struct r_strlenpair * > -_dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, > - size_t *max_capstrlen) > +_dl_important_hwcaps (size_t *sz, size_t *max_capstrlen) > { > uint64_t hwcap_mask = GET_HWCAP_MASK(); > /* Determine how many important bits are set. */ > uint64_t masked = GLRO(dl_hwcap) & hwcap_mask; > - size_t cnt = platform != NULL; > + size_t cnt = GLRO (dl_platform) != NULL; > size_t n, m; > size_t total; > struct r_strlenpair *result; Ok. > @@ -60,10 +59,10 @@ _dl_important_hwcaps (const char *platform, size_t platform_len, size_t *sz, > masked ^= 1ULL << n; > ++m; > } > - if (platform != NULL) > + if (GLRO (dl_platform) != NULL) > { > - temp[m].str = platform; > - temp[m].len = platform_len; > + temp[m].str = GLRO (dl_platform); > + temp[m].len = GLRO (dl_platformlen); > ++m; > } > Ok. > diff --git a/elf/dl-load.c b/elf/dl-load.c > index 0c8fa72c4d..f3201e7c14 100644 > --- a/elf/dl-load.c > +++ b/elf/dl-load.c > @@ -697,8 +697,7 @@ _dl_init_paths (const char *llp, const char *source) > > #ifdef SHARED > /* Get the capabilities. */ > - capstr = _dl_important_hwcaps (GLRO(dl_platform), GLRO(dl_platformlen), > - &ncapstr, &max_capstrlen); > + capstr = _dl_important_hwcaps (&ncapstr, &max_capstrlen); > #endif > > /* First set up the rest of the default search directory entries. */ Ok. > diff --git a/sysdeps/generic/ldsodefs.h b/sysdeps/generic/ldsodefs.h > index 510a2f6841..382eeb9be0 100644 > --- a/sysdeps/generic/ldsodefs.h > +++ b/sysdeps/generic/ldsodefs.h > @@ -1071,12 +1071,12 @@ extern void _dl_show_auxv (void) attribute_hidden; > other. */ > extern char *_dl_next_ld_env_entry (char ***position) attribute_hidden; > > -/* Return an array with the names of the important hardware capabilities. */ > -extern const struct r_strlenpair *_dl_important_hwcaps (const char *platform, > - size_t paltform_len, > - size_t *sz, > - size_t *max_capstrlen) > - attribute_hidden; > +/* Return an array with the names of the important hardware > + capabilities. The length of the array is written to *SZ, and the > + maximum of all strings length is written to *MAX_CAPSTRLEN. */ > +const struct r_strlenpair *_dl_important_hwcaps (size_t *sz, > + size_t *max_capstrlen) > + attribute_hidden; > > /* Look up NAME in ld.so.cache and return the file name stored there, > or null if none is found. Caller must free returned string. */ > Ok.