lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

Browse Source 
* tag 'for-linus' of git://github.com/rustyrussell/linux:
  mod/file2alias: make modpost compile on darwin again
This commit is contained in:
Linus Torvalds
2012-02-26 21:02:07 -08:00
parent f694fc9729 dd2a3acaec
commit f6bd5798f3
1 changed files with 31 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
scripts/mod/file2alias.c
View File

@@ -46,11 +46,37 @@ struct devtable {
void *function; void *function;
}; };
#define ___cat(a,b) a ## b
#define __cat(a,b) ___cat(a,b)
/* we need some special handling for this host tool running eventually on
* Darwin. The Mach-O section handling is a bit different than ELF section
* handling. The differnces in detail are:
* a) we have segments which have sections
* b) we need a API call to get the respective section symbols */
#if defined(__MACH__)
#include <mach-o/getsect.h>
#define INIT_SECTION(name) do { \
unsigned long name ## _len; \
char *__cat(pstart_,name) = getsectdata("__TEXT", \
#name, &__cat(name,_len)); \
char *__cat(pstop_,name) = __cat(pstart_,name) + \
__cat(name, _len); \
__cat(__start_,name) = (void *)__cat(pstart_,name); \
__cat(__stop_,name) = (void *)__cat(pstop_,name); \
} while (0)
#define SECTION(name) __attribute__((section("__TEXT, " #name)))
struct devtable **__start___devtable, **__stop___devtable;
#else
#define INIT_SECTION(name) /* no-op for ELF */
#define SECTION(name) __attribute__((section(#name)))
/* We construct a table of pointers in an ELF section (pointers generally /* We construct a table of pointers in an ELF section (pointers generally
* go unpadded by gcc). ld creates boundary syms for us. */ * go unpadded by gcc). ld creates boundary syms for us. */
extern struct devtable *__start___devtable[], *__stop___devtable[]; extern struct devtable *__start___devtable[], *__stop___devtable[];
#define ___cat(a,b) a ## b #endif /* __MACH__ */
#define __cat(a,b) ___cat(a,b)
#if __GNUC__ == 3 && __GNUC_MINOR__ < 3 #if __GNUC__ == 3 && __GNUC_MINOR__ < 3
# define __used __attribute__((__unused__)) # define __used __attribute__((__unused__))
@@ -65,8 +91,8 @@ extern struct devtable *__start___devtable[], *__stop___devtable[];
(type *)NULL, \ (type *)NULL, \
(char *)NULL)), \ (char *)NULL)), \
sizeof(type), (function) }; \ sizeof(type), (function) }; \
static struct devtable *__attribute__((section("__devtable"))) \ static struct devtable *SECTION(__devtable) __used \
__used __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__) __cat(devtable_ptr,__LINE__) = &__cat(devtable,__LINE__)
#define ADD(str, sep, cond, field) \ #define ADD(str, sep, cond, field) \
do { \ do { \
@@ -1080,6 +1106,7 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
do_pnp_card_entries(symval, sym->st_size, mod); do_pnp_card_entries(symval, sym->st_size, mod);
else { else {
struct devtable **p; struct devtable **p;
INIT_SECTION(__devtable);
for (p = __start___devtable; p < __stop___devtable; p++) { for (p = __start___devtable; p < __stop___devtable; p++) {
if (sym_is(name, namelen, (*p)->device_id)) { if (sym_is(name, namelen, (*p)->device_id)) {