[Debian-astro-commits] [iraf] 01/01: Add arm64 port

[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 d9607bd42f65b40c2597d0ecd25b628055801151
Author: Ole Streicher <olebole at debian.org>
Date:   Mon Jan 1 22:10:02 2018 +0100

    Add arm64 port
---
 debian/control                             |  8 +++---
 debian/patches/Add-new-architectures.patch | 43 +++++++++++++++++++++++-------
 2 files changed, 38 insertions(+), 13 deletions(-)

diff --git a/debian/control b/debian/control
index 9c3924d..d42067e 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
 Vcs-Git: https://anonscm.debian.org/cgit/debian-astro/packages/iraf.git
 
 Package: iraf
-Architecture: armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
+Architecture: arm64 armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: iraf-noao, python3-pyraf | x11iraf | xterm | python-pyraf
 Suggests: iraf-dev
@@ -36,7 +36,7 @@ Description: Image Reduction and Analysis Facility
  facility.
 
 Package: iraf-dev
-Architecture: armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
+Architecture: arm64 armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
 Multi-Arch: no
 Depends: gcc | c-compiler,
          iraf,
@@ -59,7 +59,7 @@ Description: Image Reduction and Analysis Facility (development files)
  system and all applications are written.
 
 Package: iraf-noao
-Architecture: armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
+Architecture: arm64 armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
 Depends: iraf, ${misc:Depends}, ${shlibs:Depends}
 Multi-Arch: foreign
 Description: IRAF NOAO data reduction package
@@ -73,7 +73,7 @@ Description: IRAF NOAO data reduction package
  of Optical Astronomy data.
 
 Package: iraf-noao-dev
-Architecture: armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
+Architecture: arm64 armel armhf hurd-i386 linux-amd64 linux-i386 mipsel
 Multi-Arch: no
 Depends: iraf-dev, iraf-noao, ${misc:Depends}
 Description: IRAF NOAO data reduction package (development files)
diff --git a/debian/patches/Add-new-architectures.patch b/debian/patches/Add-new-architectures.patch
index 6ac5fed..5c360e2 100644
--- a/debian/patches/Add-new-architectures.patch
+++ b/debian/patches/Add-new-architectures.patch
@@ -3,17 +3,19 @@ Date: Wed, 13 Dec 2017 15:14:03 +0100
 Subject: Add new architectures
 
 ---
- Makefile                   |  8 ++++++++
- unix/as.hurd/zsvjmp.s      | 15 +++++++++++++++
- unix/as.linuxarm/zsvjmp.s  | 18 ++++++++++++++++++
- unix/as.linuxmips/zsvjmp.s | 28 ++++++++++++++++++++++++++++
- unix/boot/spp/xc.c         |  2 +-
- unix/f2c/libf2c/uninit.c   | 34 ++++++++++++++++++++++++++++++++--
- unix/hlib/irafarch.sh      | 27 ++++++++++++++++++++++++---
- util/mkarch                |  4 +++-
- 8 files changed, 129 insertions(+), 7 deletions(-)
+ Makefile                    |  8 ++++++++
+ unix/as.hurd/zsvjmp.s       | 15 +++++++++++++++
+ unix/as.linuxarm/zsvjmp.s   | 18 ++++++++++++++++++
+ unix/as.linuxarm64/zsvjmp.s | 17 +++++++++++++++++
+ unix/as.linuxmips/zsvjmp.s  | 28 ++++++++++++++++++++++++++++
+ unix/boot/spp/xc.c          |  2 +-
+ unix/f2c/libf2c/uninit.c    | 34 ++++++++++++++++++++++++++++++++--
+ unix/hlib/irafarch.sh       | 27 ++++++++++++++++++++++++---
+ util/mkarch                 |  4 +++-
+ 9 files changed, 146 insertions(+), 7 deletions(-)
  create mode 100644 unix/as.hurd/zsvjmp.s
  create mode 100644 unix/as.linuxarm/zsvjmp.s
+ create mode 100644 unix/as.linuxarm64/zsvjmp.s
  create mode 100644 unix/as.linuxmips/zsvjmp.s
 
 diff --git a/Makefile b/Makefile
@@ -80,6 +82,29 @@ index 0000000..e14b668
 +	add	r0, r0, #4     @ &buf[1] --> 1st arg for sigsetjmp
 +	mov	r1, #0         @ 0       --> 2nd arg for sigsetjmp
 +	b	__sigsetjmp    @ call sigsetjmp
+diff --git a/unix/as.linuxarm64/zsvjmp.s b/unix/as.linuxarm64/zsvjmp.s
+new file mode 100644
+index 0000000..c281dab
+--- /dev/null
++++ b/unix/as.linuxarm64/zsvjmp.s
+@@ -0,0 +1,17 @@
++	.file	"zsvjmp.s"
++
++# Copyright (c) 2018 Peter Green
++# Distributable under the same license as IRAF
++# This file contains the Linux arm64 version of ZSVJMP for Debian.
++
++	.arch armv8-a
++	.text
++	.global	zsvjmp_
++	.type	zsvjmp_, %function
++
++zsvjmp_:
++        str     xzr, [x1]    # *status = 0;
++        str     x1, [x0], 8  # ((long **)buf)[0] = status;
++	# also post-increment x0 by 8: 1st arg for sigsetjmp
++        mov     w1, 0        # 0 --> 2nd arg for sigsetjmp
++        b      __sigsetjmp   # call sigsetjmp
 diff --git a/unix/as.linuxmips/zsvjmp.s b/unix/as.linuxmips/zsvjmp.s
 new file mode 100644
 index 0000000..d6637f4

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