diff options
-rw-r--r-- | recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch | 53 | ||||
-rw-r--r-- | recipes-extended/qat/qat16.inc | 2 |
2 files changed, 54 insertions, 1 deletions
diff --git a/recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch b/recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch new file mode 100644 index 0000000..2f794ce --- /dev/null +++ b/recipes-extended/qat/files/qat16-Osal-fix-build-with-x32.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | From 8da85286efc86b4f5bbf14f755c84d1982841973 Mon Sep 17 00:00:00 2001 | ||
2 | From: Anuj Mittal <anuj.mittal@intel.com> | ||
3 | Date: Wed, 3 Jan 2018 15:45:59 +0800 | ||
4 | Subject: [PATCH] Osal: fix build with x32 | ||
5 | |||
6 | x32 follows ILP32 model and has __x86_64__ defined too. Make sure | ||
7 | that we check for ILP32 also before using architecture dependent | ||
8 | types. | ||
9 | |||
10 | Upstream-Status: Accepted [Code released in tarball form only] | ||
11 | |||
12 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
13 | --- | ||
14 | quickassist/adf/platform/include/adf_platform_common.h | 2 +- | ||
15 | quickassist/utilities/osal/include/OsalTypes.h | 4 ++-- | ||
16 | 2 files changed, 3 insertions(+), 3 deletions(-) | ||
17 | |||
18 | diff --git a/quickassist/adf/platform/include/adf_platform_common.h b/quickassist/adf/platform/include/adf_platform_common.h | ||
19 | index 8673ec1..de5c31a 100755 | ||
20 | --- a/quickassist/adf/platform/include/adf_platform_common.h | ||
21 | +++ b/quickassist/adf/platform/include/adf_platform_common.h | ||
22 | @@ -207,7 +207,7 @@ | ||
23 | * xx refers to arch, i.e.64bit or 32bit | ||
24 | * yy refers to number of bytes copied from src to dst, i.e. 64 or 128 bytes | ||
25 | */ | ||
26 | -#ifdef __x86_64__ | ||
27 | +#if (defined (__x86_64__) && !defined (__ILP32__)) | ||
28 | #define adf_memcpy64_64(dst, src)\ | ||
29 | do { \ | ||
30 | __asm__ __volatile__ ( \ | ||
31 | diff --git a/quickassist/utilities/osal/include/OsalTypes.h b/quickassist/utilities/osal/include/OsalTypes.h | ||
32 | index d8fa1d9..eaf08bf 100755 | ||
33 | --- a/quickassist/utilities/osal/include/OsalTypes.h | ||
34 | +++ b/quickassist/utilities/osal/include/OsalTypes.h | ||
35 | @@ -160,13 +160,13 @@ typedef volatile INT32 VINT32; | ||
36 | */ | ||
37 | #define OSAL_HUNDRED (100) | ||
38 | |||
39 | -#ifdef __x86_64__ | ||
40 | +#if (defined (__x86_64__) && !defined (__ILP32__)) | ||
41 | #define ARCH_INT INT64 | ||
42 | #else | ||
43 | #define ARCH_INT INT32 | ||
44 | #endif | ||
45 | |||
46 | -#ifdef __x86_64__ | ||
47 | +#if (defined (__x86_64__) && !defined (__ILP32__)) | ||
48 | #define UARCH_INT UINT64 | ||
49 | #else | ||
50 | #define UARCH_INT UINT32 | ||
51 | -- | ||
52 | 2.7.4 | ||
53 | |||
diff --git a/recipes-extended/qat/qat16.inc b/recipes-extended/qat/qat16.inc index 9b5372e..4b9c835 100644 --- a/recipes-extended/qat/qat16.inc +++ b/recipes-extended/qat/qat16.inc | |||
@@ -16,10 +16,10 @@ SRC_URI="file://qat16_2.3.0-34-qat-fix-for-cross-compilation-issue.patch \ | |||
16 | file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \ | 16 | file://qat16_2.3.0-34-make-sure-CFLAGS-are-correct.patch \ |
17 | file://qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch \ | 17 | file://qat16_2.5.0-80-qat-change-in-return-type-of-func-in-kernel-v4.4.patch \ |
18 | file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \ | 18 | file://qat16_2.5.0-80-qat-Added-include-dir-path.patch \ |
19 | file://qat16-Osal-fix-build-with-x32.patch \ | ||
19 | " | 20 | " |
20 | 21 | ||
21 | COMPATIBLE_MACHINE = "null" | 22 | COMPATIBLE_MACHINE = "null" |
22 | COMPATIBLE_HOST_linux-gnux32 = "null" | ||
23 | 23 | ||
24 | S = "${WORKDIR}/${ICP_DRIVER_TYPE}" | 24 | S = "${WORKDIR}/${ICP_DRIVER_TYPE}" |
25 | ICP_TOOLS = "accelcomp" | 25 | ICP_TOOLS = "accelcomp" |