diff options
| author | Eli Friedman <eli.friedman@gmail.com> | 2009-06-04 23:00:29 +0000 |
|---|---|---|
| committer | Eli Friedman <eli.friedman@gmail.com> | 2009-06-04 23:00:29 +0000 |
| commit | fd4b1559dbf087a165d68596c94d82cbce8f8fc3 (patch) | |
| tree | dae3263fc0b5fc8ced1705cf61dc49cb649bec14 | |
| parent | d6ac8bec21b92c0e606f35ff4eedd5d5e02f3abb (diff) | |
| download | bcm5719-llvm-fd4b1559dbf087a165d68596c94d82cbce8f8fc3.tar.gz bcm5719-llvm-fd4b1559dbf087a165d68596c94d82cbce8f8fc3.zip | |
Move a couple Darwin-specific defines into getDarwinDefines.
llvm-svn: 72900
| -rw-r--r-- | clang/lib/Basic/Targets.cpp | 5 | ||||
| -rw-r--r-- | clang/lib/Frontend/InitPreprocessor.cpp | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index 4b94bcfc432..9e4f29ea9d7 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -182,6 +182,11 @@ static void getDarwinDefines(std::vector<char> &Defs, const LangOptions &Opts) { Define(Defs, "__strong", ""); else Define(Defs, "__strong", "__attribute__((objc_gc(strong)))"); + + if (Opts.Static) + Define(Defs, "__STATIC__"); + else + Define(Defs, "__DYNAMIC__"); } static void getDarwinOSXDefines(std::vector<char> &Defs, const char *Triple) { diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp index 890eb0fef55..64c81b8e373 100644 --- a/clang/lib/Frontend/InitPreprocessor.cpp +++ b/clang/lib/Frontend/InitPreprocessor.cpp @@ -403,11 +403,6 @@ static void InitializePredefinedMacros(const TargetInfo &TI, // command line options or something. DefineBuiltinMacro(Buf, "__FINITE_MATH_ONLY__=0"); - if (LangOpts.Static) - DefineBuiltinMacro(Buf, "__STATIC__=1"); - else - DefineBuiltinMacro(Buf, "__DYNAMIC__=1"); - if (LangOpts.GNUInline) DefineBuiltinMacro(Buf, "__GNUC_GNU_INLINE__=1"); else |
