From: drepper <drepper>
Date: Wed, 13 May 1998 17:15:15 +0000 (+0000)
Subject: Don't use the optimized versions for the string functions if
X-Git-Tag: libc-ud-980518~92
X-Git-Url: http://git.csclub.uwaterloo.ca/?p=kopensolaris-gnu%2Fglibc.git;a=commitdiff_plain;h=f87476e1558c2bd84c87aeb68b0556de7af1899d

Don't use the optimized versions for the string functions if
optimizing for space.
---

diff --git a/string/string.h b/string/string.h
index 266a5d518e..ee69a78d55 100644
--- a/string/string.h
+++ b/string/string.h
@@ -298,7 +298,8 @@ extern char *basename __P ((__const char *__filename));
 #endif
 
 
-#if defined __GNUC__ && __GNUC__ >= 2 && defined __OPTIMIZE__
+#if defined __GNUC__ && __GNUC__ >= 2
+# if defined __OPTIMIZE__ && !defined __OPTIMIZE_SIZE__
 /* When using GNU CC we provide some optimized versions of selected
    functions from this header.  There are two kinds of optimizations:
 
@@ -318,10 +319,11 @@ extern char *basename __P ((__const char *__filename));
    One can inhibit all optimizations by defining __NO_STRING_INLINES.  */
 
 /* Get the machine-dependent optimizations (if any).  */
-# include <bits/string.h>
+#  include <bits/string.h>
 
 /* These are generic optimizations which do not add too much inline code.  */
-# include <bits/string2.h>
+#  include <bits/string2.h>
+# endif
 #endif
 
 __END_DECLS