Module Name: src
Committed By: mrg
Date: Wed Mar 16 18:58:34 UTC 2016
Modified Files:
src/libexec/lfs_cleanerd: lfs_cleanerd.c
Log Message:
make the GCC 4.8 specific hack for ci.clean being set GCC >= 4.8.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/libexec/lfs_cleanerd/lfs_cleanerd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/lfs_cleanerd/lfs_cleanerd.c
diff -u src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.56 src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.57
--- src/libexec/lfs_cleanerd/lfs_cleanerd.c:1.56 Fri Feb 19 03:54:37 2016
+++ src/libexec/lfs_cleanerd/lfs_cleanerd.c Wed Mar 16 18:58:34 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_cleanerd.c,v 1.56 2016/02/19 03:54:37 riastradh Exp $ */
+/* $NetBSD: lfs_cleanerd.c,v 1.57 2016/03/16 18:58:34 mrg Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -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.
