Index: clang/include/clang/Basic/DiagnosticDriverKinds.td =================================================================== --- clang/include/clang/Basic/DiagnosticDriverKinds.td +++ clang/include/clang/Basic/DiagnosticDriverKinds.td @@ -52,38 +52,46 @@ "standard library not linked and so no interrupt vector table or " "compiler runtime routines will be linked">, InGroup; -def err_drv_cuda_bad_gpu_arch : Error<"Unsupported CUDA gpu architecture: %0">; +def err_drv_cuda_bad_gpu_arch : Error<"unsupported CUDA gpu architecture: %0">; def err_drv_no_cuda_installation : Error< - "cannot find CUDA installation. Provide its path via --cuda-path, or pass " - "-nocudainc to build without CUDA includes.">; + "cannot find CUDA installation; provide its path via '--cuda-path', or pass " + "'-nocudainc' to build without CUDA includes">; def err_drv_no_cuda_libdevice : Error< - "cannot find libdevice for %0. Provide path to different CUDA installation " - "via --cuda-path, or pass -nocudalib to build without linking with libdevice.">; + "cannot find libdevice for %0; provide path to different CUDA installation " + "via '--cuda-path', or pass '-nocudalib' to build without linking with " + "libdevice">; def err_drv_no_rocm_device_lib : Error< - "cannot find ROCm device library%select{| for %1}0. Provide its path via --rocm-path or " - "--rocm-device-lib-path, or pass -nogpulib to build without ROCm device library.">; + "cannot find ROCm device library%select{| for %1}0; provide its path via " + "'--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build " + "without ROCm device library">; def err_drv_no_hip_runtime : Error< - "cannot find HIP runtime. Provide its path via --rocm-path, or pass " - "-nogpuinc to build without HIP runtime.">; + "cannot find HIP runtime; provide its path via '--rocm-path', or pass " + "'-nogpuinc' to build without HIP runtime">; def err_drv_undetermined_amdgpu_arch : Error< - "Cannot determine AMDGPU architecture: %0. Consider passing it via --march.">; + "cannot determine AMDGPU architecture: %0; consider passing it via " + "'--march'">; def err_drv_cuda_version_unsupported : Error< "GPU arch %0 is supported by CUDA versions between %1 and %2 (inclusive), " - "but installation at %3 is %4. Use --cuda-path to specify a different CUDA " - "install, pass a different GPU arch with --cuda-gpu-arch, or pass " - "--no-cuda-version-check.">; + "but installation at %3 is %4; use '--cuda-path' to specify a different CUDA " + "install, pass a different GPU arch with '--cuda-gpu-arch', or pass " + "'--no-cuda-version-check'">; def warn_drv_unknown_cuda_version: Warning< - "Unknown CUDA version. %0 Assuming the latest supported version %1">, + "unknown CUDA version: %0; assuming the latest supported version %1">, InGroup; -def err_drv_cuda_host_arch : Error<"unsupported architecture '%0' for host compilation.">; -def err_drv_mix_cuda_hip : Error<"Mixed Cuda and HIP compilation is not supported.">; -def err_drv_bad_target_id : Error<"Invalid target ID: %0 (A target ID is a processor name " - "followed by an optional list of predefined features post-fixed by a plus or minus sign deliminated " - "by colon, e.g. 'gfx908:sramecc+:xnack-')">; -def err_drv_bad_offload_arch_combo : Error<"Invalid offload arch combinations: %0 and %1 (For a specific " - "processor, a feature should either exist in all offload archs, or not exist in any offload archs)">; +def err_drv_cuda_host_arch : Error< + "unsupported architecture '%0' for host compilation">; +def err_drv_mix_cuda_hip : Error< + "mixed CUDA and HIP compilation is not supported">; +def err_drv_bad_target_id : Error< + "invalid target ID: %0 (a target ID is a processor name followed by an " + "optional list of predefined features post-fixed by a plus or minus sign " + "delimited by a colon, e.g. 'gfx908:sramecc+:xnack-')">; +def err_drv_bad_offload_arch_combo : Error< + "invalid offload arch combinations: %0 and %1 (for a specific processor, a " + "feature should either exist in all offload archs, or not exist in any " + "offload archs)">; def err_drv_invalid_thread_model_for_target : Error< "invalid thread model '%0' in '%1' for this target">; def err_drv_invalid_linker_name : Error< @@ -195,7 +203,7 @@ def err_cpu_unsupported_isa : Error<"CPU '%0' does not support '%1' execution mode">; def err_arch_unsupported_isa - : Error<"Architecture '%0' does not support '%1' execution mode">; + : Error<"architecture '%0' does not support '%1' execution mode">; def err_drv_I_dash_not_supported : Error< "'%0' not supported, please use -iquote instead">; @@ -265,18 +273,23 @@ def err_drv_invalid_omp_target : Error<"OpenMP target is invalid: '%0'">; def err_drv_incompatible_omp_arch : Error<"OpenMP target architecture '%0' pointer size is incompatible with host '%1'">; def err_drv_omp_host_ir_file_not_found : Error< - "The provided host compiler IR file '%0' is required to generate code for OpenMP target regions but cannot be found.">; + "provided host compiler IR file '%0' is required to generate code for OpenMP " + "target regions but cannot be found">; def err_drv_omp_host_target_not_supported : Error< - "The target '%0' is not a supported OpenMP host target.">; + "target '%0' is not a supported OpenMP host target">; def err_drv_expecting_fopenmp_with_fopenmp_targets : Error< - "The option -fopenmp-targets must be used in conjunction with a -fopenmp option compatible with offloading, please use -fopenmp=libomp or -fopenmp=libiomp5.">; + "'-fopenmp-targets' must be used in conjunction with a '-fopenmp' option " + "compatible with offloading; e.g., '-fopenmp=libomp' or '-fopenmp=libiomp5'">; def err_drv_omp_offload_target_missingbcruntime : Error< - "No library '%0' found in the default clang lib directory or in LIBRARY_PATH. Please use --libomptarget-%1-bc-path to specify %1 bitcode library.">; -def err_drv_omp_offload_target_bcruntime_not_found : Error<"Bitcode library '%0' does not exist.">; -def err_drv_omp_offload_target_cuda_version_not_support : Error<"NVPTX target requires CUDA 9.2 or above. CUDA %0 is detected.">; + "no library '%0' found in the default clang lib directory or in LIBRARY_PATH" + "; use '--libomptarget-%1-bc-path' to specify %1 bitcode library">; +def err_drv_omp_offload_target_bcruntime_not_found : Error< + "bitcode library '%0' does not exist">; +def err_drv_omp_offload_target_cuda_version_not_support : Error< + "NVPTX target requires CUDA 9.2 or above; CUDA %0 detected">; def warn_drv_omp_offload_target_duplicate : Warning< - "The OpenMP offloading target '%0' is similar to target '%1' already specified - will be ignored.">, - InGroup; + "OpenMP offloading target '%0' is similar to target '%1' already specified; " + "will be ignored">, InGroup; def err_drv_unsupported_embed_bitcode : Error<"%0 is not supported with -fembed-bitcode">; def err_drv_bitcode_unsupported_on_toolchain : Error< @@ -303,7 +316,8 @@ "debug information option '%0' is not supported for target '%1'">, InGroup; def warn_drv_dwarf_version_limited_by_target : Warning< - "debug information option '%0' is not supported. It needs DWARF-%2 but target '%1' only provides DWARF-%3.">, + "debug information option '%0' is not supported; it needs DWARF-%2 but " + "target '%1' only provides DWARF-%3">, InGroup; def warn_c_kext : Warning< "ignoring -fapple-kext which is valid for C++ and Objective-C++ only">; @@ -370,7 +384,7 @@ def note_drv_command_failed_diag_msg : Note< "diagnostic msg: %0">; def note_drv_t_option_is_global : Note< - "The last /TC or /TP option takes precedence over earlier instances">; + "the last '/TC' or '/TP' option takes precedence over earlier instances">; def note_drv_address_sanitizer_debug_runtime : Note< "AddressSanitizer doesn't support linking with debug runtime libraries yet">; def note_drv_use_standard : Note<"use '%0'" @@ -410,7 +424,8 @@ def warn_slash_u_filename : Warning<"'/U%0' treated as the '/U' option">, InGroup>; -def note_use_dashdash : Note<"Use '--' to treat subsequent arguments as filenames">; +def note_use_dashdash : Note< + "use '--' to treat subsequent arguments as filenames">; def err_drv_ropi_rwpi_incompatible_with_pic : Error< "embedded and GOT-based position independence are incompatible">; @@ -479,14 +494,14 @@ def err_drv_unsupported_linker : Error<"unsupported value '%0' for -linker option">; def err_drv_defsym_invalid_format : Error<"defsym must be of the form: sym=value: %0">; -def err_drv_defsym_invalid_symval : Error<"Value is not an integer: %0">; +def err_drv_defsym_invalid_symval : Error<"value is not an integer: %0">; def warn_drv_msvc_not_found : Warning< "unable to find a Visual Studio installation; " "try running Clang from a developer command prompt">, InGroup>; def warn_drv_fuse_ld_path : Warning< - "'-fuse-ld=' taking a path is deprecated. Use '--ld-path=' instead">, + "'-fuse-ld=' taking a path is deprecated; use '--ld-path=' instead">, InGroup, DefaultIgnore; def warn_drv_fine_grained_bitfield_accesses_ignored : Warning< @@ -506,11 +521,11 @@ InGroup; def warn_drv_moutline_unsupported_opt : Warning< - "The '%0' architecture does not support -moutline; flag ignored">, + "the '%0' architecture does not support '-moutline'; flag ignored">, InGroup; def warn_drv_moutline_atomics_unsupported_opt : Warning< - "The '%0' architecture does not support -moutline-atomics; flag ignored">, + "the '%0' architecture does not support '-moutline-atomics'; flag ignored">, InGroup; def warn_drv_darwin_sdk_invalid_settings : Warning< @@ -518,25 +533,28 @@ InGroup>; def err_drv_trivial_auto_var_init_zero_disabled : Error< - "-ftrivial-auto-var-init=zero hasn't been enabled. Enable it at your own peril for benchmarking purpose only with " - "-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang">; + "'-ftrivial-auto-var-init=zero' hasn't been enabled; enable it at your own " + "peril for benchmarking purpose only with " + "'-enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang'">; def err_drv_trivial_auto_var_init_stop_after_missing_dependency : Error< - "-ftrivial-auto-var-init-stop-after=* is used without -ftrivial-auto-var-init=zero or -ftrivial-auto-var-init=pattern.">; + "'-ftrivial-auto-var-init-stop-after=*' is used without " + "'-ftrivial-auto-var-init=zero' or '-ftrivial-auto-var-init=pattern'">; def err_drv_trivial_auto_var_init_stop_after_invalid_value : Error< - "-ftrivial-auto-var-init-stop-after=* only accepts positive integers.">; + "'-ftrivial-auto-var-init-stop-after=*' only accepts positive integers">; -def warn_drv_msp430_hwmult_unsupported : Warning<"the given MCU does not " - "support hardware multiply, but -mhwmult is set to %0.">, +def warn_drv_msp430_hwmult_unsupported : Warning< + "the given MCU does not support hardware multiply, but '-mhwmult' is set to " + "%0">, InGroup; +def warn_drv_msp430_hwmult_mismatch : Warning< + "the given MCU supports %0 hardware multiply, but '-mhwmult' is set to %1">, InGroup; -def warn_drv_msp430_hwmult_mismatch : Warning<"the given MCU supports %0 " - "hardware multiply, but -mhwmult is set to %1.">, - InGroup; -def warn_drv_msp430_hwmult_no_device : Warning<"no MCU device specified, but " - "'-mhwmult' is set to 'auto', assuming no hardware multiply. Use -mmcu to " - "specify a MSP430 device, or -mhwmult to set hardware multiply type " - "explicitly.">, InGroup; +def warn_drv_msp430_hwmult_no_device : Warning< + "no MCU device specified, but '-mhwmult' is set to 'auto', assuming no " + "hardware multiply; use '-mmcu' to specify an MSP430 device, or '-mhwmult' " + "to set the hardware multiply type explicitly">, + InGroup; def warn_drv_libstdcxx_not_found : Warning< "include path for libstdc++ headers not found; pass '-stdlib=libc++' on the " @@ -545,17 +563,23 @@ def err_drv_cannot_mix_options : Error<"cannot specify '%1' along with '%0'">; -def err_drv_invalid_object_mode : Error<"OBJECT_MODE setting %0 is not recognized and is not a valid setting.">; +def err_drv_invalid_object_mode : Error< + "OBJECT_MODE setting %0 is not recognized and is not a valid setting">; def err_aix_unsupported_tls_model : Error<"TLS model '%0' is not yet supported on AIX">; -def err_invalid_cxx_abi : Error<"Invalid C++ ABI name '%0'">; +def err_invalid_cxx_abi : Error<"invalid C++ ABI name '%0'">; def err_unsupported_cxx_abi : Error<"C++ ABI '%0' is not supported on target triple '%1'">; -def note_cc1_round_trip_original : Note<"Original arguments in round-trip: %0">; -def note_cc1_round_trip_generated : Note<"Generated arguments #%0 in round-trip: %1">; -def remark_cc1_round_trip_generated : Remark<"Generated arguments #%0 in round-trip: %1">, InGroup; -def err_cc1_round_trip_fail_then_ok : Error<"Original arguments parse failed, then succeeded in round-trip">; -def err_cc1_round_trip_ok_then_fail : Error<"Generated arguments parse failed in round-trip">; -def err_cc1_round_trip_mismatch : Error<"Generated arguments do not match in round-trip">; +def note_cc1_round_trip_original : Note<"original arguments in round-trip: %0">; +def note_cc1_round_trip_generated : Note< + "generated arguments #%0 in round-trip: %1">; +def remark_cc1_round_trip_generated : Remark< + "generated arguments #%0 in round-trip: %1">, InGroup; +def err_cc1_round_trip_fail_then_ok : Error< + "original arguments parse failed, then succeeded in round-trip">; +def err_cc1_round_trip_ok_then_fail : Error< + "generated arguments parse failed in round-trip">; +def err_cc1_round_trip_mismatch : Error< + "generated arguments do not match in round-trip">; } Index: clang/test/Driver/aix-object-mode.c =================================================================== --- clang/test/Driver/aix-object-mode.c +++ clang/test/Driver/aix-object-mode.c @@ -19,4 +19,4 @@ // RUN: env OBJECT_MODE=31 \ // RUN: not %clang -target powerpc-ibm-aix 2>&1 | FileCheck -check-prefix=DIAG %s -// DIAG: error: OBJECT_MODE setting 31 is not recognized and is not a valid setting. +// DIAG: error: OBJECT_MODE setting 31 is not recognized and is not a valid setting Index: clang/test/Driver/arm-thumb-only-cores.c =================================================================== --- clang/test/Driver/arm-thumb-only-cores.c +++ clang/test/Driver/arm-thumb-only-cores.c @@ -6,7 +6,7 @@ // RUN: | FileCheck --check-prefix ARMV7M %s // RUN: not %clang -target armv7m-unknown-linux -mno-thumb %s -o /dev/null 2>&1 \ // RUN: | FileCheck --check-prefix ARMV7M %s -// ARMV7M: error: Architecture 'armv7m' does not support 'ARM' execution mode +// ARMV7M: error: architecture 'armv7m' does not support 'ARM' execution mode // // RUN: %clang -S -emit-llvm -target arm-unknown-linux -mcpu=cortex-m0 %s -o /dev/null 2>&1 // M-Profile CPUs default to Thumb mode even if arm triples are provided. Index: clang/test/Driver/cl-inputs.c =================================================================== --- clang/test/Driver/cl-inputs.c +++ clang/test/Driver/cl-inputs.c @@ -28,7 +28,7 @@ // RUN: %clang_cl /TP /TC /TP -### -- %s 2>&1 | FileCheck -check-prefix=WARN %s // WARN: warning: overriding '/TP' option with '/TC' // WARN: warning: overriding '/TC' option with '/TP' -// WARN: note: The last /TC or /TP option takes precedence over earlier instances +// WARN: note: the last '/TC' or '/TP' option takes precedence over earlier instances // WARN-NOT: note // MSYS2_ARG_CONV_EXCL tells MSYS2 to skip conversion of the specified argument. Index: clang/test/Driver/cl-options.c =================================================================== --- clang/test/Driver/cl-options.c +++ clang/test/Driver/cl-options.c @@ -538,7 +538,7 @@ // for other flags too, but this is the one people run into.) // RUN: %clang_cl /c /Users/me/myfile.c -### 2>&1 | FileCheck -check-prefix=SlashU %s // SlashU: warning: '/Users/me/myfile.c' treated as the '/U' option -// SlashU: note: Use '--' to treat subsequent arguments as filenames +// SlashU: note: use '--' to treat subsequent arguments as filenames // RTTI is on by default. /GR- controls -fno-rtti-data. // RUN: %clang_cl /c /GR- -### -- %s 2>&1 | FileCheck -check-prefix=NoRTTI %s Index: clang/test/Driver/clang_f_opts.c =================================================================== --- clang/test/Driver/clang_f_opts.c +++ clang/test/Driver/clang_f_opts.c @@ -581,11 +581,11 @@ // RUN: %clang -### -S -ftrivial-auto-var-init-stop-after=0 %s 2>&1 | FileCheck -check-prefix=CHECK-TRIVIAL-STOP-AFTER-MISSING-DEPENDENCY %s // RUN: %clang -### -S -ftrivial-auto-var-init=pattern -ftrivial-auto-var-init-stop-after=0 %s 2>&1 | FileCheck -check-prefix=CHECK-TRIVIAL-PATTERN-STOP-AFTER-INVALID-VALUE %s // RUN: %clang -### -S -ftrivial-auto-var-init=zero -enable-trivial-auto-var-init-zero-knowing-it-will-be-removed-from-clang -ftrivial-auto-var-init-stop-after=0 %s 2>&1 | FileCheck -check-prefix=CHECK-TRIVIAL-ZERO-STOP-AFTER-INVALID-VALUE %s -// CHECK-TRIVIAL-PATTERN-STOP-AFTER-NOT: is used without -ftrivial-auto-var-init +// CHECK-TRIVIAL-PATTERN-STOP-AFTER-NOT: is used without '-ftrivial-auto-var-init' // CHECK-TRIVIAL-PATTERN-STOP-AFTER-NOT: only accepts positive integers -// CHECK-TRIVIAL-ZERO-STOP-AFTER-NOT: is used without -ftrivial-auto-var-init +// CHECK-TRIVIAL-ZERO-STOP-AFTER-NOT: is used without '-ftrivial-auto-var-init' // CHECK-TRIVIAL-ZERO-STOP-AFTER-NOT: only accepts positive integers -// CHECK-TRIVIAL-STOP-AFTER-MISSING-DEPENDENCY: used without -ftrivial-auto-var-init +// CHECK-TRIVIAL-STOP-AFTER-MISSING-DEPENDENCY: used without '-ftrivial-auto-var-init=zero' or // CHECK-TRIVIAL-PATTERN-STOP-AFTER-INVALID-VALUE: only accepts positive integers // CHECK-TRIVIAL-ZERO-STOP-AFTER-INVALID-VALUE: only accepts positive integers Index: clang/test/Driver/defsym.s =================================================================== --- clang/test/Driver/defsym.s +++ clang/test/Driver/defsym.s @@ -24,7 +24,7 @@ // RUN: not %clang -c -integrated-as -o /dev/null %s \ // RUN: -Wa,-defsym,abc=1a2b3c \ // RUN: 2>&1 | FileCheck %s --check-prefix=CHECK-DEFSYM-ERR3 -// CHECK-DEFSYM-ERR3: error: Value is not an integer: 1a2b3c +// CHECK-DEFSYM-ERR3: error: value is not an integer: 1a2b3c // RUN: not %clang -c -integrated-as -o /dev/null %s \ // RUN: -Wa,-defsym \ Index: clang/test/Driver/fuse-ld.c =================================================================== --- clang/test/Driver/fuse-ld.c +++ clang/test/Driver/fuse-ld.c @@ -2,7 +2,7 @@ // RUN: %clang %s -### -target x86_64-unknown-linux -Wfuse-ld-path \ // RUN: -fuse-ld=/usr/local/bin/or1k-linux-ld 2>&1 | \ // RUN: FileCheck %s --check-prefix=CHECK-ABSOLUTE-LD -// CHECK-ABSOLUTE-LD: warning: '-fuse-ld=' taking a path is deprecated. Use '--ld-path=' instead +// CHECK-ABSOLUTE-LD: warning: '-fuse-ld=' taking a path is deprecated; use '--ld-path=' instead // CHECK-ABSOLUTE-LD: /usr/local/bin/or1k-linux-ld // RUN: %clang %s -### -target x86_64-unknown-linux -Wextra \ Index: clang/test/Driver/msp430-hwmult.c =================================================================== --- clang/test/Driver/msp430-hwmult.c +++ clang/test/Driver/msp430-hwmult.c @@ -28,15 +28,15 @@ // RUN: %clang -### -target msp430 %s -mhwmult=auto 2>&1 | FileCheck --check-prefix=WRN-NODEV %s // WRN-NODEV: warning: no MCU device specified, but '-mhwmult' is set to 'auto', -// assuming no hardware multiply. Use -mmcu to specify a MSP430 device, -// or -mhwmult to set hardware multiply type explicitly. +// assuming no hardware multiply; use '-mmcu' to specify a MSP430 device, +// or '-mhwmult' to set hardware multiply type explicitly. // RUN: %clang -### -target msp430 %s -mhwmult=16bit -mmcu=msp430c111 2>&1 | FileCheck --check-prefix=WRN-UNSUP %s // RUN: %clang -### -target msp430 %s -mhwmult=32bit -mmcu=msp430c111 2>&1 | FileCheck --check-prefix=WRN-UNSUP %s // RUN: %clang -### -target msp430 %s -mhwmult=f5series -mmcu=msp430c111 2>&1 | FileCheck --check-prefix=WRN-UNSUP %s -// WRN-UNSUP: warning: the given MCU does not support hardware multiply, but -mhwmult is set to +// WRN-UNSUP: warning: the given MCU does not support hardware multiply, but '-mhwmult' is set to // RUN: %clang -### -target msp430 %s -mhwmult=16bit -mmcu=msp430f4783 2>&1 | FileCheck --check-prefix=WRN-MISMCH %s // RUN: %clang -### -target msp430 %s -mhwmult=32bit -mmcu=msp430f147 2>&1 | FileCheck --check-prefix=WRN-MISMCH %s // RUN: %clang -### -target msp430 %s -mhwmult=f5series -mmcu=msp430f4783 2>&1 | FileCheck --check-prefix=WRN-MISMCH %s -// WRN-MISMCH: warning: the given MCU supports {{.*}} hardware multiply, but -mhwmult is set to {{.*}} +// WRN-MISMCH: warning: the given MCU supports {{.*}} hardware multiply, but '-mhwmult' is set to {{.*}} Index: clang/test/Driver/rocm-not-found.cl =================================================================== --- clang/test/Driver/rocm-not-found.cl +++ clang/test/Driver/rocm-not-found.cl @@ -5,7 +5,7 @@ // RUN: %clang -### --sysroot=%s/no-rocm-there -target amdgcn--amdhsa %s 2>&1 | FileCheck %s --check-prefix ERR // RUN: %clang -### --rocm-path=%s/no-rocm-there -target amdgcn--amdhsa %s 2>&1 | FileCheck %s --check-prefix ERR -// ERR: cannot find ROCm device library. Provide its path via --rocm-path or --rocm-device-lib-path, or pass -nogpulib to build without ROCm device library +// ERR: cannot find ROCm device library; provide its path via '--rocm-path' or '--rocm-device-lib-path', or pass '-nogpulib' to build without ROCm device library // Accept nogpulib or nostdlib for OpenCL. // RUN: %clang -### -nogpulib --rocm-path=%s/no-rocm-there %s 2>&1 | FileCheck %s --check-prefix OK Index: clang/test/Frontend/invalid-cxx-abi.cpp =================================================================== --- clang/test/Frontend/invalid-cxx-abi.cpp +++ clang/test/Frontend/invalid-cxx-abi.cpp @@ -1,8 +1,8 @@ // These shouldn't be valid -fc++-abi values. // RUN: not %clang_cc1 -S -emit-llvm -o /dev/null -fc++-abi=InvalidABI %s 2>&1 | FileCheck %s -check-prefix=INVALID // RUN: not %clang_cc1 -S -emit-llvm -o /dev/null -fc++-abi=Fuchsia %s 2>&1 | FileCheck %s -check-prefix=CASE-SENSITIVE -// INVALID: error: Invalid C++ ABI name 'InvalidABI' -// CASE-SENSITIVE: error: Invalid C++ ABI name 'Fuchsia' +// INVALID: error: invalid C++ ABI name 'InvalidABI' +// CASE-SENSITIVE: error: invalid C++ ABI name 'Fuchsia' // Some C++ ABIs are not supported on some platforms. // RUN: not %clang_cc1 -S -emit-llvm -o /dev/null -fc++-abi=fuchsia -triple i386 %s 2>&1 | FileCheck %s -check-prefix=UNSUPPORTED-FUCHSIA Index: clang/test/Frontend/round-trip-cc1-args.c =================================================================== --- clang/test/Frontend/round-trip-cc1-args.c +++ clang/test/Frontend/round-trip-cc1-args.c @@ -4,4 +4,4 @@ // CHECK-WITHOUT-ROUND-TRIP-NOT: remark: // CHECK-ROUND-TRIP-WITHOUT-REMARKS-NOT: remark: -// CHECK-ROUND-TRIP-WITH-REMARKS: remark: Generated arguments #{{.*}} in round-trip: {{.*}} +// CHECK-ROUND-TRIP-WITH-REMARKS: remark: generated arguments #{{.*}} in round-trip: {{.*}} Index: clang/test/OpenMP/target_messages.cpp =================================================================== --- clang/test/OpenMP/target_messages.cpp +++ clang/test/OpenMP/target_messages.cpp @@ -8,12 +8,12 @@ // CHECK: error: OpenMP target is invalid: 'aaa-bbb-ccc-ddd' // RUN: not %clang_cc1 -fopenmp -std=c++11 -triple nvptx64-nvidia-cuda -o - %s 2>&1 | FileCheck --check-prefix CHECK-UNSUPPORTED-HOST-TARGET %s // RUN: not %clang_cc1 -fopenmp -std=c++11 -triple nvptx-nvidia-cuda -o - %s 2>&1 | FileCheck --check-prefix CHECK-UNSUPPORTED-HOST-TARGET %s -// CHECK-UNSUPPORTED-HOST-TARGET: error: The target '{{nvptx64-nvidia-cuda|nvptx-nvidia-cuda}}' is not a supported OpenMP host target. +// CHECK-UNSUPPORTED-HOST-TARGET: error: target '{{nvptx64-nvidia-cuda|nvptx-nvidia-cuda}}' is not a supported OpenMP host target // RUN: not %clang_cc1 -fopenmp -std=c++11 -fopenmp-targets=hexagon-linux-gnu -o - %s 2>&1 | FileCheck --check-prefix CHECK-UNSUPPORTED-DEVICE-TARGET %s // CHECK-UNSUPPORTED-DEVICE-TARGET: OpenMP target is invalid: 'hexagon-linux-gnu' // RUN: not %clang_cc1 -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path 1111.bc -o - 2>&1 | FileCheck --check-prefix NO-HOST-BC %s -// NO-HOST-BC: The provided host compiler IR file '1111.bc' is required to generate code for OpenMP target regions but cannot be found. +// NO-HOST-BC: provided host compiler IR file '1111.bc' is required to generate code for OpenMP target regions but cannot be found // RUN: %clang_cc1 -fopenmp -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm-bc %s -o %t-ppc-host.bc -DREGION_HOST // RUN: not %clang_cc1 -verify=expected,omp4 -fopenmp -fopenmp-version=45 -x c++ -triple powerpc64le-unknown-unknown -fopenmp-targets=powerpc64le-ibm-linux-gnu -emit-llvm %s -fopenmp-is-device -fopenmp-host-ir-file-path %t-ppc-host.bc -o - -DREGION_DEVICE 2>&1