about summary refs log tree commit diff
path: root/Makerules
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-01-13 08:36:54 +0000
committerUlrich Drepper <drepper@redhat.com>2004-01-13 08:36:54 +0000
commited20b3d9cc5ce78fd71f32c47b2eb7a897c7a25d (patch)
treec4ea660173f2c8cc138e8f0f1c64055a156c5036 /Makerules
parent1c563add69af03557ba47a4a13790d821133478c (diff)
downloadglibc-ed20b3d9cc5ce78fd71f32c47b2eb7a897c7a25d.tar.gz
glibc-ed20b3d9cc5ce78fd71f32c47b2eb7a897c7a25d.tar.xz
glibc-ed20b3d9cc5ce78fd71f32c47b2eb7a897c7a25d.zip
Update.
2004-01-13  Ulrich Drepper  <drepper@redhat.com>

	* Makeconfig: Define relro-LDFLAGS if have-z-relro==yes.  Add it to
	LDFLAGS.so and LDFLAGS-rtld.
	(+link): Add relro-LDFLAGS.
	* Makeconfig (shlib.lds): Place __libc_subfreeres, __libc_atexit, and
	__libc_thread_subfreeres sections after .jcr section.
	* config.make.in: Add have-z-relro.
	* configure.in: Add check for -z relro option.
	* include/link.h (struct link_map): Add relro_addr and relro_size
	members.
	* elf/dl-load.c (_dl_map_object_from_fd): Recognize PT_GNU_RELRO.
	* elf/dl-reloc.c (_dl_relocate_object): At the end, make relro
	part of loaded segments read-only.
	* elf/elf.h: Define PT_GNU_RELRO.
	* elf/rtld.c (_dl_start): Recognize PT_GNU_RELRO of ld.so.
	(dl_main): Recognize PT_GNU_RELRO of the application.  Call
	_dl_debug_initialize and initialize l_info[DT_DEBUG] before
	relocations.
Diffstat (limited to 'Makerules')
-rw-r--r--Makerules14
1 files changed, 12 insertions, 2 deletions
diff --git a/Makerules b/Makerules
index d1bef8c983..9aa0703be7 100644
--- a/Makerules
+++ b/Makerules
@@ -1,4 +1,4 @@
-# Copyright (C) 1991-2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 1991-2002, 2003, 2004 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
@@ -488,7 +488,17 @@ $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules
 	      -e 's/^.*\*(\.dynbss).*$$/& \
 		 PROVIDE(__start___libc_freeres_ptrs = .); \
 		 *(__libc_freeres_ptrs) \
-		 PROVIDE(__stop___libc_freeres_ptrs = .);/'
+		 PROVIDE(__stop___libc_freeres_ptrs = .);/'\
+	      -e 's/^.*\*(\.jcr).*$$/&\n\
+		 PROVIDE(__start___libc_subfreeres = .);\n\
+		 __libc_subfreeres : { *(__libc_subfreeres) }\n\
+		 PROVIDE(__stop___libc_subfreeres = .);\n\
+		 PROVIDE(__start___libc_atexit = .);\n\
+		 __libc_atexit : { *(__libc_atexit) }\n\
+		 PROVIDE(__stop___libc_atexit = .);\n\
+		 PROVIDE(__start___libc_thread_subfreeres = .);\n\
+		 __libc_thread_subfreeres : { *(__libc_thread_subfreeres) }\n\
+		 PROVIDE(__stop___libc_thread_subfreeres = .);/'
 	mv -f $@T $@
 common-generated += shlib.lds