* scripttempl/elf.sc (WRITABLE_RODATA): New variable for

	controlling whether or not .rodata is in the data segment or the
	text segment.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index b1e5071fdc6400cb91b093915bc897aba8e728d6..3e2235d81257c02e7098eca2b447ab39936321a2 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,10 +1,15 @@
+1999-06-20  Mark Mitchell  <mark@codesourcery.com>
+
+       * scripttempl/elf.sc (WRITABLE_RODATA): New variable for
+       controlling whether or not .rodata is in the data segment or the
+       text segment.
+
 1999-06-18  Nick Clifton  <nickc@cygnus.com>
 
        * emultempl/pe.em: Add new command line switch --thumb-entry.
        * emultempl/armelf.em: Add new command line switch --thumb-entry.
        * emultempl/armcoff.em: Add new command line switch --thumb-entry.
        * ld.texinfo: Document new ARM command line switch: --thumb-entry.      
-
 1999-06-20  H.J. Lu  <hjl@gnu.org>
 
        * configure.in (all_libpath): Accumulate across all enabled targets.

diff --git a/ld/scripttempl/elf.sc b/ld/scripttempl/elf.sc
index e1fea97d791a692b267a267a9a70463289eeb998..afb4ac67c1cd614aba0cb2320d12e84acea5223a 100644 (file)
--- a/ld/scripttempl/elf.sc
+++ b/ld/scripttempl/elf.sc
@@ -25,6 +25,7 @@
 #      SHLIB_TEXT_START_ADDR - if set, add to SIZEOF_HEADERS to set
 #              start address of shared library.
 #      INPUT_FILES - INPUT command of files to always include
+#      WRITABLE_RODATA - if set, the .rodata section should be writable
 #
 # When adding sections, do note that the names of some sections are used
 # when specifying the start address of the next.
@@ -40,7 +41,7 @@ test "$LD_FLAG" = "N" && DATA_ADDR=.
 INTERP=".interp   ${RELOCATING-0} : { *(.interp)       }"
 PLT=".plt    ${RELOCATING-0} : { *(.plt)       }"
 DYNAMIC=".dynamic     ${RELOCATING-0} : { *(.dynamic) }"
-
+RODATA=".rodata ${RELOCATING-0} : { *(.rodata) ${RELOCATING+*(.rodata.*)} ${RELOCATING+*(.gnu.linkonce.r*)} }"
 CTOR=".ctors ${CONSTRUCTING-0} : 
   {
     ${CONSTRUCTING+${CTOR_START}}
@@ -180,12 +181,7 @@ SECTIONS
   ${RELOCATING+_etext = .;}
   ${RELOCATING+PROVIDE (etext = .);}
   .fini    ${RELOCATING-0} : { KEEP (*(.fini))         } =${NOP-0}
-  .rodata  ${RELOCATING-0} :
-  {
-    *(.rodata)
-    ${RELOCATING+*(.rodata.*)}
-    ${RELOCATING+*(.gnu.linkonce.r*)}
-  }
+  ${WRITABLE_RODATA-${RODATA}}
   .rodata1 ${RELOCATING-0} : { *(.rodata1) }
   ${RELOCATING+${OTHER_READONLY_SECTIONS}}
 
@@ -205,6 +201,7 @@ SECTIONS
   .data1 ${RELOCATING-0} : { *(.data1) }
   .eh_frame : { *(.eh_frame) }
   .gcc_except_table : { *(.gcc_except_table) }
+  ${WRITABLE_RODATA+${RODATA}}
   ${RELOCATING+${OTHER_READWRITE_SECTIONS}}
   ${RELOCATING+${CTOR}}
   ${RELOCATING+${DTOR}}