diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/emultempl/elf32.em ld/emultempl/elf32.em
--- ../../binutils/src/ld/emultempl/elf32.em	2008-11-03 11:38:40.000000000 -0800
+++ ld/emultempl/elf32.em	2009-01-12 18:23:03.000000000 -0800
@@ -145,6 +145,31 @@ gld${EMULATION_NAME}_load_symbols (lang_
 EOF
 fi
 
+if test x"$LDEMUL_GET_CONSTANT" != xgld"${EMULATION_NAME}"_get_constant; then
+fragment <<EOF
+
+static bfd_vma gld${EMULATION_NAME}_text_start_addr
+  = ${TEXT_START_ADDR};
+static bfd_vma gld${EMULATION_NAME}_shlib_text_start_addr
+  = ${SHLIB_TEXT_START_ADDR:-0};
+
+static bfd_vma
+gld${EMULATION_NAME}_get_constant (enum ld_emul_constant constant)
+{
+  switch (constant)
+    {
+    case text_start_addr:
+      return gld${EMULATION_NAME}_text_start_addr;
+      break;
+    case shlib_text_start_addr:
+      return gld${EMULATION_NAME}_shlib_text_start_addr;
+    default:
+      abort ();
+    }
+}
+EOF
+fi
+
 fragment <<EOF
 
 /* These variables are required to pass information back and forth
@@ -2176,6 +2201,24 @@ fragment <<EOF
 	  bfd_emul_set_commonpagesize (default_target,
 				       config.commonpagesize);
 	}
+      else if (CONST_STRNEQ (optarg, "text-start-addr="))
+	{
+	  char *end;
+	  bfd_vma addr = strtoul (optarg + 16, &end, 0);
+	  if (*end || addr == (bfd_vma) -1)
+	    einfo (_("%P%F: invalid text start address\`%s'\n"),
+		   optarg + 16);
+	  gld${EMULATION_NAME}_text_start_addr = addr;
+	}
+      else if (CONST_STRNEQ (optarg, "shlib-text-start-addr="))
+	{
+	  char *end;
+	  bfd_vma addr = strtoul (optarg + 22, &end, 0);
+	  if (*end || addr == (bfd_vma) -1)
+	    einfo (_("%P%F: invalid shared library text start address\`%s'\n"),
+		   optarg + 22);
+	  gld${EMULATION_NAME}_shlib_text_start_addr = addr;
+	}
       /* What about the other Solaris -z options? FIXME.  */
       break;
 EOF
@@ -2277,6 +2320,12 @@ fragment <<EOF
   fprintf (file, _("\
   -z common-page-size=SIZE    Set common page size to SIZE\n"));
   fprintf (file, _("\
+  -z text-start-addr=ADDR\n\
+                              Set text start address to ADDR in executable\n"));
+  fprintf (file, _("\
+  -z shlib-text-start-addr=ADDR\n\
+                              Set text start address to ADDR in shared library\n"));
+  fprintf (file, _("\
   -z KEYWORD                  Ignored for Solaris compatibility\n"));
 EOF
 fi
@@ -2337,6 +2386,7 @@ struct ld_emulation_xfer_struct ld_${EMU
   ${LDEMUL_LIST_OPTIONS-gld${EMULATION_NAME}_list_options},
   ${LDEMUL_RECOGNIZED_FILE-gld${EMULATION_NAME}_load_symbols},
   ${LDEMUL_FIND_POTENTIAL_LIBRARIES-NULL},
-  ${LDEMUL_NEW_VERS_PATTERN-NULL}
+  ${LDEMUL_NEW_VERS_PATTERN-NULL},
+  ${LDEMUL_GET_CONSTANT-gld${EMULATION_NAME}_get_constant}
 };
 EOF
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/emultempl/linux.em ld/emultempl/linux.em
--- ../../binutils/src/ld/emultempl/linux.em	2008-02-16 16:07:36.000000000 -0800
+++ ld/emultempl/linux.em	2009-01-12 18:10:42.000000000 -0800
@@ -206,6 +206,7 @@ struct ld_emulation_xfer_struct ld_${EMU
   NULL,	/* list options */
   NULL,	/* recognized file */
   NULL,	/* find_potential_libraries */
-  NULL	/* new_vers_pattern */
+  NULL,	/* new_vers_pattern */
+  get_constant_default /* get_constant */
 };
 EOF
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/ldemul.c ld/ldemul.c
--- ../../binutils/src/ld/ldemul.c	2008-11-03 11:38:40.000000000 -0800
+++ ld/ldemul.c	2009-01-12 18:16:11.000000000 -0800
@@ -320,3 +320,17 @@ ldemul_new_vers_pattern (struct bfd_elf_
     entry = (*ld_emulation->new_vers_pattern) (entry);
   return entry;
 }
+
+bfd_vma
+ldemul_get_constant (enum ld_emul_constant constant)
+{
+  return (*ld_emulation->get_constant) (constant);
+}
+
+bfd_vma
+get_constant_default (enum ld_emul_constant ignore ATTRIBUTE_UNUSED)
+{
+  abort ();
+  return (bfd_vma) -1;
+}
+
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/ldemul.h ld/ldemul.h
--- ../../binutils/src/ld/ldemul.h	2008-11-03 11:38:40.000000000 -0800
+++ ld/ldemul.h	2009-01-12 18:25:26.000000000 -0800
@@ -97,6 +97,19 @@ extern int  ldemul_find_potential_librar
 extern struct bfd_elf_version_expr *ldemul_new_vers_pattern
   (struct bfd_elf_version_expr *);
 
+enum ld_emul_constant
+  {
+    /* The first byte of the text segment in executable.  */
+    text_start_addr,
+    /* The first byte of the text segment in shared library.  */
+    shlib_text_start_addr
+  };
+
+extern bfd_vma get_constant_default
+  (enum ld_emul_constant);
+extern bfd_vma ldemul_get_constant
+  (enum ld_emul_constant);
+
 typedef struct ld_emulation_xfer_struct {
   /* Run before parsing the command line and script file.
      Set the architecture, maybe other things.  */
@@ -196,6 +209,9 @@ typedef struct ld_emulation_xfer_struct 
   struct bfd_elf_version_expr * (*new_vers_pattern)
     (struct bfd_elf_version_expr *);
 
+  /* Return the value of constant.  */
+  bfd_vma (*get_constant) (enum ld_emul_constant);
+
 } ld_emulation_xfer_type;
 
 typedef enum {
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/ldexp.c ld/ldexp.c
--- ../../binutils/src/ld/ldexp.c	2008-09-30 12:56:03.000000000 -0700
+++ ld/ldexp.c	2009-01-12 18:16:54.000000000 -0800
@@ -40,6 +40,8 @@
 #include "ldlex.h"
 #include <ldgram.h>
 #include "ldlang.h"
+#include "ldfile.h"
+#include "ldemul.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
 
@@ -677,8 +679,24 @@ fold_name (etree_type *tree)
       else if (strcmp (tree->name.name, "COMMONPAGESIZE") == 0)
 	new_abs (bfd_emul_get_commonpagesize (default_target));
       else
-	einfo (_("%F%S: unknown constant `%s' referenced in expression\n"),
-	       tree->name.name);
+	{
+	  enum ld_emul_constant constant;
+
+	  if (strcmp (tree->name.name, "TEXT_START_ADDR") == 0)
+	    constant = text_start_addr;
+	  else if (strcmp (tree->name.name, "SHLIB_TEXT_START_ADDR")
+		   == 0)
+	    constant = shlib_text_start_addr;
+	  else
+	    {
+	      einfo (_("%F%S: unknown constant `%s' referenced in expression\n"),
+		     tree->name.name);
+	      /* Silence gcc 3.4.  */
+	      constant = text_start_addr;
+	    }
+
+	  new_abs (ldemul_get_constant (constant));
+	}
       break;
 
     default:
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/ld.h ld/ld.h
--- ../../binutils/src/ld/ld.h	2008-06-03 09:01:28.000000000 -0700
+++ ld/ld.h	2009-01-12 12:05:21.000000000 -0800
@@ -300,6 +300,9 @@ typedef struct {
 
   /* The common page size for ELF.  */
   bfd_vma commonpagesize;
+
+  /* The first byte of the text segment for ELF.  */
+  bfd_vma text_start_addr;
 } ld_config_type;
 
 extern ld_config_type config;
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/ld.texinfo ld/ld.texinfo
--- ../../binutils/src/ld/ld.texinfo	2009-01-09 12:38:00.000000000 -0800
+++ ld/ld.texinfo	2009-01-12 18:18:49.000000000 -0800
@@ -1049,6 +1049,12 @@ Set the emulation maximum page size to @
 @item common-page-size=@var{value}
 Set the emulation common page size to @var{value}.
 
+@item text-start-addr=@var{value}
+Set the first byte of the text segment in executable to @var{value}.
+
+@item shlib-text-start-addr=@var{value}
+Set the first byte of the text segment in shared library to @var{value}.
+
 @end table
 
 Other keywords are ignored for Solaris compatibility.
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/scripttempl/elf.sc ld/scripttempl/elf.sc
--- ../../binutils/src/ld/scripttempl/elf.sc	2008-12-04 06:55:48.000000000 -0800
+++ ld/scripttempl/elf.sc	2009-01-12 18:20:51.000000000 -0800
@@ -244,9 +244,9 @@ STACK="  .stack        ${RELOCATING-0}${
 
 # if this is for an embedded system, don't add SIZEOF_HEADERS.
 if [ -z "$EMBEDDED" ]; then
-   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR} + SIZEOF_HEADERS"
+   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="CONSTANT (TEXT_START_ADDR) + SIZEOF_HEADERS"
 else
-   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="${TEXT_START_ADDR}"
+   test -z "${TEXT_BASE_ADDRESS}" && TEXT_BASE_ADDRESS="CONSTANT (TEXT_START_ADDR)"
 fi
 
 cat <<EOF
@@ -266,9 +266,9 @@ ${RELOCATING- /* For some reason, the So
 SECTIONS
 {
   /* Read-only sections, merged into text segment: */
-  ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+PROVIDE (__executable_start = ${TEXT_START_ADDR}); . = ${TEXT_BASE_ADDRESS};}}}
-  ${CREATE_SHLIB+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
-  ${CREATE_PIE+${RELOCATING+. = ${SHLIB_TEXT_START_ADDR:-0} + SIZEOF_HEADERS;}}
+  ${CREATE_SHLIB-${CREATE_PIE-${RELOCATING+PROVIDE (__executable_start = "CONSTANT (TEXT_START_ADDR)"); . = ${TEXT_BASE_ADDRESS};}}}
+  ${CREATE_SHLIB+${RELOCATING+. = "CONSTANT (SHLIB_TEXT_START_ADDR)" + SIZEOF_HEADERS;}}
+  ${CREATE_PIE+${RELOCATING+. = "CONSTANT (SHLIB_TEXT_START_ADDR)" + SIZEOF_HEADERS;}}
   ${INITIAL_READONLY_SECTIONS}
   .note.gnu.build-id : { *(.note.gnu.build-id) }
 EOF
diff -uprN -x .svn -x ChangeLog.addr ../../binutils/src/ld/testsuite/ld-elf/textaddr1.d ld/testsuite/ld-elf/textaddr1.d
--- ../../binutils/src/ld/testsuite/ld-elf/textaddr1.d	1969-12-31 16:00:00.000000000 -0800
+++ ld/testsuite/ld-elf/textaddr1.d	2009-01-12 12:32:49.000000000 -0800
@@ -0,0 +1,9 @@
+#source: maxpage1.s
+#ld: -z text-start-addr=0x7000000 -z max-page-size=0x200000
+#readelf: -l --wide
+#target: x86_64-*-linux-gnu i?86-*-linux-gnu
+
+#...
+  LOAD +0x0+ 0x0*7000000 0x0*7000000 0x0*[0-9a-f][0-9a-f] 0x0*[0-9a-f][0-9a-f] R E 0x200000
+  LOAD +0x0+[0-9a-f][0-9a-f] 0x0*72000[0-9a-f][0-9a-f] 0x0*72000[0-9a-f][0-9a-f] 0x0+4 0x0+4 RW  0x200000
+#pass