Skip to content

Fix Clang + libc++ compilation and portability issues#28049

Open
mustjab wants to merge 3 commits intomicrosoft:mainfrom
mustjab:fix/clang-libcxx-compat
Open

Fix Clang + libc++ compilation and portability issues#28049
mustjab wants to merge 3 commits intomicrosoft:mainfrom
mustjab:fix/clang-libcxx-compat

Conversation

@mustjab
Copy link
Copy Markdown

@mustjab mustjab commented Apr 13, 2026

Description

Fixes compilation of ONNX Runtime with Clang/libc++ toolchains (e.g. Chromium's build system) and clang-cl on ARM64 Windows.

Portability fixes

  • Add math_constants.h with M_PI, M_SQRT2, M_SQRT1_2 for libc++ (which does not define these by default)
  • Use __attribute__((visibility(default))) for ORT_EXPORT on GCC/Clang
  • Move TargetConditionals.h include outside namespace for Clang modules
  • Out-of-line Node/Model destructors for libc++ unique_ptr with incomplete types
  • Add gsl::narrow alias for onnxruntime::narrow in narrow.h
  • Add [[maybe_unused]] on catch variables for -Wunused-variable
  • Fix reverse attribute validation in cumsum.cc (string literal as condition)
  • Use M_PI/M_SQRT2/M_SQRT1_2 from math_constants.h in all signal/optimizer/contrib files

ARM64 MLAS fixes (clang-cl on Windows)

  • Guard MSVC-specific NEON builtins (neon_fmaxv, neon_fminv) with !defined(__clang__) in mlasi.h
  • Include clang in portable NEON _ex fallbacks in qladd.h
  • Guard vcleq_z_f32_ex with !defined(__clang__) in activate.cpp
  • Add _WIN32 case in asmmacro.h to skip ELF .type directive on COFF

Motivation

These changes enable building ORT from source with Chromium's Clang/libc++ toolchain on all platforms (Windows x64/ARM64, Linux x64, Mac x64/ARM64).

@mustjab mustjab force-pushed the fix/clang-libcxx-compat branch 8 times, most recently from 543449a to 5e8c7bf Compare April 22, 2026 04:10
@mustjab mustjab requested a review from Copilot April 22, 2026 06:09
Copy link
Copy Markdown
Contributor

Copilot AI left a comment

Choose a reason for hiding this comment

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

Pull request overview

This PR targets cross-toolchain portability, primarily fixing build issues when compiling ONNX Runtime with Clang/libc++ (e.g., Chromium toolchains) and clang-cl on Windows ARM64.

Changes:

  • Adds/adjusts portability shims (export visibility, math constants header, Windows stacktrace gating, path handling, override fixups).
  • Moves several destructors/constructors out-of-line to satisfy libc++ requirements around std::unique_ptr to incomplete types.
  • Updates ARM64/NEON + AArch64 asm macro guards to avoid MSVC-only intrinsics/ELF directives under clang-cl/COFF.

Reviewed changes

Copilot reviewed 27 out of 27 changed files in this pull request and generated 9 comments.

Show a summary per file
File Description
onnxruntime/core/session/plugin_ep/ep_plugin_provider_interfaces.h Declares out-of-line FusedNodeState destructor and adds move assignment to support libc++.
onnxruntime/core/session/plugin_ep/ep_plugin_provider_interfaces.cc Defines FusedNodeState destructor out-of-line.
onnxruntime/core/session/inference_session.cc Uses std::filesystem::path for ifstream construction for broader toolchain compatibility.
onnxruntime/core/providers/cpu/tensor/gelu.cc Adds math_constants.h include (portability-related).
onnxruntime/core/providers/cpu/signal/window_functions.cc Adds math_constants.h include and replaces M_PI usage.
onnxruntime/core/providers/cpu/signal/dft.cc Adds math_constants.h include and replaces M_PI usage.
onnxruntime/core/providers/cpu/ml/ml_common.h Adds math_constants.h include and replaces M_PI/M_SQRT2 usage.
onnxruntime/core/providers/cpu/math/cumsum.cc Fixes incorrect ORT_ENFORCE usage for exclusive attribute validation.
onnxruntime/core/platform/windows/stacktrace.cc Disables <stacktrace> path under libc++ to avoid build issues.
onnxruntime/core/platform/windows/env.h Adds missing override to match base class interface.
onnxruntime/core/optimizer/stft_decomposition.cc Adds math_constants.h include and replaces M_PI usage in weight generation.
onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.h Moves ctor/dtor declarations out-of-line for libc++ incomplete-type rules.
onnxruntime/core/optimizer/qdq_transformer/selectors_actions/shared/utils.cc Adds out-of-line ctor/dtor definitions for selector-related types.
onnxruntime/core/optimizer/optimizer_execution_frame.h Moves OptimizerExecutionFrame::Info destructor out-of-line for libc++.
onnxruntime/core/optimizer/optimizer_execution_frame.cc Defines OptimizerExecutionFrame::Info destructor out-of-line.
onnxruntime/core/optimizer/gelu_fusion.cc Adds math_constants.h include and replaces M_SQRT2 usage.
onnxruntime/core/mlas/lib/qladd.h Expands NEON fallback path to include clang under Windows.
onnxruntime/core/mlas/lib/mlasi.h Guards MSVC-specific ARM64 NEON aliases when building with clang.
onnxruntime/core/mlas/lib/activate.cpp Avoids MSVC-only NEON intrinsic path under clang on Windows.
onnxruntime/core/mlas/lib/aarch64/asmmacro.h Adds _WIN32 case to avoid ELF-only .type directive on COFF.
onnxruntime/core/graph/graph.cc Moves Node ctor/dtor (and another ctor) out-of-line for libc++ incomplete-type rules.
onnxruntime/core/graph/ep_api_types.h Declares out-of-line EpNode::SubgraphState destructor for libc++.
onnxruntime/core/graph/ep_api_types.cc Defines EpNode::SubgraphState destructor out-of-line.
onnxruntime/core/common/math_constants.h Introduces portable M_* math constant definitions when missing.
onnxruntime/contrib_ops/cpu/bert/bias_gelu.cc Adds math_constants.h include and replaces M_SQRT1_2 usage.
include/onnxruntime/core/session/onnxruntime_c_api.h Broadens ORT_EXPORT visibility attribute usage to GCC/Clang (non-Windows).
include/onnxruntime/core/graph/graph.h Declares Node ctor/dtor and one ctor out-of-line to match graph.cc.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Comment thread onnxruntime/core/providers/cpu/math/cumsum.cc
Comment thread onnxruntime/core/common/math_constants.h Outdated
Comment thread onnxruntime/core/providers/cpu/signal/dft.cc Outdated
Comment thread onnxruntime/core/optimizer/stft_decomposition.cc Outdated
Comment thread onnxruntime/core/providers/cpu/tensor/gelu.cc Outdated
Comment thread onnxruntime/core/providers/cpu/signal/window_functions.cc Outdated
Comment thread onnxruntime/core/providers/cpu/ml/ml_common.h
Comment thread onnxruntime/core/optimizer/gelu_fusion.cc Outdated
Comment thread onnxruntime/contrib_ops/cpu/bert/bias_gelu.cc Outdated
@mustjab mustjab force-pushed the fix/clang-libcxx-compat branch from 5e8c7bf to aaafb13 Compare April 22, 2026 16:29
@mustjab mustjab marked this pull request as ready for review April 22, 2026 16:47
@mustjab
Copy link
Copy Markdown
Author

mustjab commented Apr 22, 2026

@microsoft-github-policy-service agree company="Microsoft"

@mustjab please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”), and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your contributions to Microsoft open source projects. This Agreement is effective as of the latest signature date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@mustjab please read the following Contributor License Agreement(CLA). If you agree with the CLA, please reply with the following information.

