diff options
author | Thomas Deutschmann <whissi@gentoo.org> | 2021-03-30 10:59:39 +0200 |
---|---|---|
committer | Thomas Deutschmann <whissi@gentoo.org> | 2021-04-01 00:04:14 +0200 |
commit | 5ff1d6955496b3cf9a35042c9ac35db43bc336b1 (patch) | |
tree | 6d470f7eb448f59f53e8df1010aec9dad8ce1f72 /ios | |
parent | Import Ghostscript 9.53.1 (diff) | |
download | ghostscript-gpl-patches-5ff1d6955496b3cf9a35042c9ac35db43bc336b1.tar.gz ghostscript-gpl-patches-5ff1d6955496b3cf9a35042c9ac35db43bc336b1.tar.bz2 ghostscript-gpl-patches-5ff1d6955496b3cf9a35042c9ac35db43bc336b1.zip |
Import Ghostscript 9.54ghostscript-9.54
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'ios')
-rwxr-xr-x | ios/build_ios_gslib.sh | 4 | ||||
-rw-r--r-- | ios/ios_arch-arm.h | 18 | ||||
-rw-r--r-- | ios/ios_arch-x86.h | 14 |
3 files changed, 28 insertions, 8 deletions
diff --git a/ios/build_ios_gslib.sh b/ios/build_ios_gslib.sh index 9afa1565..07a99962 100755 --- a/ios/build_ios_gslib.sh +++ b/ios/build_ios_gslib.sh @@ -29,7 +29,7 @@ export BIGENDIAN=0 export CCAUX=/usr/bin/gcc export CFLAGSAUX=" " -./configure --without-x --with-arch_h=./ios/ios_arch-x86.h --host=x86_64-apple-darwin7 --build=x86_64-linux-gnu 2>&1 | tee conflog_x86.txt || exit 1 +./configure --without-cal --without-x --with-arch_h=./ios/ios_arch-x86.h --host=x86_64-apple-darwin7 --build=x86_64-linux-gnu 2>&1 | tee conflog_x86.txt || exit 1 make -j4 BUILDDIRPREFIX=ios_x86- GS=libgs_x86 libgs$DEBUGSTR 2>&1 | tee buildlog_x86.txt || exit 1 @@ -40,7 +40,7 @@ export CPP="$(xcrun --sdk iphoneos --find cpp)" export CFLAGS=" -isysroot $(xcrun --sdk iphoneos --show-sdk-path) -Wno-implicit-function-declaration -arch armv7 -arch armv7s -arch arm64" export RANLIB="$(xcrun --sdk iphoneos --find ranlib)" -./configure --without-x --with-arch_h=./ios/ios_arch-arm.h --host=armv7-apple-darwin7 --build=x86_64-linux-gnu 2>&1 | tee conflog_arm.txt || exit 1 +./configure --without-cal -without-x --with-arch_h=./ios/ios_arch-arm.h --host=armv7-apple-darwin7 --build=x86_64-linux-gnu 2>&1 | tee conflog_arm.txt || exit 1 make -j4 BUILDDIRPREFIX=ios_arm- GS=libgs_arm libgs$DEBUGSTR 2>&1 | tee buildlog_arm.txt || exit 1 diff --git a/ios/ios_arch-arm.h b/ios/ios_arch-arm.h index f1ab071d..cd7b9fc0 100644 --- a/ios/ios_arch-arm.h +++ b/ios/ios_arch-arm.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2020 Artifex Software, Inc. +/* Copyright (C) 2001-2021 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -13,12 +13,13 @@ CA 94945, U.S.A., +1(415)492-9861, for further information. */ -#ifdef __ARM64_ARCH_8__ +#if defined(__ARM64_ARCH_8__) && __ARM64_ARCH_8__ == 1 /* ---------------- Scalar alignments ---------------- */ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 8 +#define ARCH_ALIGN_SIZE_T_MOD 8 #define ARCH_ALIGN_PTR_MOD 8 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 8 @@ -33,7 +34,9 @@ #define ARCH_LOG2_SIZEOF_PTR 3 #define ARCH_LOG2_SIZEOF_FLOAT 2 #define ARCH_LOG2_SIZEOF_DOUBLE 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 3 +#define ARCH_SIZEOF_SIZE_T 8 #define ARCH_SIZEOF_PTR 8 #define ARCH_SIZEOF_FLOAT 4 #define ARCH_SIZEOF_DOUBLE 8 @@ -44,6 +47,7 @@ #define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Floating point ---------------- */ @@ -96,12 +100,13 @@ #define ARCH_ARITH_RSHIFT 2 #define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#elif defined(__ARM_ARCH_7S__) /* __ARM64_ARCH_8__ */ +#elif defined(__ARM_ARCH_7S__) && __ARM_ARCH_7S__ == 1 /* __ARM64_ARCH_8__ */ /* ---------------- Scalar alignments ---------------- */ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 4 +#define ARCH_ALIGN_SIZE_T_MOD 4 #define ARCH_ALIGN_PTR_MOD 4 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 4 @@ -116,7 +121,9 @@ #define ARCH_LOG2_SIZEOF_PTR 2 #define ARCH_LOG2_SIZEOF_FLOAT 2 #define ARCH_LOG2_SIZEOF_DOUBLE 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 2 +#define ARCH_SIZEOF_SIZE_T 4 #define ARCH_SIZEOF_PTR 4 #define ARCH_SIZEOF_FLOAT 4 #define ARCH_SIZEOF_DOUBLE 8 @@ -127,6 +134,7 @@ #define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Floating point ---------------- */ @@ -186,6 +194,7 @@ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 4 +#define ARCH_ALIGN_SIZE_T_MOD 4 #define ARCH_ALIGN_PTR_MOD 4 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 4 @@ -200,7 +209,9 @@ #define ARCH_LOG2_SIZEOF_PTR 2 #define ARCH_LOG2_SIZEOF_FLOAT 2 #define ARCH_LOG2_SIZEOF_DOUBLE 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 2 +#define ARCH_SIZEOF_SIZE_T 4 #define ARCH_SIZEOF_PTR 4 #define ARCH_SIZEOF_FLOAT 4 #define ARCH_SIZEOF_DOUBLE 8 @@ -211,6 +222,7 @@ #define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Floating point ---------------- */ diff --git a/ios/ios_arch-x86.h b/ios/ios_arch-x86.h index aeac82ea..af818f85 100644 --- a/ios/ios_arch-x86.h +++ b/ios/ios_arch-x86.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001-2020 Artifex Software, Inc. +/* Copyright (C) 2001-2021 Artifex Software, Inc. All Rights Reserved. This software is provided AS-IS with no warranty, either express or @@ -13,12 +13,13 @@ CA 94945, U.S.A., +1(415)492-9861, for further information. */ -#if __x86_64__ == 1 +#if defined(__x86_64__) && __x86_64__ == 1 /* ---------------- Scalar alignments ---------------- */ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 8 +#define ARCH_ALIGN_SIZE_T_MOD 8 #define ARCH_ALIGN_PTR_MOD 8 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 8 @@ -33,7 +34,9 @@ #define ARCH_LOG2_SIZEOF_PTR 3 #define ARCH_LOG2_SIZEOF_FLOAT 2 #define ARCH_LOG2_SIZEOF_DOUBLE 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 3 +#define ARCH_SIZEOF_SIZE_T 8 #define ARCH_SIZEOF_PTR 8 #define ARCH_SIZEOF_FLOAT 4 #define ARCH_SIZEOF_DOUBLE 8 @@ -44,6 +47,7 @@ #define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Floating point ---------------- */ @@ -96,13 +100,14 @@ #define ARCH_ARITH_RSHIFT 2 #define ARCH_SIZEOF_GX_COLOR_INDEX 8 -#elif __i386__ == 1 /* __x86_64__ */ +#elif defined(__i386__) && __i386__ == 1 /* __x86_64__ */ /* ---------------- Scalar alignments ---------------- */ #define ARCH_ALIGN_SHORT_MOD 2 #define ARCH_ALIGN_INT_MOD 4 #define ARCH_ALIGN_LONG_MOD 4 +#define ARCH_ALIGN_SIZE_T_MOD 4 #define ARCH_ALIGN_PTR_MOD 4 #define ARCH_ALIGN_FLOAT_MOD 4 #define ARCH_ALIGN_DOUBLE_MOD 4 @@ -117,7 +122,9 @@ #define ARCH_LOG2_SIZEOF_PTR 2 #define ARCH_LOG2_SIZEOF_FLOAT 2 #define ARCH_LOG2_SIZEOF_DOUBLE 3 +#define ARCH_LOG2_SIZEOF_SIZE_T 2 +#define ARCH_SIZEOF_SIZE_T 4 #define ARCH_SIZEOF_PTR 4 #define ARCH_SIZEOF_FLOAT 4 #define ARCH_SIZEOF_DOUBLE 8 @@ -128,6 +135,7 @@ #define ARCH_MAX_USHORT ((unsigned short)~(unsigned short)0 + (unsigned short)0) #define ARCH_MAX_UINT ((unsigned int)~0 + (unsigned int)0) #define ARCH_MAX_ULONG ((unsigned long)~0L + (unsigned long)0) +#define ARCH_MAX_SIZE_T ((size_t)~0L + (size_t)0) /* ---------------- Floating point ---------------- */ |