commit 47972afd102f557553d7c6555240bd80982afdd1
author Richard Smith <richard-llvm@metafoo.co.uk> Tue Jun 16 00:08:24 2015 +0000
committer Richard Smith <richard-llvm@metafoo.co.uk> Tue Jun 16 00:08:24 2015 +0000
tree 0bed0c1be68a6498c9b574dd7fe883aa450bda66
parent 345c1449c821a815d23f874d7cb9890003ce2cc1

[modules] Simplify -cc1 interface for enabling implicit module maps.

We used to have a flag to enable module maps, and two more flags to enable
implicit module maps. This is all redundant; we don't need any flag for
enabling module maps in the abstract, and we don't usually have -fno- flags for
-cc1. We now have just a single flag, -fimplicit-module-maps, that enables
implicitly searching the file system for module map files and loading them.

The driver interface is unchanged for now. We should probably rename
-fmodule-maps to -fimplicit-module-maps at some point.

llvm-svn: 239789

clang/test/Modules/macro-ambiguity.cpp

diff --git a/clang/test/Modules/macro-ambiguity.cpp b/clang/test/Modules/macro-ambiguity.cpp
index af43b35..747a80b 100644
--- a/clang/test/Modules/macro-ambiguity.cpp
+++ b/clang/test/Modules/macro-ambiguity.cpp
@@ -5,7 +5,7 @@
 // RUN:   -v \
 // RUN:   -iquote Inputs/macro-ambiguity/a/quote \
 // RUN:   -isystem Inputs/macro-ambiguity/a/system \
-// RUN:   -fno-implicit-modules -fno-modules-implicit-maps \
+// RUN:   -fno-implicit-modules \
 // RUN:   -fmodule-map-file-home-is-cwd \
 // RUN:   -emit-module -fmodule-name=a -o %t/a.pcm \
 // RUN:   Inputs/macro-ambiguity/module.modulemap
@@ -14,7 +14,7 @@
 // RUN:   -v \
 // RUN:   -iquote Inputs/macro-ambiguity/b/quote \
 // RUN:   -isystem Inputs/macro-ambiguity/b/system \
-// RUN:   -fno-implicit-modules -fno-modules-implicit-maps \
+// RUN:   -fno-implicit-modules \
 // RUN:   -fmodule-map-file-home-is-cwd \
 // RUN:   -emit-module -fmodule-name=b -o %t/b.pcm \
 // RUN:   Inputs/macro-ambiguity/module.modulemap
@@ -23,7 +23,7 @@
 // RUN:   -v \
 // RUN:   -iquote Inputs/macro-ambiguity/c/quote \
 // RUN:   -isystem Inputs/macro-ambiguity/c/system \
-// RUN:   -fno-implicit-modules -fno-modules-implicit-maps \
+// RUN:   -fno-implicit-modules \
 // RUN:   -fmodule-map-file-home-is-cwd \
 // RUN:   -emit-module -fmodule-name=c -o %t/c.pcm \
 // RUN:   Inputs/macro-ambiguity/module.modulemap
@@ -32,7 +32,7 @@
 // RUN:   -v \
 // RUN:   -iquote Inputs/macro-ambiguity/d/quote \
 // RUN:   -isystem Inputs/macro-ambiguity/d/system \
-// RUN:   -fno-implicit-modules -fno-modules-implicit-maps \
+// RUN:   -fno-implicit-modules \
 // RUN:   -fmodule-map-file-home-is-cwd \
 // RUN:   -emit-module -fmodule-name=d -o %t/d.pcm \
 // RUN:   Inputs/macro-ambiguity/module.modulemap
@@ -49,7 +49,7 @@
 // RUN:   -isystem Inputs/macro-ambiguity/d/system \
 // RUN:   -iquote Inputs/macro-ambiguity/e/quote \
 // RUN:   -isystem Inputs/macro-ambiguity/e/system \
-// RUN:   -fno-implicit-modules -fno-modules-implicit-maps \
+// RUN:   -fno-implicit-modules \
 // RUN:   -fmodule-map-file-home-is-cwd \
 // RUN:   -fmodule-map-file=Inputs/macro-ambiguity/module.modulemap \
 // RUN:   -fmodule-file=%t/a.pcm \
@@ -70,7 +70,7 @@
 // RUN:   -isystem Inputs/macro-ambiguity/d/system \
 // RUN:   -iquote Inputs/macro-ambiguity/e/quote \
 // RUN:   -isystem Inputs/macro-ambiguity/e/system \
-// RUN:   -fno-implicit-modules -fno-modules-implicit-maps \
+// RUN:   -fno-implicit-modules \
 // RUN:   -fmodule-map-file-home-is-cwd \
 // RUN:   -fmodule-map-file=Inputs/macro-ambiguity/module.modulemap \
 // RUN:   -fmodule-file=%t/a.pcm \