[llvm-branch-commits] [llvm-gcc-branch] r106691 - in /llvm-gcc-4.2/branches/Apple/Morbo: ./ gcc/c-cppbuiltin.c gcc/testsuite/gcc.apple/tls-1.c

[Eric Christopher]

Author: echristo
Date: Wed Jun 23 17:34:37 2010
New Revision: 106691

URL: http://llvm.org/viewvc/llvm-project?rev=106691&view=rev
Log:
Merge:

--- Merging r106690 into '.':
U    gcc/c-cppbuiltin.c
A    gcc/testsuite/gcc.apple/tls-1.c

Fixes rdar://8106046


Added:
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/testsuite/gcc.apple/tls-1.c
      - copied unchanged from r106690, llvm-gcc-4.2/trunk/gcc/testsuite/gcc.apple/tls-1.c
Modified:
    llvm-gcc-4.2/branches/Apple/Morbo/   (props changed)
    llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-cppbuiltin.c

Propchange: llvm-gcc-4.2/branches/Apple/Morbo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jun 23 17:34:37 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,105504,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681
+/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,105828-105829,105902,105948-105949,106005,106243-106244,106270,106352,106564,106611-106612,106681,106690

Modified: llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-cppbuiltin.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-cppbuiltin.c?rev=106691&r1=106690&r2=106691&view=diff
==============================================================================
--- llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-cppbuiltin.c (original)
+++ llvm-gcc-4.2/branches/Apple/Morbo/gcc/c-cppbuiltin.c Wed Jun 23 17:34:37 2010
@@ -639,6 +639,11 @@
   if (flag_openmp)
     cpp_define (pfile, "_OPENMP=200505");
 
+  /* LLVM LOCAL begin tls */
+  if (targetm.have_tls)
+    cpp_define (pfile, "__HAS_TLS__");
+  /* LLVM LOCAL end tls */
+
   /* A straightforward target hook doesn't work, because of problems
      linking that hook's body when part of non-C front ends.  */
 # define preprocessing_asm_p() (cpp_get_options (pfile)->lang == CLK_ASM)