* [PATCH] load correct syscall table for s390 and s390x
@ 2014-02-01 10:12 Dan Horák
2014-02-01 10:49 ` Dan Horák
2014-02-01 15:29 ` Dave Jones
0 siblings, 2 replies; 3+ messages in thread
From: Dan Horák @ 2014-02-01 10:12 UTC (permalink / raw)
To: trinity
The actual syscall table for s390/s390x must be loaded depending on
the __s390x__ symbol.
building on s390 (32=bit) ends with
...
In file included from /builddir/build/BUILD/trinity-1.3/include/arch.h:27:0,
from tables.c:10:
tables.c: In function 'select_syscall_tables':
/builddir/build/BUILD/trinity-1.3/include/arch-s390.h:24:18: error: 'syscalls_s390x' undeclared (first use in this function)
#define SYSCALLS syscalls_s390x
^
tables.c:347:32: note: in expansion of macro 'SYSCALLS'
syscalls = copy_syscall_table(SYSCALLS, ARRAY_SIZE(SYSCALLS));
^
/builddir/build/BUILD/trinity-1.3/include/arch-s390.h:24:18: note: each undeclared identifier is reported only once for each function it appears in
#define SYSCALLS syscalls_s390x
^
tables.c:347:32: note: in expansion of macro 'SYSCALLS'
syscalls = copy_syscall_table(SYSCALLS, ARRAY_SIZE(SYSCALLS));
^
make: *** [tables.o] Error 1
---
include/arch-s390.h | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/arch-s390.h b/include/arch-s390.h
index 030b4cf..c322030 100644
--- a/include/arch-s390.h
+++ b/include/arch-s390.h
@@ -8,6 +8,8 @@
#define PAGE_SHIFT 12
#define PTE_FILE_MAX_BITS 59
+#define SYSCALLS syscalls_s390x
+
#else /* __s390x__ */
#define KERNEL_ADDR 0UL
@@ -15,6 +17,8 @@
#define PAGE_SHIFT 12
#define PTE_FILE_MAX_BITS 26
+#define SYSCALLS syscalls_s390
+
#endif /* __s390x__ */
#define PAGE_OFFSET 0x0UL
@@ -22,5 +26,3 @@
#define PTRACE_GETFPREGS 0
#define PTRACE_SETREGS 0
#define PTRACE_SETFPREGS 0
-
-#define SYSCALLS syscalls_s390x
--
1.8.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] load correct syscall table for s390 and s390x
2014-02-01 10:12 [PATCH] load correct syscall table for s390 and s390x Dan Horák
@ 2014-02-01 10:49 ` Dan Horák
2014-02-01 15:29 ` Dave Jones
1 sibling, 0 replies; 3+ messages in thread
From: Dan Horák @ 2014-02-01 10:49 UTC (permalink / raw)
To: trinity
On Sat, 1 Feb 2014 11:12:04 +0100
Dan Hor√°k <dan@danny.cz> wrote:
> The actual syscall table for s390/s390x must be loaded depending on
> the __s390x__ symbol.
a successful scratch build in Fedora with the patch applied
http://s390.koji.fedoraproject.org/koji/taskinfo?taskID=1346283
Dan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] load correct syscall table for s390 and s390x
2014-02-01 10:12 [PATCH] load correct syscall table for s390 and s390x Dan Horák
2014-02-01 10:49 ` Dan Horák
@ 2014-02-01 15:29 ` Dave Jones
1 sibling, 0 replies; 3+ messages in thread
From: Dave Jones @ 2014-02-01 15:29 UTC (permalink / raw)
To: Dan Horák; +Cc: trinity
On Sat, Feb 01, 2014 at 11:12:04AM +0100, Dan Horák wrote:
> The actual syscall table for s390/s390x must be loaded depending on
> the __s390x__ symbol.
>
thanks, applied and pushed out.
Dave
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-02-01 15:29 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-02-01 10:12 [PATCH] load correct syscall table for s390 and s390x Dan Horák
2014-02-01 10:49 ` Dan Horák
2014-02-01 15:29 ` Dave Jones
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.