From: Sylvestre Ledru <sylvestre@debian.org>
Date: Tue, 11 Feb 2014 17:30:18 +0000 (+0000)
Subject: Improve the declaration when LDPO_PIE is not available.
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6a089db385064d26afc0afca7b737fc75ba093c9;p=oota-llvm.git

Improve the declaration when LDPO_PIE is not available.
Thanks to İsmail Dönmez for the better declaration.



git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@201163 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/tools/gold/gold-plugin.cpp b/tools/gold/gold-plugin.cpp
index 26f3f42770c..31a1555ebba 100644
--- a/tools/gold/gold-plugin.cpp
+++ b/tools/gold/gold-plugin.cpp
@@ -38,6 +38,12 @@
 # define read _read
 #endif
 
+#ifndef LDPO_PIE
+// FIXME: remove this declaration when we stop maintaining Ubuntu Quantal and
+// Precise and Debian Wheezy (binutils 2.23 is required)
+# define LDPO_PIE 3
+#endif
+
 using namespace llvm;
 
 namespace {
@@ -153,14 +159,7 @@ ld_plugin_status onload(ld_plugin_tv *tv) {
         switch (tv->tv_u.tv_val) {
           case LDPO_REL:  // .o
           case LDPO_DYN:  // .so
-#ifdef LDPO_PIE
           case LDPO_PIE:  // position independent executable
-#else
-          // FIXME: remove this declaration when we stop maintaining
-          // Ubuntu Quantal and Precise and Debian Wheezy (binutils 2.23 is
-          // required)
-          case 3:
-#endif
             output_type = LTO_CODEGEN_PIC_MODEL_DYNAMIC;
             break;
           case LDPO_EXEC:  // .exe