aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg McGary <greg@mcgary.org>2000-07-17 22:34:11 +0000
committerGreg McGary <greg@mcgary.org>2000-07-17 22:34:11 +0000
commit916c1395e160f7a4ea2c3f736982a5975c44b5af (patch)
tree306a88e028bd85f169baa98bc6048198d43150c6
parent03df72bf736599aa4c2c8343b33bed3d2954afa8 (diff)
downloadglibc-916c1395e160f7a4ea2c3f736982a5975c44b5af.zip
glibc-916c1395e160f7a4ea2c3f736982a5975c44b5af.tar.gz
glibc-916c1395e160f7a4ea2c3f736982a5975c44b5af.tar.bz2
* Makerules (o-objects): Supplement with $(o-objects$o).
* string/Makefile (o-objects.ob): Add variable to pull unbounded versions of memcpy, memset and memchr into libc_b. * Makerules (o-objects): Supplement with $(o-objects$o). * string/Makefile (o-objects.ob): Add variable to pull unbounded versions of memcpy, memset and memchr into libc_b.
-rw-r--r--ChangeLog4
-rw-r--r--Makerules4
-rw-r--r--string/Makefile6
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 9b5e90d..86ba936 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,6 +31,10 @@
* include/set-hooks.h (RUN_HOOK): Revert 2000-06-26 mods. Qualify
ptr as __unbouned.
+ * Makerules (o-objects): Supplement with $(o-objects$o).
+ * string/Makefile (o-objects.ob): Add variable to pull
+ unbounded versions of memcpy, memset and memchr into libc_b.
+
2000-07-17 Bruno Haible <haible@clisp.cons.org>
* iconv/gconv_open.c (__gconv_open): Initialize the __data
diff --git a/Makerules b/Makerules
index afd4aa1..ff79700 100644
--- a/Makerules
+++ b/Makerules
@@ -554,7 +554,9 @@ lib-noranlib: libobjs
# Makefiles can define `elide-routines.so = foo' to leave foo.so out.
o-objects = $(patsubst %.o,%$o,$(filter-out $(patsubst %,$(objpfx)%.o,\
$(elide-routines$o)),\
- $(objects)))
+ $(objects))) \
+ $(addprefix $(objpfx),$(o-objects$o))
+
others: $(addprefix $(objpfx),$(install-lib))
ifndef objects
diff --git a/string/Makefile b/string/Makefile
index d8e6ef7..478ee90 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991,92,93,94,95,96,97,98,99 Free Software Foundation, Inc.
+# Copyright (C) 1991,92,93,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
# This file is part of the GNU C Library.
# The GNU C Library is free software; you can redistribute it and/or
@@ -41,6 +41,10 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
envz basename \
strcoll_l strxfrm_l string-inlines memrchr
+# Gcc internally generates calls to unbounded memcpy and memset
+# for -fbounded-pointer compiles. Glibc uses memchr for explicit checks.
+o-objects.ob := memcpy.o memset.o memchr.o
+
tests := tester inl-tester noinl-tester testcopy test-ffs \
tst-strlen stratcliff tst-svc tst-inlcall
distribute := memcopy.h pagecopy.h tst-svc.expect