[Debian-astro-commits] [iraf] 01/05: Remove explicit setting of mem_ on x86_64

[Ole Streicher]

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

olebole pushed a commit to branch master
in repository iraf.

commit cd327cbf08b3a64b9d0c615534911fef5ccb34d1
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Dec 14 13:56:41 2017 +0100

    Remove explicit setting of mem_ on x86_64
---
 ...Remove-explicit-setting-of-mem_-on-x86_64.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/Remove-explicit-setting-of-mem_-on-x86_64.patch b/debian/patches/Remove-explicit-setting-of-mem_-on-x86_64.patch
new file mode 100644
index 0000000..2c92cea
--- /dev/null
+++ b/debian/patches/Remove-explicit-setting-of-mem_-on-x86_64.patch
@@ -0,0 +1,41 @@
+From: Ole Streicher <olebole at debian.org>
+Date: Thu, 14 Dec 2017 13:54:43 +0100
+Subject: Remove explicit setting of mem_ on x86_64
+
+On some platforms (Ubuntu 16.04), this avoids a mysterious linker
+error
+
+```
+/.../ipcmap.x:38:(.text+0x5):
+  relocation truncated to fit: R_X86_64_32 against symbol `mem_'
+  defined in *ABS* section in /tmp/T_xx_dataio.e.12ffky
+```
+
+and it is really not needed to set this at all.
+---
+ unix/as.linux64/zsvjmp.s | 12 ------------
+ 1 file changed, 12 deletions(-)
+
+diff --git a/unix/as.linux64/zsvjmp.s b/unix/as.linux64/zsvjmp.s
+index f2e4af2..b5813e2 100644
+--- a/unix/as.linux64/zsvjmp.s
++++ b/unix/as.linux64/zsvjmp.s
+@@ -22,18 +22,6 @@
+         .globl	zsvjmp_
+ 	.type   zsvjmp_, @function
+ 
+-	# The following has nothing to do with ZSVJMP, and is included here
+-	# only because this assembler module is loaded with every process.
+-	# This code sets the value of the symbol MEM (the VOS or Fortran Mem
+-	# common) to zero, setting the origin for IRAF pointers to zero
+-	# rather than some arbitrary value, and ensuring that the MEM common
+-	# is aligned for all datatypes as well as page aligned.  A further
+-	# advantage is that references to NULL pointers are likely to cause a
+-	# memory violation.
+-
+-	.globl  mem_
+-	mem_   =       0
+-
+ zsvjmp_:
+ 	# %rsi ... &status  %rdi ... &jumpbuf
+ 	movq    %rsi, (%rdi)    # store &status in jmpbuf[0]
diff --git a/debian/patches/series b/debian/patches/series
index 4aeb2f8..b207ce6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,3 +9,4 @@ Propagate-CFLAGS-and-debug-flag-to-xc.patch
 Skip-source-dependent-tests.patch
 Add-new-architectures.patch
 Don-t-link-to-librt.patch
+Remove-explicit-setting-of-mem_-on-x86_64.patch

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