Make find_separate_debug_file* return std::string

[deliverable/binutils-gdb.git] / gold / options.cc

diff --git a/gold/options.cc b/gold/options.cc
index f54fb9b1cb4946a177fbda740915f3086896fa12..f511ba1e7943ad6f0beeb104d218f14f60c32cfc 100644 (file)
--- a/gold/options.cc
+++ b/gold/options.cc
@@ -1,6 +1,6 @@
 // options.c -- handle command line options for gold
 
-// Copyright (C) 2006-2017 Free Software Foundation, Inc.
+// Copyright (C) 2006-2018 Free Software Foundation, Inc.
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of gold.
@@ -1343,6 +1343,8 @@ General_options::finalize()
        gold_fatal(_("incremental linking is not compatible with --plugin"));
       if (this->relro())
        gold_fatal(_("incremental linking is not compatible with -z relro"));
+      if (this->pie())
+       gold_fatal(_("incremental linking is not compatible with -pie"));
       if (this->gc_sections())
        {
          gold_warning(_("ignoring --gc-sections for an incremental link"));