summaryrefslogtreecommitdiffstats
path: root/meta/recipes-kernel
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2011-01-05 16:48:33 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-06 10:06:31 +0000
commit34b067eebf0f257745c95f43f6fdbff0f9e28493 (patch)
tree88d5feda059662fcdf701f1a25e893bf2a78223a /meta/recipes-kernel
parent1539ecf265277349b19bafd8cc4ec62bf5ed45ad (diff)
downloadpoky-34b067eebf0f257745c95f43f6fdbff0f9e28493.tar.gz
modutils: Extend gcc4 patch for obj_ppc.c
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r--meta/recipes-kernel/modutils/files/gcc4.patch57
1 files changed, 41 insertions, 16 deletions
diff --git a/meta/recipes-kernel/modutils/files/gcc4.patch b/meta/recipes-kernel/modutils/files/gcc4.patch
index e204898f05..53750bc617 100644
--- a/meta/recipes-kernel/modutils/files/gcc4.patch
+++ b/meta/recipes-kernel/modutils/files/gcc4.patch
@@ -1,6 +1,8 @@
1--- modutils-2.4.27/depmod/depmod.c.old 2005-06-05 23:25:28.000000000 +0100 1Index: modutils-2.4.27/depmod/depmod.c
2+++ modutils-2.4.27/depmod/depmod.c 2005-06-05 23:25:38.000000000 +0100 2===================================================================
3@@ -1133,7 +1133,7 @@ 3--- modutils-2.4.27.orig/depmod/depmod.c
4+++ modutils-2.4.27/depmod/depmod.c
5@@ -1133,7 +1133,7 @@ static int addksyms(char *file_syms)
4 6
5 for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) { 7 for (ksym = ksyms; so_far < nksyms; ++so_far, ksym++) {
6 if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0) 8 if (strncmp((char *)ksym->name, "GPLONLY_", 8) == 0)
@@ -9,9 +11,11 @@
9 assert(n_syms < MAX_MAP_SYM); 11 assert(n_syms < MAX_MAP_SYM);
10 symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0); 12 symtab[n_syms++] = addsym((char *)ksym->name, mod, SYM_DEFINED, 0);
11 } 13 }
12--- modutils-2.4.27/genksyms/genksyms.c.old 2005-06-05 23:24:16.000000000 +0100 14Index: modutils-2.4.27/genksyms/genksyms.c
13+++ modutils-2.4.27/genksyms/genksyms.c 2005-06-05 23:24:35.000000000 +0100 15===================================================================
14@@ -45,7 +45,7 @@ 16--- modutils-2.4.27.orig/genksyms/genksyms.c
17+++ modutils-2.4.27/genksyms/genksyms.c
18@@ -45,7 +45,7 @@ char *cur_filename, *output_directory;
15 int flag_debug, flag_dump_defs, flag_warnings; 19 int flag_debug, flag_dump_defs, flag_warnings;
16 int checksum_version = 1, kernel_version = version(2,0,0); 20 int checksum_version = 1, kernel_version = version(2,0,0);
17 21
@@ -20,9 +24,11 @@
20 static int nsyms; 24 static int nsyms;
21 25
22 static struct symbol *expansion_trail; 26 static struct symbol *expansion_trail;
23--- modutils-2.4.27/insmod/insmod.c.old 2005-06-05 23:21:47.000000000 +0100 27Index: modutils-2.4.27/insmod/insmod.c
24+++ modutils-2.4.27/insmod/insmod.c 2005-06-05 23:22:34.000000000 +0100 28===================================================================
25@@ -275,7 +275,7 @@ 29--- modutils-2.4.27.orig/insmod/insmod.c
30+++ modutils-2.4.27/insmod/insmod.c
31@@ -275,7 +275,7 @@ static int add_symbols_from(struct obj_f
26 if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) { 32 if (strncmp((char *)s->name, "GPLONLY_", 8) == 0) {
27 gplonly_seen = 1; 33 gplonly_seen = 1;
28 if (gpl) 34 if (gpl)
@@ -31,9 +37,11 @@
31 else 37 else
32 continue; 38 continue;
33 } 39 }
34--- modutils-2.4.27/obj/obj_kallsyms.c.old 2005-06-05 23:20:08.000000000 +0100 40Index: modutils-2.4.27/obj/obj_kallsyms.c
35+++ modutils-2.4.27/obj/obj_kallsyms.c 2005-06-05 23:20:24.000000000 +0100 41===================================================================
36@@ -200,7 +200,7 @@ 42--- modutils-2.4.27.orig/obj/obj_kallsyms.c
43+++ modutils-2.4.27/obj/obj_kallsyms.c
44@@ -200,7 +200,7 @@ obj_kallsyms (struct obj_file *fin, stru
37 45
38 /* Initial contents, header + one entry per input section. No strings. */ 46 /* Initial contents, header + one entry per input section. No strings. */
39 osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec); 47 osec->header.sh_size = sizeof(*a_hdr) + loaded*sizeof(*a_sec);
@@ -42,7 +50,7 @@
42 xmalloc(osec->header.sh_size); 50 xmalloc(osec->header.sh_size);
43 memset(osec->contents, 0, osec->header.sh_size); 51 memset(osec->contents, 0, osec->header.sh_size);
44 a_hdr->size = sizeof(*a_hdr); 52 a_hdr->size = sizeof(*a_hdr);
45@@ -275,7 +275,7 @@ 53@@ -275,7 +275,7 @@ obj_kallsyms (struct obj_file *fin, stru
46 a_hdr->symbol_off + 54 a_hdr->symbol_off +
47 a_hdr->symbols*a_hdr->symbol_size + 55 a_hdr->symbols*a_hdr->symbol_size +
48 strings_size - strings_left; 56 strings_size - strings_left;
@@ -51,9 +59,11 @@
51 xrealloc(a_hdr, a_hdr->total_size); 59 xrealloc(a_hdr, a_hdr->total_size);
52 p = (char *)a_hdr + a_hdr->symbol_off; 60 p = (char *)a_hdr + a_hdr->symbol_off;
53 memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size); 61 memcpy(p, symbols, a_hdr->symbols*a_hdr->symbol_size);
54--- modutils-2.4.27/obj/obj_mips.c.orig 2003-04-05 00:47:17.000000000 +0200 62Index: modutils-2.4.27/obj/obj_mips.c
55+++ modutils-2.4.27/obj/obj_mips.c 2005-07-21 12:51:48.000000000 +0200 63===================================================================
56@@ -244,7 +244,9 @@ 64--- modutils-2.4.27.orig/obj/obj_mips.c
65+++ modutils-2.4.27/obj/obj_mips.c
66@@ -244,7 +244,9 @@ arch_archdata (struct obj_file *f, struc
57 archdata_sec->header.sh_size = 0; 67 archdata_sec->header.sh_size = 0;
58 sec = obj_find_section(f, "__dbe_table"); 68 sec = obj_find_section(f, "__dbe_table");
59 if (sec) { 69 if (sec) {
@@ -64,3 +74,18 @@
64 memset(ad, 0, sizeof(*ad)); 74 memset(ad, 0, sizeof(*ad));
65 archdata_sec->header.sh_size = sizeof(*ad); 75 archdata_sec->header.sh_size = sizeof(*ad);
66 ad->__start___dbe_table = sec->header.sh_addr; 76 ad->__start___dbe_table = sec->header.sh_addr;
77Index: modutils-2.4.27/obj/obj_ppc.c
78===================================================================
79--- modutils-2.4.27.orig/obj/obj_ppc.c
80+++ modutils-2.4.27/obj/obj_ppc.c
81@@ -255,7 +255,9 @@ arch_archdata (struct obj_file *f, struc
82 archdata_sec->header.sh_size = 0;
83 sec = obj_find_section(f, "__ftr_fixup");
84 if (sec) {
85- ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad));
86+ /* ad = (struct archdata *) (archdata_sec->contents) = xmalloc(sizeof(*ad)); */
87+ archdata_sec->contents = xmalloc(sizeof(*ad));
88+ ad = (struct archdata *) (archdata_sec->contents);
89 memset(ad, 0, sizeof(*ad));
90 archdata_sec->header.sh_size = sizeof(*ad);
91 ad->__start___ftr_fixup = sec->header.sh_addr;