diff options
| author | Ryan S. Arnold <rsa@us.ibm.com> | 2009-07-24 12:34:13 -0500 |
|---|---|---|
| committer | Ryan Arnold <ryanarn@etna.rchland.ibm.com> | 2009-07-24 15:10:55 -0500 |
| commit | 3fc074ffb1c4c1dce50901f49e7b59768905a889 (patch) | |
| tree | ee4e18fbac47a027af95afd5c1de6d3f69c98bf3 | |
| parent | c78ee9626525b2f309a8136274c0aca74f17f070 (diff) | |
| download | glibc-3fc074ffb1c4c1dce50901f49e7b59768905a889.tar.gz glibc-3fc074ffb1c4c1dce50901f49e7b59768905a889.tar.xz glibc-3fc074ffb1c4c1dce50901f49e7b59768905a889.zip | |
Fixed up sed invocation to work with newer linker scripts.
Also committed changes from previous patch set which removed redundant
mathinline.h file.
commit 7c8a67320e26b8c11108bf0a3410d3aef9cf3486
Author: Ulrich Drepper <drepper@redhat.com>
Date: Sat Jan 31 00:21:15 2009 +0000
* elf/Makefile (ld.so): Adjust the sed script to insert _begin in to
newer linker scripts.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | elf/Makefile | 4 |
2 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 873ddb6808..9af51910c3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6673,6 +6673,14 @@ 2006-10-06 Ulrich Drepper <drepper@redhat.com> + * sysdeps/unix/sysv/linux/x86_64/bits/fcntl.h: Declare fallocate{,64}. + * sysdeps/unix/sysv/linux/sparc/bits/fcntl.h: Likewise. + * sysdeps/unix/sysv/linux/ia64/bits/fcntl.h: Likewise. + * sysdeps/unix/sysv/linux/i386/bits/fcntl.h: Likewise. + * sysdeps/unix/sysv/linux/s390/bits/fcntl.h: Likewise. + * sysdeps/unix/sysv/linux/powerpc/bits/fcntl.h: Likewise. + * sysdeps/unix/sysv/linux/sh/bits/fcntl.h: Likewise. + * po/pl.po: Update from translation team. * nscd/nscd.c (main): Fix typo in message. diff --git a/elf/Makefile b/elf/Makefile index 861485dcd1..2c0f68f2be 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1995-2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 1995-2007, 2008, 2009 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 @@ -299,7 +299,7 @@ $(objpfx)ld.so: $(objpfx)librtld.os $(ld-map) $(LDFLAGS-rtld) -Wl,-z,defs -Wl,--verbose 2>&1 | \ LC_ALL=C \ sed -e '/^=========/,/^=========/!d;/^=========/d' \ - -e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ + -e 's/\. = .* + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \ > $@.lds $(LINK.o) -nostdlib -nostartfiles -shared -o $@ \ $(LDFLAGS-rtld) -Wl,-z,defs $(z-now-$(bind-now)) \ |