[mips] Revert r309942 & r309940

This reverts commit r309942 & commit r309940.

A revert was requested following post commit review.

llvm-svn: 309978

diff --git a/clang/include/clang/Driver/Options.td b/clang/include/clang/Driver/Options.td
index a330873..571d52f 100644 (file)
--- a/clang/include/clang/Driver/Options.td
+++ b/clang/include/clang/Driver/Options.td
@@ -2057,14 +2057,6 @@ def membedded_data : Flag<["-"], "membedded-data">, Group<m_Group>,
 def mno_embedded_data : Flag<["-"], "mno-embedded-data">, Group<m_Group>,
   HelpText<"Do not place constants in the .rodata section instead of the "
            ".sdata if they meet the -G <size> threshold (MIPS)">;
-def muninit_const_in_rodata : Flag<["-"], "muninit-const-in-rodata">,
-  Group<m_Group>, Flags<[DriverOption,CC1Option]>, HelpText<"Place "
-  "uninitialized constants in the read-only data section instead of"
-  " the common section (MIPS)">;
-def mno_uninit_const_in_rodata : Flag<["-"], "mno-uninit-const-in-rodata">,
-  Group<m_Group>, HelpText<"Do not place uninitialized constants in the "
-                           "read-only data section instead of the common"
-                           " section (MIPS)">;
 def mnan_EQ : Joined<["-"], "mnan=">, Group<m_Group>;
 def mabicalls : Flag<["-"], "mabicalls">, Group<m_Group>,
   HelpText<"Enable SVR4-style position-independent code (Mips only)">;

diff --git a/clang/include/clang/Frontend/CodeGenOptions.def b/clang/include/clang/Frontend/CodeGenOptions.def
index a5a2601..ec40ca1 100644 (file)
--- a/clang/include/clang/Frontend/CodeGenOptions.def
+++ b/clang/include/clang/Frontend/CodeGenOptions.def
@@ -101,8 +101,6 @@ CODEGENOPT(MergeAllConstants , 1, 1) ///< Merge identical constants.
 CODEGENOPT(MergeFunctions    , 1, 0) ///< Set when -fmerge-functions is enabled.
 CODEGENOPT(MSVolatile        , 1, 0) ///< Set when /volatile:ms is enabled.
 CODEGENOPT(NoCommon          , 1, 0) ///< Set when -fno-common or C++ is enabled.
-CODEGENOPT(UInitCstDataInROData, 1, 0) ///< Set when -mgpopt & -membedded-data
-                                       ///< & -muinit-const-in-rodata is set
 CODEGENOPT(NoDwarfDirectoryAsm , 1, 0) ///< Set when -fno-dwarf-directory-asm is
                                        ///< enabled.
 CODEGENOPT(NoExecStack       , 1, 0) ///< Set when -Wa,--noexecstack is enabled.

diff --git a/clang/lib/CodeGen/TargetInfo.cpp b/clang/lib/CodeGen/TargetInfo.cpp
index 473b312..1234143 100644 (file)
--- a/clang/lib/CodeGen/TargetInfo.cpp
+++ b/clang/lib/CodeGen/TargetInfo.cpp
@@ -6656,20 +6656,6 @@ public:
   void setTargetAttributes(const Decl *D, llvm::GlobalValue *GV,
                            CodeGen::CodeGenModule &CGM,
                            ForDefinition_t IsForDefinition) const override {
-
-    if (const VarDecl *VD = dyn_cast_or_null<VarDecl>(D)) {
-      if (CGM.getCodeGenOpts().UInitCstDataInROData &&
-          VD->getType().isConstQualified() && !VD->hasInit()) {
-        llvm::GlobalVariable *GVar = dyn_cast_or_null<llvm::GlobalVariable>(GV);
-        if (GVar && !GVar->hasSection()) {
-          GVar->setLinkage(llvm::GlobalValue::ExternalLinkage);
-          GVar->setSection("rodata");
-        }
-      }
-
-      return;
-    }
-
     const FunctionDecl *FD = dyn_cast_or_null<FunctionDecl>(D);
     if (!FD) return;
     llvm::Function *Fn = cast<llvm::Function>(GV);

diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 896561b..80fc992 100644 (file)
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -1515,14 +1515,6 @@ void Clang::AddMIPSTargetArgs(const ArgList &Args,
         CmdArgs.push_back("-membedded-data=0");
       }
       EmbeddedData->claim();
-
-      if (Arg *A = Args.getLastArg(options::OPT_muninit_const_in_rodata,
-                                   options::OPT_mno_uninit_const_in_rodata)) {
-        if (A->getOption().matches(options::OPT_muninit_const_in_rodata)) {
-          CmdArgs.push_back("-muninit-const-in-rodata");
-          A->claim();
-        }
-      }
     }
 
   } else if ((!ABICalls || (!NoABICalls && ABICalls)) && WantGPOpt)

diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index cdc3b4b..003ea55 100644 (file)
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -950,8 +950,6 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
 
   Opts.Backchain = Args.hasArg(OPT_mbackchain);
 
-  Opts.UInitCstDataInROData = Args.hasArg(OPT_muninit_const_in_rodata);
-
   Opts.EmitCheckPathComponentsToStrip = getLastArgIntValue(
       Args, OPT_fsanitize_undefined_strip_path_components_EQ, 0, Diags);
 

diff --git a/clang/test/CodeGen/mips-uninit-const-in-ro.c b/clang/test/CodeGen/mips-uninit-const-in-ro.c
deleted file mode 100644 (file)
index 04c2170..0000000
--- a/clang/test/CodeGen/mips-uninit-const-in-ro.c
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %clang_cc1 -triple mips-mti--elf -emit-llvm -mrelocation-model static \
-// RUN:            -target-feature +noabicalls -mllvm -mgpopt -mllvm \
-// RUN:            -membedded-data=1 -muninit-const-in-rodata -o - %s | \
-// RUN:   FileCheck %s
-
-// REQUIRES: mips-registered-target
-
-// Test that -muninit-const-in-rodata places constant uninitialized structures
-// in the .rodata section rather than the commeon section.
-
-// CHECK: @a = global [8 x i32] zeroinitializer, section "rodata", align 4
-const int a[8];