diff --git a/[refs] b/[refs]
index e9bea3720994..29d41a6bf2a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9b5a146a43db3733c731d47022f4f5259e6b31e6
+refs/heads/master: a9468f30b5eac6957c86aea97954553bfb7c1f18
diff --git a/trunk/scripts/gcc-goto.sh b/trunk/scripts/gcc-goto.sh
index 98cffcb941ea..a2af2e88daf3 100644
--- a/trunk/scripts/gcc-goto.sh
+++ b/trunk/scripts/gcc-goto.sh
@@ -2,4 +2,20 @@
 # Test for gcc 'asm goto' support
 # Copyright (C) 2010, Jason Baron <jbaron@redhat.com>
 
-echo "int main(void) { entry: asm goto (\"\"::::entry); return 0; }" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+cat << "END" | $@ -x c - -c -o /dev/null >/dev/null 2>&1 && echo "y"
+int main(void)
+{
+#ifdef __arm__
+	/*
+	 * Not related to asm goto, but used by jump label
+	 * and broken on some ARM GCC versions (see GCC Bug 48637).
+	 */
+	static struct { int dummy; int state; } tp;
+	asm (".long %c0" :: "i" (&tp.state));
+#endif
+
+entry:
+	asm goto ("" :::: entry);
+	return 0;
+}
+END