revert some accidentally committed test/debug changes from the module symbol export patch - should fix #5655

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17200 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2009-08-09 12:33:08 +00:00
parent ce94c7725a
commit 22d8434f6f
2 changed files with 24 additions and 24 deletions

View File

@ -5,24 +5,24 @@
#endif #endif
+#ifndef SYMTAB_KEEP_STR +#ifndef SYMTAB_KEEP_STR
+#define SYMTAB_KEEP_STR *(__ksymtab_strings*) +#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
+#define SYMTAB_DISCARD_STR +#define SYMTAB_DISCARD_STR
+#else +#else
+#define SYMTAB_DISCARD_STR *(__ksymtab_strings*) +#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
+#endif +#endif
+ +
+#ifndef SYMTAB_KEEP +#ifndef SYMTAB_KEEP
+#define SYMTAB_KEEP *(__ksymtab*) +#define SYMTAB_KEEP *(__ksymtab.*)
+#define SYMTAB_DISCARD +#define SYMTAB_DISCARD
+#else +#else
+#define SYMTAB_DISCARD *(__ksymtab*) +#define SYMTAB_DISCARD *(__ksymtab.*)
+#endif +#endif
+ +
+#ifndef SYMTAB_KEEP_GPL +#ifndef SYMTAB_KEEP_GPL
+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl*) +#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
+#define SYMTAB_DISCARD_GPL +#define SYMTAB_DISCARD_GPL
+#else +#else
+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl*) +#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
+#endif +#endif
+ +
#ifndef VMLINUX_SYMBOL #ifndef VMLINUX_SYMBOL
@ -49,7 +49,7 @@
__ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \ __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \ VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \
- *(__ksymtab_unused) \ - *(__ksymtab_unused) \
+ *(__ksymtab_unused*) \ + *(__ksymtab_unused.*) \
VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \
} \ } \
\ \
@ -57,7 +57,7 @@
__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \ __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \ VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \
- *(__ksymtab_unused_gpl) \ - *(__ksymtab_unused_gpl) \
+ *(__ksymtab_unused_gpl*) \ + *(__ksymtab_unused_gpl.*) \
VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \
} \ } \
\ \
@ -65,7 +65,7 @@
__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \ __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \ VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \
- *(__ksymtab_gpl_future) \ - *(__ksymtab_gpl_future) \
+ *(__ksymtab_gpl_future*) \ + *(__ksymtab_gpl_future.*) \
VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \
} \ } \
\ \
@ -78,9 +78,9 @@
+ } \ + } \
+ \ + \
+ /DISCARD/ : { \ + /DISCARD/ : { \
+ *(__ksymtab.*) \ + SYMTAB_DISCARD \
+ *(__ksymtab_gpl.*) \ + SYMTAB_DISCARD_GPL \
+ *(__ksymtab_strings.*) \ + SYMTAB_DISCARD_STR \
} \ } \
\ \
/* __*init sections */ \ /* __*init sections */ \

View File

@ -5,24 +5,24 @@
#endif #endif
+#ifndef SYMTAB_KEEP_STR +#ifndef SYMTAB_KEEP_STR
+#define SYMTAB_KEEP_STR *(__ksymtab_strings*) +#define SYMTAB_KEEP_STR *(__ksymtab_strings.*)
+#define SYMTAB_DISCARD_STR +#define SYMTAB_DISCARD_STR
+#else +#else
+#define SYMTAB_DISCARD_STR *(__ksymtab_strings*) +#define SYMTAB_DISCARD_STR *(__ksymtab_strings.*)
+#endif +#endif
+ +
+#ifndef SYMTAB_KEEP +#ifndef SYMTAB_KEEP
+#define SYMTAB_KEEP *(__ksymtab*) +#define SYMTAB_KEEP *(__ksymtab.*)
+#define SYMTAB_DISCARD +#define SYMTAB_DISCARD
+#else +#else
+#define SYMTAB_DISCARD *(__ksymtab*) +#define SYMTAB_DISCARD *(__ksymtab.*)
+#endif +#endif
+ +
+#ifndef SYMTAB_KEEP_GPL +#ifndef SYMTAB_KEEP_GPL
+#define SYMTAB_KEEP_GPL *(__ksymtab_gpl*) +#define SYMTAB_KEEP_GPL *(__ksymtab_gpl.*)
+#define SYMTAB_DISCARD_GPL +#define SYMTAB_DISCARD_GPL
+#else +#else
+#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl*) +#define SYMTAB_DISCARD_GPL *(__ksymtab_gpl.*)
+#endif +#endif
+ +
#ifndef VMLINUX_SYMBOL #ifndef VMLINUX_SYMBOL
@ -49,7 +49,7 @@
__ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \ __ksymtab_unused : AT(ADDR(__ksymtab_unused) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \ VMLINUX_SYMBOL(__start___ksymtab_unused) = .; \
- *(__ksymtab_unused) \ - *(__ksymtab_unused) \
+ *(__ksymtab_unused*) \ + *(__ksymtab_unused.*) \
VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_unused) = .; \
} \ } \
\ \
@ -57,7 +57,7 @@
__ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \ __ksymtab_unused_gpl : AT(ADDR(__ksymtab_unused_gpl) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \ VMLINUX_SYMBOL(__start___ksymtab_unused_gpl) = .; \
- *(__ksymtab_unused_gpl) \ - *(__ksymtab_unused_gpl) \
+ *(__ksymtab_unused_gpl*) \ + *(__ksymtab_unused_gpl.*) \
VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_unused_gpl) = .; \
} \ } \
\ \
@ -65,7 +65,7 @@
__ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \ __ksymtab_gpl_future : AT(ADDR(__ksymtab_gpl_future) - LOAD_OFFSET) { \
VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \ VMLINUX_SYMBOL(__start___ksymtab_gpl_future) = .; \
- *(__ksymtab_gpl_future) \ - *(__ksymtab_gpl_future) \
+ *(__ksymtab_gpl_future*) \ + *(__ksymtab_gpl_future.*) \
VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \ VMLINUX_SYMBOL(__stop___ksymtab_gpl_future) = .; \
} \ } \
\ \
@ -78,9 +78,9 @@
+ } \ + } \
+ \ + \
+ /DISCARD/ : { \ + /DISCARD/ : { \
+ *(__ksymtab.*) \ + SYMTAB_DISCARD \
+ *(__ksymtab_gpl.*) \ + SYMTAB_DISCARD_GPL \
+ *(__ksymtab_strings.*) \ + SYMTAB_DISCARD_STR \
} \ } \
\ \
/* __*init sections */ \ /* __*init sections */ \