commit 6f75755c9204b1d8817ae5a65a2f7e5af0ec3f70
author Stephen Hines <srhines@google.com> Mon Mar 04 19:51:03 2013 -0800
committer Stephen Hines <srhines@google.com> Mon Mar 04 20:01:30 2013 -0800
tree 35a64dc0a0ad870f64fae2c88f4357d88270def8
parent 86036a3bd999904d071826b2f0a84023e28aeebc

Update mclinker to 176d79dc69b439b23ce7101ef8c3250057119664.

Change-Id: Ibae073aefc7838fce46875a6bf6ce7b7e18eced8
Date:   Mon Mar 4 22:29:06 2013 +0100

lib/LD/DiagnosticInfos.cpp

diff --git a/lib/LD/DiagnosticInfos.cpp b/lib/LD/DiagnosticInfos.cpp
index 130fd9a..280e178 100644
--- a/lib/LD/DiagnosticInfos.cpp
+++ b/lib/LD/DiagnosticInfos.cpp
@@ -130,12 +130,17 @@
             severity = DiagnosticEngine::Ignore;
           break;
         case LinkerConfig::DynObj:
-          if (m_Config.options().isNoUndefined() || !m_Config.options().isAllowShlibUndefined())
+          if (m_Config.options().isNoUndefined())
             severity = DiagnosticEngine::Error;
           else
             severity = DiagnosticEngine::Ignore;
           break;
         case LinkerConfig::Exec:
+          if (m_Config.options().isNoUndefined() || m_Config.isCodeStatic())
+            severity = DiagnosticEngine::Error;
+          else
+            severity = DiagnosticEngine::Ignore;
+          break;
         default:
           severity = DiagnosticEngine::Error;
           break;