diff --git a/src/_manifest.lua b/src/_manifest.lua
index b700564d..ff8236e8 100644
--- a/src/_manifest.lua
+++ b/src/_manifest.lua
@@ -29,6 +29,7 @@
 		"base/profiler.lua",
 		"tools/dotnet.lua",
 		"tools/gcc.lua",
+		"tools/clang.lua",
 		"tools/ghs.lua",
 		"tools/msc.lua",
 		"tools/ow.lua",
diff --git a/src/actions/cmake/_cmake.lua b/src/actions/cmake/_cmake.lua
index 9620c63b..bc7f18d8 100644
--- a/src/actions/cmake/_cmake.lua
+++ b/src/actions/cmake/_cmake.lua
@@ -17,7 +17,7 @@ newaction {
 	valid_kinds     = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
 	valid_languages = { "C", "C++" },
 	valid_tools     = {
-		cc   = { "gcc" },
+		cc   = { "gcc", "clang" },
 	},
 	onsolution = function(sln)
 		premake.generate(sln, "CMakeLists.txt", premake.cmake.workspace)
diff --git a/src/actions/example/_example.lua b/src/actions/example/_example.lua
index d6a0c17b..7e26d234 100644
--- a/src/actions/example/_example.lua
+++ b/src/actions/example/_example.lua
@@ -38,7 +38,7 @@
 		-- is specified with the /cc and /dotnet command-line options. You can find
 		-- the tool interfaces at src/tools.
 		valid_tools     = {
-			cc     = { "msc", "gcc", "ow" },
+			cc     = { "msc", "gcc", "clang", "ow" },
 			dotnet = { "mono", "msnet", "pnet" },
 		},
 
diff --git a/src/actions/jcdb/_jcdb.lua b/src/actions/jcdb/_jcdb.lua
index 14a9eadb..47256732 100644
--- a/src/actions/jcdb/_jcdb.lua
+++ b/src/actions/jcdb/_jcdb.lua
@@ -11,7 +11,7 @@ newaction {
 
 	valid_kinds = { "ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle" },
 	valid_languages = { "C", "C++" },
-	valid_tools = { cc = { "gcc" } },
+	valid_tools = { cc = { "gcc", "clang" } },
 
 	onsolution = function(sln)
 		local jsonpath = path.join(sln.location, "compile_commands.json")
diff --git a/src/actions/make/_make.lua b/src/actions/make/_make.lua
index 0f1a4b60..6c9a2352 100644
--- a/src/actions/make/_make.lua
+++ b/src/actions/make/_make.lua
@@ -157,7 +157,7 @@
 		valid_languages = { "C", "C++", "C#", "Vala", "Swift" },
 
 		valid_tools     = {
-			cc     = { "gcc", "ghs" },
+			cc     = { "gcc", "clang", "ghs" },
 			dotnet = { "mono", "msnet", "pnet" },
 			valac  = { "valac" },
 			swift  = { "swift" },
diff --git a/src/actions/ninja/_ninja.lua b/src/actions/ninja/_ninja.lua
index d2fea225..0d18a501 100644
--- a/src/actions/ninja/_ninja.lua
+++ b/src/actions/ninja/_ninja.lua
@@ -19,7 +19,7 @@ newaction
 	valid_kinds     = {"ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle"},
 	valid_languages = {"C", "C++", "Swift"},
 	valid_tools     = {
-		cc    = { "gcc" },
+		cc    = { "gcc", "clang" },
 		swift = { "swift" },
 	},
 
diff --git a/src/actions/qbs/_qbs.lua b/src/actions/qbs/_qbs.lua
index 8f1ba4b5..165aea2f 100644
--- a/src/actions/qbs/_qbs.lua
+++ b/src/actions/qbs/_qbs.lua
@@ -19,7 +19,7 @@ newaction
 	valid_kinds     = {"ConsoleApp", "WindowedApp", "StaticLib", "SharedLib", "Bundle"},
 	valid_languages = {"C", "C++"},
 	valid_tools     = {
-		cc = { "gcc", "msc" },
+		cc = { "gcc", "clang", "msc" },
 	},
 
 	-- Solution and project generation logic
diff --git a/src/actions/xcode/xcode10.lua b/src/actions/xcode/xcode10.lua
index f8ae0b42..bbf3d427 100644
--- a/src/actions/xcode/xcode10.lua
+++ b/src/actions/xcode/xcode10.lua
@@ -78,7 +78,7 @@
 		valid_languages = { "C", "C++" },
 
 		valid_tools     = {
-			cc     = { "gcc" },
+			cc     = { "gcc", "clang" },
 		},
 
 		valid_platforms = {
diff --git a/src/actions/xcode/xcode8.lua b/src/actions/xcode/xcode8.lua
index 5a658c99..41ed11fc 100644
--- a/src/actions/xcode/xcode8.lua
+++ b/src/actions/xcode/xcode8.lua
@@ -324,7 +324,7 @@
 		valid_languages = { "C", "C++" },
 
 		valid_tools     = {
-			cc     = { "gcc" },
+			cc     = { "gcc", "clang" },
 		},
 
 		valid_platforms = {
diff --git a/src/actions/xcode/xcode9.lua b/src/actions/xcode/xcode9.lua
index aa70275b..b8961f8f 100644
--- a/src/actions/xcode/xcode9.lua
+++ b/src/actions/xcode/xcode9.lua
@@ -69,7 +69,7 @@
 		valid_languages = { "C", "C++" },
 
 		valid_tools     = {
-			cc     = { "gcc" },
+			cc     = { "gcc", "clang" },
 		},
 
 		valid_platforms = {
diff --git a/src/base/cmdline.lua b/src/base/cmdline.lua
index c3357b70..5e30ec8c 100644
--- a/src/base/cmdline.lua
+++ b/src/base/cmdline.lua
@@ -15,9 +15,10 @@
 		value       = "VALUE",
 		description = "Choose a C/C++ compiler set",
 		allowed = {
-			{ "gcc", "GNU GCC (gcc/g++)" },
-			{ "ow",  "OpenWatcom"        },
-			{ "ghs", "Green Hills Software" },
+			{ "gcc",   "GNU GCC (gcc/g++)" },
+			{ "clang", "LLVM Clang (clang/clang++)" },
+			{ "ow",    "OpenWatcom"        },
+			{ "ghs",   "Green Hills Software" },
 		}
 	}
 
diff --git a/src/tools/clang.lua b/src/tools/clang.lua
new file mode 100644
index 00000000..8a0161a9
--- /dev/null
+++ b/src/tools/clang.lua
@@ -0,0 +1,384 @@
+--
+-- gcc.lua
+-- Provides GCC-specific configuration strings.
+-- Copyright (c) 2002-2011 Jason Perkins and the Premake project
+--
+
+
+	premake.clang = { }
+
+
+--
+-- Set default tools
+--
+
+	premake.clang.cc     = "clang"
+	premake.clang.cxx    = "clang++"
+	premake.clang.ar     = "ar"
+	premake.clang.rc     = "windres"
+	premake.clang.llvm   = false
+
+
+--
+-- Translation of Premake flags into GCC flags
+--
+
+	local cflags =
+	{
+		EnableSSE        = "-msse",
+		EnableSSE2       = "-msse2",
+		EnableAVX        = "-mavx",
+		EnableAVX2       = "-mavx2",
+		PedanticWarnings = "-Wall -Wextra -pedantic",
+		ExtraWarnings    = "-Wall -Wextra",
+		FatalWarnings    = "-Werror",
+		FloatFast        = "-ffast-math",
+		FloatStrict      = "-ffloat-store",
+		NoFramePointer   = "-fomit-frame-pointer",
+		Optimize         = "-O2",
+		OptimizeSize     = "-Os",
+		OptimizeSpeed    = "-O3",
+		Symbols          = "-g",
+	}
+
+	local cxxflags =
+	{
+		Cpp11        = "-std=c++11",
+		Cpp14        = "-std=c++14",
+		Cpp17        = "-std=c++17",
+		CppLatest    = "-std=c++2a",
+		NoExceptions = "-fno-exceptions",
+		NoRTTI       = "-fno-rtti",
+		UnsignedChar = "-funsigned-char",
+	}
+
+	local objcflags =
+	{
+		ObjcARC = "-fobjc-arc",
+	}
+
+--
+-- Map platforms to flags
+--
+
+	premake.clang.platforms =
+	{
+		Native = {
+			cppflags = "-MMD -MP",
+		},
+		x32 = {
+			cppflags = "-MMD -MP",
+			flags    = "-m32",
+		},
+		x64 = {
+			cppflags = "-MMD -MP",
+			flags    = "-m64",
+		},
+		Universal = {
+			ar       = "libtool",
+			cppflags = "-MMD -MP",
+			flags    = "-arch i386 -arch x86_64 -arch ppc -arch ppc64",
+		},
+		Universal32 = {
+			ar       = "libtool",
+			cppflags = "-MMD -MP",
+			flags    = "-arch i386 -arch ppc",
+		},
+		Universal64 = {
+			ar       = "libtool",
+			cppflags = "-MMD -MP",
+			flags    = "-arch x86_64 -arch ppc64",
+		},
+		PS3 = {
+			cc         = "ppu-lv2-g++",
+			cxx        = "ppu-lv2-g++",
+			ar         = "ppu-lv2-ar",
+			cppflags   = "-MMD -MP",
+		},
+		WiiDev = {
+			cppflags    = "-MMD -MP -I$(LIBOGC_INC) $(MACHDEP)",
+			ldflags		= "-L$(LIBOGC_LIB) $(MACHDEP)",
+			cfgsettings = [[
+  ifeq ($(strip $(DEVKITPPC)),)
+    $(error "DEVKITPPC environment variable is not set")'
+  endif
+  include $(DEVKITPPC)/wii_rules']],
+		},
+		Orbis = {
+			cc         = "orbis-clang",
+			cxx        = "orbis-clang++",
+			ar         = "orbis-ar",
+			cppflags   = "-MMD -MP",
+		},
+		Emscripten = {
+			cc         = "$(EMSCRIPTEN)/emcc",
+			cxx        = "$(EMSCRIPTEN)/em++",
+			ar         = "$(EMSCRIPTEN)/emar",
+			cppflags   = "-MMD -MP",
+		}
+	}
+
+	local platforms = premake.clang.platforms
+
+
+--
+-- Returns a list of compiler flags, based on the supplied configuration.
+--
+
+	function premake.clang.getcppflags(cfg)
+		local flags = { }
+		table.insert(flags, platforms[cfg.platform].cppflags)
+
+		-- We want the -MP flag for dependency generation (creates phony rules
+		-- for headers, prevents make errors if file is later deleted)
+		if flags[1]:startswith("-MMD") then
+			table.insert(flags, "-MP")
+		end
+
+		return flags
+	end
+
+
+	function premake.clang.getcflags(cfg)
+		local result = table.translate(cfg.flags, cflags)
+		table.insert(result, platforms[cfg.platform].flags)
+		if cfg.system ~= "windows" and cfg.kind == "SharedLib" then
+			table.insert(result, "-fPIC")
+		end
+		return result
+	end
+
+
+	function premake.clang.getcxxflags(cfg)
+		local result = table.translate(cfg.flags, cxxflags)
+		return result
+	end
+
+
+	function premake.clang.getobjcflags(cfg)
+		return table.translate(cfg.flags, objcflags)
+	end
+
+
+--
+-- Returns a list of linker flags, based on the supplied configuration.
+--
+
+	function premake.clang.getldflags(cfg)
+		local result = { }
+
+		-- OS X has a bug, see http://lists.apple.com/archives/Darwin-dev/2006/Sep/msg00084.html
+		if not cfg.flags.Symbols then
+			if cfg.system == "macosx" then
+-- Issue#80
+-- https://github.com/bkaradzic/genie/issues/80#issuecomment-100664007
+--				table.insert(result, "-Wl,-x")
+			else
+				table.insert(result, "-s")
+			end
+		end
+
+		if cfg.kind == "Bundle" then
+			table.insert(result, "-bundle")
+		end
+
+		if cfg.kind == "SharedLib" then
+			if cfg.system == "macosx" then
+				table.insert(result, "-dynamiclib")
+			else
+				table.insert(result, "-shared")
+			end
+
+			if cfg.system == "windows" and not cfg.flags.NoImportLib then
+				table.insert(result, '-Wl,--out-implib="' .. cfg.linktarget.fullpath .. '"')
+			end
+		end
+
+		if cfg.kind == "WindowedApp" and cfg.system == "windows" then
+			table.insert(result, "-mwindows")
+		end
+
+		local platform = platforms[cfg.platform]
+		table.insert(result, platform.flags)
+		table.insert(result, platform.ldflags)
+
+		return result
+	end
+
+
+--
+-- Return a list of library search paths. Technically part of LDFLAGS but need to
+-- be separated because of the way Visual Studio calls GCC for the PS3. See bug
+-- #1729227 for background on why library paths must be split.
+--
+
+	function premake.clang.getlibdirflags(cfg)
+		local result = { }
+		for _, value in ipairs(premake.getlinks(cfg, "all", "directory")) do
+			table.insert(result, '-L\"' .. value .. '\"')
+		end
+		return result
+	end
+
+--
+-- Given a path, return true if it's considered a real path
+-- to a library file, false otherwise.
+--  p: path
+--
+	function premake.clang.islibfile(p)
+		if path.getextension(p) == ".a" then
+			return true
+		end
+		return false
+	end
+
+--
+-- Returns a list of project-relative paths to external library files.
+-- This function examines the linker flags and returns any that seem to be
+-- a real path to a library file (e.g. "path/to/a/library.a", but not "GL").
+-- Useful for adding to targets to trigger a relink when an external static
+-- library gets updated.
+--  cfg: configuration
+--
+	function premake.clang.getlibfiles(cfg)
+		local result = {}
+		for _, value in ipairs(premake.getlinks(cfg, "system", "fullpath")) do
+			if premake.clang.islibfile(value) then
+				table.insert(result, _MAKE.esc(value))
+			end
+		end
+		return result
+	end
+
+--
+-- This is poorly named: returns a list of linker flags for external
+-- (i.e. system, or non-sibling) libraries. See bug #1729227 for
+-- background on why the path must be split.
+--
+
+	function premake.clang.getlinkflags(cfg)
+		local result = {}
+		for _, value in ipairs(premake.getlinks(cfg, "system", "fullpath")) do
+			if premake.clang.islibfile(value) then
+				value = path.rebase(value, cfg.project.location, cfg.location)
+				table.insert(result, _MAKE.esc(value))
+			elseif path.getextension(value) == ".framework" then
+				table.insert(result, '-framework ' .. _MAKE.esc(path.getbasename(value)))
+			else
+				table.insert(result, '-l' .. _MAKE.esc(path.getname(value)))
+			end
+		end
+		return result
+	end
+
+--
+-- Get the arguments for whole-archive linking.
+--
+
+	function premake.clang.wholearchive(lib)
+		if premake.clang.llvm then
+			return {"-force_load", lib}
+		elseif os.get() == "macosx" then
+			return {"-Wl,-force_load", lib}
+		else
+			return {"-Wl,--whole-archive", lib, "-Wl,--no-whole-archive"}
+		end
+	end
+
+--
+-- Get flags for passing to AR before the target is appended to the commandline
+--  prj: project
+--  cfg: configuration
+--  ndx: true if the final step of a split archive
+--
+
+	function premake.clang.getarchiveflags(prj, cfg, ndx)
+		local result = {}
+		if cfg.platform:startswith("Universal") then
+				if prj.options.ArchiveSplit then
+					error("gcc tool 'Universal*' platforms do not support split archives")
+				end
+				table.insert(result, '-o')
+		else
+			if (not prj.options.ArchiveSplit) then
+				if premake.clang.llvm then
+					table.insert(result, 'rcs')
+				else
+					table.insert(result, '-rcs')
+				end
+			else
+				if premake.clang.llvm then
+					if (not ndx) then
+						table.insert(result, 'qc')
+					else
+						table.insert(result, 'cs')
+					end
+				else
+					if (not ndx) then
+						table.insert(result, '-qc')
+					else
+						table.insert(result, '-cs')
+					end
+				end
+			end
+		end
+		return result
+	end
+
+
+--
+-- Decorate defines for the GCC command line.
+--
+
+	function premake.clang.getdefines(defines)
+		local result = { }
+		for _,def in ipairs(defines) do
+			table.insert(result, "-D" .. def)
+		end
+		return result
+	end
+
+--
+-- Decorate include file search paths for the GCC command line.
+--
+
+	function premake.clang.getincludedirs(includedirs)
+		local result = { }
+		for _,dir in ipairs(includedirs) do
+			table.insert(result, "-I\"" .. dir .. "\"")
+		end
+		return result
+	end
+
+--
+-- Decorate user include file search paths for the GCC command line.
+--
+
+	function premake.clang.getquoteincludedirs(includedirs)
+		local result = { }
+		for _,dir in ipairs(includedirs) do
+			table.insert(result, "-iquote \"" .. dir .. "\"")
+		end
+		return result
+	end
+
+--
+-- Decorate system include file search paths for the GCC command line.
+--
+
+	function premake.clang.getsystemincludedirs(includedirs)
+		local result = { }
+		for _,dir in ipairs(includedirs) do
+			table.insert(result, "-isystem \"" .. dir .. "\"")
+		end
+		return result
+	end
+
+--
+-- Return platform specific project and configuration level
+-- makesettings blocks.
+--
+
+	function premake.clang.getcfgsettings(cfg)
+		return platforms[cfg.platform].cfgsettings
+	end