diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index 4bf7c750611..51b6cf28445 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-05-19  Eric Botcazou  <ebotcazou@adacore.com>
+
+	* Makefile.in (LIBUNWIND): Move dependency for shared libgcc.
+	Remove useless endif/ifneq ($(enable_shared),yes) pair.
+
 2015-05-15  Martin Galvan  <martin.galvan@tallertechnologies.com>
 
         * config/arm/lib1funcs.S (CFI_START_FUNCTION, CFI_END_FUNCTION):
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index 1ab188d6321..1f2b8069512 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -910,17 +910,14 @@ all: libgcc.a libgcov.a
 
 ifneq ($(LIBUNWIND),)
 all: libunwind.a
-libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
 endif
 
 ifeq ($(enable_shared),yes)
 all: libgcc_eh.a libgcc_s$(SHLIB_EXT)
 ifneq ($(LIBUNWIND),)
 all: libunwind$(SHLIB_EXT)
+libgcc_s$(SHLIB_EXT): libunwind$(SHLIB_EXT)
 endif
-endif
-
-ifeq ($(enable_shared),yes)
 
 # Map-file generation.
 ifneq ($(SHLIB_MKMAP),)