Implement support for the -undef command line option, patch by

Roman Divacky! PR5363

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@85932 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Frontend/InitPreprocessor.h b/include/clang/Frontend/InitPreprocessor.h
index eb03602dc57b6e94e335ae11b17ef14a60e8626f..b29ee2728a8698551e1eca7b029f54e2f3b061a1 100644 (file)
--- a/include/clang/Frontend/InitPreprocessor.h
+++ b/include/clang/Frontend/InitPreprocessor.h
@@ -63,7 +63,8 @@ public:
 /// environment ready to process a single file. This returns true on error.
 ///
 bool InitializePreprocessor(Preprocessor &PP,
-                            const PreprocessorInitOptions& InitOptions);
+                            const PreprocessorInitOptions& InitOptions,
+                            bool undef_macros);
 
 } // end namespace clang
 

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 47234ef649255ffc326f0d8b60dfe093361aade0..521c90dc31e5c152d2c6f12dcfe46d12594cc24e 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -1015,6 +1015,8 @@ void Clang::ConstructJob(Compilation &C, const JobAction &JA,
       II.getInputArg().renderAsInput(Args, CmdArgs);
   }
 
+  Args.AddAllArgs(CmdArgs, options::OPT_undef);
+
   const char *Exec =
     Args.MakeArgString(getToolChain().GetProgramPath(C, "clang-cc"));
   Dest.addCommand(new Command(JA, Exec, CmdArgs));

diff --git a/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp
index 2719fbb456c0497308a1ea4dd893f3365bdaedea..ec5c1061bb938cc46153012f4777059ffcf0863d 100644 (file)
--- a/lib/Frontend/InitPreprocessor.cpp
+++ b/lib/Frontend/InitPreprocessor.cpp
@@ -443,7 +443,8 @@ static void InitializePredefinedMacros(const TargetInfo &TI,
 /// environment ready to process a single file. This returns true on error.
 ///
 bool clang::InitializePreprocessor(Preprocessor &PP,
-                                   const PreprocessorInitOptions &InitOpts) {
+                                   const PreprocessorInitOptions &InitOpts,
+                                   bool undef_macros) {
   std::vector<char> PredefineBuffer;
 
   const char *LineDirective = "# 1 \"<built-in>\" 3\n";
@@ -451,8 +452,9 @@ bool clang::InitializePreprocessor(Preprocessor &PP,
                          LineDirective, LineDirective+strlen(LineDirective));
 
   // Install things like __POWERPC__, __GNUC__, etc into the macro table.
-  InitializePredefinedMacros(PP.getTargetInfo(), PP.getLangOptions(),
-                             PredefineBuffer);
+  if (!undef_macros)
+    InitializePredefinedMacros(PP.getTargetInfo(), PP.getLangOptions(),
+                               PredefineBuffer);
 
   // Add on the predefines from the driver.  Wrap in a #line directive to report
   // that they come from the command line.

diff --git a/test/Preprocessor/macro_undef.c b/test/Preprocessor/macro_undef.c
new file mode 100644 (file)
index 0000000..4507cdd
--- /dev/null
+++ b/test/Preprocessor/macro_undef.c
@@ -0,0 +1,4 @@
+// RUN: clang-cc -dM -undef -Dfoo=1 -E %s | FileCheck %s
+
+// CHECK-NOT: #define __clang__
+// CHECK: #define foo 1

diff --git a/tools/clang-cc/clang-cc.cpp b/tools/clang-cc/clang-cc.cpp
index 5840f5f9900ba0c84f043e8cc98b01fee083749b..71e546980007fec4b38117f0a4d50c54441f3c72 100644 (file)
--- a/tools/clang-cc/clang-cc.cpp
+++ b/tools/clang-cc/clang-cc.cpp
@@ -932,6 +932,9 @@ static bool InitializeSourceManager(Preprocessor &PP,
 //   -A...    - Play with #assertions
 //   -undef   - Undefine all predefined macros
 
+static llvm::cl::opt<bool>
+undef_macros("undef", llvm::cl::value_desc("macro"), llvm::cl::desc("undef all system defines"));
+
 static llvm::cl::list<std::string>
 D_macros("D", llvm::cl::value_desc("macro"), llvm::cl::Prefix,
        llvm::cl::desc("Predefine the specified macro"));
@@ -1243,7 +1246,7 @@ public:
 
     PreprocessorInitOptions InitOpts;
     InitializePreprocessorInitOptions(InitOpts);
-    if (InitializePreprocessor(*PP, InitOpts))
+    if (InitializePreprocessor(*PP, InitOpts, undef_macros))
       return 0;
 
     return PP.take();