Merge remote-tracking branch 'upstream/main'

llvm-mos · Sep 30, 2024 · 76b1367 · 76b1367
2 parents bd3728b + a400206
commit 76b1367
Show file tree

Hide file tree

Showing 5 changed files with 235 additions and 53 deletions.
diff --git a/Bitcode/Benchmarks/Halide/CMakeLists.txt b/Bitcode/Benchmarks/Halide/CMakeLists.txt
@@ -10,11 +10,11 @@ if(NOT MSVC)
 endif()
 
 macro(test_img_input img)
-  llvm_test_run(%S/../images/${img}.bytes ${ARGN} %S/${img}_out.bytes)
+  llvm_test_run(%S/images/${img}.bytes ${ARGN} %S/${img}_out.bytes)
   llvm_test_verify(%b/${FPCMP} %S/output/${img}_out.bytes %S/${img}_out.bytes)
 endmacro()
 macro(test_img_data target img)
-  llvm_test_data(${target} ../images/${img}.bytes)
+  llvm_test_data(${target} SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/.. images/${img}.bytes)
   llvm_test_data(${target} output/${img}_out.bytes)
 endmacro()
 

diff --git a/Fortran/gfortran/regression/DisabledFiles.cmake b/Fortran/gfortran/regression/DisabledFiles.cmake
@@ -1052,6 +1052,7 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
   io_real_boz2.f90
   io_real_boz_4.f90
   io_real_boz_5.f90
+  namelist_96.f90 # real data for integer NAMELIST input
   no_unit_error_1.f90
   pointer_check_10.f90
   pointer_remapping_6.f08
@@ -1301,6 +1302,8 @@ file(GLOB FAILING_FILES CONFIGURE_DEPENDS
   pr95614_2.f90
   pr95882_3.f90
   recursive_check_3.f90
+  restricted_expression_2.f90
+  restricted_expression_3.f90
   return_1.f90
   size_kind_3.f90
   string_3.f90