summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel/modutils/files/gcc4.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-kernel/modutils/files/gcc4.patch')
-rw-r--r--meta/recipes-kernel/modutils/files/gcc4.patch93
1 files changed, 0 insertions, 93 deletions
diff --git a/meta/recipes-kernel/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
deleted file mode 100644
index 4507b0338b..0000000000
--- a/meta/recipes-kernel/modutils/files/gcc4.patch
+++ /dev/null
@@ -1,93 +0,0 @@
1Upstream-Status: Pending
2
3Index: modutils-2.4.27/depmod/depmod.c
4===================================================================
5--- modutils-2.4.27.orig/depmod/depmod.c
6+++ modutils-2.4.27/depmod/depmod.c
7@@ -1133,7 +1133,7 @@ static int addksyms(char *file_syms)
8
9 for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
10 if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
11- ((char *)ksym->name) += 8;
12+ ksym->name += 8;
13 assert(n_syms < MAX_MAP_SYM);
14 symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
15 }
16Index: modutils-2.4.27/genksyms/genksyms.c
17===================================================================
18--- modutils-2.4.27.orig/genksyms/genksyms.c
19+++ modutils-2.4.27/genksyms/genksyms.c
20@@ -45,7 +45,7 @@ char *cur_filename, *output_directory;
21 int flag_debug, flag_dump_defs, flag_warnings;
22 int checksum_version = 1, kernel_version = version(2,0,0);
23
24-static int errors;
25+int errors;
26 static int nsyms;
27
28 static struct symbol *expansion_trail;
29Index: modutils-2.4.27/insmod/insmod.c
30===================================================================
31--- modutils-2.4.27.orig/insmod/insmod.c
32+++ modutils-2.4.27/insmod/insmod.c
33@@ -275,7 +275,7 @@ static int add_symbols_from(struct obj_f
34 if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
35 gplonly_seen = 1;
36 if (gpl)
37- ((char *)s->name) += 8;
38+ s->name += 8;
39 else
40 continue;
41 }
42Index: modutils-2.4.27/obj/obj_kallsyms.c
43===================================================================
44--- modutils-2.4.27.orig/obj/obj_kallsyms.c
45+++ modutils-2.4.27/obj/obj_kallsyms.c
46@@ -200,7 +200,7 @@ obj_kallsyms (struct obj_file *fin, stru
47
48 /* Initial contents, header + one entry per input section. No strings. */
49 osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
50- a_hdr = (struct kallsyms_header *) osec->contents =
51+ a_hdr = osec->contents =
52 xmalloc(osec->header.sh_size);
53 memset(osec->contents, 0, osec->header.sh_size);
54 a_hdr->size = sizeof(*a_hdr);
55@@ -275,7 +275,7 @@ obj_kallsyms (struct obj_file *fin, stru
56 a_hdr->symbol_off +
57 a_hdr->symbols*a_hdr->symbol_size +
58 strings_size - strings_left;
59- a_hdr = (struct kallsyms_header *) osec->contents =
60+ a_hdr = osec->contents =
61 xrealloc(a_hdr, a_hdr->total_size);
62 p = (char *)a_hdr + a_hdr->symbol_off;
63 memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
64Index: modutils-2.4.27/obj/obj_mips.c
65===================================================================
66--- modutils-2.4.27.orig/obj/obj_mips.c
67+++ modutils-2.4.27/obj/obj_mips.c
68@@ -244,7 +244,9 @@ arch_archdata (struct obj_file *f, struc
69 archdata_sec->header.sh_size = 0;
70 sec = obj_find_section(f, "__dbe_table");
71 if (sec) {
72- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
73+/* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));*/
74+ archdata_sec->contents = xmalloc(sizeof(*ad));
75+ ad = (struct archdata *) (archdata_sec->contents);
76 memset(ad, 0, sizeof(*ad));
77 archdata_sec->header.sh_size = sizeof(*ad);
78 ad->__start___dbe_table = sec->header.sh_addr;
79Index: modutils-2.4.27/obj/obj_ppc.c
80===================================================================
81--- modutils-2.4.27.orig/obj/obj_ppc.c
82+++ modutils-2.4.27/obj/obj_ppc.c
83@@ -255,7 +255,9 @@ arch_archdata (struct obj_file *f, struc
84 archdata_sec->header.sh_size = 0;
85 sec = obj_find_section(f, "__ftr_fixup");
86 if (sec) {
87- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
88+ /* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); */
89+ archdata_sec->contents = xmalloc(sizeof(*ad));
90+ ad = (struct archdata *) (archdata_sec->contents);
91 memset(ad, 0, sizeof(*ad));
92 archdata_sec->header.sh_size = sizeof(*ad);
93 ad->__start___ftr_fixup = sec->header.sh_addr;