Merge remote-tracking branch 'upstream/main'

llvm-mos · Apr 29, 2024 · 57fbe77 · 57fbe77
2 parents 40ee200 + dae2ca9
commit 57fbe77
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/Fortran/gfortran/regression/DisabledFiles.cmake b/Fortran/gfortran/regression/DisabledFiles.cmake
@@ -531,7 +531,6 @@ file(GLOB SKIPPED_FILES CONFIGURE_DEPENDS
 
   # lowering bugs (reported)
   c_char_tests.f03
-  masklr_2.F90
 
   # Categorize and debug further
   bounds_check_17.f90 # needs -fcheck=bounds

diff --git a/MultiSource/UnitTests/Float/Makefile b/MultiSource/UnitTests/Float/Makefile
@@ -6,7 +6,7 @@ PARALLEL_DIRS :=
 
 # Tests in 'rounding' can run only if the target implements builtin functions
 # for rounding mode manipulation.
-ifneq (, $filter($(ARCH), X86_64 AArch64)
+ifneq (,$(filter $(ARCH), X86_64 AArch64))
 PARALLEL_DIRS += rounding
 endif