From 3bbc75302fd43cf13d868b46c94ff8794b302e43 Mon Sep 17 00:00:00 2001 From: Daniel Dunbar Date: Wed, 8 Apr 2009 18:03:55 +0000 Subject: More fixes to builtin preprocessor defines. - Add -static-define option driver can use when __STATIC__ should be defined (instead of __DYNAMIC__). - Don't set __OPTIMIZE_SIZE__ on Os, __OPTIMIZE_SIZE__ is tied to Oz. - Set __NO_INLINE__ following GCC 4.2. - Set __GNU_GNU_INLINE__ or __GNU_STDC_INLINE__ following GCC 4.2. - Set __EXCEPTIONS for Objective-C NonFragile ABI. - Set __STRICT_ANSI__ for standard conforming modes. - I added a clang style test case in utils for this, but its not particularly portable and I don't think it belongs in the test suite. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@68621 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Lex/Preprocessor.cpp | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'lib/Lex/Preprocessor.cpp') diff --git a/lib/Lex/Preprocessor.cpp b/lib/Lex/Preprocessor.cpp index d3d5b8c3fd..452a04ccb3 100644 --- a/lib/Lex/Preprocessor.cpp +++ b/lib/Lex/Preprocessor.cpp @@ -486,6 +486,10 @@ static void InitializePredefinedMacros(Preprocessor &PP, DefineBuiltinMacro(Buf, "__STDC_VERSION__=199901L"); else if (0) // STDC94 ? DefineBuiltinMacro(Buf, "__STDC_VERSION__=199409L"); + + // Standard conforming mode? + if (!PP.getLangOptions().GNUMode) + DefineBuiltinMacro(Buf, "__STRICT_ANSI__=1"); if (PP.getLangOptions().CPlusPlus0x) DefineBuiltinMacro(Buf, "__GXX_EXPERIMENTAL_CXX0X__"); @@ -500,6 +504,7 @@ static void InitializePredefinedMacros(Preprocessor &PP, if (PP.getLangOptions().ObjCNonFragileABI) { DefineBuiltinMacro(Buf, "__OBJC2__=1"); DefineBuiltinMacro(Buf, "OBJC_ZEROCOST_EXCEPTIONS=1"); + DefineBuiltinMacro(Buf, "__EXCEPTIONS=1"); } if (PP.getLangOptions().getGCMode() != LangOptions::NonGC) @@ -628,9 +633,20 @@ static void InitializePredefinedMacros(Preprocessor &PP, // Build configuration options. FIXME: these should be controlled by // command line options or something. - DefineBuiltinMacro(Buf, "__DYNAMIC__=1"); DefineBuiltinMacro(Buf, "__FINITE_MATH_ONLY__=0"); - DefineBuiltinMacro(Buf, "__NO_INLINE__=1"); + + if (PP.getLangOptions().Static) + DefineBuiltinMacro(Buf, "__STATIC__=1"); + else + DefineBuiltinMacro(Buf, "__DYNAMIC__=1"); + + if (PP.getLangOptions().GNUInline) + DefineBuiltinMacro(Buf, "__GNUC_GNU_INLINE__=1"); + else + DefineBuiltinMacro(Buf, "__GNUC_STDC_INLINE__=1"); + + if (PP.getLangOptions().NoInline) + DefineBuiltinMacro(Buf, "__NO_INLINE__=1"); if (unsigned PICLevel = PP.getLangOptions().PICLevel) { sprintf(MacroBuf, "__PIC__=%d", PICLevel); -- cgit v1.2.3-18-g5258