From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 12 Sep 2001 18:50:25 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.30~22481
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e69924e348d364f9e5efd5bb7bc452887bb893f9;p=external%2Fglibc.git

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 95e19cd..0fe4bd6 100644
--- 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 aa5570a..ee3a880 100644
--- 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 84c20a9..ffeb1f3 100644
--- 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 3575749..785c227 100644
--- 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 c7493cd..0d4cc06 100644
--- 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)