This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.17-233-gdaaa771
- From: jsm28 at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 15 Feb 2013 15:08:08 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.17-233-gdaaa771
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via daaa7713e9170ec42536b5a0e46b434dd84753a5 (commit)
from 2bdd4ca6b6c38367e301042c2247395568c63ebd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=daaa7713e9170ec42536b5a0e46b434dd84753a5
commit daaa7713e9170ec42536b5a0e46b434dd84753a5
Author: Joseph Myers <joseph@codesourcery.com>
Date: Fri Feb 15 15:07:54 2013 +0000
Remove bounded-pointers build system support.
diff --git a/ChangeLog b/ChangeLog
index 7013c09..bb84e32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,54 @@
+2013-02-15 Joseph Myers <joseph@codesourcery.com>
+
+ [BZ #13550]
+ * Makeconfig [!+link-bounded] (+link-bounded): Remove variable.
+ [!link-extra-libs] (link-extra-libs-bounded): Likewise.
+ (run-via-rtld-prefix): Do not handle %-bp tests.
+ (test-via-rtld-prefix): Do not mention %-bp tests in comment.
+ (all-object-suffixes): Remove .ob.
+ (bppfx): Remove variable.
+ [$(build-bounded) = yes] (object-suffixes): Do not add .ob.
+ [$(build-bounded) = yes] (CPPFLAGS-.ob): Remove variable.
+ [$(build-bounded) = yes] (CFLAGS-.ob): Likewise.
+ [$(build-bounded) = yes] (libtype.ob): Likewise.
+ * Makerules (elide-routines.ob): Remove variable.
+ (do-tests-clean): Do not handle *-bp.out.
+ (common-mostlyclean): Do not handle *-bp and *-bp.out.
+ * Rules [$(build-bounded) = yes] (tests-bp.out): Remove variable.
+ [$(build-bounded) = yes] (xtests-bp.out): Likewise.
+ (tests): Do not include $(tests-bp.out).
+ (xtests): Do not include $(xtests-bp.out).
+ [$(build-bounded) = yes] (binaries-bounded): Remove variable.
+ [$(build-bounded) = yes] ($(addprefix
+ $(objpfx),$(binaries-bounded))): Remove rule.
+ ($(objpfx)%-bp.out): Remove rule.
+ * config.make.in (build-bounded): Remove variable.
+ * crypt/Makefile [$(build-bounded) = yes]
+ ($(tests:%=$(objpfx)%-bp)): Remove dependency.
+ * csu/Makefile [$(build-bounded) = yes] (extra-objs): Do not
+ append to variable.
+ [$(build-bounded) = yes] (install-lib): Likewise.
+ [$(build-bounded) = yes] (generated): Likewise.
+ [!start-installed-name-rule] ($(objpfx)b$(start-installed-name)):
+ Remove rule.
+ * intl/Makefile [$(build-bounded) = yes]
+ ($(multithread-test-srcs:%=$(objpfx)%-bp)): Remove dependency.
+ * math/Makefile [$(build-bounded) = yes]
+ ($(tests:%=$(objpfx)%-bp): Likewise.
+ * misc/Makefile [$(build-bounded) = yes]
+ ($(objpfx)tst-tsearch-bp): Likewise.
+ * nptl/Makeconfig (bounded-thread-library): Remove variable.
+ * rt/Makefile [$(build-bounded) = yes] ($(tests:%=$(objpfx)%-bp)):
+ Remove dependency.
+ * string/Makefile (o-objects.ob): Remove variable.
+ * sysdeps/i386/i686/Makefile [$(config-asflags-i686) = yes]
+ (CFLAGS-.ob): Remove variable.
+ [$(config-asflags-i686) = yes] (ASFLAGS-.ob): Likewise.
+ * sysdeps/sparc/sparc32/sparcv9/Makefile (ASFLAGS-.ob): Remove
+ both definitions of variable.
+ * sysdeps/sparc/sparc64/Makefile [$(have-as-vis3) = yes]
+ (ASFLAGS-.ob): Remove variable.
+
2013-02-14 Joseph Myers <joseph@codesourcery.com>
[BZ #13550]
diff --git a/Makeconfig b/Makeconfig
index 49c5a81..5d86f56 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -435,18 +435,6 @@ else
+link-tests = $(+link-static-tests)
endif
endif
-# Command for statically linking bounded-pointer programs with the C library.
-ifndef +link-bounded
-+link-bounded = $(CC) -nostdlib -nostartfiles -static -fbounded-pointers -o $@ \
- $(sysdep-LDFLAGS) $(LDFLAGS) \
- $(addprefix $(csu-objpfx),b$(static-start-installed-name)) \
- $(+preinit) $(+prectorT) \
- $(filter-out $(addprefix $(csu-objpfx),start.ob \
- $(start-installed-name))\
- $(+preinit) $(link-extra-libs-bounded) \
- $(common-objpfx)libc% $(+postinit),$^) \
- $(link-extra-libs-bounded) $(link-libc-bounded) $(+postctorT) $(+postinit)
-endif
ifeq (yes,$(build-shared))
ifndef rtld-LDFLAGS
rtld-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
@@ -506,13 +494,11 @@ endif
ifndef link-extra-libs
link-extra-libs = $(LDLIBS-$(@F))
link-extra-libs-static = $(link-extra-libs)
-link-extra-libs-bounded = $(link-extra-libs)
endif
# The static libraries.
link-libc-static = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib) -Wl,--end-group
link-libc-static-tests = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib-tests) -Wl,--end-group
-link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a
# How to link against libgcc. Some libgcc functions, such as those
# for "long long" arithmetic or software floating point, can always be
@@ -617,12 +603,11 @@ $(subst $(empty) ,:,$(strip $(patsubst -Wl$(comma)-rpath-link=%, %,\
# $(run-via-rtld-prefix) is a command that, when prepended to the name
# of a program built with the newly built library, produces a command
# that, executed on the host for which the library is built, runs that
-# program. For the statically-linked %-bp test programs, and for
-# tests listed in tests-static or xtests-static, it is empty.
+# program. For tests listed in tests-static or xtests-static, it is
+# empty.
run-via-rtld-prefix = \
$(if $(strip $(filter $(notdir $(built-program-file)), \
- $(tests-static) $(xtests-static)) \
- $(filter %-bp,$(built-program-file))),, \
+ $(tests-static) $(xtests-static))),, \
$(elf-objpfx)$(rtld-installed-name) \
--library-path $(rpath-link)$(patsubst %,:%,$(sysdep-library-path)))
else
@@ -652,9 +637,9 @@ endif
# $(test-via-rtld-prefix) is a command that, when prepended to the name
# of a test program built with the newly built library, produces a command
# that, executed on the host for which the library is built, runs that
-# program. For the statically-linked %-bp test programs, and for
-# tests listed in tests-static or xtests-static as well as when test
-# programs are hardcoded to the newly built libraries, it is empty.
+# program. For tests listed in tests-static or xtests-static as well
+# as when test programs are hardcoded to the newly built libraries, it
+# is empty.
# $(test-program-prefix) is a command that, when prepended to the name
# of a test program built with the newly built library, produces a command
@@ -817,7 +802,7 @@ endif
# The compilation rules use $(CPPFLAGS-${SUFFIX}) and $(CFLAGS-${SUFFIX})
# to pass different flags for each flavor.
libtypes = $(foreach o,$(object-suffixes-for-libc),$(libtype$o))
-all-object-suffixes := .o .os .op .og .ob .oS
+all-object-suffixes := .o .os .op .og .oS
object-suffixes :=
CPPFLAGS-.o = $(pic-default)
CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
@@ -852,18 +837,6 @@ endif
# differently from the rest.
object-suffixes-noshared := $(filter-out .os,$(object-suffixes))
-bppfx = BP-
-ifeq (yes,$(build-bounded))
-# Under --enable-bounded, we build the library with `-fbounded-pointers -g'
-# to runtime bounds checking. The bounded-pointer objects are named foo.ob.
-# We disable sibling-call optimizations so that stack traces will be complete
-# and thus aid debugging, since after all, BPs are a debugging tool.
-object-suffixes += .ob
-CPPFLAGS-.ob = -fbounded-pointers $(pic-default)
-CFLAGS-.ob = -g -O2 -fno-optimize-sibling-calls -fno-strict-aliasing
-libtype.ob = lib%_b.a
-endif
-
object-suffixes-for-libc := $(object-suffixes)
ifeq (yes,$(build-shared))
diff --git a/Makerules b/Makerules
index 5e7d205..b115f1a 100644
--- a/Makerules
+++ b/Makerules
@@ -418,7 +418,6 @@ elide-routines.os += $(static-only-routines)
elide-routines.o += $(shared-only-routines)
elide-routines.op += $(shared-only-routines)
elide-routines.og += $(shared-only-routines)
-elide-routines.ob += $(shared-only-routines)
# Shared library building.
@@ -1265,9 +1264,7 @@ mostlyclean: common-mostlyclean
do-tests-clean:
-rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(xtests) \
- $(test-srcs)) \
- $(addsuffix -bp.out,$(tests) $(xtests) \
- $(test-srcs)))
+ $(test-srcs)))
# Remove the object files.
common-mostlyclean:
@@ -1276,12 +1273,8 @@ common-mostlyclean:
$(addsuffix .o,$(tests) $(xtests) \
$(test-srcs) $(others) \
$(sysdep-others)) \
- $(addsuffix -bp,$(tests) $(xtests) \
- $(test-srcs)) \
$(addsuffix .out,$(tests) $(xtests) \
- $(test-srcs)) \
- $(addsuffix -bp.out,$(tests) $(xtests) \
- $(test-srcs)))
+ $(test-srcs)))
-rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \
$(install-lib) $(install-lib.so) \
$(install-lib.so:%.so=%_pic.a))
diff --git a/Rules b/Rules
index 5728d09..301a748 100644
--- a/Rules
+++ b/Rules
@@ -98,12 +98,8 @@ ifeq ($(run-built-tests),no)
tests: $(addprefix $(objpfx),$(tests) $(test-srcs))
xtests: tests
else
-ifeq ($(build-bounded),yes)
-tests-bp.out = $(tests:%=$(objpfx)%-bp.out)
-xtests-bp.out = $(xtests:%=$(objpfx)%-bp.out)
-endif
-tests: $(tests:%=$(objpfx)%.out) $(tests-bp.out)
-xtests: tests $(xtests:%=$(objpfx)%.out) $(xtests-bp.out)
+tests: $(tests:%=$(objpfx)%.out)
+xtests: tests $(xtests:%=$(objpfx)%.out)
endif
ifeq ($(build-programs),yes)
@@ -179,14 +175,6 @@ $(addprefix $(objpfx),$(binaries-static-tests)): %: %.o \
$(+link-static-tests)
endif
-ifeq ($(build-bounded),yes)
-binaries-bounded = $(addsuffix -bp,$(tests) $(xtests) $(test-srcs))
-$(addprefix $(objpfx),$(binaries-bounded)): %-bp: %.ob \
- $(sort $(filter $(common-objpfx)lib%,$(link-libc-bounded))) \
- $(addprefix $(csu-objpfx),start.ob) $(+preinit) $(+postinit)
- $(+link-bounded)
-endif
-
ifneq "$(strip $(tests) $(xtests) $(test-srcs))" ""
# These are the implicit rules for making test outputs
# from the test programs and whatever input files are present.
@@ -194,8 +182,6 @@ ifneq "$(strip $(tests) $(xtests) $(test-srcs))" ""
make-test-out = $(test-wrapper-env) \
GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
$($*-ENV) $(host-test-program-cmd) $($*-ARGS)
-$(objpfx)%-bp.out: %.input $(objpfx)%-bp
- $(make-test-out) > $@ < $(word 1,$^)
$(objpfx)%.out: %.input $(objpfx)%
$(make-test-out) > $@ < $(word 1,$^)
$(objpfx)%.out: /dev/null $(objpfx)% # Make it 2nd arg for canned sequence.
diff --git a/config.make.in b/config.make.in
index ed27163..a966dca 100644
--- a/config.make.in
+++ b/config.make.in
@@ -91,7 +91,6 @@ nss-crypt = @libc_cv_nss_crypt@
build-shared = @shared@
build-pic-default= @libc_cv_pic_default@
build-profile = @profile@
-build-bounded = no
build-static-nss = @static_nss@
add-ons = @add_ons@
add-on-subdirs = @add_on_subdirs@
diff --git a/crypt/Makefile b/crypt/Makefile
index 208579a..0f5f099 100644
--- a/crypt/Makefile
+++ b/crypt/Makefile
@@ -69,9 +69,6 @@ $(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.so
else
$(addprefix $(objpfx),$(tests)): $(objpfx)libcrypt.a
endif
-ifeq (yes,$(build-bounded))
-$(tests:%=$(objpfx)%-bp): $(objpfx)libcrypt_b.a
-endif
# Depend on libc.so so a DT_NEEDED is generated in the shared objects.
# This ensures they will load libc.so for needed symbols if loaded by
diff --git a/csu/Makefile b/csu/Makefile
index bf0b4c4..24f0974 100644
--- a/csu/Makefile
+++ b/csu/Makefile
@@ -53,12 +53,6 @@ install-lib += S$(start-installed-name)
generated += start.os
endif
-ifeq (yes,$(build-bounded))
-extra-objs += b$(start-installed-name)
-install-lib += b$(start-installed-name)
-generated += start.ob
-endif
-
ifneq ($(start-installed-name),$(static-start-installed-name))
extra-objs += $(static-start-installed-name) g$(static-start-installed-name)
omit-deps += $(patsubst %.o,%,$(static-start-installed-name) \
@@ -98,9 +92,6 @@ $(objpfx)$(start-installed-name): $(objpfx)start.o $(objpfx)abi-note.o \
$(objpfx)S$(start-installed-name): $(objpfx)start.os $(objpfx)abi-note.o \
$(objpfx)init.o
$(link-relocatable)
-$(objpfx)b$(start-installed-name): $(objpfx)start.ob $(objpfx)abi-note.ob \
- $(objpfx)init.ob
- $(link-relocatable)
endif
# The profiling startfile is made by linking together the normal
diff --git a/intl/Makefile b/intl/Makefile
index d8bff4a..b1572a7 100644
--- a/intl/Makefile
+++ b/intl/Makefile
@@ -117,9 +117,6 @@ $(addprefix $(objpfx),$(multithread-test-srcs)): $(shared-thread-library)
else
$(addprefix $(objpfx),$(multithread-test-srcs)): $(static-thread-library)
endif
-ifeq (yes,$(build-bounded))
-$(multithread-test-srcs:%=$(objpfx)%-bp): $(bounded-thread-library)
-endif
endif
$(objpfx)tst-translit.out: $(objpfx)tst-gettext.out
diff --git a/math/Makefile b/math/Makefile
index da18b56..72cf338 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -193,9 +193,6 @@ $(addprefix $(objpfx),$(tests)): $(objpfx)libm.so$(libm.so-version)
else
$(addprefix $(objpfx),$(tests)): $(objpfx)libm.a
endif
-ifeq ($(build-bounded),yes)
-$(tests:%=$(objpfx)%-bp): $(objpfx)libm_b.a
-endif
gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
diff --git a/misc/Makefile b/misc/Makefile
index 3d2328d..5df70e6 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -109,10 +109,6 @@ else
$(objpfx)tst-tsearch: $(common-objpfx)math/libm.a
endif
-ifeq ($(build-bounded),yes)
-$(objpfx)tst-tsearch-bp: $(common-objpfx)math/libm_b.a
-endif
-
tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace
tst-error1-ARGS = $(objpfx)tst-error1.out
$(objpfx)tst-error1-mem: $(objpfx)tst-error1.out
diff --git a/nptl/Makeconfig b/nptl/Makeconfig
index 7be9b0d..2a1399d 100644
--- a/nptl/Makeconfig
+++ b/nptl/Makeconfig
@@ -24,7 +24,6 @@ have-thread-library = yes
shared-thread-library = $(common-objpfx)nptl/libpthread_nonshared.a \
$(common-objpfx)nptl/libpthread.so
static-thread-library = $(common-objpfx)nptl/libpthread.a
-bounded-thread-library = $(common-objpfx)nptl/libpthread_b.a
rpath-dirs += nptl
diff --git a/rt/Makefile b/rt/Makefile
index 6a98c81..ef356d0 100644
--- a/rt/Makefile
+++ b/rt/Makefile
@@ -76,8 +76,5 @@ $(addprefix $(objpfx),$(tests)): $(objpfx)librt.so $(shared-thread-library)
else
$(addprefix $(objpfx),$(tests)): $(objpfx)librt.a $(static-thread-library)
endif
-ifeq (yes,$(build-bounded))
-$(tests:%=$(objpfx)%-bp): $(objpfx)librt_b.a $(bounded-thread-library)
-endif
tst-mqueue7-ARGS = -- $(host-test-program-cmd)
diff --git a/string/Makefile b/string/Makefile
index 894bae4..0237edd 100644
--- a/string/Makefile
+++ b/string/Makefile
@@ -41,10 +41,6 @@ routines := strcat strchr strcmp strcoll strcpy strcspn \
strcoll_l strxfrm_l string-inlines memrchr \
xpg-strerror strerror_l
-# 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
-
strop-tests := memchr memcmp memcpy memmove mempcpy memset memccpy \
stpcpy stpncpy strcat strchr strcmp strcpy strcspn \
strlen strncmp strncpy strpbrk strrchr strspn memmem \
diff --git a/sysdeps/i386/i686/Makefile b/sysdeps/i386/i686/Makefile
index e6b2924..01c2917 100644
--- a/sysdeps/i386/i686/Makefile
+++ b/sysdeps/i386/i686/Makefile
@@ -15,13 +15,11 @@ CFLAGS-.o += -Wa,-mtune=i686
CFLAGS-.os += -Wa,-mtune=i686
CFLAGS-.op += -Wa,-mtune=i686
CFLAGS-.og += -Wa,-mtune=i686
-CFLAGS-.ob += -Wa,-mtune=i686
CFLAGS-.oS += -Wa,-mtune=i686
ASFLAGS-.o += -Wa,-mtune=i686
ASFLAGS-.os += -Wa,-mtune=i686
ASFLAGS-.op += -Wa,-mtune=i686
ASFLAGS-.og += -Wa,-mtune=i686
-ASFLAGS-.ob += -Wa,-mtune=i686
ASFLAGS-.oS += -Wa,-mtune=i686
endif
diff --git a/sysdeps/sparc/sparc32/sparcv9/Makefile b/sysdeps/sparc/sparc32/sparcv9/Makefile
index 8a9330f..7d475b0 100644
--- a/sysdeps/sparc/sparc32/sparcv9/Makefile
+++ b/sysdeps/sparc/sparc32/sparcv9/Makefile
@@ -10,13 +10,11 @@ ASFLAGS-.o += -Wa,-Av9d
ASFLAGS-.os += -Wa,-Av9d
ASFLAGS-.op += -Wa,-Av9d
ASFLAGS-.og += -Wa,-Av9d
-ASFLAGS-.ob += -Wa,-Av9d
ASFLAGS-.oS += -Wa,-Av9d
else
ASFLAGS-.o += -Wa,-Av9a
ASFLAGS-.os += -Wa,-Av9a
ASFLAGS-.op += -Wa,-Av9a
ASFLAGS-.og += -Wa,-Av9a
-ASFLAGS-.ob += -Wa,-Av9a
ASFLAGS-.oS += -Wa,-Av9a
endif
diff --git a/sysdeps/sparc/sparc64/Makefile b/sysdeps/sparc/sparc64/Makefile
index 2b7b830..fb161ea 100644
--- a/sysdeps/sparc/sparc64/Makefile
+++ b/sysdeps/sparc/sparc64/Makefile
@@ -12,6 +12,5 @@ ASFLAGS-.o += -Wa,-Av9d
ASFLAGS-.os += -Wa,-Av9d
ASFLAGS-.op += -Wa,-Av9d
ASFLAGS-.og += -Wa,-Av9d
-ASFLAGS-.ob += -Wa,-Av9d
ASFLAGS-.oS += -Wa,-Av9d
endif
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 51 ++++++++++++++++++++++++++++++++
Makeconfig | 41 ++++---------------------
Makerules | 11 +-----
Rules | 18 +----------
config.make.in | 1 -
crypt/Makefile | 3 --
csu/Makefile | 9 -----
intl/Makefile | 3 --
math/Makefile | 3 --
misc/Makefile | 4 --
nptl/Makeconfig | 1 -
rt/Makefile | 3 --
string/Makefile | 4 --
sysdeps/i386/i686/Makefile | 2 -
sysdeps/sparc/sparc32/sparcv9/Makefile | 2 -
sysdeps/sparc/sparc64/Makefile | 1 -
16 files changed, 62 insertions(+), 95 deletions(-)
hooks/post-receive
--
GNU C Library master sources