diff options
| author | Jon Masters <jcm@jonmasters.org> | 2009-06-27 04:07:46 -0400 |
|---|---|---|
| committer | Jon Masters <jcm@jonmasters.org> | 2009-06-27 04:07:46 -0400 |
| commit | 82581ff415d6d8b79714b054812fabfd1cba2479 (patch) | |
| tree | 1ba634d29b694ec89aa5f38f603a65d6bc8ddb4f | |
| parent | f7de968054eaa043c20abf831c8dbb0ddaf2df5e (diff) | |
| download | module-init-tools-82581ff415d6d8b79714b054812fabfd1cba2479.tar.gz | |
From: Michal Marek <mmarek@suse.cz>
testsuite: stop testing the old style EXPORT_SYMBOL macro
The "new style" macro has been in use long enough (since 2.5.59 or so),
so stop testing the old one. The next patch will remove support for the
old macro.
The modules were rebuilt on a x86 and ppc machine, using gcc 4.3.2.
Signed-off-by: Michal Marek <mmarek@suse.cz>
59 files changed, 32 insertions, 95 deletions
diff --git a/tests/data/32-be/complex/complex_b-32.ko b/tests/data/32-be/complex/complex_b-32.ko Binary files differindex ffcf112..17be505 100644 --- a/tests/data/32-be/complex/complex_b-32.ko +++ b/tests/data/32-be/complex/complex_b-32.ko diff --git a/tests/data/32-be/complex/complex_c-32.ko b/tests/data/32-be/complex/complex_c-32.ko Binary files differindex 1403ed6..3e2360b 100644 --- a/tests/data/32-be/complex/complex_c-32.ko +++ b/tests/data/32-be/complex/complex_c-32.ko diff --git a/tests/data/32-be/complex/complex_d-32.ko b/tests/data/32-be/complex/complex_d-32.ko Binary files differindex 562fe20..6627055 100644 --- a/tests/data/32-be/complex/complex_d-32.ko +++ b/tests/data/32-be/complex/complex_d-32.ko diff --git a/tests/data/32-be/complex/complex_e-32.ko b/tests/data/32-be/complex/complex_e-32.ko Binary files differindex 446f61b..2e32c38 100644 --- a/tests/data/32-be/complex/complex_e-32.ko +++ b/tests/data/32-be/complex/complex_e-32.ko diff --git a/tests/data/32-be/loop/loop1-32.ko b/tests/data/32-be/loop/loop1-32.ko Binary files differindex 5bcfa24..2635374 100644 --- a/tests/data/32-be/loop/loop1-32.ko +++ b/tests/data/32-be/loop/loop1-32.ko diff --git a/tests/data/32-be/loop/loop2-32.ko b/tests/data/32-be/loop/loop2-32.ko Binary files differindex 8036736..463c146 100644 --- a/tests/data/32-be/loop/loop2-32.ko +++ b/tests/data/32-be/loop/loop2-32.ko diff --git a/tests/data/32-be/normal/export_dep-32.ko b/tests/data/32-be/normal/export_dep-32.ko Binary files differindex c31d4ef..f69fbd8 100644 --- a/tests/data/32-be/normal/export_dep-32.ko +++ b/tests/data/32-be/normal/export_dep-32.ko diff --git a/tests/data/32-be/normal/export_nodep-32.ko b/tests/data/32-be/normal/export_nodep-32.ko Binary files differindex de24b0e..af28981 100644 --- a/tests/data/32-be/normal/export_nodep-32.ko +++ b/tests/data/32-be/normal/export_nodep-32.ko diff --git a/tests/data/32-le/complex/complex_b-32.ko b/tests/data/32-le/complex/complex_b-32.ko Binary files differindex 0b16172..e9a614d 100644 --- a/tests/data/32-le/complex/complex_b-32.ko +++ b/tests/data/32-le/complex/complex_b-32.ko diff --git a/tests/data/32-le/complex/complex_c-32.ko b/tests/data/32-le/complex/complex_c-32.ko Binary files differindex 3ad846d..9de63bc 100644 --- a/tests/data/32-le/complex/complex_c-32.ko +++ b/tests/data/32-le/complex/complex_c-32.ko diff --git a/tests/data/32-le/complex/complex_d-32.ko b/tests/data/32-le/complex/complex_d-32.ko Binary files differindex e9ff748..cfae470 100644 --- a/tests/data/32-le/complex/complex_d-32.ko +++ b/tests/data/32-le/complex/complex_d-32.ko diff --git a/tests/data/32-le/complex/complex_e-32.ko b/tests/data/32-le/complex/complex_e-32.ko Binary files differindex 4668328..433b150 100644 --- a/tests/data/32-le/complex/complex_e-32.ko +++ b/tests/data/32-le/complex/complex_e-32.ko diff --git a/tests/data/32-le/loop/loop1-32.ko b/tests/data/32-le/loop/loop1-32.ko Binary files differindex 3afc7cc..025c0a6 100644 --- a/tests/data/32-le/loop/loop1-32.ko +++ b/tests/data/32-le/loop/loop1-32.ko diff --git a/tests/data/32-le/loop/loop2-32.ko b/tests/data/32-le/loop/loop2-32.ko Binary files differindex 31b7aeb..e6846ac 100644 --- a/tests/data/32-le/loop/loop2-32.ko +++ b/tests/data/32-le/loop/loop2-32.ko diff --git a/tests/data/32-le/normal/export_dep-32.ko b/tests/data/32-le/normal/export_dep-32.ko Binary files differindex 02f658f..1421c39 100644 --- a/tests/data/32-le/normal/export_dep-32.ko +++ b/tests/data/32-le/normal/export_dep-32.ko diff --git a/tests/data/32-le/normal/export_nodep-32.ko b/tests/data/32-le/normal/export_nodep-32.ko Binary files differindex b6d1c23..6a55cc7 100644 --- a/tests/data/32-le/normal/export_nodep-32.ko +++ b/tests/data/32-le/normal/export_nodep-32.ko diff --git a/tests/data/64-be/complex/complex_b-64.ko b/tests/data/64-be/complex/complex_b-64.ko Binary files differindex 00c6aad..38cec96 100644 --- a/tests/data/64-be/complex/complex_b-64.ko +++ b/tests/data/64-be/complex/complex_b-64.ko diff --git a/tests/data/64-be/complex/complex_c-64.ko b/tests/data/64-be/complex/complex_c-64.ko Binary files differindex 43341cf..05ed6ec 100644 --- a/tests/data/64-be/complex/complex_c-64.ko +++ b/tests/data/64-be/complex/complex_c-64.ko diff --git a/tests/data/64-be/complex/complex_d-64.ko b/tests/data/64-be/complex/complex_d-64.ko Binary files differindex ee5f026..4364641 100644 --- a/tests/data/64-be/complex/complex_d-64.ko +++ b/tests/data/64-be/complex/complex_d-64.ko diff --git a/tests/data/64-be/complex/complex_e-64.ko b/tests/data/64-be/complex/complex_e-64.ko Binary files differindex bb0b2c0..969b898 100644 --- a/tests/data/64-be/complex/complex_e-64.ko +++ b/tests/data/64-be/complex/complex_e-64.ko diff --git a/tests/data/64-be/loop/loop1-64.ko b/tests/data/64-be/loop/loop1-64.ko Binary files differindex 7ad784c..ae2e3e1 100644 --- a/tests/data/64-be/loop/loop1-64.ko +++ b/tests/data/64-be/loop/loop1-64.ko diff --git a/tests/data/64-be/loop/loop2-64.ko b/tests/data/64-be/loop/loop2-64.ko Binary files differindex 56d2d7a..cdab2cf 100644 --- a/tests/data/64-be/loop/loop2-64.ko +++ b/tests/data/64-be/loop/loop2-64.ko diff --git a/tests/data/64-be/normal/export_dep-64.ko b/tests/data/64-be/normal/export_dep-64.ko Binary files differindex 96fb168..eb2655c 100644 --- a/tests/data/64-be/normal/export_dep-64.ko +++ b/tests/data/64-be/normal/export_dep-64.ko diff --git a/tests/data/64-be/normal/export_nodep-64.ko b/tests/data/64-be/normal/export_nodep-64.ko Binary files differindex 8b0188f..af38f47 100644 --- a/tests/data/64-be/normal/export_nodep-64.ko +++ b/tests/data/64-be/normal/export_nodep-64.ko diff --git a/tests/data/64-le/alias/alias-64.ko b/tests/data/64-le/alias/alias-64.ko Binary files differindex ed932bd..6288da6 100644 --- a/tests/data/64-le/alias/alias-64.ko +++ b/tests/data/64-le/alias/alias-64.ko diff --git a/tests/data/64-le/complex/complex_a-64.ko b/tests/data/64-le/complex/complex_a-64.ko Binary files differindex 2fb34e8..3001092 100644 --- a/tests/data/64-le/complex/complex_a-64.ko +++ b/tests/data/64-le/complex/complex_a-64.ko diff --git a/tests/data/64-le/complex/complex_b-64.ko b/tests/data/64-le/complex/complex_b-64.ko Binary files differindex c4cb202..79fe573 100644 --- a/tests/data/64-le/complex/complex_b-64.ko +++ b/tests/data/64-le/complex/complex_b-64.ko diff --git a/tests/data/64-le/complex/complex_c-64.ko b/tests/data/64-le/complex/complex_c-64.ko Binary files differindex 3054e6b..946d828 100644 --- a/tests/data/64-le/complex/complex_c-64.ko +++ b/tests/data/64-le/complex/complex_c-64.ko diff --git a/tests/data/64-le/complex/complex_d-64.ko b/tests/data/64-le/complex/complex_d-64.ko Binary files differindex f2e5c6f..948d768 100644 --- a/tests/data/64-le/complex/complex_d-64.ko +++ b/tests/data/64-le/complex/complex_d-64.ko diff --git a/tests/data/64-le/complex/complex_e-64.ko b/tests/data/64-le/complex/complex_e-64.ko Binary files differindex e87bc8e..cd5f288 100644 --- a/tests/data/64-le/complex/complex_e-64.ko +++ b/tests/data/64-le/complex/complex_e-64.ko diff --git a/tests/data/64-le/loop/loop1-64.ko b/tests/data/64-le/loop/loop1-64.ko Binary files differindex 1f0c777..c2436ab 100644 --- a/tests/data/64-le/loop/loop1-64.ko +++ b/tests/data/64-le/loop/loop1-64.ko diff --git a/tests/data/64-le/loop/loop2-64.ko b/tests/data/64-le/loop/loop2-64.ko Binary files differindex 9d1862e..529d435 100644 --- a/tests/data/64-le/loop/loop2-64.ko +++ b/tests/data/64-le/loop/loop2-64.ko diff --git a/tests/data/64-le/loop/loop_dep-64.ko b/tests/data/64-le/loop/loop_dep-64.ko Binary files differindex ad4cfd9..c85af1a 100644 --- a/tests/data/64-le/loop/loop_dep-64.ko +++ b/tests/data/64-le/loop/loop_dep-64.ko diff --git a/tests/data/64-le/map/ccw_map-64.ko b/tests/data/64-le/map/ccw_map-64.ko Binary files differindex a1093b8..b9a9771 100644 --- a/tests/data/64-le/map/ccw_map-64.ko +++ b/tests/data/64-le/map/ccw_map-64.ko diff --git a/tests/data/64-le/map/ieee1394_map-64.ko b/tests/data/64-le/map/ieee1394_map-64.ko Binary files differindex ca9885b..310da21 100644 --- a/tests/data/64-le/map/ieee1394_map-64.ko +++ b/tests/data/64-le/map/ieee1394_map-64.ko diff --git a/tests/data/64-le/map/input_map-64.ko b/tests/data/64-le/map/input_map-64.ko Binary files differindex cb8f414..8b02d01 100644 --- a/tests/data/64-le/map/input_map-64.ko +++ b/tests/data/64-le/map/input_map-64.ko diff --git a/tests/data/64-le/map/input_map_new-64.ko b/tests/data/64-le/map/input_map_new-64.ko Binary files differindex e70081d..2769c15 100644 --- a/tests/data/64-le/map/input_map_new-64.ko +++ b/tests/data/64-le/map/input_map_new-64.ko diff --git a/tests/data/64-le/map/of_map-64.ko b/tests/data/64-le/map/of_map-64.ko Binary files differindex 5aedc52..e5c47ba 100644 --- a/tests/data/64-le/map/of_map-64.ko +++ b/tests/data/64-le/map/of_map-64.ko diff --git a/tests/data/64-le/map/pci_map-64.ko b/tests/data/64-le/map/pci_map-64.ko Binary files differindex cc46441..6f24540 100644 --- a/tests/data/64-le/map/pci_map-64.ko +++ b/tests/data/64-le/map/pci_map-64.ko diff --git a/tests/data/64-le/map/pnp_map-64.ko b/tests/data/64-le/map/pnp_map-64.ko Binary files differindex 7769c92..b7bc2db 100644 --- a/tests/data/64-le/map/pnp_map-64.ko +++ b/tests/data/64-le/map/pnp_map-64.ko diff --git a/tests/data/64-le/map/usb_map-64.ko b/tests/data/64-le/map/usb_map-64.ko Binary files differindex fb8bd97..796be2b 100644 --- a/tests/data/64-le/map/usb_map-64.ko +++ b/tests/data/64-le/map/usb_map-64.ko diff --git a/tests/data/64-le/normal/export_dep-64.ko b/tests/data/64-le/normal/export_dep-64.ko Binary files differindex 3a8d92c..8760753 100644 --- a/tests/data/64-le/normal/export_dep-64.ko +++ b/tests/data/64-le/normal/export_dep-64.ko diff --git a/tests/data/64-le/normal/export_nodep-64.ko b/tests/data/64-le/normal/export_nodep-64.ko Binary files differindex c94adff..fccd906 100644 --- a/tests/data/64-le/normal/export_nodep-64.ko +++ b/tests/data/64-le/normal/export_nodep-64.ko diff --git a/tests/data/64-le/normal/noexport_dep-64.ko b/tests/data/64-le/normal/noexport_dep-64.ko Binary files differindex 2bdc7bd..9a58394 100644 --- a/tests/data/64-le/normal/noexport_dep-64.ko +++ b/tests/data/64-le/normal/noexport_dep-64.ko diff --git a/tests/data/64-le/normal/noexport_doubledep-64.ko b/tests/data/64-le/normal/noexport_doubledep-64.ko Binary files differindex d787927..85c6fad 100644 --- a/tests/data/64-le/normal/noexport_doubledep-64.ko +++ b/tests/data/64-le/normal/noexport_doubledep-64.ko diff --git a/tests/data/64-le/normal/noexport_nodep-64.ko b/tests/data/64-le/normal/noexport_nodep-64.ko Binary files differindex a30186d..3373517 100644 --- a/tests/data/64-le/normal/noexport_nodep-64.ko +++ b/tests/data/64-le/normal/noexport_nodep-64.ko diff --git a/tests/data/64-le/rename/rename-new-64.ko b/tests/data/64-le/rename/rename-new-64.ko Binary files differindex e09a3dc..ee67ea9 100644 --- a/tests/data/64-le/rename/rename-new-64.ko +++ b/tests/data/64-le/rename/rename-new-64.ko diff --git a/tests/data/64-le/rename/rename-old-64.ko b/tests/data/64-le/rename/rename-old-64.ko Binary files differindex 0772db9..127f693 100644 --- a/tests/data/64-le/rename/rename-old-64.ko +++ b/tests/data/64-le/rename/rename-old-64.ko diff --git a/tests/data/64-le/rename/rename-version-64.ko b/tests/data/64-le/rename/rename-version-64.ko Binary files differindex acea804..98091e3 100644 --- a/tests/data/64-le/rename/rename-version-64.ko +++ b/tests/data/64-le/rename/rename-version-64.ko diff --git a/tests/data/64-le/unknown/unknown-64.ko b/tests/data/64-le/unknown/unknown-64.ko Binary files differindex 57b9911..135bb9a 100644 --- a/tests/data/64-le/unknown/unknown-64.ko +++ b/tests/data/64-le/unknown/unknown-64.ko diff --git a/tests/data/src/complex_b.c b/tests/data/src/complex_b.c index 5048183..a2691a9 100644 --- a/tests/data/src/complex_b.c +++ b/tests/data/src/complex_b.c @@ -1,5 +1,7 @@ /* A depends on B, C and D. B depends on E. C depends on B and E. D depends on B. */ +#include "module.h" + int b; extern int e; @@ -8,17 +10,6 @@ static void foo(void) b = e = 0; } -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; - -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } EXPORT_SYMBOL(b); diff --git a/tests/data/src/complex_c.c b/tests/data/src/complex_c.c index 7ac86c9..abe4bea 100644 --- a/tests/data/src/complex_c.c +++ b/tests/data/src/complex_c.c @@ -1,5 +1,7 @@ /* A depends on B, C and D. B depends on E. C depends on B and E. D depends on B. */ +#include "module.h" + int c; extern int b, e; @@ -8,17 +10,6 @@ static void foo(void) c = b = e = 0; } -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; - -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } EXPORT_SYMBOL(c); diff --git a/tests/data/src/complex_d.c b/tests/data/src/complex_d.c index f8fbfcb..decb422 100644 --- a/tests/data/src/complex_d.c +++ b/tests/data/src/complex_d.c @@ -1,5 +1,7 @@ /* A depends on B, C and D. B depends on E. C depends on B and E. D depends on B. */ +#include "module.h" + int d; extern int b; @@ -8,17 +10,5 @@ static void foo(void) d = b; } -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; - -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } - EXPORT_SYMBOL(d); diff --git a/tests/data/src/complex_e.c b/tests/data/src/complex_e.c index a4b71a9..1815c7d 100644 --- a/tests/data/src/complex_e.c +++ b/tests/data/src/complex_e.c @@ -1,18 +1,8 @@ /* A depends on B, C and D. B depends on E. C depends on B and E. D depends on B. */ -int e; - -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; +#include "module.h" -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } +int e; EXPORT_SYMBOL(e); diff --git a/tests/data/src/export_dep.c b/tests/data/src/export_dep.c index e4984e4..ef32589 100644 --- a/tests/data/src/export_dep.c +++ b/tests/data/src/export_dep.c @@ -1,15 +1,5 @@ /* A module exporting a symbol, and requiring a symbol */ -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; - -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } +#include "module.h" extern int exported1; int exported3; diff --git a/tests/data/src/export_nodep.c b/tests/data/src/export_nodep.c index 765feb0..f4c2cc9 100644 --- a/tests/data/src/export_nodep.c +++ b/tests/data/src/export_nodep.c @@ -1,17 +1,5 @@ -/* A module exporting two symbols, and requiring none. New-style */ -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - const char *name; -}; - -#define EXPORT_SYMBOL(sym) \ - const char __ksymtab_string_##sym[] \ - __attribute__((section("__ksymtab_strings"))) = #sym; \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, __ksymtab_string_##sym } +/* A module exporting two symbols, and requiring none. */ +#include "module.h" int exported1, exported2; diff --git a/tests/data/src/loop1.c b/tests/data/src/loop1.c index 2eeafde..902cc01 100644 --- a/tests/data/src/loop1.c +++ b/tests/data/src/loop1.c @@ -1,17 +1,7 @@ /* Part of a simple module loop */ -extern int from_loop2; - -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; +#include "module.h" -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } +extern int from_loop2; int from_loop1; diff --git a/tests/data/src/loop2.c b/tests/data/src/loop2.c index 4a68dc2..0c77972 100644 --- a/tests/data/src/loop2.c +++ b/tests/data/src/loop2.c @@ -1,17 +1,7 @@ /* Part of a simple module loop */ -extern int from_loop1; - -#define MODULE_NAME_LEN (64 - sizeof(unsigned long)) -struct kernel_symbol -{ - unsigned long value; - char name[MODULE_NAME_LEN]; -}; +#include "module.h" -#define EXPORT_SYMBOL(sym) \ - const struct kernel_symbol __ksymtab_##sym \ - __attribute__((section("__ksymtab"))) \ - = { (unsigned long)&sym, #sym } +extern int from_loop1; int from_loop2; diff --git a/tests/data/src/module.h b/tests/data/src/module.h new file mode 100644 index 0000000..3474df1 --- /dev/null +++ b/tests/data/src/module.h @@ -0,0 +1,17 @@ +#ifndef _MODULE_H +#define _MODULE_H + +struct kernel_symbol +{ + unsigned long value; + const char *name; +}; + +#define EXPORT_SYMBOL(sym) \ + const char __ksymtab_string_##sym[] \ + __attribute__((section("__ksymtab_strings"))) = #sym; \ + const struct kernel_symbol __ksymtab_##sym \ + __attribute__((section("__ksymtab"))) \ + = { (unsigned long)&sym, __ksymtab_string_##sym } + +#endif |