This is an archive of the discontinued LLVM Phabricator instance.

Driver: consume -nostdinc++ along with -nostdinc
AbandonedPublic

Authored by kastiglione on Jun 30 2017, 2:17 PM.

Download Raw Diff

Details

Reviewers

compnerd
smeenai
rsmith

Summary

Using both -nostdinc and -nostdinc++ should not emit diagnostics.

Diff Detail

Build Status

Buildable 7868
Build 7868: arc lint + arc unit

Event Timeline

kastiglione created this revision.Jun 30 2017, 2:17 PM

There are other drivers with the same issue. If there's no opposition to this, I can update those here as well.

In D34909#797252, @kastiglione wrote:

There are other drivers with the same issue. If there's no opposition to this, I can update those here as well.

Yes, that'd be great, thanks :)

This revision is now accepted and ready to land.Jun 30 2017, 2:25 PM

kastiglione abandoned this revision.Jun 13 2018, 9:46 PM

Revision Contents

Path

Size

lib/

Driver/

ToolChains/

CrossWindows.cpp

3 lines

test/

Driver/

windows-cross.c

4 lines

Diff 104933

lib/Driver/ToolChains/CrossWindows.cpp

	Show First 20 Lines • Show All 258 Lines • ▼ Show 20 Lines
	}			}

	void CrossWindowsToolChain::			void CrossWindowsToolChain::
	AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,			AddClangCXXStdlibIncludeArgs(const llvm::opt::ArgList &DriverArgs,
	llvm::opt::ArgStringList &CC1Args) const {			llvm::opt::ArgStringList &CC1Args) const {
	const llvm::Triple &Triple = getTriple();			const llvm::Triple &Triple = getTriple();
	const std::string &SysRoot = getDriver().SysRoot;			const std::string &SysRoot = getDriver().SysRoot;

	if (DriverArgs.hasArg(options::OPT_nostdinc) \|\|			if (DriverArgs.hasArg(options::OPT_nostdinc, options::OPT_nostdincxx))
	DriverArgs.hasArg(options::OPT_nostdincxx))
	return;			return;

	switch (GetCXXStdlibType(DriverArgs)) {			switch (GetCXXStdlibType(DriverArgs)) {
	case ToolChain::CST_Libcxx:			case ToolChain::CST_Libcxx:
	addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include/c++/v1");			addSystemInclude(DriverArgs, CC1Args, SysRoot + "/usr/include/c++/v1");
	break;			break;

	case ToolChain::CST_Libstdcxx:			case ToolChain::CST_Libstdcxx:
	Show All 39 Lines

test/Driver/windows-cross.c

	Show First 20 Lines • Show All 79 Lines • ▼ Show 20 Lines
	// CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}um"			// CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}um"
	// CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}shared"			// CHECK-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}shared"

	// RUN: %clang -### -target armv7-windows-itanium -nostdinc -isystem-after "Windows Kits/10/Include/10.0.10586.0/ucrt" -c %s -o /dev/null 2>&1 \			// RUN: %clang -### -target armv7-windows-itanium -nostdinc -isystem-after "Windows Kits/10/Include/10.0.10586.0/ucrt" -c %s -o /dev/null 2>&1 \
	// RUN: \| FileCheck %s --check-prefix CHECK-NOSTDINC-ISYSTEM-AFTER			// RUN: \| FileCheck %s --check-prefix CHECK-NOSTDINC-ISYSTEM-AFTER
	// CHECK-NOSTDINC-ISYSTEM-AFTER: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"			// CHECK-NOSTDINC-ISYSTEM-AFTER: "-resource-dir" "[[RESOURCE_DIR:[^"]+]]"
	// CHECK-NOSTDINC-ISYSTEM-AFTER-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/\|\\\\)}}include"			// CHECK-NOSTDINC-ISYSTEM-AFTER-NOT: "-internal-isystem" "[[RESOURCE_DIR]]{{(/\|\\\\)}}include"
	// CHECK-NOSTDINC-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}ucrt"			// CHECK-NOSTDINC-ISYSTEM-AFTER: "-internal-isystem" "Windows Kits{{[/\\]}}10{{[/\\]}}Include{{[/\\]}}10.0.10586.0{{[/\\]}}ucrt"

				// RUN: %clang -### -target armv7-windows-itanium -nostdinc -nostdinc++ -x c++ -c %s -o /dev/null 2>&1 \
				// RUN: \| FileCheck %s --check-prefix CHECK-NOSTDINC-NOSTDINCXX
				// CHECK-NOSTDINC-NOSTDINCXX-NOT: argument unused during compilation: '-nostdinc++'