diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 16:25:15 -0800 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2010-01-14 16:25:15 -0800 |
| commit | 21dfc00031ebb523314475a7ed5141eace23404b (patch) | |
| tree | 8225944b78c627a16f51973bddc9af02f0ed1ba1 | |
| parent | 6a7007d7be6dd34fff897a3bf0d22221b895d7d3 (diff) | |
| parent | 35e6599946c142e1685c9dc46cff55e4ae6aac37 (diff) | |
| download | glibc-21dfc00031ebb523314475a7ed5141eace23404b.tar.gz glibc-21dfc00031ebb523314475a7ed5141eace23404b.tar.xz glibc-21dfc00031ebb523314475a7ed5141eace23404b.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/glibc
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makeconfig | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index a8aa8f15c0..9cd9250c93 100644 --- a/ChangeLog +++ b/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, diff --git a/Makeconfig b/Makeconfig index 9f134cc137..15cd4caad5 100644 --- a/Makeconfig +++ b/Makeconfig @@ -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/ |