From: Jan Beulich <jbeulich@suse.com>
To: "Martin Storsjö" <martin@martin.st>
Cc: binutils@sourceware.org
Subject: Re: [PATCH v3] ld: Make archive member file extension comparisons case insensitive when cross compiling too
Date: Wed, 24 Aug 2022 08:38:16 +0200 [thread overview]
Message-ID: <dd267b03-6924-8cff-adde-9416b3950e5e@suse.com> (raw)
In-Reply-To: <20220823211154.1775739-1-martin@martin.st>
On 23.08.2022 23:11, Martin Storsjö wrote:
> On Windows, filename_cmp is case insensitive, but when cross compiling
> with libraries that may contain members with uppercase file names, we
> should keep those comparisons case insensitive when running the build
> tools on other OSes too.
> ---
> v3: Renamed the function to fileext_cmp as suggested. (This also fixes
> building on Windows, where there already existed a non-static
> function named stricmp.)
I was actually surprised you did get away with using the earlier name;
I did have the potential name collision in mind, but didn't spell it
out because there was an (imo) more relevant reason for the rename.
> --- a/ld/emultempl/pe.em
> +++ b/ld/emultempl/pe.em
> @@ -171,6 +171,23 @@ static int is_underscoring (void)
> return pe_leading_underscore;
> }
>
> +/* A case insensitive comparison, regardless of the host platform,
> + used for comparing file extensions. */
> +static int fileext_cmp (const char *s1, const char *s2)
> +{
> + for (;;)
> + {
> + int c1 = TOLOWER (*s1++);
> + int c2 = TOLOWER (*s2++);
> +
> + if (c1 != c2)
> + return (c1 - c2);
> +
> + if (c1 == '\0')
> + return 0;
> + }
> +}
I'm not going to insist, but since you're touching all involved call
sites anyway, two suggestions:
1) Don't convert the 2nd string to lower case, but instead require
that this always be lower case when passed in. The function isn't a
generic string comparison one anymore with the name change, after
all.
2) Omit the leading . in the string literals passed, incrementing the
first argument to compensate. Besides saving a little bit of space
and work, the function name now also carries in its name what is
being done, so the leading .-s don't really carry that much extra
information to the reader anymore.
Jan
> @@ -1666,7 +1683,7 @@ gld${EMULATION_NAME}_after_open (void)
> extension, and use that for the remainder of the
> comparisons. */
> pnt = strrchr (bfd_get_filename (is3->the_bfd), '.');
> - if (pnt != NULL && filename_cmp (pnt, ".dll") == 0)
> + if (pnt != NULL && fileext_cmp (pnt, ".dll") == 0)
> break;
> }
>
> @@ -1683,7 +1700,7 @@ gld${EMULATION_NAME}_after_open (void)
> /* Skip static members, ie anything with a .obj
> extension. */
> pnt = strrchr (bfd_get_filename (is2->the_bfd), '.');
> - if (pnt != NULL && filename_cmp (pnt, ".obj") == 0)
> + if (pnt != NULL && fileext_cmp (pnt, ".obj") == 0)
> continue;
>
> if (filename_cmp (bfd_get_filename (is3->the_bfd),
> @@ -1701,7 +1718,7 @@ gld${EMULATION_NAME}_after_open (void)
> then leave the filename alone. */
> pnt = strrchr (bfd_get_filename (is->the_bfd), '.');
>
> - if (is_ms_arch && (filename_cmp (pnt, ".dll") == 0))
> + if (is_ms_arch && (fileext_cmp (pnt, ".dll") == 0))
> {
> int idata2 = 0, reloc_count=0;
> asection *sec;
> @@ -1857,7 +1874,7 @@ gld${EMULATION_NAME}_unrecognized_file (lang_input_statement_type *entry ATTRIBU
> #ifdef DLL_SUPPORT
> const char *ext = entry->filename + strlen (entry->filename) - 4;
>
> - if (filename_cmp (ext, ".def") == 0 || filename_cmp (ext, ".DEF") == 0)
> + if (fileext_cmp (ext, ".def") == 0)
> {
> pe_def_file = def_file_parse (entry->filename, pe_def_file);
>
next prev parent reply other threads:[~2022-08-24 6:38 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 13:06 [PATCH v2] ld: Make library member file suffix " Martin Storsjö
2022-08-23 14:01 ` Nick Clifton
2022-08-23 14:19 ` Martin Storsjö
2022-08-23 14:23 ` Jan Beulich
2022-08-23 21:11 ` [PATCH v3] ld: Make archive member file extension " Martin Storsjö
2022-08-24 6:38 ` Jan Beulich [this message]
2022-08-24 8:23 ` [PATCH v4] " Martin Storsjö
2022-08-24 9:48 ` Nick Clifton
2022-08-24 10:03 ` Martin Storsjö
2022-08-24 10:04 ` [PATCH v5] " Martin Storsjö
2022-08-24 10:29 ` Jan Beulich
2022-08-24 10:46 ` Martin Storsjö
2022-08-24 10:46 ` Martin Storsjö
2022-08-24 10:47 ` [PATCH v6] " Martin Storsjö
2022-08-24 11:17 ` Jan Beulich
2022-08-24 12:25 ` [PATCH v7] " Martin Storsjö
2022-08-24 12:39 ` Jan Beulich
2022-08-24 12:56 ` Nick Clifton
2022-08-24 20:23 ` Martin Storsjö
2022-08-25 6:53 ` [PATCH v4] " Martin Storsjö
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=dd267b03-6924-8cff-adde-9416b3950e5e@suse.com \
--to=jbeulich@suse.com \
--cc=binutils@sourceware.org \
--cc=martin@martin.st \
/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: link
Be 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).