[SPARC]: Fix dot-symbol exporting for good.

From: Al Viro <viro@ZenIV.linux.org.uk> Instead of playing all of these hand-coded assembler aliasing games, just translate symbol names in the name space ".sym" to "_Sym" at module load time. Signed-off-by: David S. Miller <davem@davemloft.net>

[SPARC]: Fix dot-symbol exporting for good.
From: Al Viro <viro@ZenIV.linux.org.uk> Instead of playing all of these hand-coded assembler aliasing games, just translate symbol names in the name space ".sym" to "_Sym" at module load time. Signed-off-by: David S. Miller <davem@davemloft.net>
Al Viro · David S. Miller
1 parent 357d596bd5
Showing 9 changed files with 36 additions and 22 deletions Side-by-side Diff
arch/sparc/kernel/module.c
arch/sparc/kernel/sparc_ksyms.c
arch/sparc/lib/mul.S
arch/sparc/lib/rem.S
arch/sparc/lib/sdiv.S
arch/sparc/lib/udiv.S
arch/sparc/lib/umul.S
arch/sparc/lib/urem.S
scripts/mod/modpost.c
@@ -10,6 +10,7 @@
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/string.h>
+#include <linux/ctype.h>
  
 void *module_alloc(unsigned long size)
 {
@@ -37,7 +38,7 @@
 }
  
 /* Make generic code ignore STT_REGISTER dummy undefined symbols,
- * and replace references to .func with func as in ppc64's dedotify.
+ * and replace references to .func with _Func
  */
 int module_frob_arch_sections(Elf_Ehdr *hdr,
 			      Elf_Shdr *sechdrs,
@@ -64,8 +65,10 @@
 				sym[i].st_shndx = SHN_ABS;
 			else {
 				char *name = strtab + sym[i].st_name;
-				if (name[0] == '.')
-					memmove(name, name+1, strlen(name));
+				if (name[0] == '.') {
+					name[0] = '_';
+					name[1] = toupper(name[1]);
+				}
 			}
 		}
 	}
@@ -97,20 +97,13 @@
 /* Alias functions whose names begin with "." and export the aliases.
  * The module references will be fixed up by module_frob_arch_sections.
  */
