merge amd-stg-open into amd-mainline-open

for Dec25th Bulk Promotion

Merge remote-tracking branch 'gerritgit/dsalinas/amd-mainline-open_merge-dec25-2021' into HEAD

Change-Id: I3831be48a29e5416497fb34fedaac788978f65ba

lib/comgr/CMakeLists.txt

@@ -335,6 +335,12 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   set(CPACK_PACKAGE_CONTACT "ROCm Compiler Support <[email protected]>")
   set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE.txt")
 
+  # Install License file
+  install(FILES
+    "${CPACK_RESOURCE_FILE_LICENSE}"
+    COMPONENT amd-comgr
+    DESTINATION ${CMAKE_INSTALL_DOCDIR}/${CPACK_PACKAGE_NAME})
+
   # Make proper version for appending
   set(ROCM_VERSION_FOR_PACKAGE "")
   if(DEFINED ENV{ROCM_LIBPATCH_VERSION})
@@ -365,6 +371,7 @@ if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR)
   else()
     set(CPACK_RPM_PACKAGE_RELEASE "local")
   endif()
+  set(CPACK_RPM_PACKAGE_LICENSE "BSD")
 
   # Get rpm distro
   if(CPACK_RPM_PACKAGE_RELEASE)

lib/comgr/src/comgr-compiler.cpp

@@ -680,6 +680,9 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
       }
       std::unique_ptr<CompilerInstance> Clang(new CompilerInstance());
       Clang->setVerboseOutputStream(LogS);
+      if (!Argv.back()) {
+        Argv.pop_back();
+      }
       if (!CompilerInvocation::CreateFromArgs(Clang->getInvocation(), Argv,
                                               Diags)) {
         return AMD_COMGR_STATUS_ERROR;
@@ -699,6 +702,9 @@ AMDGPUCompiler::executeInProcessDriver(ArrayRef<const char *> Args) {
         logArgv(LogS, "clang", Argv);
       }
       Argv.erase(Argv.begin() + 1);
+      if (!Argv.back()) {
+        Argv.pop_back();
+      }
       AssemblerInvocation Asm;
       if (!AssemblerInvocation::createFromArgs(Asm, Argv, Diags)) {
         return AMD_COMGR_STATUS_ERROR;