Re: Fwd: Bug#561891: Please support sh4

[Nobuhiro Iwamatsu <iwamatsu@nigauri.org>]

HI, all.

2009/12/21 Martin Steigerwald <ms@teamix.de>:
> Am Montag, 21. Dezember 2009 schrieb Jens Axboe:
>> On Mon, Dec 21 2009, Martin Steigerwald wrote:
>> > Hello Jens,
>> >
>> > Can you have a look at the following build fix? It looks reasonable for
>> > me.
>> >
>> > I hope I will make time to create an update to the package real soon.
>> > Have some discussions with git and maybe pristine-tar to solve tough
>> > (merge conflicts where they shouldn't be any).
>> >
>> > If you release with this patch upstream, I will take it from you.
>> > Otherwise I will temporarily include it in the Debian package.
>>
>> I seem to be missing some bits, I don't have sh support integrated. Is
>> there a predecessor to this patch?
>
> Hmmm, indeed I do not see a arch-sh.h file in your latest fio 1.36 archive. (I
> didn't look before, cause I assumed it was there.)
>
>> > ----------  Weitergeleitete Nachricht  ----------
>> >
>> > Betreff: Bug#561891: Please support sh4
>> > Datum: Montag, 21. Dezember 2009
>> > Von: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
>> > An: Debian Bug Tracking System <submit@bugs.debian.org>
>> >
>> > Package: fio
>> > Version: 1.33.1-1
>> > Severity: important
>> > User: debian-sh4@superh.org
>> > Tags: patch
>> > Usertags: sh4
>> > X-Debbugs-CC: debian-superh@lists.debian.org
>> >
>> > Hi,
>> >
>> > I am now trying to run Debian on Renesas SH(sh4) CPU.
>> > http://buildd.debian-ports.org/status/architecture.php?suite=unstable&a=s
>> >h4
>> >
>> > fio FTBFS on sh4.
>> > Because fio supports SuperH, but information is not enough in header
>> > file (arch/arch.h).
>> >
>> > -----
>> > # Add here commands to compile the package.
>> > /usr/bin/make
>> > make[1]: Entering directory
>> > `/build/buildd-fio_1.33.1-1-sh4-NFt0ru/fio-1.33.1' CC gettime.o
>> > In file included from fio.h:22,
>> >                 from gettime.c:8:
>> > arch/arch.h:37:2: error: #error "Unsupported arch"
>> > make[1]: *** [gettime.o] Error 1
>> > -----
>> >
>> > I created patch which revised this problem.
>> > Could you check and apply this patch?
>
> Nobuhiro, could you tell us, where you got arch-sh.h file from? Or did you
> create it and forgot to add it to your patch? We need that file in order to
> have SuperH / sh4 support in fio.
>
> Ciao,

Sorry, I have sent a different patch.
I send right patch.

Best regards,
  Nobuhiro

-- 
Nobuhiro Iwamatsu
   iwamatsu at {nigauri.org / debian.org}
   GPG ID: 40AD1FA6

diff -ruN fio-1.33.1orig/arch/arch-sh.h fio-1.33.1/arch/arch-sh.h
--- fio-1.33.1.a/arch/arch-sh.h	1970-01-01 00:00:00.000000000 +0000
+++ fio-1.33.1/arch/arch-sh.h	2009-12-21 20:20:00.000000000 +0000
@@ -0,0 +1,27 @@
+/* Renesas SH (32bit) only */
+
+#ifndef ARCH_SH_H
+#define ARCH_SH_H
+
+#define SH	(arch_sh)
+
+#ifndef __NR_ioprio_set
+#define __NR_ioprio_set	288
+#define __NR_ioprio_get	289
+#endif
+
+#ifndef __NR_fadvise64
+#define __NR_fadvise64	250
+#endif
+
+#ifndef __NR_sys_splice
+#define __NR_sys_splice		313
+#define __NR_sys_tee		315
+#define __NR_sys_vmsplice	316
+#endif
+
+#define nop             __asm__ __volatile__ ("nop": : :"memory")
+#define read_barrier()  __asm__ __volatile__ (" " : : : "memory")
+#define write_barrier() __asm__ __volatile__ (" " : : : "memory")
+
+#endif
diff -ruN fio-1.33.1orig/arch/arch.h fio-1.33.1/arch/arch.h
--- fio-1.33.1.a/arch/arch.h	2009-12-21 20:16:54.000000000 +0000
+++ fio-1.33.1/arch/arch.h	2009-12-21 20:22:34.000000000 +0000
@@ -11,6 +11,7 @@
 	arch_sparc,
 	arch_sparc64,
 	arch_arm,
+	arch_sh,
 };
 
 #if defined(__i386__)
@@ -33,6 +34,8 @@
 #include "arch-arm.h"
 #elif defined(__mips__) || defined(__mips64__)
 #include "arch-mips.h"
+#elif defined(__sh__)
+#include "arch-sh.h"
 #else
 #error "Unsupported arch"
 #endif