Merge branch 'compiler-research:main' into undo-repl

Author: kr-2003

.github/workflows/emscripten.yml

@@ -327,7 +327,7 @@ jobs:
                         -DLLVM_ENABLE_THREADS=OFF                       \
                         -G Ninja                                         \
                         ../llvm
-          emmake ninja clang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
+          emmake ninja libclang clangInterpreter clangStaticAnalyzerCore lld -j ${{ env.ncpus }}
         fi
         cd ../
         rm -rf $(find . -maxdepth 1 ! -name "build" ! -name "llvm" ! -name "clang" ! -name ".")

Emscripten-build-instructions.md

@@ -70,8 +70,8 @@ emcmake cmake -DCMAKE_BUILD_TYPE=Release \
                         -DLLVM_INCLUDE_TESTS=OFF                        \
                         -DLLVM_ENABLE_THREADS=OFF                       \
                         ../llvm
-emmake make clang -j $(nproc --all)
-emmake make clang-repl -j $(nproc --all)
+emmake make libclang -j $(nproc --all)
+emmake make clangInterpreter clangStaticAnalyzerCore -j $(nproc --all)
 emmake make lld -j $(nproc --all)
 ```
 

docs/Emscripten-build-instructions.rst

@@ -86,8 +86,8 @@ executing the following
                  -DLLVM_INCLUDE_TESTS=OFF                        \
                  -DLLVM_ENABLE_THREADS=OFF                       \
                  ../llvm
-   emmake make clang -j $(nproc --all)
-   emmake make clang-repl -j $(nproc --all)
+   emmake make libclang -j $(nproc --all)
+   emmake make clangInterpreter clangStaticAnalyzerCore -j $(nproc --all)
    emmake make lld -j $(nproc --all)
 
 Once this finishes building we need to take note of where we built our

lib/Interpreter/CMakeLists.txt

@@ -122,12 +122,7 @@ if(EMSCRIPTEN)
 
   # Replace newlines with spaces
   string(REPLACE "\n" " " SYMBOLS_LIST "${SYMBOLS_LIST}")
-  
-  #FIXME: Setting no_soname=1 is needed until https://github.com/emscripten-core/emscripten/blob/ac676d5e437525d15df5fd46bc2c208ec6d376a3/cmake/Modules/Platform/Emscripten.cmake#L36
-  # is patched out of emsdk, as --soname is not recognised by emscripten. A PR to do this has been done here https://github.com/emscripten-core/emscripten/pull/23453 
-  #FIXME: A patch is needed to llvm to remove -Wl,-z,defs since it is now recognised on emscripten. What needs to be removed is here
-  # https://github.com/llvm/llvm-project/blob/128e2e446e90c3b1827cfc7d4d19e3c0976beff3/llvm/cmake/modules/HandleLLVMOptions.cmake#L318 . The PR to do try to do this is here 
-  # https://github.com/llvm/llvm-project/pull/123396
+
   set_target_properties(clangCppInterOp
     PROPERTIES NO_SONAME 1
   )

unittests/CppInterOp/CMakeLists.txt

@@ -1,6 +1,3 @@
-set(LLVM_LINK_COMPONENTS
-  Support
-)
 if (EMSCRIPTEN)
   # Omitting CUDATest.cpp since Emscripten build currently has no GPU support
   # For Emscripten builds linking to gtest_main will not suffice for gtest to run