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.

diff --git a/ChangeLog b/ChangeLog
index 873ddb6808ab407c028814d71da7daca5c275336..9af51910c323c0945f74f0b555469b1125722a10 100644 (file)
--- 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 861485dcd17e18b2864a756b426bd8754bebde0d..2c0f68f2be0ce89acf994daa7a39cf3f21c290d1 100644 (file)
--- 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))      \