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.15-61-g2119dcf
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 8 Jan 2012 14:52:50 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.15-61-g2119dcf
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 2119dcfaccfa6fabf9e6be15f6d97ad041252ac9 (commit)
via 121766a9d6295d1b3f33b2171c3ad234615627c3 (commit)
from 3857022a761ea7251f8e5c0e45d382ebc3e34cf9 (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=2119dcfaccfa6fabf9e6be15f6d97ad041252ac9
commit 2119dcfaccfa6fabf9e6be15f6d97ad041252ac9
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sun Jan 8 09:52:29 2012 -0500
Static linking is always needed
diff --git a/ChangeLog b/ChangeLog
index 0834b90..78ac067 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2012-01-08 Ulrich Drepper <drepper@gmail.com>
+ * configure.in: static is always set to yes. Remove.
+ * config.make.in: Don't set build-static.
+ * Makeconfig: Remove use of build-static.
+ * dlfcn/Makefile: Likewise.
+ * elf/Makefile: Likewise.
+ * math/Makefile: Likewise.
+ * misc/Makefile: Likewise.
+ * nptl/Makefile: Likewise.
+ * sysdeps/mach/hurd/Makefile: Likewise.
+
* configure.in: PWD_P is not used anymore.
* config.make.in: Remove PWD_P entry.
diff --git a/Makeconfig b/Makeconfig
index fb7468f..2db2821 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -535,14 +535,7 @@ link-extra-libs-bounded = $(link-extra-libs)
endif
# The static libraries.
-ifeq (yes,$(build-static))
link-libc-static = -Wl,--start-group $(common-objpfx)libc.a $(static-gnulib) -Wl,--end-group
-else
-ifeq (yes,$(build-shared))
-# We can try to link the programs with lib*_pic.a...
-link-libc-static = $(static-gnulib) $(common-objpfx)libc_pic.a
-endif
-endif
link-libc-bounded = $(common-objpfx)libc_b.a $(gnulib) $(common-objpfx)libc_b.a
ifndef gnulib
@@ -721,10 +714,8 @@ all-object-suffixes := .o .os .op .og .ob .oS
object-suffixes :=
CPPFLAGS-.o = $(pic-default)
CFLAGS-.o = $(filter %frame-pointer,$(+cflags))
-ifeq (yes,$(build-static))
libtype.o := lib%.a
object-suffixes += .o
-endif
ifeq (yes,$(build-shared))
# Under --enable-shared, we will build a shared library of PIC objects.
# The PIC object files are named foo.os.
diff --git a/config.make.in b/config.make.in
index 90d6b28..d937952 100644
--- a/config.make.in
+++ b/config.make.in
@@ -88,7 +88,6 @@ sizeof-long-double = @sizeof_long_double@
nss-crypt = @libc_cv_nss_crypt@
# Configuration options.
-build-static = @static@
build-shared = @shared@
build-pic-default= @libc_cv_pic_default@
build-profile = @profile@
diff --git a/configure.in b/configure.in
index fbc8881..5fd6d85 100644
--- a/configure.in
+++ b/configure.in
@@ -112,16 +112,6 @@ AC_ARG_ENABLE([check-abi],
[enable_check_abi=$enableval],
[enable_check_abi=no])
-dnl Arguments to enable or disable building the static, shared, profiled,
-dnl and -fomit-frame-pointer libraries.
-dnl I've disabled this for now since we cannot build glibc without static
-dnl libraries built in the moment.
-dnl AC_ARG_ENABLE([static],
-dnl AC_HELP_STRING([--enable-static],
-dnl [build static library @<:@default=yes@:>@]),
-dnl [static=$enableval],
-dnl [static=yes])
-static=yes
AC_ARG_ENABLE([shared],
AC_HELP_STRING([--enable-shared],
[build shared library @<:@default=yes if GNU ld@:>@]),
diff --git a/dlfcn/Makefile b/dlfcn/Makefile
index ae76082..be8580c 100644
--- a/dlfcn/Makefile
+++ b/dlfcn/Makefile
@@ -53,7 +53,7 @@ failtestmod.so-no-z-defs = yes
glreflib2.so-no-z-defs = yes
errmsg1mod.so-no-z-defs = yes
-ifeq (yesyes,$(build-static)$(build-shared))
+ifeq (yes,$(build-shared))
tests += tststatic tststatic2
tests-static += tststatic tststatic2
modules-names += modstatic modstatic2
diff --git a/elf/Makefile b/elf/Makefile
index b010085..052e763 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -200,9 +200,8 @@ tests = tst-tls1 tst-tls2 tst-tls9 tst-leaks1
ifeq (yes,$(have-initfini-array))
tests += tst-array1 tst-array2 tst-array3 tst-array4 tst-array5
endif
-ifeq (yes,$(build-static))
tests-static = tst-tls1-static tst-tls2-static tst-stackguard1-static
-ifeq (yesyes,$(build-static)$(build-shared))
+ifeq (yes,$(build-shared))
tests-static += tst-tls9-static
tst-tls9-static-ENV = \
LD_LIBRARY_PATH=$(objpfx):$(common-objpfx):$(common-objpfx)dlfcn
@@ -211,7 +210,6 @@ ifeq (yes,$(have-initfini-array))
tests-static += tst-array1-static tst-array5-static
endif
tests += $(tests-static)
-endif
ifeq (yes,$(build-shared))
tests += loadtest restest1 preloadtest loadfail multiload origtest resolvfail \
constload1 order vismain noload filter unload \
diff --git a/math/Makefile b/math/Makefile
index 41340da..2819550 100644
--- a/math/Makefile
+++ b/math/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1996-2006,2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2006,2011,2012 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
@@ -199,12 +199,7 @@ ifeq ($(build-bounded),yes)
$(tests:%=$(objpfx)%-bp): $(objpfx)libm_b.a
endif
-ifeq ($(build-static),yes)
-o = .o
-else
-o = .os
-endif
-gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%$o,\
+gmp-objs = $(patsubst %,$(common-objpfx)stdlib/%.o,\
add_n sub_n cmp addmul_1 mul_1 mul_n divmod_1 \
lshift rshift mp_clz_tab udiv_qrnnd inlines)
$(objpfx)atest-exp: $(gmp-objs)
diff --git a/misc/Makefile b/misc/Makefile
index 6be2bc7..f9c51ac 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2006, 2007, 2009, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1991-2007, 2009, 2011, 2012 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
@@ -74,9 +74,7 @@ generated := tst-error1.mtrace tst-error1-mem
include ../Makeconfig
aux := init-misc
-ifeq ($(build-static),yes)
install-lib := libbsd-compat.a libg.a
-endif
gpl2lgpl := error.c error.h
tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
diff --git a/nptl/Makefile b/nptl/Makefile
index be6f490..0c317b0 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -352,11 +352,10 @@ CFLAGS-funlockfile.c = -D_IO_MTSAFE_IO
link-libc-static := $(common-objpfx)libc.a $(static-gnulib) \
$(common-objpfx)libc.a
-ifeq ($(build-static),yes)
tests-static += tst-locale1 tst-locale2 tst-stackguard1-static
tests += tst-stackguard1-static
xtests-static += tst-setuid1-static
-endif
+
# These tests are linked with libc before libpthread
tests-reverse += tst-cancel5 tst-cancel23 tst-vfork1x tst-vfork2x
diff --git a/sysdeps/mach/hurd/Makefile b/sysdeps/mach/hurd/Makefile
index 93058ff..36aebaa 100644
--- a/sysdeps/mach/hurd/Makefile
+++ b/sysdeps/mach/hurd/Makefile
@@ -1,5 +1,4 @@
-# Copyright (C) 1993,94,95,96,97,98,99,2000,2001,2002,2003,2004,2009,2011
-# Free Software Foundation, Inc.
+# Copyright (C) 1993-2004,2009,2011,2012 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
@@ -169,20 +168,10 @@ CFLAGS-dl-load.c = -DEXTERNAL_MAP_FROM_FD
endif
# We need these libs to link static programs in the libc source tree, too.
-ifeq (yes,$(build-static))
link-libc-static := -Wl,-\( \
$(patsubst %,$(common-objpfx)%.a,\
libc mach/libmachuser hurd/libhurduser) \
$(static-gnulib) -Wl,-\)
-else
-ifeq (yes,$(build-shared))
-# We can try to link the programs with lib*_pic.a...
-link-libc-static := $(link-libc) -Wl,-\( \
- $(patsubst %,$(common-objpfx)%_pic.a,\
- libc mach/libmachuser hurd/libhurduser) \
- $(static-gnulib) -Wl,-\)
-endif
-endif
ifeq ($(subdir),csu)
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=121766a9d6295d1b3f33b2171c3ad234615627c3
commit 121766a9d6295d1b3f33b2171c3ad234615627c3
Author: Ulrich Drepper <drepper@gmail.com>
Date: Sun Jan 8 09:31:02 2012 -0500
Remove pwd tst from configure
diff --git a/ChangeLog b/ChangeLog
index ff53953..0834b90 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-01-08 Ulrich Drepper <drepper@gmail.com>
+ * configure.in: PWD_P is not used anymore.
+ * config.make.in: Remove PWD_P entry.
+
* configure.in: Remove last remnants of RANLIB.
No need to check for signed size_t anymore.
Don't set libc_commonpagesize and libc_relro_required here for Alpha
diff --git a/config.make.in b/config.make.in
index 8c0a4dc..90d6b28 100644
--- a/config.make.in
+++ b/config.make.in
@@ -111,7 +111,6 @@ AR = @AR@
MAKEINFO = @MAKEINFO@
AS = $(CC) -c
MIG = @MIG@
-PWD_P = @PWD_P@
BISON = @BISON@
AUTOCONF = @AUTOCONF@
OBJDUMP = @OBJDUMP@
diff --git a/configure b/configure
index e090f16..8483b78 100755
--- a/configure
+++ b/configure
@@ -670,7 +670,6 @@ SED
MAKEINFO
MSGFMT
MAKE
-PWD_P
LD
AS
MIG
@@ -4748,56 +4747,6 @@ if test $ac_verc_fail = yes; then
fi
-# We need the physical current working directory. We cannot use the
-# "pwd -P" shell builtin since that's not portable. Instead we try to
-# find a pwd binary. Note that assigning to the PWD environment
-# variable might have some interesting side effects, so we don't do
-# that.
-# Extract the first word of "pwd", so it can be a program name with args.
-set dummy pwd; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_PWD_P+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $PWD_P in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_PWD_P="$PWD_P" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_PWD_P="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_PWD_P" && ac_cv_path_PWD_P="no"
- ;;
-esac
-fi
-PWD_P=$ac_cv_path_PWD_P
-if test -n "$PWD_P"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PWD_P" >&5
-$as_echo "$PWD_P" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-if test "$PWD_P" = no; then
- as_fn_error $? "*** A pwd binary could not be found." "$LINENO" 5
-fi
-
# These programs are version sensitive.
for ac_prog in ${ac_tool_prefix}gcc ${ac_tool_prefix}cc
diff --git a/configure.in b/configure.in
index 15f925e..fbc8881 100644
--- a/configure.in
+++ b/configure.in
@@ -939,16 +939,6 @@ AC_CHECK_PROG_VER(LD, $LD, --version,
[GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
[2.1[3-9]*|2.1[0-9][0-9]*|2.[2-9][0-9]*|[3-9].*|[1-9][0-9]*], LD=: critic_missing="$critic_missing ld")
-# We need the physical current working directory. We cannot use the
-# "pwd -P" shell builtin since that's not portable. Instead we try to
-# find a pwd binary. Note that assigning to the PWD environment
-# variable might have some interesting side effects, so we don't do
-# that.
-AC_PATH_PROG(PWD_P, pwd, no)
-if test "$PWD_P" = no; then
- AC_MSG_ERROR(*** A pwd binary could not be found.)
-fi
-
# These programs are version sensitive.
AC_CHECK_TOOL_PREFIX
AC_CHECK_PROG_VER(CC, ${ac_tool_prefix}gcc ${ac_tool_prefix}cc, -v,
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 13 +++++++++++
Makeconfig | 9 -------
config.make.in | 2 -
configure | 51 --------------------------------------------
configure.in | 20 -----------------
dlfcn/Makefile | 2 +-
elf/Makefile | 4 +--
math/Makefile | 9 +------
misc/Makefile | 4 +--
nptl/Makefile | 3 +-
sysdeps/mach/hurd/Makefile | 13 +----------
11 files changed, 20 insertions(+), 110 deletions(-)
hooks/post-receive
--
GNU C Library master sources