From: Dawn Perchik Date: Thu, 2 Sep 2010 23:59:25 +0000 (+0000) Subject: Add support for Borland extensions via option -fborland-extensions X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=400b607546a8dbfcee3b690f3d0a2fee0ea6480b;p=clang Add support for Borland extensions via option -fborland-extensions (original patch r112791 was reverted due to a bug). git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@112915 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/docs/tools/clang.pod b/docs/tools/clang.pod index bcf84b7049..032efcfcab 100644 --- a/docs/tools/clang.pod +++ b/docs/tools/clang.pod @@ -168,6 +168,10 @@ Enable support for Pascal-style strings with "\pfoo". Enable support for Microsoft extensions. +=item B<-fborland-extensions> + +Enable support for Borland extensions. + =item B<-fwritable-strings> Make all string literals default to writable. This disables uniquing of diff --git a/include/clang/Basic/LangOptions.h b/include/clang/Basic/LangOptions.h index bbcceb70ac..5bd0d04a4e 100644 --- a/include/clang/Basic/LangOptions.h +++ b/include/clang/Basic/LangOptions.h @@ -34,6 +34,7 @@ public: unsigned HexFloats : 1; // C99 Hexadecimal float constants. unsigned C99 : 1; // C99 Support unsigned Microsoft : 1; // Microsoft extensions. + unsigned Borland : 1; // Borland extensions. unsigned CPlusPlus : 1; // C++ Support unsigned CPlusPlus0x : 1; // C++0x Support unsigned CXXOperatorNames : 1; // Treat C++ operator names as keywords. @@ -140,7 +141,7 @@ public: HexFloats = 0; GC = ObjC1 = ObjC2 = ObjCNonFragileABI = ObjCNonFragileABI2 = 0; NoConstantCFStrings = 0; InlineVisibilityHidden = 0; - C99 = Microsoft = CPlusPlus = CPlusPlus0x = 0; + C99 = Microsoft = Borland = CPlusPlus = CPlusPlus0x = 0; CXXOperatorNames = PascalStrings = WritableStrings = ConstStrings = 0; Exceptions = SjLjExceptions = Freestanding = NoBuiltin = 0; NeXTRuntime = 1; diff --git a/include/clang/Driver/CC1Options.td b/include/clang/Driver/CC1Options.td index bdb918bfae..fd40aa0c5f 100644 --- a/include/clang/Driver/CC1Options.td +++ b/include/clang/Driver/CC1Options.td @@ -418,6 +418,8 @@ def fmath_errno : Flag<"-fmath-errno">, HelpText<"Require math functions to indicate errors by setting errno">; def fms_extensions : Flag<"-fms-extensions">, HelpText<"Accept some non-standard constructs used in Microsoft header files ">; +def fborland_extensions : Flag<"-fborland-extensions">, + HelpText<"Accept non-standard constructs supported by the Borland compiler">; def main_file_name : Separate<"-main-file-name">, HelpText<"Main file name to use for debug info">; def fno_elide_constructors : Flag<"-fno-elide-constructors">, diff --git a/include/clang/Driver/Options.td b/include/clang/Driver/Options.td index ef0d62f925..c51d12a487 100644 --- a/include/clang/Driver/Options.td +++ b/include/clang/Driver/Options.td @@ -243,6 +243,7 @@ def fast : Flag<"-fast">, Group; def fasynchronous_unwind_tables : Flag<"-fasynchronous-unwind-tables">, Group; def fblocks : Flag<"-fblocks">, Group; def fbootclasspath_EQ : Joined<"-fbootclasspath=">, Group; +def fborland_extensions : Flag<"-fborland-extensions">, Group; def fbuiltin_strcat : Flag<"-fbuiltin-strcat">, Group; def fbuiltin_strcpy : Flag<"-fbuiltin-strcpy">, Group; def fbuiltin : Flag<"-fbuiltin">, Group; @@ -302,6 +303,7 @@ def fno_asm : Flag<"-fno-asm">, Group; def fno_asynchronous_unwind_tables : Flag<"-fno-asynchronous-unwind-tables">, Group; def fno_assume_sane_operator_new : Flag<"-fno-assume-sane-operator-new">, Group; def fno_blocks : Flag<"-fno-blocks">, Group; +def fno_borland_extensions : Flag<"-fno-borland-extensions">, Group; def fno_builtin_strcat : Flag<"-fno-builtin-strcat">, Group; def fno_builtin_strcpy : Flag<"-fno-builtin-strcpy">, Group; def fno_builtin : Flag<"-fno-builtin">, Group; diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index 9e7a061e94..8436561e6e 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -1215,6 +1215,11 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA, getToolChain().getTriple().getOS() == llvm::Triple::Win32)) CmdArgs.push_back("-fms-extensions"); + // -fborland-extensions=0 is default. + if (Args.hasFlag(options::OPT_fborland_extensions, + options::OPT_fno_borland_extensions, false)) + CmdArgs.push_back("-fborland-extensions"); + // -fgnu-keywords default varies depending on language; only pass if // specified. if (Arg *A = Args.getLastArg(options::OPT_fgnu_keywords, diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index c4ecf61ce2..8c644833b2 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -526,6 +526,8 @@ static void LangOptsToArgs(const LangOptions &Opts, Res.push_back("-fgnu-keywords"); if (Opts.Microsoft) Res.push_back("-fms-extensions"); + if (Opts.Borland) + Res.push_back("-fborland-extensions"); if (Opts.ObjCNonFragileABI) Res.push_back("-fobjc-nonfragile-abi"); if (Opts.ObjCNonFragileABI2) @@ -1317,6 +1319,7 @@ static void ParseLangArgs(LangOptions &Opts, ArgList &Args, InputKind IK, !Opts.AsmPreprocessor); Opts.PascalStrings = Args.hasArg(OPT_fpascal_strings); Opts.Microsoft = Args.hasArg(OPT_fms_extensions); + Opts.Borland = Args.hasArg(OPT_fborland_extensions); Opts.WritableStrings = Args.hasArg(OPT_fwritable_strings); Opts.ConstStrings = Args.hasArg(OPT_Wwrite_strings); if (Args.hasArg(OPT_fno_lax_vector_conversions)) diff --git a/test/SemaCXX/borland-extensions.cpp b/test/SemaCXX/borland-extensions.cpp new file mode 100644 index 0000000000..703222eb54 --- /dev/null +++ b/test/SemaCXX/borland-extensions.cpp @@ -0,0 +1,6 @@ +// RUN: %clang_cc1 %s -fsyntax-only -verify -fborland-extensions + +// Borland extensions + +// 1. test -fborland-extensions +int dummy_function() { return 0; }