[llvm-branch-commits] [llvm-gcc-branch] r105506 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/config/darwin.c gcc/llvm-debug.cpp

[Devang Patel]

Author: dpatel
Date: Fri Jun  4 18:57:16 2010
New Revision: 105506

URL: http://llvm.org/viewvc/llvm-project?rev=105506&view=rev
Log:
Merge from trunk.  r105504.

Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.c
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun  4 18:57:16 2010
@@ -1,2 +1,2 @@
 /llvm/trunk:100565
-/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726
+/llvm-gcc-4.2/trunk:98728,98841,98893,99196,99305,99592-99593,99629,99670,99982,99984-99986,99988,99992-99993,99995,99997-99999,100035,100149,100303,100565,100624-100626,100712,100721,101090-101091,101199,101216,101304,101333,101804,101959,102139,102148,102433,102444,102506-102507,102511,102532,102561,102589,102636,102648,102745,103361,103366-103367,103394,103414,103644,103800,103918,104181,104384,104420,104423,104726,105504

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.c?rev=105506&r1=105505&r2=105506&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/config/darwin.c Fri Jun  4 18:57:16 2010
@@ -2633,6 +2633,7 @@
       var = build_decl (CONST_DECL, NULL, TREE_TYPE (constructor));
       DECL_INITIAL (var) = constructor;
       TREE_STATIC (var) = 1;
+      DECL_IGNORED_P (var) = 1;
       pushdecl_top_level (var);
       desc->constructor = var;
     }

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp?rev=105506&r1=105505&r2=105506&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/llvm-debug.cpp Fri Jun  4 18:57:16 2010
@@ -527,7 +527,7 @@
 /// EmitGlobalVariable - Emit information about a global variable.
 ///
 void DebugInfo::EmitGlobalVariable(GlobalVariable *GV, tree decl) {
-  if (DECL_ARTIFICIAL(decl))
+  if (DECL_ARTIFICIAL(decl) || DECL_IGNORED_P(decl))
     return;
   // Gather location information.
   expanded_location Loc = expand_location(DECL_SOURCE_LOCATION(decl));