fix svn patch breakage in glib
[openwrt/svn-archive/archive.git] / obsolete-buildroot / sources / valgrind.patch
1 --- valgrind-2.1.1.orig/coregrind/vg_syscalls.c 2004-02-24 17:07:10.000000000 -0700
2 +++ valgrind-2.1.1/coregrind/vg_syscalls.c 2004-04-16 18:13:11.000000000 -0600
3 @@ -3231,6 +3245,93 @@
4 case CDROM_CLEAR_OPTIONS: /* 0x5321 */
5 break;
6
7 + /* Stuff added by Erik Andersen for general device probing/handling */
8 +#define BLKSSZGET _IO(0x12,104)
9 + case BLKSSZGET:
10 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKSSZGET)", arg3,
11 + sizeof(int));
12 + break;
13 +#undef _IOR
14 +#define _IOR(type,nr,size) _IOC(_IOC_READ,(type),(nr),sizeof(size))
15 +#define BLKGETSIZE64 _IOR(0x12,114,sizeof(uint64_t))
16 + case BLKGETSIZE64:
17 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(BLKGETSIZE64)", arg3,
18 + sizeof(uint64_t));
19 + break;
20 +#define HDIO_GETGEO 0x0301 /* get device geometry */
21 + case HDIO_GETGEO:
22 + {
23 + struct hd_geometry {
24 + unsigned char heads;
25 + unsigned char sectors;
26 + unsigned short cylinders;
27 + unsigned long start;
28 + };
29 +
30 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(HDIO_GETGEO)", arg3,
31 + sizeof(struct hd_geometry));
32 + }
33 + break;
34 +#define HDIO_GET_IDENTITY 0x030d /* get IDE identification info */
35 +#define struct_hd_driveid_size 256 /* ATA6 specifies words 0-255 */
36 + case HDIO_GET_IDENTITY:
37 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(HDIO_GET_IDENTITY)", arg3,
38 + struct_hd_driveid_size);
39 + break;
40 +#define SCSI_IOCTL_GET_IDLUN 0x5382
41 + case SCSI_IOCTL_GET_IDLUN:
42 + {
43 + struct scsi_idlun
44 + {
45 + int mux4;
46 + int host_unique_id;
47 +
48 + };
49 +
50 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_GET_IDLUN)", arg3,
51 + sizeof(struct scsi_idlun));
52 + }
53 + break;
54 +#define SCSI_IOCTL_SEND_COMMAND 1
55 + case SCSI_IOCTL_SEND_COMMAND:
56 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_SEND_COMMAND)", arg3,
57 + ((2 * sizeof(unsigned int)) + 6 + 512));
58 + break;
59 +#define SCSI_IOCTL_GET_BUS_NUMBER 0x5386
60 + case SCSI_IOCTL_GET_BUS_NUMBER:
61 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_GET_BUS_NUMBER)", arg3,
62 + sizeof(int));
63 + break;
64 +#define SCSI_IOCTL_PROBE_HOST 0x5385
65 + case SCSI_IOCTL_PROBE_HOST:
66 + {
67 + int xxxx;
68 + char *array = (char*)arg3;
69 + xxxx = array[0] + (array[1]<<8) + (array[2]<<16) + (array[3]<<24);
70 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(SCSI_IOCTL_PROBE_HOST)", arg3,
71 + sizeof(int));
72 + }
73 + break;
74 +#define BLKFLSBUF _IO(0x12,97)
75 + case BLKFLSBUF:
76 + break;
77 +#define BLKRRPART _IO(0x12,95)
78 + case BLKRRPART:
79 + break;
80 +#define MTIOCTOP _IO(0x6d,0x1)
81 + case MTIOCTOP:
82 + {
83 + struct mtop
84 + {
85 + short int mt_op; /* Operations defined below. */
86 + int mt_count; /* How many of them. */
87 + };
88 + SYSCALL_TRACK( pre_mem_write, tid, "ioctl(MTIOCTOP)", arg3,
89 + sizeof(struct mtop));
90 + }
91 + break;
92 +
93 +
94 /* We don't have any specific information on it, so
95 try to do something reasonable based on direction and
96 size bits. The encoding scheme is described in
97 --- valgrind-2.1.1.orig/coregrind/vg_libpthread.c 2004-03-08 08:57:17.000000000 -0700
98 +++ valgrind-2.1.1/coregrind/vg_libpthread.c 2004-04-16 17:58:31.000000000 -0600
99 @@ -3175,6 +3175,8 @@
100 pthread_mutex). So basically, this is completely broken on recent
101 glibcs. */
102
103 +#ifndef __UCLIBC__
104 +
105 #undef _IO_flockfile
106 void _IO_flockfile ( _IO_FILE * file )
107 {
108 @@ -3192,6 +3194,7 @@
109 weak_alias(_IO_funlockfile, funlockfile);
110 #endif
111
112 +#endif
113
114 /* This doesn't seem to be needed to simulate libpthread.so's external
115 interface, but many people complain about its absence. */