Backport patches from issue #40#41

github-actions[bot] wants to merge 1 commit intorelease/10.xtstellar/llvm-project:release/10.xfrom

issue-40-prtstellar/llvm-project:issue-40-prCopy head branch name to clipboard