[polyml] 04/09: Mark polyexport.o as CPIC on MIPS when code is position-independent

[James Clarke]

This is an automated email from the git hooks/post-receive script.

jrtc27-guest pushed a commit to branch master
in repository polyml.

commit 13c158f845333da27e6bfa01785cfecff95626bb
Author: James Clarke <jrtc27 at jrtc27.com>
Date:   Sun Jan 31 18:19:50 2016 +0000

    Mark polyexport.o as CPIC on MIPS when code is position-independent
---
 debian/changelog             |  4 ++++
 debian/patches/mips-abi.diff | 17 +++++++++++++++++
 debian/patches/series        |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 50f1135..58a3ec9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,10 @@ polyml (5.6-2) UNRELEASED; urgency=low
     rounding-mode-test-only-allow-exceptions-for-set-mode.diff, soft-fpu.diff
     and disable-compile-time-real-eval.diff. Avoids modifying the test driver,
     instead skipping the test if unsupported directly inside the test itself.
+  * New patches (excluding soft-float-rounding.diff replacements):
+    - mips-abi.diff: Mark polyexport.o as CPIC on MIPS when code is
+      position-independent. Fixes ld warning about linking abicalls files with
+      non-abicalls files.
 
  -- James Clarke <jrtc27 at jrtc27.com>  Sun, 31 Jan 2016 17:59:21 +0000
 
diff --git a/debian/patches/mips-abi.diff b/debian/patches/mips-abi.diff
new file mode 100644
index 0000000..d1c2ff4
--- /dev/null
+++ b/debian/patches/mips-abi.diff
@@ -0,0 +1,17 @@
+Description: Mark polyexport.o as CPIC on MIPS when code is position-independent
+Author: James Clarke <jrtc27 at jrtc27.com>
+Forwarded: https://github.com/polyml/polyml/pull/18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/libpolyml/elfexport.cpp
++++ b/libpolyml/elfexport.cpp
+@@ -393,6 +393,9 @@
+ #elif defined(HOSTARCHITECTURE_MIPS)
+     fhdr.e_machine = EM_MIPS;
+     directReloc = R_MIPS_32;
++#ifdef __PIC__
++    fhdr.e_flags = EF_MIPS_CPIC;
++#endif
+     useRela = true;
+ #else
+ #error "No support for exporting on this architecture"
diff --git a/debian/patches/series b/debian/patches/series
index b25f1aa..9cb4f4c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ rounding-mode-test-allow-exceptions.diff
 rounding-mode-test-only-allow-exceptions-for-set-mode.diff
 soft-fpu.diff
 disable-compile-time-real-eval.diff
+mips-abi.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/polyml.git