Skip to content

[llvm-dlltool] Use -N for input native def option to avoid conflict with GNU dlltool --no-delete option. #81847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 15, 2024

Conversation

cjacek
Copy link
Contributor

@cjacek cjacek commented Feb 15, 2024

As spotted by @mstorsjo in #81624. Also fixes the long form alias.

@@ -32,7 +32,10 @@ ARMAP2-NEXT: __imp_aux_func in test.dll
ARMAP2-NEXT: __imp_func in test.dll
ARMAP2-NEXT: func in test.dll

RUN: not llvm-dlltool -m arm64 -d test.def -n test2.def -l test2.lib 2>&1 | FileCheck --check-prefix=ERR %s
RUN: llvm-dlltool -m arm64ec -d test.def -N test2.def -l test3.lib
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What does this line test, isn't this the exact same test as what's above on line 19?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It was meant to test the long form, but I failed to commit the final version. I pushed a fixup.

Copy link
Member

@mstorsjo mstorsjo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, thanks!

@cjacek cjacek merged commit 4bf50e0 into llvm:main Feb 15, 2024
@cjacek cjacek deleted the dlltool-n branch February 15, 2024 22:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants