From b020dd4c06741b6700598ff10075b8680d4e77da Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Apr 23 2014 10:31:19 +0000 Subject: Add AArch64 definitions --- diff --git a/cln-add-aarch64.patch b/cln-add-aarch64.patch new file mode 100644 index 0000000..c837b7c --- /dev/null +++ b/cln-add-aarch64.patch @@ -0,0 +1,53 @@ +diff --git a/include/cln/object.h b/include/cln/object.h +index 3a47117..376baf8 100644 +--- a/include/cln/object.h ++++ b/include/cln/object.h +@@ -22,7 +22,7 @@ namespace cln { + #if defined(__m68k__) + #define cl_word_alignment 2 + #endif +-#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__)) ++#if defined(__i386__) || defined(__mips__) || defined(__mipsel__) || (defined(__sparc__) && !defined(__arch64__)) || defined(__hppa__) || defined(__arm__) || defined(__rs6000__) || defined(__m88k__) || defined(__convex__) || (defined(__s390__) && !defined(__s390x__)) || defined(__sh__) || (defined(__x86_64__) && defined(__ILP32__)) || defined(__aarch64__) + #define cl_word_alignment 4 + #endif + #if defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || (defined(__x86_64__) && !defined(__ILP32__)) || defined(__s390x__) +diff --git a/include/cln/types.h b/include/cln/types.h +index ce8d7a6..9e820cd 100644 +--- a/include/cln/types.h ++++ b/include/cln/types.h +@@ -48,7 +48,7 @@ + #undef HAVE_LONGLONG + #endif + #endif +- #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__)) ++ #if defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__mips64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__)) || defined(__aarch64__) + // 64 bit registers in hardware + #define HAVE_FAST_LONGLONG + #endif +@@ -76,7 +76,7 @@ + + // Integer type used for counters. + // Constraint: sizeof(uintC) >= sizeof(uintL) +- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__))) ++ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__))) || defined(__aarch64__) + #define intCsize long_bitsize + typedef long sintC; + typedef unsigned long uintC; +@@ -88,7 +88,7 @@ + + // Integer type used for lfloat exponents. + // Constraint: sizeof(uintE) >= sizeof(uintC) +-#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) ++#if (defined(HAVE_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || (defined(__sparc__) && defined(__arch64__)) || defined(__x86_64__) || defined(__i386__) || defined(__mips__) || defined(__rs6000__))) || defined(__aarch64__) + #define intEsize 64 + typedef sint64 sintE; + typedef uint64 uintE; +@@ -127,7 +127,7 @@ + typedef int sintD; + typedef unsigned int uintD; + #else // we are not using GMP, so just guess something reasonable +- #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__))) ++ #if (defined(HAVE_FAST_LONGLONG) && (defined(__alpha__) || defined(__ia64__) || defined(__powerpc64__) || (defined(__sparc__) && defined(__arch64__)) || defined(__s390x__) || defined(__x86_64__))) || defined(__aarch64__) + #define intDsize 64 + typedef sint64 sintD; + typedef uint64 uintD; diff --git a/cln.spec b/cln.spec index 97d8329..6149957 100644 --- a/cln.spec +++ b/cln.spec @@ -1,6 +1,6 @@ Name: cln Version: 1.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Class Library for Numbers Group: System Environment/Libraries @@ -8,6 +8,7 @@ License: GPLv2+ URL: http://www.ginac.de/CLN/ Source0: http://www.ginac.de/CLN/%{name}-%{version}.tar.bz2 Patch1: cln-arm-preprocessor-fix.patch +Patch2: cln-add-aarch64.patch Requires(post): /sbin/install-info Requires(preun): /sbin/install-info @@ -41,6 +42,7 @@ the CLN library. %prep %setup -q %patch1 -p0 -b .fix +%patch2 -p1 -b .aarch64 %build %configure --disable-static CXXFLAGS="%{XFLAGS}" CFLAGS="%{XFLAGS}" @@ -85,6 +87,9 @@ fi %doc doc/cln.pdf doc/cln.html %changelog +* Wed Apr 23 2014 Marcin Juszkiewicz - 1.3.3-2 +- Add AArch64 definitions. + * Wed Aug 14 2013 Deji Akingunola - 1.3.3-1 - New upstream version