Index: libexec/lfs_cleanerd/lfs_cleanerd.c
===================================================================
RCS file: /cvsroot/src/libexec/lfs_cleanerd/lfs_cleanerd.c,v
retrieving revision 1.56
diff -p -u -r1.56 lfs_cleanerd.c
--- libexec/lfs_cleanerd/lfs_cleanerd.c	19 Feb 2016 03:54:37 -0000	1.56
+++ libexec/lfs_cleanerd/lfs_cleanerd.c	16 Mar 2016 18:57:00 -0000
@@ -1453,10 +1453,11 @@ lfs_cleaner_main(int argc, char **argv)
 	char *cp, *pidname;
 #endif
 
-#if defined(__GNUC__) && __GNUC__ >= 4 && __GNUC_MINOR__ == 8 && \
+#if defined(__GNUC__) && \
+    (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8)) && \
     defined(__OPTIMIZE_SIZE__)
 	/*
-	 * XXX: Work around apparent bug with gcc 4.8 and -Os: it
+	 * XXX: Work around apparent bug with GCC >= 4.8 and -Os: it
 	 * claims that ci.clean is uninitialized in clean_fs (at one
 	 * of the several uses of it, which is neither the first nor
 	 * last use) -- this doesn't happen with plain -O2.