Update.

	* Makeconfig (preprocess-versions): Define ASSEMBLER.
	* stdlib/Makefile (isomac-CFLAGS): Define to -O.
	* posix/Makefile (annexc-CFLAGS): Define to -O.

diff --git a/ChangeLog b/ChangeLog
index 95e19cd3dfbbdc0933bb7bc0ef6ce7481aed00d9..0fe4bd62945cbf9c59fa45b504ec2d188f8061c6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2001-09-12  Ulrich Drepper  <drepper@redhat.com>
 
        * config.h.in: Enforce optimization to be used.
+       * Makeconfig (preprocess-versions): Define ASSEMBLER.
+       * stdlib/Makefile (isomac-CFLAGS): Define to -O.
+       * posix/Makefile (annexc-CFLAGS): Define to -O.
 
 2001-09-11  Ulrich Drepper  <drepper@redhat.com>
 

diff --git a/Makeconfig b/Makeconfig
index aa5570a3fc4323f18e244150386ef26833607ad5..ee3a880b6c934798851359ddb7d7c999e51e3947 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -737,7 +737,7 @@ define preprocess-versions
 sed '/^[       ]*#/d;s/^[      ]*%/#/' \
 | $(CC) -E -undef -I$(common-objdir) -I$(..)include \
                  -include $(common-objpfx)config.h \
-                 -x assembler-with-cpp - \
+                 -DASSEMBLER -x assembler-with-cpp - \
 | sed '/^[     ]*#/d;/^[       ]*$$/d'
 endef
 

diff --git a/config.h.in b/config.h.in
index 84c20a9f7e19e4cb2cce57a0cc7f881b74ee1782..ffeb1f39ded9c3d05cb22159090d369582342081 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -1,4 +1,4 @@
-#ifndef __OPTIMIZE__
+#if !defined ASSEMBLER && !defined _ISOMAC && !defined __OPTIMIZE__
 # error "glibc cannot be compiled without optimization"
 #endif
 

diff --git a/posix/Makefile b/posix/Makefile
index 3575749dd66ad14291d457d17dcd6da3042c1118..785c227ebb41aab57a2050d3b3896f88b0980493 100644 (file)
--- a/posix/Makefile
+++ b/posix/Makefile
@@ -150,6 +150,7 @@ $(objpfx)annexc.out: $(objpfx)annexc
        -$(dir $<)$(notdir $<) '$(CC)' \
                               '-I../include -I.. $(+sysdep-includes) $(sysincludes)' > $@
 
+annexc-CFLAGS = -O
 $(objpfx)annexc: annexc.c
        $(native-compile)
 

diff --git a/stdlib/Makefile b/stdlib/Makefile
index c7493cdac183e6c652de00fbe750d6d8f78fffae..0d4cc060cc8b84f5a22f2bed507de6ac4545b2c6 100644 (file)
--- a/stdlib/Makefile
+++ b/stdlib/Makefile
@@ -160,6 +160,7 @@ $(objpfx)isomac.out: $(objpfx)isomac
        $(dir $<)$(notdir $<) '$(CC)'  \
        '-I../include -I.. $(+sysdep-includes) $(sysincludes)' > $<.out
 
+isomac-CFLAGS = -O
 $(objpfx)isomac: isomac.c
        $(native-compile)