This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch hjl/ifunc/libc_ifunc created. glibc-2.16-ports-merge-445-g5e5aafb
- From: hjl at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 25 Sep 2012 20:45:31 -0000
- Subject: GNU C Library master sources branch hjl/ifunc/libc_ifunc created. glibc-2.16-ports-merge-445-g5e5aafb
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, hjl/ifunc/libc_ifunc has been created
at 5e5aafb29847ce627113e25288dea45b34bb1ff1 (commit)
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=5e5aafb29847ce627113e25288dea45b34bb1ff1
commit 5e5aafb29847ce627113e25288dea45b34bb1ff1
Merge: 223813f d032e0d
Author: H.J. Lu <hjl.tools@gmail.com>
Date: Tue Sep 25 13:34:54 2012 -0700
Merge remote-tracking branch 'origin/master' into hjl/ifunc/test
Conflicts:
Makeconfig
diff --cc Makeconfig
index ae5a566,e96ebc7..a46c7ec
--- a/Makeconfig
+++ b/Makeconfig
@@@ -457,9 -440,28 +440,32 @@@ ifndef +link-stati
$(+link-static-after-libc)
+link-static-tests = $(+link-static-before-libc) $(link-libc-static-tests) \
$(+link-static-after-libc)
++link-static-ifunc-tests = $(+link-static-before-libc) $(link-libc-static-ifunc-tests) \
+ $(+link-static-after-libc)
endif
+ # Commands for linking programs with the C library.
+ ifndef +link
+ ifeq (yes,$(build-shared))
+ +link-before-libc = $(CC) -nostdlib -nostartfiles -o $@ \
+ $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS) $(LDFLAGS-$(@F)) \
+ $(combreloc-LDFLAGS) $(relro-LDFLAGS) $(hashstyle-LDFLAGS) \
+ $(addprefix $(csu-objpfx),$(start-installed-name)) \
+ $(+preinit) $(+prector) \
+ $(filter-out $(addprefix $(csu-objpfx),start.o \
+ $(start-installed-name))\
+ $(+preinit) $(link-extra-libs) \
+ $(common-objpfx)libc% $(+postinit),$^) \
+ $(link-extra-libs)
+ +link-after-libc = $(+postctor) $(+postinit)
+ +link = $(+link-before-libc) $(link-libc) $(+link-after-libc)
+ +link-tests = $(+link-before-libc) $(link-libc-tests) $(+link-after-libc)
+++link-ifunc-tests = $(+link-before-libc) $(link-libc-ifunc-tests) $(+link-after-libc)
+ else
+ +link = $(+link-static)
+ +link-tests = $(+link-static-tests)
+++link-ifunc-tests = $(+link-static-ifunc-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 $@ \
-----------------------------------------------------------------------
hooks/post-receive
--
GNU C Library master sources