diff --git a/ChangeLog b/ChangeLog
index 4943748c4a..2d8ceea193 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2016-12-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/alpha/setjmp.S (__sigsetjmp): Use hidden_def.
+	* sysdeps/hppa/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/mips/mips64/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/mips/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/sh/sh3/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/sh/sh4/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/sparc/sparc32/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/tile/setjmp.S (__sigsetjmp): Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S (__sigsetjmp):
+	Likewise.
+
 2016-12-01  Adhemerval Zanella  <adhemerval.zanella@linaro.org>
 
 	* sysdeps/powerpc/powerpc64/multiarch/strrchr-ppc64.c (weak_alias):
diff --git a/sysdeps/alpha/setjmp.S b/sysdeps/alpha/setjmp.S
index e85bd52301..8ce52007c5 100644
--- a/sysdeps/alpha/setjmp.S
+++ b/sysdeps/alpha/setjmp.S
@@ -96,6 +96,7 @@ $sigsetjmp_local:
 #endif
 
 END(__sigsetjmp)
+hidden_def (__sigsetjmp)
 
 /* Put these traditional entry points in the same file so that we can
    elide much of the nonsense in trying to jmp to the real function.  */
diff --git a/sysdeps/hppa/setjmp.S b/sysdeps/hppa/setjmp.S
index cdf65146ad..0cc830fedb 100644
--- a/sysdeps/hppa/setjmp.S
+++ b/sysdeps/hppa/setjmp.S
@@ -70,3 +70,4 @@ __sigsetjmp:
 	b __sigjmp_save
 	nop
 	.procend
+hidden_def (__sigsetjmp)
diff --git a/sysdeps/mips/mips64/setjmp.S b/sysdeps/mips/mips64/setjmp.S
index e72eaa71fd..a3afd9ccbb 100644
--- a/sysdeps/mips/mips64/setjmp.S
+++ b/sysdeps/mips/mips64/setjmp.S
@@ -42,3 +42,4 @@ ENTRY (__sigsetjmp)
 #endif
 	jr t9
 END (__sigsetjmp)
+hidden_def (__sigsetjmp)
diff --git a/sysdeps/mips/setjmp.S b/sysdeps/mips/setjmp.S
index 8ddbf19085..f2833e465e 100644
--- a/sysdeps/mips/setjmp.S
+++ b/sysdeps/mips/setjmp.S
@@ -44,3 +44,4 @@ ENTRY (__sigsetjmp)
 	j	__sigsetjmp_aux
 #endif
 END (__sigsetjmp)
+hidden_def (__sigsetjmp)
diff --git a/sysdeps/sh/sh3/setjmp.S b/sysdeps/sh/sh3/setjmp.S
index 4e484c34b2..9745ec2de5 100644
--- a/sysdeps/sh/sh3/setjmp.S
+++ b/sysdeps/sh/sh3/setjmp.S
@@ -78,3 +78,4 @@ ENTRY (__sigsetjmp)
 # endif
 #endif
 END (__sigsetjmp)
+hidden_def (__sigsetjmp)
diff --git a/sysdeps/sh/sh4/setjmp.S b/sysdeps/sh/sh4/setjmp.S
index b42446560d..934292a7db 100644
--- a/sysdeps/sh/sh4/setjmp.S
+++ b/sysdeps/sh/sh4/setjmp.S
@@ -87,3 +87,4 @@ ENTRY (__sigsetjmp)
 # endif
 #endif
 END (__sigsetjmp)
+hidden_def (__sigsetjmp)
diff --git a/sysdeps/sparc/sparc32/setjmp.S b/sysdeps/sparc/sparc32/setjmp.S
index 6d0989fd65..cef5986da5 100644
--- a/sysdeps/sparc/sparc32/setjmp.S
+++ b/sysdeps/sparc/sparc32/setjmp.S
@@ -53,6 +53,7 @@ ENTRY (__sigsetjmp)
 	call	__sigjmp_save
 	 mov	%g1, %o7
 END(__sigsetjmp)
+hidden_def (__sigsetjmp)
 
 weak_extern(_setjmp)
 weak_extern(setjmp)
diff --git a/sysdeps/tile/setjmp.S b/sysdeps/tile/setjmp.S
index 4f08e9a9c2..7bcbc3f787 100644
--- a/sysdeps/tile/setjmp.S
+++ b/sysdeps/tile/setjmp.S
@@ -44,3 +44,4 @@ ENTRY(__sigsetjmp)
 	j plt(__sigjmp_save)
 	jrp lr   /* Keep the backtracer happy. */
 END(__sigsetjmp)
+hidden_def (__sigsetjmp)
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S b/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
index 1be32d917a..01661cc410 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/setjmp.S
@@ -61,6 +61,7 @@ __sigsetjmp_local:
 	 mov	%g1, %o0
 
 END(__sigsetjmp)
+hidden_def (__sigsetjmp)
 
 weak_extern(_setjmp)
 weak_extern(setjmp)