From 318ca7106d59c9851125b9b8979e2dff05b390d0 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Fri, 20 Mar 2009 15:55:34 +0000 Subject: [PATCH] pass langoptions around. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67376 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Basic/Targets.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp index 1b12b0a2f6..979b5fe21b 100644 --- a/lib/Basic/Targets.cpp +++ b/lib/Basic/Targets.cpp @@ -44,8 +44,8 @@ static void getSolarisDefines(std::vector &Defs) { Define(Defs, "__SOLARIS__"); } -static void getFreeBSDDefines(std::vector &Defs, bool is64Bit, - const char *Triple) { +static void getFreeBSDDefines(const LangOptions &Opts, bool is64Bit, + const char *Triple, std::vector &Defs) { // FreeBSD defines; list based off of gcc output const char *FreeBSD = strstr(Triple, "-freebsd"); @@ -65,7 +65,8 @@ static void getFreeBSDDefines(std::vector &Defs, bool is64Bit, } } -static void getDragonFlyDefines(std::vector &Defs) { +static void getDragonFlyDefines(const LangOptions &Opts, + std::vector &Defs) { // DragonFly defines; list based off of gcc output Define(Defs, "__DragonFly__"); Define(Defs, "__DragonFly_cc_version", "100001"); @@ -77,7 +78,7 @@ static void getDragonFlyDefines(std::vector &Defs) { Define(Defs, "__unix__"); } -static void getLinuxDefines(std::vector &Defs) { +static void getLinuxDefines(const LangOptions &Opts, std::vector &Defs) { // Linux defines; list based off of gcc output Define(Defs, "__unix__"); Define(Defs, "__unix"); @@ -658,7 +659,7 @@ public: virtual void getTargetDefines(const LangOptions &Opts, std::vector &Defines) const { X86_32TargetInfo::getTargetDefines(Opts, Defines); - getFreeBSDDefines(Defines, 0, getTargetTriple()); + getFreeBSDDefines(Opts, 0, getTargetTriple(), Defines); } }; } // end anonymous namespace @@ -675,7 +676,7 @@ public: virtual void getTargetDefines(const LangOptions &Opts, std::vector &Defines) const { X86_32TargetInfo::getTargetDefines(Opts, Defines); - getDragonFlyDefines(Defines); + getDragonFlyDefines(Opts, Defines); } }; } // end anonymous namespace @@ -693,7 +694,7 @@ public: virtual void getTargetDefines(const LangOptions &Opts, std::vector &Defines) const { X86_32TargetInfo::getTargetDefines(Opts, Defines); - getLinuxDefines(Defines); + getLinuxDefines(Opts, Defines); } }; } // end anonymous namespace @@ -763,7 +764,7 @@ public: virtual void getTargetDefines(const LangOptions &Opts, std::vector &Defines) const { X86_64TargetInfo::getTargetDefines(Opts, Defines); - getFreeBSDDefines(Defines, 1, getTargetTriple()); + getFreeBSDDefines(Opts, 1, getTargetTriple(), Defines); } }; } // end anonymous namespace @@ -778,7 +779,7 @@ public: virtual void getTargetDefines(const LangOptions &Opts, std::vector &Defines) const { X86_64TargetInfo::getTargetDefines(Opts, Defines); - getLinuxDefines(Defines); + getLinuxDefines(Opts, Defines); } }; } // end anonymous namespace -- 2.40.0