OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 135... Line 135...
135 135
Line 136... Line 136...
136 check_modinfo_retpoline(mod, info); 136 check_modinfo_retpoline(mod, info);
137 137
138 --- a/scripts/mod/modpost.c 138 --- a/scripts/mod/modpost.c
139 +++ b/scripts/mod/modpost.c 139 +++ b/scripts/mod/modpost.c
Line 140... Line 140...
140 @@ -1967,7 +1967,9 @@ static void read_symbols(char *modname) 140 @@ -1965,7 +1965,9 @@ static void read_symbols(char *modname)
141 symname = remove_dot(info.strtab + sym->st_name); 141 symname = remove_dot(info.strtab + sym->st_name);
142 142
143 handle_modversions(mod, &info, sym, symname); 143 handle_modversions(mod, &info, sym, symname);
144 +#ifndef CONFIG_MODULE_STRIPPED 144 +#ifndef CONFIG_MODULE_STRIPPED
145 handle_moddevtable(mod, &info, sym, symname); 145 handle_moddevtable(mod, &info, sym, symname);
146 +#endif 146 +#endif
147 } 147 }
148 if (!is_vmlinux(modname) || 148 if (!is_vmlinux(modname) ||
149 (is_vmlinux(modname) && vmlinux_section_warnings)) 149 (is_vmlinux(modname) && vmlinux_section_warnings))
150 @@ -2111,7 +2113,9 @@ static void add_header(struct buffer *b, 150 @@ -2109,7 +2111,9 @@ static void add_header(struct buffer *b,
151 buf_printf(b, "#include <linux/vermagic.h>\n"); 151 buf_printf(b, "#include <linux/vermagic.h>\n");
152 buf_printf(b, "#include <linux/compiler.h>\n"); 152 buf_printf(b, "#include <linux/compiler.h>\n");
153 buf_printf(b, "\n"); 153 buf_printf(b, "\n");
154 +#ifndef CONFIG_MODULE_STRIPPED 154 +#ifndef CONFIG_MODULE_STRIPPED
155 buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n"); 155 buf_printf(b, "MODULE_INFO(vermagic, VERMAGIC_STRING);\n");
156 +#endif 156 +#endif
157 buf_printf(b, "\n"); 157 buf_printf(b, "\n");
Line 158... Line 158...
158 buf_printf(b, "__visible struct module __this_module\n"); 158 buf_printf(b, "__visible struct module __this_module\n");
159 buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n"); 159 buf_printf(b, "__attribute__((section(\".gnu.linkonce.this_module\"))) = {\n");
160 @@ -2128,24 +2132,30 @@ static void add_header(struct buffer *b, 160 @@ -2126,24 +2130,30 @@ static void add_header(struct buffer *b,
161 161
Line 186... Line 186...
186 buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n"); 186 buf_printf(b, "\nMODULE_INFO(staging, \"Y\");\n");
187 +#endif 187 +#endif
188 } 188 }
Line 189... Line 189...
189 189
190 /* In kernel, this size is defined in linux/module.h; 190 /* In kernel, this size is defined in linux/module.h;
Line 191... Line 191...
191 @@ -2249,11 +2259,13 @@ static void add_depends(struct buffer *b 191 @@ -2247,11 +2257,13 @@ static void add_depends(struct buffer *b
192 192
193 static void add_srcversion(struct buffer *b, struct module *mod) 193 static void add_srcversion(struct buffer *b, struct module *mod)
194 { 194 {
Line 200... Line 200...
200 } 200 }
201 +#endif 201 +#endif
202 } 202 }
Line 203... Line 203...
203 203
204 static void write_if_changed(struct buffer *b, const char *fname) 204 static void write_if_changed(struct buffer *b, const char *fname)
205 @@ -2488,7 +2500,9 @@ int main(int argc, char **argv) 205 @@ -2486,7 +2498,9 @@ int main(int argc, char **argv)
206 add_staging_flag(&buf, mod->name); 206 add_staging_flag(&buf, mod->name);
207 err |= add_versions(&buf, mod); 207 err |= add_versions(&buf, mod);
208 add_depends(&buf, mod, modules); 208 add_depends(&buf, mod, modules);
209 +#ifndef CONFIG_MODULE_STRIPPED 209 +#ifndef CONFIG_MODULE_STRIPPED