svn commit: r264464 - in stable: 10 10/contrib/llvm/tools/clang/lib/Driver 9 9/contrib/llvm/tools/clang/lib/Driver

[Dimitry Andric]

Author: dim
Date: Mon Apr 14 17:54:01 2014
New Revision: 264464
URL: http://svnweb.freebsd.org/changeset/base/264464

Log:
  MFC r264345:
  
  Amend r263891, by making clang default to DWARF2 debug info format for
  all FreeBSD versions, not just 10.x and earlier.  Apparently too many
  people seem to have trouble with post-1993 formats.
  
  Also remove the related notes about messing with kernel configuration
  files from UPDATING, which are now superfluous.
  
  Requested by:	many

Modified:
  stable/10/UPDATING
  stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Directory Properties:
  stable/10/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/9/UPDATING   (contents, props changed)
  stable/9/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
Directory Properties:
  stable/9/contrib/llvm/   (props changed)
  stable/9/contrib/llvm/tools/clang/   (props changed)

Modified: stable/10/UPDATING
==============================================================================
--- stable/10/UPDATING	Mon Apr 14 16:55:09 2014	(r264463)
+++ stable/10/UPDATING	Mon Apr 14 17:54:01 2014	(r264464)
@@ -16,18 +16,8 @@ from older versions of FreeBSD, try WITH
 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

Modified: stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp
==============================================================================
--- stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Mon Apr 14 16:55:09 2014	(r264463)
+++ stable/10/contrib/llvm/tools/clang/lib/Driver/Tools.cpp	Mon Apr 14 17:54:01 2014	(r264464)
@@ -2628,10 +2628,9 @@ void Clang::ConstructJob(Compilation &C,
       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");