From f5b72f62c0f012d9ba6a3ad4fcbcbed2ab5dd047 Mon Sep 17 00:00:00 2001 From: Sam Clegg Date: Mon, 18 Mar 2019 20:04:34 +0000 Subject: [PATCH] Restore comment regarding why Reloc::PIC_ can't be PIC The original change back in rL29307 explained this but it was lost somewhere along the way. Differential Revision: https://reviews.llvm.org/D59445 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@356402 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/Support/CodeGen.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/llvm/Support/CodeGen.h b/include/llvm/Support/CodeGen.h index 3175b29a4dd..a3f423e558c 100644 --- a/include/llvm/Support/CodeGen.h +++ b/include/llvm/Support/CodeGen.h @@ -18,13 +18,14 @@ namespace llvm { // Relocation model types. namespace Reloc { - enum Model { Static, PIC_, DynamicNoPIC, ROPI, RWPI, ROPI_RWPI }; + // Cannot be named PIC due to collision with -DPIC + enum Model { Static, PIC_, DynamicNoPIC, ROPI, RWPI, ROPI_RWPI }; } // Code model types. namespace CodeModel { // Sync changes with CodeGenCWrappers.h. - enum Model { Tiny, Small, Kernel, Medium, Large }; + enum Model { Tiny, Small, Kernel, Medium, Large }; } namespace PICLevel { -- 2.11.4.GIT