aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2001-09-12 18:50:25 +0000
committerUlrich Drepper <drepper@redhat.com>2001-09-12 18:50:25 +0000
commite69924e348d364f9e5efd5bb7bc452887bb893f9 (patch)
treeb5dd856b6a5a931e473c0b7f19a580c243d00cc9
parentd322efa8e5240e4cc22b224e606e10dfe9678b31 (diff)
downloadglibc-e69924e348d364f9e5efd5bb7bc452887bb893f9.tar
glibc-e69924e348d364f9e5efd5bb7bc452887bb893f9.tar.gz
glibc-e69924e348d364f9e5efd5bb7bc452887bb893f9.tar.bz2
glibc-e69924e348d364f9e5efd5bb7bc452887bb893f9.zip
Update.
* Makeconfig (preprocess-versions): Define ASSEMBLER. * stdlib/Makefile (isomac-CFLAGS): Define to -O. * posix/Makefile (annexc-CFLAGS): Define to -O.
-rw-r--r--ChangeLog3
-rw-r--r--Makeconfig2
-rw-r--r--config.h.in2
-rw-r--r--posix/Makefile1
-rw-r--r--stdlib/Makefile1
5 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 95e19cd3df..0fe4bd6294 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 aa5570a3fc..ee3a880b6c 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 84c20a9f7e..ffeb1f39de 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 3575749dd6..785c227ebb 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 c7493cdac1..0d4cc060cc 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)