[src/netbsd-6]: src/gnu/dist/gcc4/gcc Apply patch, requested by mrg in ticket...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/51675347be65
branches:  netbsd-6
changeset: 320346:51675347be65
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 02 14:36:42 2018 +0000

description:
Apply patch, requested by mrg in ticket #1551:

Avoid redefining functions.

diffstat:

 gnu/dist/gcc4/gcc/toplev.h |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (19 lines):

diff -r 96342638b69b -r 51675347be65 gnu/dist/gcc4/gcc/toplev.h
--- a/gnu/dist/gcc4/gcc/toplev.h        Sat Jun 30 11:42:34 2018 +0000
+++ b/gnu/dist/gcc4/gcc/toplev.h        Mon Jul 02 14:36:42 2018 +0000
@@ -158,6 +158,7 @@
 /* Return floor of log2, with -1 for zero.  */
 extern int floor_log2                  (unsigned HOST_WIDE_INT);
 
+#if 0 /* these are not valid, and break in GCC 5. */
 /* Inline versions of the above for speed.  */
 #if GCC_VERSION >= 3004
 # if HOST_BITS_PER_WIDE_INT == HOST_BITS_PER_LONG
@@ -183,6 +184,7 @@
   return x == (x & -x) && x ? (int) CTZ_HWI (x) : -1;
 }
 #endif /* GCC_VERSION >= 3004 */
+#endif
 
 /* Functions used to get and set GCC's notion of in what directory
    compilation was started.  */