From a2160bd5f1a96a2e159d9f71e024ff1185896a2d Mon Sep 17 00:00:00 2001
From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Wed, 22 Apr 2015 17:48:59 -0400
Subject: [PATCH] Bug 464916 - Add a -pthread checkbox in the GCC C/C++ Linker
 settings

Change-Id: Ib06482847e88a327b3e3dccf1522d5f8dab1a72b
Signed-off-by: Simon Marchi <simon.marchi@polymtl.ca>
Signed-off-by: Marc-Andre Laperle <marc-andre.laperle@ericsson.com>
---
 .../plugin.properties                         |  3 ++
 .../plugin.xml                                | 40 ++++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
index af48e631568..0af38b6d24b 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.properties
@@ -162,6 +162,9 @@ Option.Posix.Ansi=Support ANSI programs (-ansi)
 Option.PIC=Position Independent Code (-fPIC)
 Option.codecov=Generate gcov information (-ftest-coverage -fprofile-arcs)
 Option.codecovTip="Check this flag if you want to enable Profile Code Coverage in your application. Remember to enable this option in both the Compiler-&gt; Miscellaneous and Linker -&gt; General. Then rebuild your project and run Code Coverage again."
+Option.Pthread=Support for pthread (-pthread)
+Option.PthreadCompilerTip="If you select this option, you probably want to select -pthread in the linker settings."
+Option.PthreadLinkerTip="If you select this option, you probably want to select -pthread in the compiler settings."
 
 Option.Posix.Linker.NoStartFiles=Do not use standard start files (-nostartfiles)
 Option.Posix.Linker.NoDefLibs=Do not use default libraries (-nodefaultlibs)
diff --git a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
index ac3834a1b26..54bbb209765 100644
--- a/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
+++ b/build/org.eclipse.cdt.managedbuilder.gnu.ui/plugin.xml
@@ -1840,15 +1840,42 @@
 				  </tool>                 
 				  <tool
                       id="cdt.managedbuild.tool.gnu.cpp.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler">                         
+                      superClass="cdt.managedbuild.tool.gnu.cpp.compiler">
+         <option
+               category="gnu.cpp.compiler.category.other"
+               command="-pthread"
+               defaultValue="false"
+               id="cdt.managedbuild.tool.gnu.cpp.pthread"
+               name="%Option.Pthread"
+               tip="%Option.PthreadCompilerTip"
+               valueType="boolean">
+         </option>
                   </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.c.compiler.base"
-                      superClass="cdt.managedbuild.tool.gnu.c.compiler">                          
+                      superClass="cdt.managedbuild.tool.gnu.c.compiler">
+                     <option
+                           category="gnu.c.compiler.category.other"
+                           command="-pthread"
+                           defaultValue="false"
+                           id="cdt.managedbuild.tool.gnu.c.pthread"
+                           name="%Option.Pthread"
+                           tip="%Option.PthreadCompilerTip"
+                           valueType="boolean">
+                     </option>
 				  </tool>
                   <tool
                       id="cdt.managedbuild.tool.gnu.c.linker.base"
                       superClass="cdt.managedbuild.tool.gnu.c.linker">
+                     <option
+                           category="gnu.c.link.category.general"
+                           command="-pthread"
+                           defaultValue="false"
+                           id="gnu.c.link.option.pthread"
+                           name="%Option.Pthread"
+                           tip="%Option.PthreadLinkerTip"
+                           valueType="boolean">
+                     </option>
              <enablement 
               	type="ALL">
               	<not>
@@ -1861,6 +1888,15 @@
                   <tool
                       id="cdt.managedbuild.tool.gnu.cpp.linker.base"
                       superClass="cdt.managedbuild.tool.gnu.cpp.linker">
+                     <option
+                           category="gnu.cpp.link.category.options"
+                           command="-pthread"
+                           defaultValue="false"
+                           id="cdt.managedbuild.tool.gnu.c.pthread"
+                           name="%Option.Pthread"
+                           tip="%Option.PthreadLinkerTip"
+                           valueType="boolean">
+                     </option>
              <enablement 
               	type="ALL">
               	<not>