diff --git a/src/ChangeLog b/src/ChangeLog
index 14e06fc1e28cda156e2cc6e151fa579fc4047136..74a9c2e21793b75291c42b192b1a0973c99f5485 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-02-21  Chong Yidong  <cyd@stupidchicken.com>
+
+	* m/arm.h: Define the LIB_GCC flag to be -lgcc_s (Bug#5518).
+
 2010-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* term.c (fatal): Add a final \n if needed (bug#5596).
diff --git a/src/m/arm.h b/src/m/arm.h
index ad3e701d276a9818ff1d243abd9a4aed72089011..b04c5ecc1d9d0b4e8b7dafeeb933f73ee21f0ab5 100644
--- a/src/m/arm.h
+++ b/src/m/arm.h
@@ -36,5 +36,11 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #define NO_REMAP
 
+/* armin76@gentoo.org reported that the lgcc_s flag is necessary to
+   build on ARM EABI under GNU/Linux (Bug#5518).  */
+#ifdef GNU_LINUX
+#define LIB_GCC -lgcc_s
+#endif
+
 /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42
    (do not change this comment) */