From 6e40ca5ca48ce5862716c1b64509d068ae067246 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Thu, 24 Oct 2013 09:17:35 +0000 Subject: [PATCH] Teach Clang to recognize and ignore GCC's -fdiagnostics-show-location flag. We should probably wire at least some variants of this up to our actual diagnostics engine, but I'm leaving that for someone else. This fixes the builds of packages which hard code something here, at least including libstdc++ itself. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193318 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/clang/Driver/Options.td | 4 ++++ test/Driver/clang_f_opts.c | 1 + 2 files changed, 5 insertions(+) diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index 1ae659ef0f..b88aeebdcb 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -1432,6 +1432,10 @@ def fuse_ld_EQ : Joined<["-"], "fuse-ld=">, Group; defm align_functions : BooleanFFlag<"align-functions">, Group; def falign_functions_EQ : Joined<["-"], "falign-functions=">, Group; +// FIXME: This option should be supported and wired up to our diognostics, but +// ignore it for now to avoid breaking builds that use it. +def fdiagnostics_show_location_EQ : Joined<["-"], "fdiagnostics-show-location=">, Group; + defm eliminate_unused_debug_types : BooleanFFlag<"eliminate-unused-debug-types">, Group; defm float_store : BooleanFFlag<"float-store">, Group; defm function_attribute_list : BooleanFFlag<"function-attribute-list">, Group; diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c index bd3862b406..e315245614 100644 --- a/test/Driver/clang_f_opts.c +++ b/test/Driver/clang_f_opts.c @@ -105,6 +105,7 @@ // RUN: -falign-functions -falign-functions=2 -fno-align-functions \ // RUN: -fasynchronous-unwind-tables -fno-asynchronous-unwind-tables \ // RUN: -fbuiltin -fno-builtin \ +// RUN: -fdiagnostics-show-location=once \ // RUN: -ffloat-store -fno-float-store \ // RUN: -feliminate-unused-debug-types -fno-eliminate-unused-debug-types \ // RUN: -fgcse -fno-gcse \ -- 2.50.1