|
 |
47bca4 |
From 3ef0c620a15994097e3e30d2ba4a90afb39d17fe Mon Sep 17 00:00:00 2001
|
|
|
47bca4 |
From: Adrian Reber <areber@redhat.com>
|
|
|
47bca4 |
Date: Fri, 4 Aug 2017 03:13:26 -0400
|
|
|
47bca4 |
Subject: [PATCH] Fix ppc64el build failure, by not redefining
|
|
|
47bca4 |
AT_VECTOR_SIZE_ARCH
|
|
|
47bca4 |
|
|
|
47bca4 |
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=1477803
|
|
|
47bca4 |
|
|
|
47bca4 |
Backport of following commit on the 2.12 release:
|
|
|
47bca4 |
|
|
|
47bca4 |
commit c10e0d215412edac55e941f57cc4ba80422968dd
|
|
|
47bca4 |
Author: Gianfranco Costamagna <costamagnagianfranco@yahoo.it>
|
|
|
47bca4 |
Date: Wed Jul 5 12:50:07 2017 +0200
|
|
|
47bca4 |
|
|
|
47bca4 |
Fix ppc64el build failure, by not redefining AT_VECTOR_SIZE_ARCH
|
|
|
47bca4 |
|
|
|
47bca4 |
This fixes the ppc64el build failure
|
|
|
47bca4 |
CC criu/arch/ppc64/sigframe.o
|
|
|
47bca4 |
In file included from criu/arch/ppc64/sigframe.c:5:0:
|
|
|
47bca4 |
criu/arch/ppc64/include/asm/types.h:32:0: error: "AT_VECTOR_SIZE_ARCH" redefined [-Werror]
|
|
|
47bca4 |
#define AT_VECTOR_SIZE_ARCH 6
|
|
|
47bca4 |
|
|
|
47bca4 |
Signed-off-by: Andrei Vagin <avagin@virtuozzo.com>
|
|
|
47bca4 |
|
|
|
47bca4 |
Signed-off-by: Adrian Reber <areber@redhat.com>
|
|
|
47bca4 |
---
|
|
|
47bca4 |
criu/arch/ppc64/include/asm/infect-types.h | 2 ++
|
|
|
47bca4 |
1 file changed, 2 insertions(+)
|
|
|
47bca4 |
|
|
|
47bca4 |
diff --git a/criu/arch/ppc64/include/asm/infect-types.h b/criu/arch/ppc64/include/asm/infect-types.h
|
|
|
47bca4 |
index 1969ca2..e07bf1e 100644
|
|
|
47bca4 |
--- a/criu/arch/ppc64/include/asm/infect-types.h
|
|
|
47bca4 |
+++ b/criu/arch/ppc64/include/asm/infect-types.h
|
|
|
47bca4 |
@@ -83,7 +83,9 @@ typedef struct {
|
|
|
47bca4 |
* include/linux/mm_types.h
|
|
|
47bca4 |
*/
|
|
|
47bca4 |
#define AT_VECTOR_SIZE_BASE 20
|
|
|
47bca4 |
+#if !defined AT_VECTOR_SIZE_ARCH
|
|
|
47bca4 |
#define AT_VECTOR_SIZE_ARCH 6
|
|
|
47bca4 |
+#endif
|
|
|
47bca4 |
#define AT_VECTOR_SIZE (2*(AT_VECTOR_SIZE_ARCH + AT_VECTOR_SIZE_BASE + 1))
|
|
|
47bca4 |
|
|
|
47bca4 |
typedef uint64_t auxv_t;
|
|
|
47bca4 |
--
|
|
|
47bca4 |
1.8.3.1
|
|
|
47bca4 |
|