Merge commit '4feb0925b086' from llvm.org/main into next

Author: git apple-llvm automerger

flang/test/Driver/flang-dwarf-version.f90

@@ -1,9 +1,18 @@
+// RUN: %if !target={{.*aix.*}} %{ \
 // RUN: %flang -### -S %s -g -gdwarf-5  2>&1 \
-// RUN:             | FileCheck --check-prefix=CHECK-DWARF5 %s
+// RUN:             | FileCheck --check-prefix=CHECK-DWARF5 %s \
+// RUN: %}
+
+// RUN: %if !target={{.*aix.*}} %{ \
 // RUN: %flang -### -S %s -gdwarf-5  2>&1 \
-// RUN:             | FileCheck --check-prefix=CHECK-DWARF5 %s
+// RUN:             | FileCheck --check-prefix=CHECK-DWARF5 %s \
+// RUN: %}
+
+// RUN: %if !target={{.*aix.*}} %{ \
 // RUN: %flang -### -S %s -g1 -gdwarf-5  2>&1 \
-// RUN:             | FileCheck --check-prefix=CHECK-WITH-G1-DWARF5 %s
+// RUN:             | FileCheck --check-prefix=CHECK-WITH-G1-DWARF5 %s \
+// RUN: %}
+
 // RUN: %flang -### -S %s -gdwarf-4  2>&1 \
 // RUN:             | FileCheck --check-prefix=CHECK-DWARF4 %s
 // RUN: %flang -### -S %s -gdwarf-3  2>&1 \

flang/test/Integration/debug-dwarf-flags.f90

@@ -1,7 +1,13 @@
+! RUN: %if !target={{.*aix.*}} %{ \
 ! RUN: %flang_fc1 -emit-llvm -debug-info-kind=standalone -dwarf-version=5 %s  \
-! RUN:         -o - | FileCheck --check-prefix=CHECK-DWARF5 %s
+! RUN:         -o - | FileCheck --check-prefix=CHECK-DWARF5 %s \
+! RUN: %}
+
+! RUN: %if !target={{.*aix.*}} %{ \
 ! RUN: %flang_fc1 -emit-llvm -debug-info-kind=line-tables-only -dwarf-version=5 \
-! RUN:         %s -o - | FileCheck --check-prefix=CHECK-DWARF5 %s
+! RUN:         %s -o - | FileCheck --check-prefix=CHECK-DWARF5 %s \
+! RUN: %}
+
 ! RUN: %flang_fc1 -emit-llvm -debug-info-kind=standalone -dwarf-version=4 %s  \
 ! RUN:         -o - | FileCheck --check-prefix=CHECK-DWARF4 %s
 ! RUN: %flang_fc1 -emit-llvm -debug-info-kind=standalone -dwarf-version=3 %s  \