summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--UPDATING12
-rw-r--r--contrib/llvm/tools/clang/lib/Driver/Tools.cpp5
2 files changed, 3 insertions, 14 deletions
diff --git a/UPDATING b/UPDATING
index 1438e86..bb8fd7d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,18 +16,8 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
stable/10, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
-
20140321:
- Clang and llvm have been upgraded to 3.4 release. Please note that
- clang 3.4 now defaults to DWARF4 debug information format when you
- specify -g. Since kgdb(1) only supports DWARF2, you should update any
- customized kernel configurations which include debug information to
- explicitly use -gdwarf-2, e.g:
-
- makeoptions DEBUG=-gdwarf-2
-
- This has already been applied to the appropriate GENERIC configuration
- files, so if you inherit from those, no changes are required.
+ Clang and llvm have been upgraded to 3.4 release.
20140306:
If a Makefile in a tests/ directory was auto-generating a Kyuafile
diff --git a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
index e5d6ec2..9576542 100644
--- a/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
+++ b/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
@@ -2628,10 +2628,9 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
CmdArgs.push_back("-gdwarf-4");
else if (!A->getOption().matches(options::OPT_g0) &&
!A->getOption().matches(options::OPT_ggdb0)) {
- // Default is dwarf-2 for darwin and FreeBSD <= 10.
+ // Default is dwarf-2 for darwin and FreeBSD.
const llvm::Triple &Triple = getToolChain().getTriple();
- if (Triple.isOSDarwin() || (Triple.getOS() == llvm::Triple::FreeBSD &&
- Triple.getOSMajorVersion() <= 10))
+ if (Triple.isOSDarwin() || Triple.getOS() == llvm::Triple::FreeBSD)
CmdArgs.push_back("-gdwarf-2");
else
CmdArgs.push_back("-g");
OpenPOWER on IntegriCloud