-#define DOT_ALIAS2(__ret, __x, __arg1, __arg2) \
-	extern __ret __x(__arg1, __arg2); \
-	asm(".weak " #__x);\
-	asm(#__x "=." #__x);
+extern int _Div(int, int);
+extern int _Mul(int, int);
+extern int _Rem(int, int);
+extern unsigned _Udiv(unsigned, unsigned);
+extern unsigned _Umul(unsigned, unsigned);
+extern unsigned _Urem(unsigned, unsigned);
  
-DOT_ALIAS2(int, div, int, int)
-DOT_ALIAS2(int, mul, int, int)
-DOT_ALIAS2(int, rem, int, int)
-DOT_ALIAS2(unsigned, udiv, unsigned, unsigned)
-DOT_ALIAS2(unsigned, umul, unsigned, unsigned)
-DOT_ALIAS2(unsigned, urem, unsigned, unsigned)
-
-#undef DOT_ALIAS2
-
 /* used by various drivers */
 EXPORT_SYMBOL(sparc_cpu_model);
 EXPORT_SYMBOL(kernel_thread);
@@ -320,12 +313,12 @@
 EXPORT_SYMBOL(__muldi3);
 EXPORT_SYMBOL(__divdi3);
  
-EXPORT_SYMBOL(rem);
-EXPORT_SYMBOL(urem);
-EXPORT_SYMBOL(mul);
-EXPORT_SYMBOL(umul);
-EXPORT_SYMBOL(div);
-EXPORT_SYMBOL(udiv);
+EXPORT_SYMBOL(_Rem);
+EXPORT_SYMBOL(_Urem);
+EXPORT_SYMBOL(_Mul);
+EXPORT_SYMBOL(_Umul);
+EXPORT_SYMBOL(_Div);
+EXPORT_SYMBOL(_Udiv);
  
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 EXPORT_SYMBOL(do_BUG);
@@ -16,7 +16,9 @@
  */
  
 	.globl .mul
+	.globl _Mul
 .mul:
+_Mul:	/* needed for export */
 	mov	%o0, %y		! multiplier -> Y
 	andncc	%o0, 0xfff, %g0	! test bits 12..31
 	be	Lmul_shortway	! if zero, can do it the short way
@@ -43,7 +43,9 @@
  
  
 	.globl .rem
+	.globl _Rem
 .rem:
+_Rem:	/* needed for export */
 	! compute sign of result; if neither is negative, no problem
 	orcc	%o1, %o0, %g0	! either negative?
 	bge	2f			! no, go do the divide
@@ -43,7 +43,9 @@
  
  
 	.globl .div
+	.globl _Div
 .div:
+_Div:	/* needed for export */
 	! compute sign of result; if neither is negative, no problem
 	orcc	%o1, %o0, %g0	! either negative?
 	bge	2f			! no, go do the divide
@@ -43,7 +43,9 @@
  
  
 	.globl .udiv
+	.globl _Udiv
 .udiv:
+_Udiv:	/* needed for export */
  
 	! Ready to divide.  Compute size of quotient; scale comparand.
 	orcc	%o1, %g0, %o5
@@ -21,7 +21,9 @@
  */
  
 	.globl .umul
+	.globl _Umul
 .umul:
+_Umul:	/* needed for export */
 	or	%o0, %o1, %o4
 	mov	%o0, %y		! multiplier -> Y
  
@@ -41,7 +41,9 @@
  */
  
 	.globl .urem
+	.globl _Urem
 .urem:
+_Urem:	/* needed for export */
  
 	! Ready to divide.  Compute size of quotient; scale comparand.
 	orcc	%o1, %g0, %o5
@@ -370,6 +370,12 @@
 			/* Ignore register directives. */
 			if (ELF_ST_TYPE(sym->st_info) == STT_SPARC_REGISTER)
 				break;
+ 			if (symname[0] == '.') {
+ 				char *munged = strdup(symname);
+ 				munged[0] = '_';
+ 				munged[1] = toupper(munged[1]);
+ 				symname = munged;
+ 			}
 		}
 #endif
...	...	@@ -10,6 +10,7 @@
10	10	#include <linux/vmalloc.h>
11	11	#include <linux/fs.h>
12	12	#include <linux/string.h>
	13	+#include <linux/ctype.h>
13	14
14	15	void *module_alloc(unsigned long size)
15	16	{
...	...	@@ -37,7 +38,7 @@
37	38	}
38	39
39	40	/* Make generic code ignore STT_REGISTER dummy undefined symbols,
40		- * and replace references to .func with func as in ppc64's dedotify.
	41	+ * and replace references to .func with _Func
41	42	*/
42	43	int module_frob_arch_sections(Elf_Ehdr *hdr,
43	44	Elf_Shdr *sechdrs,
...	...	@@ -64,8 +65,10 @@
64	65	sym[i].st_shndx = SHN_ABS;
65	66	else {
66	67	char *name = strtab + sym[i].st_name;
67		- if (name[0] == '.')
68		- memmove(name, name+1, strlen(name));
	68	+ if (name[0] == '.') {
	69	+ name[0] = '_';
	70	+ name[1] = toupper(name[1]);
	71	+ }
69	72	}
70	73	}
71	74	}
...	...	@@ -97,20 +97,13 @@
97	97	/* Alias functions whose names begin with "." and export the aliases.
98	98	* The module references will be fixed up by module_frob_arch_sections.
99	99	*/
100		-#define DOT_ALIAS2(__ret, __x, __arg1, __arg2) \
101		- extern __ret __x(__arg1, __arg2); \
102		- asm(".weak " #__x);\
103		- asm(#__x "=." #__x);
	100	+extern int _Div(int, int);
	101	+extern int _Mul(int, int);
	102	+extern int _Rem(int, int);
	103	+extern unsigned _Udiv(unsigned, unsigned);
	104	+extern unsigned _Umul(unsigned, unsigned);
	105	+extern unsigned _Urem(unsigned, unsigned);
104	106
105		-DOT_ALIAS2(int, div, int, int)
106		-DOT_ALIAS2(int, mul, int, int)
107		-DOT_ALIAS2(int, rem, int, int)
108		-DOT_ALIAS2(unsigned, udiv, unsigned, unsigned)
109		-DOT_ALIAS2(unsigned, umul, unsigned, unsigned)
110		-DOT_ALIAS2(unsigned, urem, unsigned, unsigned)
111		-
112		-#undef DOT_ALIAS2
113		-
114	107	/* used by various drivers */
115	108	EXPORT_SYMBOL(sparc_cpu_model);
116	109	EXPORT_SYMBOL(kernel_thread);
...	...	@@ -320,12 +313,12 @@
320	313	EXPORT_SYMBOL(__muldi3);
321	314	EXPORT_SYMBOL(__divdi3);
322	315
323		-EXPORT_SYMBOL(rem);
324		-EXPORT_SYMBOL(urem);
325		-EXPORT_SYMBOL(mul);
326		-EXPORT_SYMBOL(umul);
327		-EXPORT_SYMBOL(div);
328		-EXPORT_SYMBOL(udiv);
	316	+EXPORT_SYMBOL(_Rem);
	317	+EXPORT_SYMBOL(_Urem);
	318	+EXPORT_SYMBOL(_Mul);
	319	+EXPORT_SYMBOL(_Umul);
	320	+EXPORT_SYMBOL(_Div);
	321	+EXPORT_SYMBOL(_Udiv);
329	322
330	323	#ifdef CONFIG_DEBUG_BUGVERBOSE
331	324	EXPORT_SYMBOL(do_BUG);
...	...	@@ -16,7 +16,9 @@
16	16	*/
17	17
18	18	.globl .mul
	19	+ .globl _Mul
19	20	.mul:
	21	+_Mul: /* needed for export */
20	22	mov %o0, %y ! multiplier -> Y
21	23	andncc %o0, 0xfff, %g0 ! test bits 12..31
22	24	be Lmul_shortway ! if zero, can do it the short way
...	...	@@ -43,7 +43,9 @@
43	43
44	44
45	45	.globl .rem
	46	+ .globl _Rem
46	47	.rem:
	48	+_Rem: /* needed for export */
47	49	! compute sign of result; if neither is negative, no problem
48	50	orcc %o1, %o0, %g0 ! either negative?
49	51	bge 2f ! no, go do the divide
...	...	@@ -43,7 +43,9 @@
43	43
44	44
45	45	.globl .div
	46	+ .globl _Div
46	47	.div:
	48	+_Div: /* needed for export */
47	49	! compute sign of result; if neither is negative, no problem
48	50	orcc %o1, %o0, %g0 ! either negative?
49	51	bge 2f ! no, go do the divide
...	...	@@ -43,7 +43,9 @@
43	43
44	44
45	45	.globl .udiv
	46	+ .globl _Udiv
46	47	.udiv:
	48	+_Udiv: /* needed for export */
47	49
48	50	! Ready to divide. Compute size of quotient; scale comparand.
49	51	orcc %o1, %g0, %o5
...	...	@@ -21,7 +21,9 @@
21	21	*/
22	22
23	23	.globl .umul
	24	+ .globl _Umul
24	25	.umul:
	26	+_Umul: /* needed for export */
25	27	or %o0, %o1, %o4
26	28	mov %o0, %y ! multiplier -> Y
27	29
...	...	@@ -41,7 +41,9 @@
41	41	*/
42	42
43	43	.globl .urem
	44	+ .globl _Urem
44	45	.urem:
	46	+_Urem: /* needed for export */
45	47
46	48	! Ready to divide. Compute size of quotient; scale comparand.
47	49	orcc %o1, %g0, %o5
...	...	@@ -370,6 +370,12 @@
370	370	/* Ignore register directives. */
371	371	if (ELF_ST_TYPE(sym->st_info) == STT_SPARC_REGISTER)
372	372	break;
	373	+ if (symname[0] == '.') {
	374	+ char *munged = strdup(symname);
	375	+ munged[0] = '_';
	376	+ munged[1] = toupper(munged[1]);
	377	+ symname = munged;
	378	+ }
373	379	}
374	380	#endif
375	381