2004-02-21  Ryan Oliver

	* Makerules: Move sed commands for generation of shlib.lds to a separate
	sed script (gen_shlib_ldscriptcript.sed).
	* gen_shlib_ldscriptcript.sed: New file

diff -uNr glibc-2.3.3-lfs-rc1/gen_shlib_ldscript.sed glibc-2.3.3-lfs-rc2/gen_shlib_ldscript.sed
--- glibc-2.3.3-lfs-rc1/gen_shlib_ldscript.sed	1970-01-01 10:00:00.000000000 +1000
+++ glibc-2.3.3-lfs-rc2/gen_shlib_ldscript.sed	2004-02-19 23:22:09.000000000 +1100
@@ -0,0 +1,13 @@
+/^=========/,/^=========/!d;/^=========/d
+s/^.*\.hash[ 	]*:.*$/  .note.ABI-tag : { *(.note.ABI-tag) } &/ 
+s/^.*\*(\.dynbss).*$/& PROVIDE(__start___libc_freeres_ptrs = .); *(__libc_freeres_ptrs) PROVIDE(__stop___libc_freeres_ptrs = .);/
+s/^.*\*(\.jcr).*$/&\
+  PROVIDE(__start___libc_subfreeres = .);\
+  __libc_subfreeres : { *(__libc_subfreeres) }\
+  PROVIDE(__stop___libc_subfreeres = .);\
+  PROVIDE(__start___libc_atexit = .);\
+  __libc_atexit : { *(__libc_atexit) }\
+  PROVIDE(__stop___libc_atexit = .);\
+  PROVIDE(__start___libc_thread_subfreeres = .);\
+  __libc_thread_subfreeres : { *(__libc_thread_subfreeres) }\
+  PROVIDE(__stop___libc_thread_subfreeres = .);/
diff -uNr glibc-2.3.3-lfs-rc1/Makerules glibc-2.3.3-lfs-rc2/Makerules
--- glibc-2.3.3-lfs-rc1/Makerules	2004-02-18 16:47:28.000000000 +1100
+++ glibc-2.3.3-lfs-rc2/Makerules	2004-02-21 14:46:56.000000000 +1100
@@ -479,28 +479,12 @@
 ifeq (yes,$(elf))
 # binutils only position loadable notes into the first page for binaries,
 # not for shared objects
-$(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
+$(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)gen_shlib_ldscript.sed $(..)Makerules
 	$(LINK.o) -shared -Wl,-O1 \
 		  -nostdlib -nostartfiles \
 		  $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \
 		  -Wl,--verbose 2>&1 | \
-	  sed > $@T \
-	      -e '/^=========/,/^=========/!d;/^=========/d' \
-	      -e 's/^.*\.hash[ 	]*:.*$$/  .note.ABI-tag : { *(.note.ABI-tag) } &/' \
-	      -e 's/^.*\*(\.dynbss).*$$/& \
-		 PROVIDE(__start___libc_freeres_ptrs = .); \
-		 *(__libc_freeres_ptrs) \
-		 PROVIDE(__stop___libc_freeres_ptrs = .);/'\
-	      -e 's/^.*\*(\.jcr).*$$/& \
-		 PROVIDE(__start___libc_subfreeres = .); \
-		 __libc_subfreeres : { *(__libc_subfreeres) } \
-		 PROVIDE(__stop___libc_subfreeres = .); \
-		 PROVIDE(__start___libc_atexit = .); \
-		 __libc_atexit : { *(__libc_atexit) } \
-		 PROVIDE(__stop___libc_atexit = .); \
-		 PROVIDE(__start___libc_thread_subfreeres = .); \
-		 __libc_thread_subfreeres : { *(__libc_thread_subfreeres) } \
-		 PROVIDE(__stop___libc_thread_subfreeres = .);/'
+	   sed -f $(..)gen_shlib_ldscript.sed > $@T 
 	mv -f $@T $@
 common-generated += shlib.lds