Merge branch 'sp/maint-describe-all-tag-warning' into maint

diff --git a/ppc/sha1ppc.S b/ppc/sha1ppc.S
index f132696ee72bf4a2e3d608a24322a6839f9a03a8..1711eef6e71be6d243016b5e138766b3777e08ef 100644 (file)
--- a/ppc/sha1ppc.S
+++ b/ppc/sha1ppc.S
@@ -162,8 +162,8 @@ add RE(t),RE(t),%r0;  rotlwi RB(t),RB(t),30
        STEPUP4(fn, (t)+12, (s)+12,);   \
        STEPUP4(fn, (t)+16, (s)+16, loadk)
 
-       .globl  sha1_core
-sha1_core:
+       .globl  ppc_sha1_core
+ppc_sha1_core:
        stwu    %r1,-80(%r1)
        stmw    %r13,4(%r1)