OpenSDE Packages Database (without history before r20070)
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

337 lines
10 KiB

  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../linux24-psionw/gcc-4x.patch
  5. # Copyright (C) 2006 The T2 SDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  16. --- linux24-psionw/fs/proc/proc_misc.c.vanilla 2006-04-11 19:56:36.000000000 +0200
  17. +++ linux24-psionw/fs/proc/proc_misc.c 2006-04-11 19:56:43.000000000 +0200
  18. @@ -562,7 +562,7 @@
  19. /*
  20. * writing 'C' to /proc/sysrq-trigger is like sysrq-C
  21. */
  22. -static ssize_t write_sysrq_trigger(struct file *file, const char *buf,
  23. +static ssize_t write_sysrq_trigger(struct file *file, char *buf,
  24. size_t count, loff_t *ppos)
  25. {
  26. if (count) {
  27. --- linux24-psionw/fs/readdir.c.vanilla 2006-04-11 20:06:42.000000000 +0200
  28. +++ linux24-psionw/fs/readdir.c 2006-04-11 20:13:32.000000000 +0200
  29. @@ -264,7 +264,7 @@
  30. put_user(reclen, &dirent->d_reclen);
  31. copy_to_user(dirent->d_name, name, namlen);
  32. put_user(0, dirent->d_name + namlen);
  33. - ((char *) dirent) += reclen;
  34. + dirent = (char*) dirent + reclen;
  35. buf->current_dir = dirent;
  36. buf->count -= reclen;
  37. return 0;
  38. @@ -347,7 +347,7 @@
  39. copy_to_user(dirent, &d, NAME_OFFSET(&d));
  40. copy_to_user(dirent->d_name, name, namlen);
  41. put_user(0, dirent->d_name + namlen);
  42. - ((char *) dirent) += reclen;
  43. + dirent = (char*) dirent + reclen;
  44. buf->current_dir = dirent;
  45. buf->count -= reclen;
  46. return 0;
  47. --- linux24-psionw/net/irda/irlan/irlan_event.c.vanilla 2006-04-11 20:20:28.000000000 +0200
  48. +++ linux24-psionw/net/irda/irlan/irlan_event.c 2006-04-11 20:20:35.000000000 +0200
  49. @@ -24,7 +24,7 @@
  50. #include <net/irda/irlan_event.h>
  51. -char *irlan_state[] = {
  52. +static char *irlan_state[] = {
  53. "IRLAN_IDLE",
  54. "IRLAN_QUERY",
  55. "IRLAN_CONN",
  56. --- linux24-psionw/arch/arm/lib/longlong.h.vanilla 2006-04-11 21:01:31.000000000 +0200
  57. +++ linux24-psionw/arch/arm/lib/longlong.h 2006-04-11 21:01:38.000000000 +0200
  58. @@ -161,7 +161,7 @@
  59. #define UDIV_NEEDS_NORMALIZATION 1
  60. #define udiv_qrnnd __udiv_qrnnd_c
  61. -extern const UQItype __clz_tab[];
  62. +static const UQItype __clz_tab[];
  63. #define count_leading_zeros(count, x) \
  64. do { \
  65. USItype __xr = (x); \
  66. --- linux24-psionw/arch/arm/nwfpe/fpa11_cpdt.c.vanilla 2006-04-11 21:02:16.000000000 +0200
  67. +++ linux24-psionw/arch/arm/nwfpe/fpa11_cpdt.c 2006-04-11 21:03:33.000000000 +0200
  68. @@ -28,14 +28,14 @@
  69. #include <asm/uaccess.h>
  70. -static inline void loadSingle(const unsigned int Fn, const unsigned int *pMem)
  71. +static inline void loadSingle(unsigned int Fn, unsigned int *pMem)
  72. {
  73. FPA11 *fpa11 = GET_FPA11();
  74. fpa11->fType[Fn] = typeSingle;
  75. get_user(fpa11->fpreg[Fn].fSingle, pMem);
  76. }
  77. -static inline void loadDouble(const unsigned int Fn, const unsigned int *pMem)
  78. +static inline void loadDouble(const unsigned int Fn, unsigned int *pMem)
  79. {
  80. FPA11 *fpa11 = GET_FPA11();
  81. unsigned int *p;
  82. @@ -46,7 +46,7 @@
  83. }
  84. #ifdef CONFIG_FPE_NWFPE_XP
  85. -static inline void loadExtended(const unsigned int Fn, const unsigned int *pMem)
  86. +static inline void loadExtended(const unsigned int Fn, unsigned int *pMem)
  87. {
  88. FPA11 *fpa11 = GET_FPA11();
  89. unsigned int *p;
  90. @@ -58,7 +58,7 @@
  91. }
  92. #endif
  93. -static inline void loadMultiple(const unsigned int Fn, const unsigned int *pMem)
  94. +static inline void loadMultiple(unsigned int Fn, unsigned int *pMem)
  95. {
  96. FPA11 *fpa11 = GET_FPA11();
  97. register unsigned int *p;
  98. --- linux24-psionw/arch/arm/kernel/io.c.vanilla 2006-04-11 20:58:56.000000000 +0200
  99. +++ linux24-psionw/arch/arm/kernel/io.c 2006-04-11 21:00:10.000000000 +0200
  100. @@ -12,7 +12,7 @@
  101. while (count) {
  102. count--;
  103. *(char *) to = readb(from);
  104. - ((char *) to)++;
  105. + to = (char *) to + 1;
  106. from++;
  107. }
  108. }
  109. @@ -26,7 +26,7 @@
  110. while (count) {
  111. count--;
  112. writeb(*(char *) from, to);
  113. - ((char *) from)++;
  114. + from = (char *) from + 1;
  115. to++;
  116. }
  117. }
  118. --- linux24-psionw/init/do_mounts.c.vanilla 2006-04-11 18:05:05.000000000 +0200
  119. +++ linux24-psionw/init/do_mounts.c 2006-04-11 18:05:30.000000000 +0200
  120. @@ -52,7 +52,7 @@
  121. int __initdata rd_doload; /* 1 = load RAM disk, 0 = don't load */
  122. int root_mountflags = MS_RDONLY | MS_VERBOSE;
  123. -static char root_device_name[64];
  124. +char root_device_name[64];
  125. /* this is initialized in init/main.c */
  126. kdev_t ROOT_DEV;
  127. --- linux24-psionw/drivers/char/vc_screen.c.vanilla 2006-04-11 19:51:32.000000000 +0200
  128. +++ linux24-psionw/drivers/char/vc_screen.c 2006-04-11 19:51:54.000000000 +0200
  129. @@ -421,7 +421,7 @@
  130. while (this_round > 1) {
  131. unsigned short w;
  132. - w = get_unaligned(((const unsigned short *)con_buf0));
  133. + w = get_unaligned(((unsigned short *)con_buf0));
  134. vcs_scr_writew(currcons, w, org++);
  135. con_buf0 += 2;
  136. this_round -= 2;
  137. --- linux24-psionw/drivers/char/n_tty.c.vanilla 2006-04-11 19:50:37.000000000 +0200
  138. +++ linux24-psionw/drivers/char/n_tty.c 2006-04-11 19:51:07.000000000 +0200
  139. @@ -1147,9 +1147,9 @@
  140. }
  141. static ssize_t write_chan(struct tty_struct * tty, struct file * file,
  142. - const unsigned char * buf, size_t nr)
  143. + unsigned char * buf, size_t nr)
  144. {
  145. - const unsigned char *b = buf;
  146. + unsigned char *b = buf;
  147. DECLARE_WAITQUEUE(wait, current);
  148. int c;
  149. ssize_t retval = 0;
  150. --- linux24-psionw/drivers/sound/sound_firmware.c.vanilla 2006-04-11 19:52:28.000000000 +0200
  151. +++ linux24-psionw/drivers/sound/sound_firmware.c 2006-04-11 19:52:56.000000000 +0200
  152. @@ -7,7 +7,7 @@
  153. #include <linux/unistd.h>
  154. #include <asm/uaccess.h>
  155. -static int errno;
  156. +//int errno;
  157. static int do_mod_firmware_load(const char *fn, char **fp)
  158. {
  159. int fd;
  160. --- linux24-psionw/drivers/video/fbcon.c.vanilla 2006-04-11 19:53:32.000000000 +0200
  161. +++ linux24-psionw/drivers/video/fbcon.c 2006-04-11 19:55:44.000000000 +0200
  162. @@ -1877,7 +1877,7 @@
  163. font length must be multiple of 256, at least. And 256 is multiple
  164. of 4 */
  165. k = 0;
  166. - while (p > new_data) k += *--(u32 *)p;
  167. + for (; p > new_data; p-=4) k += *p;
  168. FNTSUM(new_data) = k;
  169. /* Check if the same font is on some other console already */
  170. for (i = 0; i < MAX_NR_CONSOLES; i++) {
  171. --- linux24-psionw/kernel/sysctl.c.vanilla 2006-04-11 19:38:32.000000000 +0200
  172. +++ linux24-psionw/kernel/sysctl.c 2006-04-11 19:50:06.000000000 +0200
  173. @@ -879,7 +879,7 @@
  174. if (!isspace(c))
  175. break;
  176. left--;
  177. - ((char *) buffer)++;
  178. + buffer++;
  179. }
  180. if (!left)
  181. break;
  182. @@ -1032,7 +1032,7 @@
  183. if (!isspace(c))
  184. break;
  185. left--;
  186. - ((char *) buffer)++;
  187. + buffer++;
  188. }
  189. if (!left)
  190. break;
  191. @@ -1133,7 +1133,7 @@
  192. if (!isspace(c))
  193. break;
  194. left--;
  195. - ((char *) buffer)++;
  196. + buffer++;
  197. }
  198. if (!left)
  199. break;
  200. --- linux24-psionw/include/net/irda/irttp.h.vanilla 2006-04-11 20:56:55.000000000 +0200
  201. +++ linux24-psionw/include/net/irda/irttp.h 2006-04-11 20:57:05.000000000 +0200
  202. @@ -209,6 +209,6 @@
  203. return(irlap_is_primary(self->lsap->lap->irlap));
  204. }
  205. -extern struct irttp_cb *irttp;
  206. +static struct irttp_cb *irttp;
  207. #endif /* IRTTP_H */
  208. --- linux24-psionw/include/net/irda/irlan_event.h.vanilla 2006-04-11 20:19:39.000000000 +0200
  209. +++ linux24-psionw/include/net/irda/irlan_event.h 2006-04-11 20:57:23.000000000 +0200
  210. @@ -67,7 +67,7 @@
  211. IRLAN_WATCHDOG_TIMEOUT,
  212. } IRLAN_EVENT;
  213. -extern char *irlan_state[];
  214. +static char *irlan_state[];
  215. void irlan_do_client_event(struct irlan_cb *self, IRLAN_EVENT event,
  216. struct sk_buff *skb);
  217. --- linux24-psionw/include/net/ipv6.h.vanilla 2006-04-11 20:15:01.000000000 +0200
  218. +++ linux24-psionw/include/net/ipv6.h 2006-04-11 20:15:34.000000000 +0200
  219. @@ -20,6 +20,8 @@
  220. #include <net/ndisc.h>
  221. #include <net/flow.h>
  222. +#include <net/snmp.h>
  223. +
  224. #define SIN6_LEN_RFC2133 24
  225. /*
  226. --- linux24-psionw/include/net/icmp.h.vanilla 2006-04-11 20:16:38.000000000 +0200
  227. +++ linux24-psionw/include/net/icmp.h 2006-04-11 20:17:49.000000000 +0200
  228. @@ -24,6 +24,8 @@
  229. #include <net/sock.h>
  230. #include <net/protocol.h>
  231. +#include <net/snmp.h>
  232. +
  233. struct icmp_err {
  234. int errno;
  235. unsigned fatal:1;
  236. --- linux24-psionw/include/linux/irq_cpustat.h.vanilla 2006-04-11 19:37:23.000000000 +0200
  237. +++ linux24-psionw/include/linux/irq_cpustat.h 2006-04-11 19:37:27.000000000 +0200
  238. @@ -22,7 +22,7 @@
  239. #ifdef CONFIG_SMP
  240. #define __IRQ_STAT(cpu, member) (irq_stat[cpu].member)
  241. #else
  242. -#define __IRQ_STAT(cpu, member) ((void)(cpu), irq_stat[0].member)
  243. +#define __IRQ_STAT(cpu, member) (irq_stat[((void)(cpu), 0)].member)
  244. #endif
  245. /* arch independent irq_stat fields */
  246. --- linux24-psionw/include/asm-arm/setup.h.vanilla 2006-04-11 21:06:30.000000000 +0200
  247. +++ linux24-psionw/include/asm-arm/setup.h 2006-04-11 21:07:16.000000000 +0200
  248. @@ -265,6 +265,6 @@
  249. } bank[NR_BANKS];
  250. };
  251. -extern struct meminfo meminfo;
  252. +// extern struct meminfo meminfo;
  253. #endif
  254. --- linux24-psionw/arch/arm/Makefile.vanilla 2006-04-11 23:07:45.000000000 +0200
  255. +++ linux24-psionw/arch/arm/Makefile 2006-04-11 23:07:50.000000000 +0200
  256. @@ -27,7 +27,7 @@
  257. #
  258. # Note! For APCS-26 YOU MUST HAVE AN APCS-26 LIBGCC.A
  259. #
  260. -apcs-y :=-mapcs-32
  261. +apcs-y :=
  262. apcs-$(CONFIG_CPU_26) :=-mapcs-26 -mcpu=arm3 -Os
  263. # This selects which instruction set is used.
  264. --- linux24-psionw/lib/crc32.c.vanilla 2006-07-29 20:12:35.000000000 +0200
  265. +++ linux24-psionw/lib/crc32.c 2006-07-29 20:13:40.000000000 +0200
  266. @@ -99,7 +99,7 @@
  267. /* Align it */
  268. if(unlikely(((long)b)&3 && len)){
  269. do {
  270. - DO_CRC(*((u8 *)b)++);
  271. + DO_CRC(*(b)++);
  272. } while ((--len) && ((long)b)&3 );
  273. }
  274. if(likely(len >= 4)){
  275. @@ -120,7 +120,7 @@
  276. /* And the last few bytes */
  277. if(len){
  278. do {
  279. - DO_CRC(*((u8 *)b)++);
  280. + DO_CRC(*(b)++);
  281. } while (--len);
  282. }
  283. @@ -200,7 +200,7 @@
  284. /* Align it */
  285. if(unlikely(((long)b)&3 && len)){
  286. do {
  287. - DO_CRC(*((u8 *)b)++);
  288. + DO_CRC(*(b)++);
  289. } while ((--len) && ((long)b)&3 );
  290. }
  291. if(likely(len >= 4)){
  292. @@ -221,7 +221,7 @@
  293. /* And the last few bytes */
  294. if(len){
  295. do {
  296. - DO_CRC(*((u8 *)b)++);
  297. + DO_CRC(*(b)++);
  298. } while (--len);
  299. }
  300. return __be32_to_cpu(crc);
  301. --- linux24-psionw/drivers/pcmcia/bulkmem.c.vanilla 2006-07-29 20:09:16.000000000 +0200
  302. +++ linux24-psionw/drivers/pcmcia/bulkmem.c 2006-07-29 20:10:40.000000000 +0200
  303. @@ -301,7 +301,7 @@
  304. {
  305. window_handle_t w;
  306. int ret = pcmcia_request_window(a1, a2, &w);
  307. - (window_handle_t *)a1 = w;
  308. + a1 = w;
  309. return ret;
  310. }
  311. break;