On Fri, 7 Aug 2009, Subrata Modak wrote:
> On Fri, 2009-08-07 at 10:49 +0200, Geert Uytterhoeven wrote:
> > Commit "move leading __NR_ to script to make all the .in files simpler"
> > accidentally removed all plus signs surrounded by spaces from the syscall
> > definition files for hppa/powerpc{,64}/s390{,x}/sh/sparc{,64}, breaking the
> > build like:
> >
> > fstatat01.c: In function ‘main’:
> > fstatat01.c:126: error: expected ‘)’ before numeric constant
> > make[4]: *** [fstatat01_64.o] Error 1
>
> Thanks for pointing that out.
>
> > Re-add the missing plus signs to fix it.
> >
> > Signed-off-by: Geert Uytterhoeven <[email protected]>
>
> However, it fails to apply in the present CVS snapshot:
>
> patching file testcases/kernel/include/powerpc.in
> Hunk #1 FAILED at 7.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/include/powerpc.in.rej
> patching file testcases/kernel/include/powerpc64.in
> Hunk #1 FAILED at 7.
> 1 out of 1 hunk FAILED -- saving rejects to file
> testcases/kernel/include/powerpc64.in.rej
That's because in the mean time you applied Lucio's fix (which also
reintroduced the __NR_ prefixes, which is not needed).
> Can you please resend it ?
Sure!
From: Geert Uytterhoeven <[email protected]>
Subject: [PATCH] Fix calculated syscall numbers for
hppa/powerpc{,64}/s390{,x}/sh/sparc{,64}
Commit "move leading __NR_ to script to make all the .in files simpler"
accidentally removed all plus signs surrounded by spaces from the syscall
definition files for hppa/powerpc{,64}/s390{,x}/sh/sparc{,64}, breaking the
build like:
fstatat01.c: In function ‘main’:
fstatat01.c:126: error: expected ‘)’ before numeric constant
make[4]: *** [fstatat01_64.o] Error 1
Re-add the missing plus signs to fix it.
[v2] Rebased on top of Lucio's similar fix for powerpc{,64} only
Signed-off-by: Geert Uytterhoeven <[email protected]>
---
testcases/kernel/include/hppa.in | 26 ++++++++--------
testcases/kernel/include/powerpc.in | 54 ++++++++++++++++----------------
testcases/kernel/include/powerpc64.in | 52 ++++++++++++++++----------------
testcases/kernel/include/s390.in | 26 ++++++++--------
testcases/kernel/include/s390x.in | 26 ++++++++--------
testcases/kernel/include/sh.in | 26 ++++++++--------
testcases/kernel/include/sparc.in | 26 ++++++++--------
testcases/kernel/include/sparc64.in | 26 ++++++++--------
8 files changed, 131 insertions(+), 131 deletions(-)
diff --git a/testcases/kernel/include/hppa.in b/testcases/kernel/include/hppa.in
index 56b6994..b784a2b 100644
--- a/testcases/kernel/include/hppa.in
+++ b/testcases/kernel/include/hppa.in
@@ -1,17 +1,17 @@
openat 275
-mkdirat (__NR_openat 1)
-mknodat (__NR_openat 2)
-fchownat (__NR_openat 3)
-futimesat (__NR_openat 4)
-newfstatat (__NR_openat 5)
-fstatat64 (__NR_openat 5)
-unlinkat (__NR_openat 6)
-renameat (__NR_openat 7)
-linkat (__NR_openat 8)
-symlinkat (__NR_openat 9)
-readlinkat (__NR_openat 10)
-fchmodat (__NR_openat 11)
-faccessat (__NR_openat 12)
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
splice 291
tee 293
vmsplice 294
diff --git a/testcases/kernel/include/powerpc.in
b/testcases/kernel/include/powerpc.in
index 94d7d23..fc14765 100644
--- a/testcases/kernel/include/powerpc.in
+++ b/testcases/kernel/include/powerpc.in
@@ -1,27 +1,27 @@
-__NR_timer_create 240
-__NR_timer_settime 241
-__NR_timer_delete 244
-__NR_clock_settime 245
-__NR_clock_gettime 246
-__NR_splice 283
-__NR_tee 284
-__NR_vmsplice 285
-__NR_openat 286
-__NR_mkdirat (__NR_openat + 1)
-__NR_mknodat (__NR_openat + 2)
-__NR_fchownat (__NR_openat + 3)
-__NR_futimesat (__NR_openat + 4)
-__NR_newfstatat (__NR_openat + 5)
-__NR_fstatat64 (__NR_openat + 5)
-__NR_unlinkat (__NR_openat + 6)
-__NR_renameat (__NR_openat + 7)
-__NR_linkat (__NR_openat + 8)
-__NR_symlinkat (__NR_openat + 9)
-__NR_readlinkat (__NR_openat + 10)
-__NR_fchmodat (__NR_openat + 11)
-__NR_faccessat (__NR_openat + 12)
-__NR_utimensat 304
-__NR_eventfd 307
-__NR_fallocate 309
-__NR_eventfd2 314
-__NR_perf_counter_open 319
+timer_create 240
+timer_settime 241
+timer_delete 244
+clock_settime 245
+clock_gettime 246
+splice 283
+tee 284
+vmsplice 285
+openat 286
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
+utimensat 304
+eventfd 307
+fallocate 309
+eventfd2 314
+perf_counter_open 319
diff --git a/testcases/kernel/include/powerpc64.in
b/testcases/kernel/include/powerpc64.in
index 60f289e..9e1300f 100644
--- a/testcases/kernel/include/powerpc64.in
+++ b/testcases/kernel/include/powerpc64.in
@@ -1,26 +1,26 @@
-__NR_timer_create 240
-__NR_timer_settime 241
-__NR_timer_delete 244
-__NR_clock_settime 245
-__NR_clock_gettime 246
-__NR_splice 283
-__NR_tee 284
-__NR_vmsplice 285
-__NR_openat 286
-__NR_mkdirat (__NR_openat + 1)
-__NR_mknodat (__NR_openat + 2)
-__NR_fchownat (__NR_openat + 3)
-__NR_futimesat (__NR_openat + 4)
-__NR_newfstatat (__NR_openat + 5)
-__NR_fstatat64 (__NR_openat + 5)
-__NR_unlinkat (__NR_openat + 6)
-__NR_renameat (__NR_openat + 7)
-__NR_linkat (__NR_openat + 8)
-__NR_symlinkat (__NR_openat + 9)
-__NR_readlinkat (__NR_openat + 10)
-__NR_fchmodat (__NR_openat + 11)
-__NR_faccessat (__NR_openat + 12)
-__NR_utimensat 304
-__NR_eventfd 307
-__NR_fallocate 309
-__NR_eventfd2 314
+timer_create 240
+timer_settime 241
+timer_delete 244
+clock_settime 245
+clock_gettime 246
+splice 283
+tee 284
+vmsplice 285
+openat 286
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
+utimensat 304
+eventfd 307
+fallocate 309
+eventfd2 314
diff --git a/testcases/kernel/include/s390.in b/testcases/kernel/include/s390.in
index b18c6cf..560563a 100644
--- a/testcases/kernel/include/s390.in
+++ b/testcases/kernel/include/s390.in
@@ -1,17 +1,17 @@
openat 288
-mkdirat (__NR_openat 1)
-mknodat (__NR_openat 2)
-fchownat (__NR_openat 3)
-futimesat (__NR_openat 4)
-newfstatat (__NR_openat 5)
-fstatat64 (__NR_openat 5)
-unlinkat (__NR_openat 6)
-renameat (__NR_openat 7)
-linkat (__NR_openat 8)
-symlinkat (__NR_openat 9)
-readlinkat (__NR_openat 10)
-fchmodat (__NR_openat 11)
-faccessat (__NR_openat 12)
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
splice 306
tee 308
vmsplice 309
diff --git a/testcases/kernel/include/s390x.in
b/testcases/kernel/include/s390x.in
index d5a548d..28451fc 100644
--- a/testcases/kernel/include/s390x.in
+++ b/testcases/kernel/include/s390x.in
@@ -1,16 +1,16 @@
openat 288
-mkdirat (__NR_openat 1)
-mknodat (__NR_openat 2)
-fchownat (__NR_openat 3)
-futimesat (__NR_openat 4)
-newfstatat (__NR_openat 5)
-fstatat64 (__NR_openat 5)
-unlinkat (__NR_openat 6)
-renameat (__NR_openat 7)
-linkat (__NR_openat 8)
-symlinkat (__NR_openat 9)
-readlinkat (__NR_openat 10)
-fchmodat (__NR_openat 11)
-faccessat (__NR_openat 12)
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
eventfd 318
fallocate 314
diff --git a/testcases/kernel/include/sh.in b/testcases/kernel/include/sh.in
index e1a49ee..7b4acd9 100644
--- a/testcases/kernel/include/sh.in
+++ b/testcases/kernel/include/sh.in
@@ -14,19 +14,19 @@ inotify_init 290
inotify_add_watch 291
inotify_rm_watch 292
openat 295
-mkdirat (__NR_openat 1)
-mknodat (__NR_openat 2)
-fchownat (__NR_openat 3)
-futimesat (__NR_openat 4)
-newfstatat (__NR_openat 5)
-fstatat64 (__NR_openat 5)
-unlinkat (__NR_openat 6)
-renameat (__NR_openat 7)
-linkat (__NR_openat 8)
-symlinkat (__NR_openat 9)
-readlinkat (__NR_openat 10)
-fchmodat (__NR_openat 11)
-faccessat (__NR_openat 12)
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
splice 313
tee 315
vmsplice 316
diff --git a/testcases/kernel/include/sparc.in
b/testcases/kernel/include/sparc.in
index 5c0047b..a567659 100644
--- a/testcases/kernel/include/sparc.in
+++ b/testcases/kernel/include/sparc.in
@@ -2,18 +2,18 @@ vmsplice 25
splice 232
tee 280
openat 284
-mkdirat (__NR_openat 1)
-mknodat (__NR_openat 2)
-fchownat (__NR_openat 3)
-futimesat (__NR_openat 4)
-newfstatat (__NR_openat 5)
-fstatat64 (__NR_openat 5)
-unlinkat (__NR_openat 6)
-renameat (__NR_openat 7)
-linkat (__NR_openat 8)
-symlinkat (__NR_openat 9)
-readlinkat (__NR_openat 10)
-fchmodat (__NR_openat 11)
-faccessat (__NR_openat 12)
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
eventfd 313
fallocate 314
diff --git a/testcases/kernel/include/sparc64.in
b/testcases/kernel/include/sparc64.in
index b3afb0f..954931c 100644
--- a/testcases/kernel/include/sparc64.in
+++ b/testcases/kernel/include/sparc64.in
@@ -2,18 +2,18 @@ vmsplice 25
splice 232
tee 280
openat 284
-mkdirat (__NR_openat 1)
-mknodat (__NR_openat 2)
-fchownat (__NR_openat 3)
-futimesat (__NR_openat 4)
-newfstatat (__NR_openat 5)
-fstatat64 (__NR_openat 5)
-unlinkat (__NR_openat 6)
-renameat (__NR_openat 7)
-linkat (__NR_openat 8)
-symlinkat (__NR_openat 9)
-readlinkat (__NR_openat 10)
-fchmodat (__NR_openat 11)
-faccessat (__NR_openat 12)
+mkdirat (__NR_openat + 1)
+mknodat (__NR_openat + 2)
+fchownat (__NR_openat + 3)
+futimesat (__NR_openat + 4)
+newfstatat (__NR_openat + 5)
+fstatat64 (__NR_openat + 5)
+unlinkat (__NR_openat + 6)
+renameat (__NR_openat + 7)
+linkat (__NR_openat + 8)
+symlinkat (__NR_openat + 9)
+readlinkat (__NR_openat + 10)
+fchmodat (__NR_openat + 11)
+faccessat (__NR_openat + 12)
eventd 313
fallocate 314
--
1.6.2.4
With kind regards,
Geert Uytterhoeven
Software Architect
Techsoft Centre
Technology and Software Centre Europe
The Corporate Village · Da Vincilaan 7-D1 · B-1935 Zaventem · Belgium
Phone: +32 (0)2 700 8453
Fax: +32 (0)2 700 8622
E-mail: [email protected]
Internet: http://www.sony-europe.com/
A division of Sony Europe (Belgium) N.V.
VAT BE 0413.825.160 · RPR Brussels
Fortis · BIC GEBABEBB · IBAN BE41293037680010
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