@microsoft-github-policy-service agree [company="{your company}"]

Options:

  • (default - no company specified) I have sole ownership of intellectual property rights to my Submissions and I am not making Submissions in the course of work for my employer.
@microsoft-github-policy-service agree
  • (when company given) I am making Submissions in the course of work for my employer (or my employer has intellectual property rights in my Submissions by contract or applicable law). I have permission from my employer to make Submissions and enter into this Agreement on behalf of my employer. By signing below, the defined term “You” includes me and my employer.
@microsoft-github-policy-service agree company="Microsoft"

Contributor License Agreement

Contribution License Agreement

This Contribution License Agreement (“Agreement”) is agreed to by the party signing below (“You”), and conveys certain license rights to Microsoft Corporation and its affiliates (“Microsoft”) for Your contributions to Microsoft open source projects. This Agreement is effective as of the latest signature date below.

  1. Definitions.
    “Code” means the computer software code, whether in human-readable or machine-executable form,
    that is delivered by You to Microsoft under this Agreement.
    “Project” means any of the projects owned or managed by Microsoft and offered under a license
    approved by the Open Source Initiative (www.opensource.org).
    “Submit” is the act of uploading, submitting, transmitting, or distributing code or other content to any
    Project, including but not limited to communication on electronic mailing lists, source code control
    systems, and issue tracking systems that are managed by, or on behalf of, the Project for the purpose of
    discussing and improving that Project, but excluding communication that is conspicuously marked or
    otherwise designated in writing by You as “Not a Submission.”
    “Submission” means the Code and any other copyrightable material Submitted by You, including any
    associated comments and documentation.
  2. Your Submission. You must agree to the terms of this Agreement before making a Submission to any
    Project. This Agreement covers any and all Submissions that You, now or in the future (except as
    described in Section 4 below), Submit to any Project.
  3. Originality of Work. You represent that each of Your Submissions is entirely Your original work.
    Should You wish to Submit materials that are not Your original work, You may Submit them separately
    to the Project if You (a) retain all copyright and license information that was in the materials as You
    received them, (b) in the description accompanying Your Submission, include the phrase “Submission
    containing materials of a third party:” followed by the names of the third party and any licenses or other
    restrictions of which You are aware, and (c) follow any other instructions in the Project’s written
    guidelines concerning Submissions.
  4. Your Employer. References to “employer” in this Agreement include Your employer or anyone else
    for whom You are acting in making Your Submission, e.g. as a contractor, vendor, or agent. If Your
    Submission is made in the course of Your work for an employer or Your employer has intellectual
    property rights in Your Submission by contract or applicable law, You must secure permission from Your
    employer to make the Submission before signing this Agreement. In that case, the term “You” in this
    Agreement will refer to You and the employer collectively. If You change employers in the future and
    desire to Submit additional Submissions for the new employer, then You agree to sign a new Agreement
    and secure permission from the new employer before Submitting those Submissions.
  5. Licenses.
  • Copyright License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license in the
    Submission to reproduce, prepare derivative works of, publicly display, publicly perform, and distribute
    the Submission and such derivative works, and to sublicense any or all of the foregoing rights to third
    parties.
  • Patent License. You grant Microsoft, and those who receive the Submission directly or
    indirectly from Microsoft, a perpetual, worldwide, non-exclusive, royalty-free, irrevocable license under
    Your patent claims that are necessarily infringed by the Submission or the combination of the
    Submission with the Project to which it was Submitted to make, have made, use, offer to sell, sell and
    import or otherwise dispose of the Submission alone or with the Project.
  • Other Rights Reserved. Each party reserves all rights not expressly granted in this Agreement.
    No additional licenses or rights whatsoever (including, without limitation, any implied licenses) are
    granted by implication, exhaustion, estoppel or otherwise.
  1. Representations and Warranties. You represent that You are legally entitled to grant the above
    licenses. You represent that each of Your Submissions is entirely Your original work (except as You may
    have disclosed under Section 3). You represent that You have secured permission from Your employer to
    make the Submission in cases where Your Submission is made in the course of Your work for Your
    employer or Your employer has intellectual property rights in Your Submission by contract or applicable
    law. If You are signing this Agreement on behalf of Your employer, You represent and warrant that You
    have the necessary authority to bind the listed employer to the obligations contained in this Agreement.
    You are not expected to provide support for Your Submission, unless You choose to do so. UNLESS
    REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING, AND EXCEPT FOR THE WARRANTIES
    EXPRESSLY STATED IN SECTIONS 3, 4, AND 6, THE SUBMISSION PROVIDED UNDER THIS AGREEMENT IS
    PROVIDED WITHOUT WARRANTY OF ANY KIND, INCLUDING, BUT NOT LIMITED TO, ANY WARRANTY OF
    NONINFRINGEMENT, MERCHANTABILITY, OR FITNESS FOR A PARTICULAR PURPOSE.
  2. Notice to Microsoft. You agree to notify Microsoft in writing of any facts or circumstances of which
    You later become aware that would make Your representations in this Agreement inaccurate in any
    respect.
  3. Information about Submissions. You agree that contributions to Projects and information about
    contributions may be maintained indefinitely and disclosed publicly, including Your name and other
    information that You submit with Your Submission.
  4. Governing Law/Jurisdiction. This Agreement is governed by the laws of the State of Washington, and
    the parties consent to exclusive jurisdiction and venue in the federal courts sitting in King County,
    Washington, unless no federal subject matter jurisdiction exists, in which case the parties consent to
    exclusive jurisdiction and venue in the Superior Court of King County, Washington. The parties waive all
    defenses of lack of personal jurisdiction and forum non-conveniens.
  5. Entire Agreement/Assignment. This Agreement is the entire agreement between the parties, and
    supersedes any and all prior agreements, understandings or communications, written or oral, between
    the parties relating to the subject matter hereof. This Agreement may be assigned by Microsoft.

@microsoft-github-policy-service agree company="Microsoft"

Comment thread onnxruntime/core/providers/cpu/math/cumsum.cc Outdated
Comment thread include/onnxruntime/core/session/onnxruntime_c_api.h Outdated
Comment thread onnxruntime/core/common/math_constants.h Outdated
Comment thread onnxruntime/core/platform/windows/stacktrace.cc
Comment thread onnxruntime/core/session/inference_session.cc Outdated
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