Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
  • Loading branch information
Ulrich Drepper committed Jan 15, 2010
2 parents 6a7007d + 35e6599 commit 21dfc00
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
6 changes: 6 additions & 0 deletions ChangeLog
@@ -1,3 +1,9 @@
2010-01-14 Ryan S. Arnold <rsa@us.ibm.com>

* Makeconfig (+prector, +postctor, +prectorS, +postctorS): Add
$(sysdep-LDFLAGS) to pre and post ctors so that the proper .o
files are found by GCC.

2010-01-14 Ulrich Drepper <drepper@redhat.com>

* posix/unistd.h: Relax conditions for ualarm, usleep, getwd, vfork,
Expand Down
8 changes: 4 additions & 4 deletions Makeconfig
Expand Up @@ -549,11 +549,11 @@ endif
ifeq ($(elf),yes)
+preinit = $(addprefix $(csu-objpfx),crti.o)
+postinit = $(addprefix $(csu-objpfx),crtn.o)
+prector = `$(CC) --print-file-name=crtbegin.o`
+postctor = `$(CC) --print-file-name=crtend.o`
+prector = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbegin.o`
+postctor = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtend.o`
# Variants of the two previous definitions for linking PIE programs.
+prectorS = `$(CC) --print-file-name=crtbeginS.o`
+postctorS = `$(CC) --print-file-name=crtendS.o`
+prectorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtbeginS.o`
+postctorS = `$(CC) $(sysdep-LDFLAGS) --print-file-name=crtendS.o`
+interp = $(addprefix $(elf-objpfx),interp.os)
endif
csu-objpfx = $(common-objpfx)csu/
Expand Down

0 comments on commit 21dfc00

Please sign in to comment.