Skip to content

Commit bd6be57

Browse files
Jiri SlabyIngo Molnar
authored andcommitted
x86/fpu/math-emu: Add ENDPROC to functions
Functions in math-emu are annotated as ENTRY() symbols, but their ends are not annotated at all. But these are standard functions called from C, with proper stack register update etc. Omitting the ends means: * the annotations are not paired and we cannot deal with such functions e.g. in objtool * the symbols are not marked as functions in the object file * there are no sizes of the functions in the object file So fix this by adding ENDPROC() to each such case in math-emu. Signed-off-by: Jiri Slaby <jslaby@suse.cz> Cc: Andy Lutomirski <luto@kernel.org> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/20170824080624.7768-1-jslaby@suse.cz Signed-off-by: Ingo Molnar <mingo@kernel.org>
1 parent 9e085ce commit bd6be57

File tree

14 files changed

+21
-4
lines changed

14 files changed

+21
-4
lines changed

arch/x86/math-emu/div_Xsig.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -363,3 +363,4 @@ L_bugged_2:
363363
pop %ebx
364364
jmp L_exit
365365
#endif /* PARANOID */
366+
ENDPROC(div_Xsig)

arch/x86/math-emu/div_small.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ ENTRY(FPU_div_small)
4444

4545
leave
4646
ret
47-
47+
ENDPROC(FPU_div_small)

arch/x86/math-emu/mul_Xsig.S

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ ENTRY(mul32_Xsig)
6262
popl %esi
6363
leave
6464
ret
65+
ENDPROC(mul32_Xsig)
6566

6667

6768
ENTRY(mul64_Xsig)
@@ -114,6 +115,7 @@ ENTRY(mul64_Xsig)
114115
popl %esi
115116
leave
116117
ret
118+
ENDPROC(mul64_Xsig)
117119

118120

119121

@@ -173,4 +175,4 @@ ENTRY(mul_Xsig_Xsig)
173175
popl %esi
174176
leave
175177
ret
176-
178+
ENDPROC(mul_Xsig_Xsig)

arch/x86/math-emu/polynom_Xsig.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,3 +133,4 @@ L_accum_done:
133133
popl %esi
134134
leave
135135
ret
136+
ENDPROC(polynomial_Xsig)

arch/x86/math-emu/reg_norm.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ L_overflow:
9494
call arith_overflow
9595
pop %ebx
9696
jmp L_exit
97+
ENDPROC(FPU_normalize)
9798

9899

99100

@@ -145,3 +146,4 @@ L_exit_nuo_zero:
145146
popl %ebx
146147
leave
147148
ret
149+
ENDPROC(FPU_normalize_nuo)

arch/x86/math-emu/reg_round.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -706,3 +706,5 @@ L_exception_exit:
706706
mov $-1,%eax
707707
jmp fpu_reg_round_special_exit
708708
#endif /* PARANOID */
709+
710+
ENDPROC(FPU_round)

arch/x86/math-emu/reg_u_add.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,3 +165,4 @@ L_exit:
165165
leave
166166
ret
167167
#endif /* PARANOID */
168+
ENDPROC(FPU_u_add)

arch/x86/math-emu/reg_u_div.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,3 +469,5 @@ L_exit:
469469
leave
470470
ret
471471
#endif /* PARANOID */
472+
473+
ENDPROC(FPU_u_div)

arch/x86/math-emu/reg_u_mul.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,3 +146,4 @@ L_exit:
146146
ret
147147
#endif /* PARANOID */
148148

149+
ENDPROC(FPU_u_mul)

arch/x86/math-emu/reg_u_sub.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,3 +270,4 @@ L_exit:
270270
popl %esi
271271
leave
272272
ret
273+
ENDPROC(FPU_u_sub)

arch/x86/math-emu/round_Xsig.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ L_exit:
7878
popl %ebx
7979
leave
8080
ret
81-
81+
ENDPROC(round_Xsig)
8282

8383

8484

@@ -138,4 +138,4 @@ L_n_exit:
138138
popl %ebx
139139
leave
140140
ret
141-
141+
ENDPROC(norm_Xsig)

arch/x86/math-emu/shr_Xsig.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,4 @@ L_more_than_95:
8585
popl %esi
8686
leave
8787
ret
88+
ENDPROC(shr_Xsig)

arch/x86/math-emu/wm_shrx.S

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ L_more_than_95:
9292
popl %esi
9393
leave
9494
ret
95+
ENDPROC(FPU_shrx)
9596

9697

9798
/*---------------------------------------------------------------------------+
@@ -202,3 +203,4 @@ Ls_more_than_95:
202203
popl %esi
203204
leave
204205
ret
206+
ENDPROC(FPU_shrxs)

arch/x86/math-emu/wm_sqrt.S

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -468,3 +468,4 @@ sqrt_more_prec_large:
468468
/* Our estimate is too large */
469469
movl $0x7fffff00,%eax
470470
jmp sqrt_round_result
471+
ENDPROC(wm_sqrt)

0 commit comments

Comments
 (0)