toplevel/
authorDavid S. Miller <davem@redhat.com>
Tue, 15 Apr 2008 05:16:51 +0000 (05:16 +0000)
committerDavid S. Miller <davem@redhat.com>
Tue, 15 Apr 2008 05:16:51 +0000 (05:16 +0000)
* configure.ac: Add sparc*-*-* to gold supported targets.
* configure: Regenerate.

gold/

* sparc.cc: New file.
* Makefile.am (TARGETSOURCES): Add sparc.cc
(ALL_TARGETOBJS): Add sparc.$(OBJEXT)
* configure.tgt: Document targ_extra_size and
targ_extra_big_endian.  Add entries for sparc-* and
sparc64-*.
* configure.ac: Handle targ_extra_size and
targ_extra_big_endian.
* Makefile.in: Rebuild.
* configure: Likewise.
* po/POTFILES.in: Likewise.
* po/gold.pot: Likewise.

12 files changed:
ChangeLog
configure
configure.ac
gold/ChangeLog
gold/Makefile.am
gold/Makefile.in
gold/configure
gold/configure.ac
gold/configure.tgt
gold/po/POTFILES.in
gold/po/gold.pot
gold/sparc.cc [new file with mode: 0644]

index bb9505865c314ca2d185754c842bed6594ce1469..d2ae6374b8538b857191999bd6236884c882513c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-04-14  David S. Miller  <davem@davemloft.net>
+
+       * configure.ac: Add sparc*-*-* to gold supported targets.
+       * configure: Regenerate.
+
 2008-04-14  Ben Elliston  <bje@au.ibm.com>
 
        * config.sub, config.guess: Update from upstream sources.
index b146180397e57ed7b48c4511362435654cf1b928..8d80fa26eeb351b5ac07113629556871dcc51ad7 100755 (executable)
--- a/configure
+++ b/configure
@@ -2048,7 +2048,7 @@ if test "${ENABLE_GOLD}" = "yes"; then
   if test "$is_elf" = "yes"; then
     # Check for target supported by gold.
     case "${target}" in
-      i?86-*-* | x86_64-*-*)
+      i?86-*-* | x86_64-*-* | sparc*-*-*)
         configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
         ;;
     esac
index 1a18c61ece956d4ff4800f9f00f7e10db95a27eb..06f401808d0555c45f15caf9299f7b2499f88af5 100644 (file)
@@ -316,7 +316,7 @@ if test "${ENABLE_GOLD}" = "yes"; then
   if test "$is_elf" = "yes"; then
     # Check for target supported by gold.
     case "${target}" in
-      i?86-*-* | x86_64-*-*)
+      i?86-*-* | x86_64-*-* | sparc*-*-*)
         configdirs="`echo " ${configdirs} " | sed -e 's/ ld / gold /'`"
         ;;
     esac
index a29e903fe1da4e8f04071c97f9dac750b4ae2e6c..1516415bf5672366c0dae4ea262c66baca3eb201 100644 (file)
@@ -1,3 +1,18 @@
+2008-04-14  David S. Miller  <davem@davemloft.net>
+
+       * sparc.cc: New file.
+       * Makefile.am (TARGETSOURCES): Add sparc.cc
+       (ALL_TARGETOBJS): Add sparc.$(OBJEXT)
+       * configure.tgt: Document targ_extra_size and
+       targ_extra_big_endian.  Add entries for sparc-* and
+       sparc64-*.
+       * configure.ac: Handle targ_extra_size and
+       targ_extra_big_endian.
+       * Makefile.in: Rebuild.
+       * configure: Likewise.
+       * po/POTFILES.in: Likewise.
+       * po/gold.pot: Likewise.
+
 2008-04-14  Ian Lance Taylor  <iant@google.com>
 
        * layout.cc (Layout::Layout): Initialize sections_are_attached_.
index ea43458453926eb0a31ac03a84b7d855a09240d0..148999d39fb3127b8eb7aa5d8b8e5126f2faf35a 100644 (file)
@@ -103,10 +103,10 @@ YFILES = \
 EXTRA_DIST = yyscript.c yyscript.h
 
 TARGETSOURCES = \
-       i386.cc x86_64.cc
+       i386.cc x86_64.cc sparc.cc
 
 ALL_TARGETOBJS = \
-       i386.$(OBJEXT) x86_64.$(OBJEXT)
+       i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT)
 
 libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES)
 
index 6acd7de8463bf44ca4441c8778bd834d19c19fd4..4ca446879a34d43563e897a596b697f31cf83d24 100644 (file)
@@ -54,10 +54,11 @@ DIST_COMMON = README $(am__configure_deps) $(srcdir)/../config.guess \
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/../config/depstand.m4 \
+       $(top_srcdir)/../config/gettext-sister.m4 \
        $(top_srcdir)/../config/lead-dot.m4 \
+       $(top_srcdir)/../config/nls.m4 $(top_srcdir)/../config/po.m4 \
+       $(top_srcdir)/../config/proginstall.m4 \
        $(top_srcdir)/../config/progtest.m4 \
-       $(top_srcdir)/../config/po.m4 $(top_srcdir)/../config/nls.m4 \
-       $(top_srcdir)/../config/gettext-sister.m4 \
        $(top_srcdir)/../bfd/warning.m4 $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
        $(ACLOCAL_M4)
@@ -377,10 +378,10 @@ YFILES = \
 
 EXTRA_DIST = yyscript.c yyscript.h
 TARGETSOURCES = \
-       i386.cc x86_64.cc
+       i386.cc x86_64.cc sparc.cc
 
 ALL_TARGETOBJS = \
-       i386.$(OBJEXT) x86_64.$(OBJEXT)
+       i386.$(OBJEXT) x86_64.$(OBJEXT) sparc.$(OBJEXT)
 
 libgold_a_SOURCES = $(CCFILES) $(HFILES) $(YFILES)
 sources_var = main.cc
@@ -533,6 +534,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/resolve.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script-sections.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/script.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sparc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stringpool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/symtab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/target-select.Po@am__quote@
index 4201127ad3c94b015fbc02d6cb1b565ce6af458f..6fb0c7e03eaafa3df30d560112281770beb85abb 100755 (executable)
@@ -982,7 +982,7 @@ esac
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -1463,6 +1463,7 @@ am__api_version="1.9"
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
@@ -1496,8 +1497,18 @@ case $as_dir/ in
            # program-specific install script used by HP pwplus--don't use.
            :
          else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
+           rm -rf conftest.one conftest.two conftest.dir
+           echo one > conftest.one
+           echo two > conftest.two
+           mkdir conftest.dir
+           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+             test -s conftest.one && test -s conftest.two &&
+             test -s conftest.dir/conftest.one &&
+             test -s conftest.dir/conftest.two
+           then
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
          fi
        fi
       done
@@ -1506,15 +1517,16 @@ case $as_dir/ in
 esac
 done
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
@@ -1993,30 +2005,25 @@ echo "$as_me: error: \"unsupported target $targ\"" >&2;}
    { (exit 1); exit 1; }; }
     else
       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
-      if test "$targ_size" = "32"; then
-        if test "$targ_big_endian" = "false"; then
-         targ_32_little=yes
-        elif test "$targ_big_endian" = "true"; then
-         targ_32_big=yes
-       else
-         { { echo "$as_me:$LINENO: error: \"bad configure.tgt endian $targ_big_endian\"" >&5
-echo "$as_me: error: \"bad configure.tgt endian $targ_big_endian\"" >&2;}
-   { (exit 1); exit 1; }; }
-       fi
-      elif test "$targ_size" = "64"; then
-        if test "$targ_big_endian" = "false"; then
-         targ_64_little=yes
-        elif test "$targ_big_endian" = "true"; then
-         targ_64_big=yes
-       else
-         { { echo "$as_me:$LINENO: error: \"bad configure.tgt endian $targ_big_endian\"" >&5
-echo "$as_me: error: \"bad configure.tgt endian $targ_big_endian\"" >&2;}
-   { (exit 1); exit 1; }; }
-       fi
-      else
-       { { echo "$as_me:$LINENO: error: \"bad configure.tgt size $targ_size\"" >&5
-echo "$as_me: error: \"bad configure.tgt size $targ_size\"" >&2;}
-   { (exit 1); exit 1; }; }
+      if test "$targ_size" = "32" -o "$targ_extra_size" = "32"; then
+         if test "$targ_big_endian" = "true" \
+             -o "$targ_extra_big_endian" = "true"; then
+             targ_32_big=yes
+         fi
+         if test "$targ_big_endian" = "false" \
+             -o "$targ_extra_big_endian" = "false"; then
+             targ_32_little=yes
+         fi
+      fi
+      if test "$targ_size" = "64" -o "$targ_extra_size" = "64"; then
+         if test "$targ_big_endian" = "true" \
+             -o "$targ_extra_big_endian" = "true"; then
+             targ_64_big=yes
+         fi
+         if test "$targ_big_endian" = "false" \
+             -o "$targ_extra_big_endian" = "false"; then
+             targ_64_little=yes
+         fi
       fi
 
       if test "$target" = "$targ"; then
@@ -2648,7 +2655,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2706,7 +2714,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2822,7 +2831,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2876,7 +2886,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2921,7 +2932,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2965,7 +2977,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3323,7 +3336,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3381,7 +3395,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3452,7 +3467,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3496,7 +3512,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3772,6 +3789,7 @@ fi
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # OS/2's system install, which has a completely different semantic
 # ./install, which can be erroneously created by make from ./install.sh.
+# Reject install programs that cannot install multiple files.
 echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
 echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
@@ -3805,8 +3823,18 @@ case $as_dir/ in
            # program-specific install script used by HP pwplus--don't use.
            :
          else
-           ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-           break 3
+           rm -rf conftest.one conftest.two conftest.dir
+           echo one > conftest.one
+           echo two > conftest.two
+           mkdir conftest.dir
+           if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
+             test -s conftest.one && test -s conftest.two &&
+             test -s conftest.dir/conftest.one &&
+             test -s conftest.dir/conftest.two
+           then
+             ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
+             break 3
+           fi
          fi
        fi
       done
@@ -3815,15 +3843,16 @@ case $as_dir/ in
 esac
 done
 
+rm -rf conftest.one conftest.two conftest.dir
 
 fi
   if test "${ac_cv_path_install+set}" = set; then
     INSTALL=$ac_cv_path_install
   else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
+    # As a last resort, use the slow shell script.  Don't cache a
+    # value for INSTALL within a source directory, because that will
     # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
+    # removed, or if the value is a relative name.
     INSTALL=$ac_install_sh
   fi
 fi
@@ -4273,7 +4302,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4315,7 +4345,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4372,7 +4403,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4522,7 +4554,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4581,7 +4614,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4630,7 +4664,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4686,7 +4721,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4738,7 +4774,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4912,7 +4949,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5239,7 +5277,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5409,7 +5448,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5480,7 +5520,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5534,7 +5575,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5597,7 +5639,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_c_werror_flag"                   || test ! -s conftest.err'
+        { ac_try='test -z "$ac_c_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -5999,7 +6042,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6149,7 +6193,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6333,7 +6378,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -6391,7 +6437,8 @@ if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-        { ac_try='test -z "$ac_cxx_werror_flag"                         || test ! -s conftest.err'
+        { ac_try='test -z "$ac_cxx_werror_flag"
+                        || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -7460,6 +7507,11 @@ esac
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -7498,12 +7550,6 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
         fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub
index dd9ad8aa129baf26168789c13bc25b2c0965d282..793784eac25e933663ea253065ec6480355ef925 100644 (file)
@@ -107,24 +107,25 @@ for targ in $target $canon_targets; do
       AC_MSG_ERROR("unsupported target $targ")
     else
       targetobjs="$targetobjs ${targ_obj}.\$(OBJEXT)"
-      if test "$targ_size" = "32"; then
-        if test "$targ_big_endian" = "false"; then
-         targ_32_little=yes
-        elif test "$targ_big_endian" = "true"; then
-         targ_32_big=yes
-       else
-         AC_MSG_ERROR("bad configure.tgt endian $targ_big_endian")
-       fi
-      elif test "$targ_size" = "64"; then
-        if test "$targ_big_endian" = "false"; then
-         targ_64_little=yes
-        elif test "$targ_big_endian" = "true"; then
-         targ_64_big=yes
-       else
-         AC_MSG_ERROR("bad configure.tgt endian $targ_big_endian")
-       fi
-      else
-       AC_MSG_ERROR("bad configure.tgt size $targ_size")
+      if test "$targ_size" = "32" -o "$targ_extra_size" = "32"; then
+         if test "$targ_big_endian" = "true" \
+             -o "$targ_extra_big_endian" = "true"; then
+             targ_32_big=yes
+         fi
+         if test "$targ_big_endian" = "false" \
+             -o "$targ_extra_big_endian" = "false"; then
+             targ_32_little=yes
+         fi
+      fi
+      if test "$targ_size" = "64" -o "$targ_extra_size" = "64"; then
+         if test "$targ_big_endian" = "true" \
+             -o "$targ_extra_big_endian" = "true"; then
+             targ_64_big=yes
+         fi
+         if test "$targ_big_endian" = "false" \
+             -o "$targ_extra_big_endian" = "false"; then
+             targ_64_little=yes
+         fi
       fi
 
       if test "$target" = "$targ"; then
index 93615aa0d38a2a6363e904da54e1396f8f271296..967db5621cf099ca172f94de56733b87441cfba2 100644 (file)
 # canonicalized GNU configuration triplet.  It sets the following
 # shell variables:
 
-# targ_obj         object file to include in the link, with no extension
-# targ_machine     ELF machine code for this target
-# targ_size        size of this target--32 or 64
-# targ_big_endian  whether the target is big-endian--true or false
+# targ_obj               object file to include in the link, with no extension
+# targ_machine           ELF machine code for this target
+# targ_size              size of this target--32 or 64
+# targ_extra_size        extra targ_size setting for the target
+# targ_big_endian        whether the target is big-endian--true or false
+# targ_extra_big_endian  extra targ_big_endian setting for the target
 
 # If the target is not recognized targ_obj is set to "UNKNOWN".
 
@@ -49,6 +51,22 @@ x86_64*)
   targ_size=64
   targ_big_endian=false
   ;;
+sparc-*)
+  targ_obj=sparc
+  targ_machine=EM_SPARC
+  targ_size=32
+  targ_extra_size=64
+  targ_big_endian=true
+  targ_extra_big_endian=false
+  ;;
+sparc64-*)
+  targ_obj=sparc
+  targ_machine=EM_SPARCV9
+  targ_size=64
+  targ_extra_size=32
+  targ_big_endian=true
+  targ_extra_big_endian=false
+  ;;
 *)
   targ_obj=UNKNOWN
   ;;
index 67b42936f29da456a710befb982d079003412aad..3776c861998b120ea84e6e367960e0162d8cbcd8 100644 (file)
@@ -21,10 +21,10 @@ errors.h
 expression.cc
 fileread.cc
 fileread.h
-gold.cc
-gold.h
 gold-threads.cc
 gold-threads.h
+gold.cc
+gold.h
 i386.cc
 layout.cc
 layout.h
@@ -40,28 +40,29 @@ parameters.cc
 parameters.h
 readsyms.cc
 readsyms.h
+reloc-types.h
 reloc.cc
 reloc.h
-reloc-types.h
 resolve.cc
-script.cc
 script-c.h
-script.h
 script-sections.cc
 script-sections.h
+script.cc
+script.h
+sparc.cc
 stringpool.cc
 stringpool.h
 symtab.cc
 symtab.h
-target.h
 target-reloc.h
 target-select.cc
 target-select.h
+target.h
 tls.h
 token.h
 version.cc
-workqueue.cc
-workqueue.h
 workqueue-internal.h
 workqueue-threads.cc
+workqueue.cc
+workqueue.h
 x86_64.cc
index cddc7f7286b01eea2345ba7f463e10cb02ffa2f3..34da47432f7344903f237c907b035df92a979b5f 100644 (file)
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-03-21 10:47-0700\n"
+"POT-Creation-Date: 2008-04-14 21:18-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -16,47 +16,47 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: archive.cc:97
+#: archive.cc:101
 #, c-format
 msgid "%s: no archive symbol table (run ranlib)"
 msgstr ""
 
-#: archive.cc:151
+#: archive.cc:165
 #, c-format
 msgid "%s: bad archive symbol table names"
 msgstr ""
 
-#: archive.cc:181
+#: archive.cc:197
 #, c-format
 msgid "%s: malformed archive header at %zu"
 msgstr ""
 
-#: archive.cc:201
+#: archive.cc:217
 #, c-format
 msgid "%s: malformed archive header size at %zu"
 msgstr ""
 
-#: archive.cc:212
+#: archive.cc:228
 #, c-format
 msgid "%s: malformed archive header name at %zu"
 msgstr ""
 
-#: archive.cc:237
+#: archive.cc:258
 #, c-format
 msgid "%s: bad extended name index at %zu"
 msgstr ""
 
-#: archive.cc:247
+#: archive.cc:268
 #, c-format
 msgid "%s: bad extended name entry at header %zu"
 msgstr ""
 
-#: archive.cc:340
+#: archive.cc:363
 #, c-format
 msgid "%s: short archive header at %zu"
 msgstr ""
 
-#: archive.cc:391 archive.cc:405
+#: archive.cc:477 archive.cc:491
 #, c-format
 msgid "%s: member at %zu is not an ELF object"
 msgstr ""
@@ -66,7 +66,7 @@ msgstr ""
 msgid "cannot open %s: %s:"
 msgstr ""
 
-#: compressed_output.cc:127
+#: compressed_output.cc:128
 msgid "not compressing section data: zlib error"
 msgstr ""
 
@@ -95,95 +95,95 @@ msgstr ""
 msgid "DYNAMIC section %u link %u is not a strtab"
 msgstr ""
 
-#: dynobj.cc:254
+#: dynobj.cc:255
 #, c-format
 msgid "DT_SONAME value out of range: %lld >= %lld"
 msgstr ""
 
-#: dynobj.cc:266
+#: dynobj.cc:267
 #, c-format
 msgid "DT_NEEDED value out of range: %lld >= %lld"
 msgstr ""
 
-#: dynobj.cc:279
+#: dynobj.cc:280
 msgid "missing DT_NULL in dynamic segment"
 msgstr ""
 
-#: dynobj.cc:324
+#: dynobj.cc:326
 #, c-format
 msgid "invalid dynamic symbol table name index: %u"
 msgstr ""
 
-#: dynobj.cc:331
+#: dynobj.cc:333
 #, c-format
 msgid "dynamic symbol table name section has wrong type: %u"
 msgstr ""
 
-#: dynobj.cc:405 object.cc:251 object.cc:616
+#: dynobj.cc:407 object.cc:252 object.cc:619
 #, c-format
 msgid "bad section name offset for section %u: %lu"
 msgstr ""
 
-#: dynobj.cc:434
+#: dynobj.cc:436
 #, c-format
 msgid "duplicate definition for version %u"
 msgstr ""
 
-#: dynobj.cc:463
+#: dynobj.cc:465
 #, c-format
 msgid "unexpected verdef version %u"
 msgstr ""
 
-#: dynobj.cc:479
+#: dynobj.cc:481
 #, c-format
 msgid "verdef vd_cnt field too small: %u"
 msgstr ""
 
-#: dynobj.cc:487
+#: dynobj.cc:489
 #, c-format
 msgid "verdef vd_aux field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:498
+#: dynobj.cc:500
 #, c-format
 msgid "verdaux vda_name field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:508
+#: dynobj.cc:510
 #, c-format
 msgid "verdef vd_next field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:542
+#: dynobj.cc:544
 #, c-format
 msgid "unexpected verneed version %u"
 msgstr ""
 
-#: dynobj.cc:551
+#: dynobj.cc:553
 #, c-format
 msgid "verneed vn_aux field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:565
+#: dynobj.cc:567
 #, c-format
 msgid "vernaux vna_name field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:576
+#: dynobj.cc:578
 #, c-format
 msgid "verneed vna_next field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:587
+#: dynobj.cc:589
 #, c-format
 msgid "verneed vn_next field out of range: %u"
 msgstr ""
 
-#: dynobj.cc:635
+#: dynobj.cc:637
 msgid "size of dynamic symbols is not multiple of symbol size"
 msgstr ""
 
-#: dynobj.cc:1356
+#: dynobj.cc:1358
 #, c-format
 msgid "symbol %s has undefined version %s"
 msgstr ""
@@ -198,12 +198,17 @@ msgstr ""
 msgid "%s: %s: warning: "
 msgstr ""
 
-#: errors.cc:161
+#: errors.cc:163
 #, c-format
 msgid "%s: %s: undefined reference to '%s'\n"
 msgstr ""
 
-#: errors.cc:171
+#: errors.cc:167
+#, c-format
+msgid "%s: %s: undefined reference to '%s', version '%s'\n"
+msgstr ""
+
+#: errors.cc:177
 #, c-format
 msgid "%s: "
 msgstr ""
@@ -283,86 +288,61 @@ msgstr ""
 msgid "%s: fstat failed: %s"
 msgstr ""
 
-#: fileread.cc:246
+#: fileread.cc:266
 #, c-format
 msgid "%s: pread failed: %s"
 msgstr ""
 
-#: fileread.cc:252
+#: fileread.cc:272
 #, c-format
 msgid "%s: file too short: read only %lld of %lld bytes at %lld"
 msgstr ""
 
-#: fileread.cc:331
+#: fileread.cc:353
 #, c-format
 msgid "%s: mmap offset %lld size %lld failed: %s"
 msgstr ""
 
-#: fileread.cc:406
+#: fileread.cc:497
 #, c-format
 msgid "%s: lseek failed: %s"
 msgstr ""
 
-#: fileread.cc:412
+#: fileread.cc:503
 #, c-format
 msgid "%s: readv failed: %s"
 msgstr ""
 
-#: fileread.cc:415
+#: fileread.cc:506
 #, c-format
 msgid "%s: file too short: read only %zd of %zd bytes at %lld"
 msgstr ""
 
-#: fileread.cc:562
+#: fileread.cc:655
 #, c-format
 msgid "%s: total bytes mapped for read: %llu\n"
 msgstr ""
 
-#: fileread.cc:564
+#: fileread.cc:657
 #, c-format
 msgid "%s: maximum bytes mapped for read at one time: %llu\n"
 msgstr ""
 
-#: fileread.cc:659
+#: fileread.cc:752
 #, c-format
 msgid "cannot find -l%s"
 msgstr ""
 
-#: fileread.cc:686
+#: fileread.cc:779
 #, c-format
 msgid "cannot find %s"
 msgstr ""
 
-#: fileread.cc:709
+#: fileread.cc:802
 #, c-format
 msgid "cannot open %s: %s"
 msgstr ""
 
-#: gold.cc:74
-#, c-format
-msgid "%s: internal error in %s, at %s:%d\n"
-msgstr ""
-
-#: gold.cc:120
-msgid "no input files"
-msgstr ""
-
-#. We print out just the first .so we see; there may be others.
-#: gold.cc:183
-#, c-format
-msgid "cannot mix -static with dynamic object %s"
-msgstr ""
-
-#: gold.cc:187
-#, c-format
-msgid "cannot mix -r with dynamic object %s"
-msgstr ""
-
-#: gold.cc:191
-#, c-format
-msgid "cannot use non-ELF output format with dynamic object %s"
-msgstr ""
-
 #: gold-threads.cc:103
 #, c-format
 msgid "pthead_mutextattr_init failed: %s"
@@ -423,51 +403,104 @@ msgstr ""
 msgid "pthread_cond_broadcast failed: %s"
 msgstr ""
 
+#: gold.cc:74
+#, c-format
+msgid "%s: internal error in %s, at %s:%d\n"
+msgstr ""
+
+#: gold.cc:120
+msgid "no input files"
+msgstr ""
+
+#. We print out just the first .so we see; there may be others.
+#: gold.cc:183
+#, c-format
+msgid "cannot mix -static with dynamic object %s"
+msgstr ""
+
+#: gold.cc:187
+#, c-format
+msgid "cannot mix -r with dynamic object %s"
+msgstr ""
+
+#: gold.cc:191
+#, c-format
+msgid "cannot use non-ELF output format with dynamic object %s"
+msgstr ""
+
 #. FIXME: This needs to specify the location somehow.
-#: i386.cc:191 i386.cc:1541 x86_64.cc:203 x86_64.cc:1428
+#: i386.cc:191 i386.cc:1610 sparc.cc:198 sparc.cc:2262 x86_64.cc:206
+#: x86_64.cc:1668
 msgid "missing expected TLS relocation"
 msgstr ""
 
-#: i386.cc:847 x86_64.cc:802 x86_64.cc:1029
+#: i386.cc:878 sparc.cc:1516 x86_64.cc:948 x86_64.cc:1236
 #, c-format
 msgid "%s: unsupported reloc %u against local symbol"
 msgstr ""
 
-#: i386.cc:964 i386.cc:1265 x86_64.cc:940 x86_64.cc:1215
+#: i386.cc:994 i386.cc:1313 sparc.cc:1787 sparc.cc:2137 x86_64.cc:1131
+#: x86_64.cc:1424
 #, c-format
 msgid "%s: unexpected reloc %u in object file"
 msgstr ""
 
-#: i386.cc:1104 x86_64.cc:1043 x86_64.cc:1311
+#: i386.cc:1150 sparc.cc:1806 x86_64.cc:1250 x86_64.cc:1541
 #, c-format
 msgid "%s: unsupported reloc %u against global symbol %s"
 msgstr ""
 
-#: i386.cc:1419
+#: i386.cc:1488
 #, c-format
 msgid "%s: unsupported RELA reloc section"
 msgstr ""
 
-#: i386.cc:1691 i386.cc:2258 x86_64.cc:1630 x86_64.cc:2055
+#: i386.cc:1762 i386.cc:2454 sparc.cc:2568 x86_64.cc:1871 x86_64.cc:2433
 #, c-format
 msgid "unexpected reloc %u in object file"
 msgstr ""
 
-#: i386.cc:1723 i386.cc:1799 i386.cc:1806 i386.cc:1837 i386.cc:1890
-#: x86_64.cc:1651 x86_64.cc:1731 x86_64.cc:1755
+#: i386.cc:1794 i386.cc:1873 i386.cc:1924 i386.cc:1955 i386.cc:2011
+#: sparc.cc:2574 sparc.cc:2757 sparc.cc:2818 sparc.cc:2925 x86_64.cc:1892
+#: x86_64.cc:1974 x86_64.cc:2028 x86_64.cc:2052
 #, c-format
 msgid "unsupported reloc %u"
 msgstr ""
 
-#: i386.cc:1814
+#: i386.cc:1932
 msgid "both SUN and GNU model TLS relocations"
 msgstr ""
 
-#: i386.cc:2272
+#: i386.cc:2468
 #, c-format
 msgid "unsupported reloc %u in object file"
 msgstr ""
 
+#: layout.cc:1384
+#, c-format
+msgid "--build-id=uuid failed: could not open /dev/urandom: %s"
+msgstr ""
+
+#: layout.cc:1391
+#, c-format
+msgid "/dev/urandom: read failed: %s"
+msgstr ""
+
+#: layout.cc:1393
+#, c-format
+msgid "/dev/urandom: expected %zu bytes, got %zd bytes"
+msgstr ""
+
+#: layout.cc:1415
+#, c-format
+msgid "--build-id argument '%s' not a valid hex number"
+msgstr ""
+
+#: layout.cc:1421
+#, c-format
+msgid "unrecognized --build-id argument '%s'"
+msgstr ""
+
 #: merge.cc:449
 #, c-format
 msgid "%s: %s merged constants size: %lu; input: %zu; output: %zu\n"
@@ -496,605 +529,649 @@ msgstr ""
 msgid "%s: %s"
 msgstr ""
 
-#: object.cc:107
+#: object.cc:108
 #, c-format
 msgid "section name section has wrong type: %u"
 msgstr ""
 
-#: object.cc:328
+#: object.cc:329
 #, c-format
 msgid "invalid symbol table name index: %u"
 msgstr ""
 
-#: object.cc:334
+#: object.cc:335
 #, c-format
 msgid "symbol table name section has wrong type: %u"
 msgstr ""
 
-#: object.cc:415
+#: object.cc:417
 #, c-format
 msgid "section group %u info %u out of range"
 msgstr ""
 
-#: object.cc:433
+#: object.cc:436
 #, c-format
 msgid "symbol %u name offset %u out of range"
 msgstr ""
 
-#: object.cc:472
+#: object.cc:475
 #, c-format
 msgid "section %u in section group %u out of range"
 msgstr ""
 
-#: object.cc:562 reloc.cc:214 reloc.cc:720
+#: object.cc:565 reloc.cc:214 reloc.cc:720
 #, c-format
 msgid "relocation section %u has bad info %u"
 msgstr ""
 
-#: object.cc:803
+#: object.cc:806
 msgid "size of symbols is not multiple of symbol size"
 msgstr ""
 
-#: object.cc:905
+#: object.cc:908
 #, c-format
 msgid "local symbol %u section name out of range: %u >= %u"
 msgstr ""
 
 #. FIXME: Handle SHN_XINDEX.
-#: object.cc:962
+#: object.cc:965
 #, c-format
 msgid "unknown section index %u for local symbol %u"
 msgstr ""
 
-#: object.cc:971
+#: object.cc:974
 #, c-format
 msgid "local symbol %u section index %u out of range"
 msgstr ""
 
-#: object.cc:1265
+#: object.cc:1268
 msgid "incompatible target"
 msgstr ""
 
-#: object.cc:1418
+#: object.cc:1421
 #, c-format
 msgid "%s: unsupported ELF file type %d"
 msgstr ""
 
-#: object.cc:1437 object.cc:1483 object.cc:1517
+#: object.cc:1440 object.cc:1486 object.cc:1520
 #, c-format
 msgid "%s: ELF file too short"
 msgstr ""
 
-#: object.cc:1445
+#: object.cc:1448
 #, c-format
 msgid "%s: invalid ELF version 0"
 msgstr ""
 
-#: object.cc:1447
+#: object.cc:1450
 #, c-format
 msgid "%s: unsupported ELF version %d"
 msgstr ""
 
-#: object.cc:1454
+#: object.cc:1457
 #, c-format
 msgid "%s: invalid ELF class 0"
 msgstr ""
 
-#: object.cc:1460
+#: object.cc:1463
 #, c-format
 msgid "%s: unsupported ELF class %d"
 msgstr ""
 
-#: object.cc:1467
+#: object.cc:1470
 #, c-format
 msgid "%s: invalid ELF data encoding"
 msgstr ""
 
-#: object.cc:1473
+#: object.cc:1476
 #, c-format
 msgid "%s: unsupported ELF data encoding %d"
 msgstr ""
 
-#: object.cc:1493
+#: object.cc:1496
 #, c-format
 msgid "%s: not configured to support 32-bit big-endian object"
 msgstr ""
 
-#: object.cc:1506
+#: object.cc:1509
 #, c-format
 msgid "%s: not configured to support 32-bit little-endian object"
 msgstr ""
 
-#: object.cc:1527
+#: object.cc:1530
 #, c-format
 msgid "%s: not configured to support 64-bit big-endian object"
 msgstr ""
 
-#: object.cc:1540
+#: object.cc:1543
 #, c-format
 msgid "%s: not configured to support 64-bit little-endian object"
 msgstr ""
 
-#: options.cc:139
+#: options.cc:142
 #, c-format
 msgid ""
 "Usage: %s [options] file...\n"
 "Options:\n"
 msgstr ""
 
-#: options.cc:160 options.cc:170
+#. config.guess and libtool.m4 look in ld --help output for the
+#. string "supported targets".
+#: options.cc:150
+#, c-format
+msgid "%s: supported targets:"
+msgstr ""
+
+#: options.cc:162
+#, c-format
+msgid "Report bugs to %s\n"
+msgstr ""
+
+#: options.cc:179 options.cc:189
 #, c-format
 msgid "%s: invalid option value (expected an integer): %s"
 msgstr ""
 
-#: options.cc:180
+#: options.cc:199
 #, c-format
 msgid "%s: invalid option value (expected a floating point number): %s"
 msgstr ""
 
-#: options.cc:189
+#: options.cc:208
 #, c-format
 msgid "%s: must take a non-empty argument"
 msgstr ""
 
-#: options.cc:218
+#: options.cc:243
 #, c-format
 msgid "%s: must take one of the following arguments: %s"
 msgstr ""
 
-#: options.cc:291
+#: options.cc:316
 #, c-format
 msgid "unable to parse script file %s"
 msgstr ""
 
-#: options.cc:299
+#: options.cc:324
 #, c-format
 msgid "unable to parse version script file %s"
 msgstr ""
 
-#: options.cc:325
+#: options.cc:357
 #, c-format
 msgid "%s: use the --help option for usage information\n"
 msgstr ""
 
-#: options.cc:334
+#: options.cc:366
 #, c-format
 msgid "%s: %s: %s\n"
 msgstr ""
 
-#: options.cc:355
+#: options.cc:387
 #, c-format
 msgid ""
 "format '%s' not supported; treating as elf (supported formats: elf, binary)"
 msgstr ""
 
-#: options.cc:461
+#: options.cc:493
 msgid "unexpected argument"
 msgstr ""
 
-#: options.cc:472 options.cc:530
+#: options.cc:506 options.cc:567
 msgid "missing argument"
 msgstr ""
 
-#: options.cc:541
+#: options.cc:578
 msgid "unknown -z option"
 msgstr ""
 
-#: options.cc:646
+#: options.cc:708
 #, c-format
 msgid "ignoring --threads: %s was compiled without thread support"
 msgstr ""
 
-#: options.cc:653
+#: options.cc:715
 #, c-format
 msgid "ignoring --thread-count: %s was compiled without thread support"
 msgstr ""
 
-#: options.cc:669
+#: options.cc:754
 msgid "-shared and -r are incompatible"
 msgstr ""
 
-#: options.cc:673
+#: options.cc:758
 msgid "binary output format not compatible with -shared or -r"
 msgstr ""
 
-#: options.cc:678
+#: options.cc:763
 #, c-format
 msgid "--hash-bucket-empty-fraction value %g out of range [0.0, 1.0)"
 msgstr ""
 
-#: options.cc:745
+#: options.cc:830
 msgid "May not nest groups"
 msgstr ""
 
-#: options.cc:757
+#: options.cc:842
 msgid "Group end without group start"
 msgstr ""
 
 #. I guess it's neither a long option nor a short option.
-#: options.cc:815
+#: options.cc:900
 msgid "unknown option"
 msgstr ""
 
-#: options.cc:841
+#: options.cc:926
 #, c-format
 msgid "%s: missing group end\n"
 msgstr ""
 
-#: options.h:405
+#: options.h:428
 msgid "Report usage information"
 msgstr ""
 
-#: options.h:407
+#: options.h:430
 msgid "Report version information"
 msgstr ""
 
-#: options.h:416
+#: options.h:439
 msgid "Allow unresolved references in shared libraries"
 msgstr ""
 
-#: options.h:417
+#: options.h:440
 msgid "Do not allow unresolved references in shared libraries"
 msgstr ""
 
-#: options.h:420
+#: options.h:443
 msgid "Only set DT_NEEDED for dynamic libs if used"
 msgstr ""
 
-#: options.h:421
+#: options.h:444
 msgid "Always DT_NEEDED for dynamic libs"
 msgstr ""
 
-#: options.h:428
+#: options.h:451
 msgid "Set input format"
 msgstr ""
 
-#: options.h:431
+#: options.h:454
 msgid "-l searches for shared libraries"
 msgstr ""
 
-#: options.h:435
+#: options.h:458
 msgid "-l does not search for shared libraries"
 msgstr ""
 
-#: options.h:438
+#: options.h:461
 msgid "Bind defined symbols locally"
 msgstr ""
 
-#: options.h:442 options.h:447
+#: options.h:464
+msgid "Generate build ID note"
+msgstr ""
+
+#: options.h:465 options.h:496
+msgid "[=STYLE]"
+msgstr ""
+
+#: options.h:469 options.h:474
 msgid "Compress .debug_* sections in the output file"
 msgstr ""
 
-#: options.h:448
+#: options.h:475
 msgid "[none]"
 msgstr ""
 
-#: options.h:453
+#: options.h:480
 msgid "Define common symbols"
 msgstr ""
 
-#: options.h:454
+#: options.h:481
 msgid "Do not define common symbols"
 msgstr ""
 
-#: options.h:456 options.h:458
+#: options.h:483 options.h:485
 msgid "Alias for -d"
 msgstr ""
 
-#: options.h:461
+#: options.h:488
 msgid "Turn on debugging"
 msgstr ""
 
-#: options.h:462
+#: options.h:489
 msgid "[all,files,script,task][,...]"
 msgstr ""
 
-#: options.h:465
+#: options.h:492
 msgid "Define a symbol"
 msgstr ""
 
-#: options.h:465
+#: options.h:492
 msgid "SYMBOL=EXPRESSION"
 msgstr ""
 
-#: options.h:469
+#: options.h:495
 msgid "Demangle C++ symbols in log messages"
 msgstr ""
 
-#: options.h:470
+#: options.h:499
 msgid "Do not demangle C++ symbols in log messages"
 msgstr ""
 
-#: options.h:473
+#: options.h:503
 msgid "Try to detect violations of the One Definition Rule"
 msgstr ""
 
-#: options.h:477
+#: options.h:507
 msgid "Set program start address"
 msgstr ""
 
-#: options.h:477 options.h:577 options.h:579 options.h:581
+#: options.h:507 options.h:613 options.h:615 options.h:617
 msgid "ADDRESS"
 msgstr ""
 
-#: options.h:480
+#: options.h:510
 msgid "Export all dynamic symbols"
 msgstr ""
 
-#: options.h:483
+#: options.h:513
 msgid "Create exception frame header"
 msgstr ""
 
-#: options.h:486
+#: options.h:516
 msgid "Set shared library name"
 msgstr ""
 
-#: options.h:486
+#: options.h:516
 msgid "FILENAME"
 msgstr ""
 
-#: options.h:489
+#: options.h:519
 msgid "Min fraction of empty buckets in dynamic hash"
 msgstr ""
 
-#: options.h:490
+#: options.h:520
 msgid "FRACTION"
 msgstr ""
 
-#: options.h:493
+#: options.h:523
 msgid "Dynamic hash style"
 msgstr ""
 
-#: options.h:493
+#: options.h:523
 msgid "[sysv,gnu,both]"
 msgstr ""
 
-#: options.h:497
+#: options.h:527
 msgid "Set dynamic linker path"
 msgstr ""
 
-#: options.h:497
+#: options.h:527
 msgid "PROGRAM"
 msgstr ""
 
-#: options.h:500
+#: options.h:530
 msgid "Read only symbol values from FILE"
 msgstr ""
 
-#: options.h:500 options.h:512 options.h:562 options.h:587
+#: options.h:530 options.h:545 options.h:598 options.h:623
 msgid "FILE"
 msgstr ""
 
-#: options.h:503
+#: options.h:533
 msgid "Search for library LIBNAME"
 msgstr ""
 
-#: options.h:503
+#: options.h:533
 msgid "LIBNAME"
 msgstr ""
 
-#: options.h:506
+#: options.h:536
 msgid "Add directory to search path"
 msgstr ""
 
-#: options.h:506 options.h:530 options.h:533 options.h:537 options.h:559
+#: options.h:536 options.h:566 options.h:569 options.h:573 options.h:595
 msgid "DIR"
 msgstr ""
 
-#: options.h:509
+#: options.h:539
 msgid "Ignored for compatibility"
 msgstr ""
 
-#: options.h:509
+#: options.h:539
 msgid "EMULATION"
 msgstr ""
 
-#: options.h:512
+#: options.h:542
+msgid "Create an output file even if errors occur"
+msgstr ""
+
+#: options.h:545
 msgid "Set output file name"
 msgstr ""
 
-#: options.h:515
+#: options.h:548
 msgid "Optimize output file size"
 msgstr ""
 
-#: options.h:515
+#: options.h:548
 msgid "LEVEL"
 msgstr ""
 
-#: options.h:518
+#: options.h:551
 msgid "Set output format"
 msgstr ""
 
-#: options.h:518
+#: options.h:551
 msgid "[binary]"
 msgstr ""
 
-#: options.h:521
+#: options.h:554
 msgid "Generate relocations in output"
 msgstr ""
 
-#: options.h:524
+#: options.h:557
 msgid "Generate relocatable output"
 msgstr ""
 
-#: options.h:530 options.h:533
+#: options.h:560
+msgid "Relax branches on certain targets"
+msgstr ""
+
+#: options.h:566 options.h:569
 msgid "Add DIR to runtime search path"
 msgstr ""
 
-#: options.h:536
+#: options.h:572
 msgid "Add DIR to link time shared library search path"
 msgstr ""
 
-#: options.h:540
+#: options.h:576
 msgid "Strip all symbols"
 msgstr ""
 
-#: options.h:542
+#: options.h:578
 msgid "Strip debugging information"
 msgstr ""
 
-#: options.h:544
+#: options.h:580
 msgid "Strip debug symbols that are unused by gdb (at least versions <= 6.7)"
 msgstr ""
 
-#: options.h:548
+#: options.h:584
 msgid "Generate shared library"
 msgstr ""
 
-#: options.h:553
+#: options.h:589
 msgid "Do not link against shared libraries"
 msgstr ""
 
-#: options.h:556
+#: options.h:592
 msgid "Print resource usage statistics"
 msgstr ""
 
-#: options.h:559
+#: options.h:595
 msgid "Set target system root directory"
 msgstr ""
 
-#: options.h:562
+#: options.h:598
 msgid "Read linker script"
 msgstr ""
 
-#: options.h:565
+#: options.h:601
 msgid "Run the linker multi-threaded"
 msgstr ""
 
-#: options.h:566
+#: options.h:602
 msgid "Do not run the linker multi-threaded"
 msgstr ""
 
-#: options.h:568
+#: options.h:604
 msgid "Number of threads to use"
 msgstr ""
 
-#: options.h:568 options.h:570 options.h:572 options.h:574
+#: options.h:604 options.h:606 options.h:608 options.h:610
 msgid "COUNT"
 msgstr ""
 
-#: options.h:570
+#: options.h:606
 msgid "Number of threads to use in initial pass"
 msgstr ""
 
-#: options.h:572
+#: options.h:608
 msgid "Number of threads to use in middle pass"
 msgstr ""
 
-#: options.h:574
+#: options.h:610
 msgid "Number of threads to use in final pass"
 msgstr ""
 
-#: options.h:577
+#: options.h:613
 msgid "Set the address of the bss segment"
 msgstr ""
 
-#: options.h:579
+#: options.h:615
 msgid "Set the address of the data segment"
 msgstr ""
 
-#: options.h:581
+#: options.h:617
 msgid "Set the address of the text segment"
 msgstr ""
 
-#: options.h:584
+#: options.h:620
 msgid "Synonym for --debug=files"
 msgstr ""
 
-#: options.h:587
+#: options.h:623
 msgid "Read version script"
 msgstr ""
 
-#: options.h:590
+#: options.h:626
 msgid "Include all archive contents"
 msgstr ""
 
-#: options.h:591
+#: options.h:627
 msgid "Include only needed archive contents"
 msgstr ""
 
-#: options.h:594
+#: options.h:630
+msgid "Use wrapper functions for SYMBOL"
+msgstr ""
+
+#: options.h:630
+msgid "SYMBOL"
+msgstr ""
+
+#: options.h:633
+msgid "Default search path for Solaris compatibility"
+msgstr ""
+
+#: options.h:634
+msgid "PATH"
+msgstr ""
+
+#: options.h:637
 msgid "Start a library search group"
 msgstr ""
 
-#: options.h:596
+#: options.h:639
 msgid "End a library search group"
 msgstr ""
 
-#: options.h:603
+#: options.h:646
 msgid "Set common page size to SIZE"
 msgstr ""
 
-#: options.h:603 options.h:610
+#: options.h:646 options.h:653
 msgid "SIZE"
 msgstr ""
 
-#: options.h:605
+#: options.h:648
 msgid "Report undefined symbols (even with --shared)"
 msgstr ""
 
-#: options.h:608
+#: options.h:651
 msgid "Mark output as requiring executable stack"
 msgstr ""
 
-#: options.h:610
+#: options.h:653
 msgid "Set maximum page size to SIZE"
 msgstr ""
 
-#: options.h:612
+#: options.h:655
 msgid "Mark output as not requiring executable stack"
 msgstr ""
 
-#: output.cc:994
+#: output.cc:1016
 msgid "section group retained but group element discarded"
 msgstr ""
 
-#: output.cc:1704
+#: output.cc:1667
 #, c-format
 msgid "invalid alignment %lu for section \"%s\""
 msgstr ""
 
-#: output.cc:2770
+#: output.cc:2944
 #, c-format
 msgid "nobits section %s may not precede progbits section %s in same segment"
 msgstr ""
 
-#: output.cc:2916
+#: output.cc:3090
 #, c-format
 msgid "%s: open: %s"
 msgstr ""
 
-#: output.cc:2937
+#: output.cc:3111
 #, c-format
 msgid "%s: mremap: %s"
 msgstr ""
 
-#: output.cc:2974
+#: output.cc:3148
 #, c-format
 msgid "%s: lseek: %s"
 msgstr ""
 
-#: output.cc:2977 output.cc:3014
+#: output.cc:3151 output.cc:3188
 #, c-format
 msgid "%s: write: %s"
 msgstr ""
 
-#: output.cc:2985
+#: output.cc:3159
 #, c-format
 msgid "%s: mmap: %s"
 msgstr ""
 
-#: output.cc:2995
+#: output.cc:3169
 #, c-format
 msgid "%s: munmap: %s"
 msgstr ""
 
-#: output.cc:3012
+#: output.cc:3186
 #, c-format
 msgid "%s: write: unexpected 0 return-value"
 msgstr ""
 
-#: output.cc:3026
+#: output.cc:3200
 #, c-format
 msgid "%s: close: %s"
 msgstr ""
@@ -1110,7 +1187,7 @@ msgid "%s: file is empty"
 msgstr ""
 
 #. Here we have to handle any other input file types we need.
-#: readsyms.cc:461
+#: readsyms.cc:468
 #, c-format
 msgid "%s: not an object or archive"
 msgstr ""
@@ -1162,44 +1239,11 @@ msgstr ""
 msgid "%s: previous definition here"
 msgstr ""
 
-#: script.cc:1062
-msgid "invalid use of PROVIDE for dot symbol"
-msgstr ""
-
-#: script.cc:1064
-msgid "invalid assignment to dot outside of SECTIONS"
-msgstr ""
-
-#: script.cc:1979
-#, c-format
-msgid "%s:%d:%d: %s"
-msgstr ""
-
-#. There are some options that we could handle here--e.g.,
-#. -lLIBRARY.  Should we bother?
-#: script.cc:2127
-#, c-format
-msgid ""
-"%s:%d:%d: ignoring command OPTION; OPTION is only valid for scripts "
-"specified via -T/--script"
-msgstr ""
-
-#: script.cc:2152
-#, c-format
-msgid ""
-"%s:%d:%d: ignoring SEARCH_DIR; SEARCH_DIR is only valid for scripts "
-"specified via -T/--script"
-msgstr ""
-
-#: script.cc:2499
-msgid "unknown PHDR type (try integer)"
-msgstr ""
-
-#: script-sections.cc:419
+#: script-sections.cc:422
 msgid "dot may not move backward"
 msgstr ""
 
-#: script-sections.cc:666
+#: script-sections.cc:669
 msgid "fill value is not absolute"
 msgstr ""
 
@@ -1226,11 +1270,11 @@ msgstr ""
 msgid "mismatched definition for constrained sections"
 msgstr ""
 
-#: script-sections.cc:2474
+#: script-sections.cc:2473
 msgid "no matching section constraint"
 msgstr ""
 
-#: script-sections.cc:2774
+#: script-sections.cc:2773
 msgid "TLS sections are not adjacent"
 msgstr ""
 
@@ -1238,45 +1282,83 @@ msgstr ""
 msgid "allocated section not in any segment"
 msgstr ""
 
-#: script-sections.cc:2910
+#: script-sections.cc:2931
 #, c-format
 msgid "no segment %s"
 msgstr ""
 
-#: script-sections.cc:2920
+#: script-sections.cc:2941
 msgid "section in two PT_LOAD segments"
 msgstr ""
 
-#: script-sections.cc:2927
+#: script-sections.cc:2948
 msgid "allocated section not in any PT_LOAD segment"
 msgstr ""
 
-#: script-sections.cc:2955
+#: script-sections.cc:2976
 msgid "may only specify load address for PT_LOAD segment"
 msgstr ""
 
-#: script-sections.cc:2979
+#: script-sections.cc:3000
 #, c-format
 msgid "PHDRS load address overrides section %s load address"
 msgstr ""
 
 #. We could support this if we wanted to.
-#: script-sections.cc:2990
+#: script-sections.cc:3011
 msgid "using only one of FILEHDR and PHDRS is not currently supported"
 msgstr ""
 
-#: script-sections.cc:3005
+#: script-sections.cc:3026
 msgid ""
 "sections loaded on first page without room for file and program headers are "
 "not supported"
 msgstr ""
 
-#: script-sections.cc:3011
+#: script-sections.cc:3032
 msgid ""
 "using FILEHDR and PHDRS on more than one PT_LOAD segment is not currently "
 "supported"
 msgstr ""
 
+#: script.cc:1063
+msgid "invalid use of PROVIDE for dot symbol"
+msgstr ""
+
+#: script.cc:1065
+msgid "invalid assignment to dot outside of SECTIONS"
+msgstr ""
+
+#: script.cc:1980
+#, c-format
+msgid "%s:%d:%d: %s"
+msgstr ""
+
+#. There are some options that we could handle here--e.g.,
+#. -lLIBRARY.  Should we bother?
+#: script.cc:2128
+#, c-format
+msgid ""
+"%s:%d:%d: ignoring command OPTION; OPTION is only valid for scripts "
+"specified via -T/--script"
+msgstr ""
+
+#: script.cc:2153
+#, c-format
+msgid ""
+"%s:%d:%d: ignoring SEARCH_DIR; SEARCH_DIR is only valid for scripts "
+"specified via -T/--script"
+msgstr ""
+
+#: script.cc:2500
+msgid "unknown PHDR type (try integer)"
+msgstr ""
+
+#: sparc.cc:2170 x86_64.cc:1566
+#, c-format
+msgid "%s: unsupported REL reloc section"
+msgstr ""
+
 #: stringpool.cc:525
 #, c-format
 msgid "%s: %s entries: %zu; buckets: %zu\n"
@@ -1292,55 +1374,55 @@ msgstr ""
 msgid "%s: %s Stringdata structures: %zu\n"
 msgstr ""
 
-#: symtab.cc:679
+#: symtab.cc:753
 #, c-format
 msgid "bad global symbol name offset %u at %zu"
 msgstr ""
 
-#: symtab.cc:803
+#: symtab.cc:881
 msgid "--just-symbols does not make sense with a shared object"
 msgstr ""
 
-#: symtab.cc:809
+#: symtab.cc:887
 msgid "too few symbol versions"
 msgstr ""
 
-#: symtab.cc:841
+#: symtab.cc:919
 #, c-format
 msgid "bad symbol name offset %u at %zu"
 msgstr ""
 
-#: symtab.cc:895
+#: symtab.cc:973
 #, c-format
 msgid "versym for symbol %zu out of range: %u"
 msgstr ""
 
-#: symtab.cc:903
+#: symtab.cc:981
 #, c-format
 msgid "versym for symbol %zu has no name: %u"
 msgstr ""
 
-#: symtab.cc:1707 symtab.cc:1897
+#: symtab.cc:1794 symtab.cc:1984
 #, c-format
 msgid "%s: unsupported symbol section 0x%x"
 msgstr ""
 
-#: symtab.cc:2028
+#: symtab.cc:2115
 #, c-format
 msgid "%s: undefined reference to '%s'"
 msgstr ""
 
-#: symtab.cc:2098
+#: symtab.cc:2185
 #, c-format
 msgid "%s: symbol table entries: %zu; buckets: %zu\n"
 msgstr ""
 
-#: symtab.cc:2101
+#: symtab.cc:2188
 #, c-format
 msgid "%s: symbol table entries: %zu\n"
 msgstr ""
 
-#: symtab.cc:2170
+#: symtab.cc:2257
 #, c-format
 msgid ""
 "while linking %s: symbol '%s' defined in multiple places (possible ODR "
@@ -1361,12 +1443,12 @@ msgid "TLS relocation against invalid instruction"
 msgstr ""
 
 #. This output is intended to follow the GNU standards.
-#: version.cc:50
+#: version.cc:64
 #, c-format
 msgid "Copyright 2008 Free Software Foundation, Inc.\n"
 msgstr ""
 
-#: version.cc:51
+#: version.cc:65
 #, c-format
 msgid ""
 "This program is free software; you may redistribute it under the terms of\n"
@@ -1380,17 +1462,16 @@ msgstr ""
 msgid "%s failed: %s"
 msgstr ""
 
-#: x86_64.cc:1336
-#, c-format
-msgid "%s: unsupported REL reloc section"
+#: x86_64.cc:984
+msgid "requires unsupported dynamic reloc; recompile with -fPIC"
 msgstr ""
 
-#: x86_64.cc:1803
+#: x86_64.cc:2102
 #, c-format
 msgid "unsupported reloc type %u"
 msgstr ""
 
-#: x86_64.cc:2061
+#: x86_64.cc:2439
 #, c-format
 msgid "unsupported reloc %u against local symbol"
 msgstr ""
diff --git a/gold/sparc.cc b/gold/sparc.cc
new file mode 100644 (file)
index 0000000..2812fe1
--- /dev/null
@@ -0,0 +1,3131 @@
+// sparc.cc -- sparc target support for gold.
+
+// Copyright 2008 Free Software Foundation, Inc.
+// Written by David S. Miller <davem@davemloft.net>.
+
+// This file is part of gold.
+
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+// MA 02110-1301, USA.
+
+#include "gold.h"
+
+#include <cstdlib>
+#include <cstdio>
+#include <cstring>
+
+#include "elfcpp.h"
+#include "parameters.h"
+#include "reloc.h"
+#include "sparc.h"
+#include "object.h"
+#include "symtab.h"
+#include "layout.h"
+#include "output.h"
+#include "target.h"
+#include "target-reloc.h"
+#include "target-select.h"
+#include "tls.h"
+#include "errors.h"
+
+namespace
+{
+
+using namespace gold;
+
+template<int size, bool big_endian>
+class Output_data_plt_sparc;
+
+template<int size, bool big_endian>
+class Target_sparc : public Sized_target<size, big_endian>
+{
+ public:
+  typedef Output_data_reloc<elfcpp::SHT_RELA, true, size, big_endian> Reloc_section;
+
+  Target_sparc()
+    : Sized_target<size, big_endian>(&sparc_info),
+      got_(NULL), plt_(NULL), rela_dyn_(NULL),
+      copy_relocs_(NULL), dynbss_(NULL), got_mod_index_offset_(-1U),
+      tls_get_addr_sym_(NULL)
+  {
+  }
+
+  // Scan the relocations to look for symbol adjustments.
+  void
+  scan_relocs(const General_options& options,
+             Symbol_table* symtab,
+             Layout* layout,
+             Sized_relobj<size, big_endian>* object,
+             unsigned int data_shndx,
+             unsigned int sh_type,
+             const unsigned char* prelocs,
+             size_t reloc_count,
+             Output_section* output_section,
+             bool needs_special_offset_handling,
+             size_t local_symbol_count,
+             const unsigned char* plocal_symbols);
+  // Finalize the sections.
+  void
+  do_finalize_sections(Layout*);
+
+  // Return the value to use for a dynamic which requires special
+  // treatment.
+  uint64_t
+  do_dynsym_value(const Symbol*) const;
+
+  // Relocate a section.
+  void
+  relocate_section(const Relocate_info<size, big_endian>*,
+                  unsigned int sh_type,
+                  const unsigned char* prelocs,
+                  size_t reloc_count,
+                  Output_section* output_section,
+                  bool needs_special_offset_handling,
+                  unsigned char* view,
+                  typename elfcpp::Elf_types<size>::Elf_Addr view_address,
+                  section_size_type view_size);
+
+  // Scan the relocs during a relocatable link.
+  void
+  scan_relocatable_relocs(const General_options& options,
+                         Symbol_table* symtab,
+                         Layout* layout,
+                         Sized_relobj<size, big_endian>* object,
+                         unsigned int data_shndx,
+                         unsigned int sh_type,
+                         const unsigned char* prelocs,
+                         size_t reloc_count,
+                         Output_section* output_section,
+                         bool needs_special_offset_handling,
+                         size_t local_symbol_count,
+                         const unsigned char* plocal_symbols,
+                         Relocatable_relocs*);
+
+  // Relocate a section during a relocatable link.
+  void
+  relocate_for_relocatable(const Relocate_info<size, big_endian>*,
+                          unsigned int sh_type,
+                          const unsigned char* prelocs,
+                          size_t reloc_count,
+                          Output_section* output_section,
+                          off_t offset_in_output_section,
+                          const Relocatable_relocs*,
+                          unsigned char* view,
+                          typename elfcpp::Elf_types<size>::Elf_Addr view_address,
+                          section_size_type view_size,
+                          unsigned char* reloc_view,
+                          section_size_type reloc_view_size);
+  // Return whether SYM is defined by the ABI.
+  bool
+  do_is_defined_by_abi(Symbol* sym) const
+  {
+    // XXX Really need to support this better...
+    if (sym->type() == elfcpp::STT_SPARC_REGISTER)
+      return 1;
+
+    return strcmp(sym->name(), "___tls_get_addr") == 0;
+  }
+
+  // Return the size of the GOT section.
+  section_size_type
+  got_size()
+  {
+    gold_assert(this->got_ != NULL);
+    return this->got_->data_size();
+  }
+
+ private:
+
+  // The class which scans relocations.
+  struct Scan
+  {
+    inline void
+    local(const General_options& options, Symbol_table* symtab,
+         Layout* layout, Target_sparc* target,
+         Sized_relobj<size, big_endian>* object,
+         unsigned int data_shndx,
+         Output_section* output_section,
+         const elfcpp::Rela<size, big_endian>& reloc, unsigned int r_type,
+         const elfcpp::Sym<size, big_endian>& lsym);
+
+    inline void
+    global(const General_options& options, Symbol_table* symtab,
+          Layout* layout, Target_sparc* target,
+          Sized_relobj<size, big_endian>* object,
+          unsigned int data_shndx,
+          Output_section* output_section,
+          const elfcpp::Rela<size, big_endian>& reloc, unsigned int r_type,
+          Symbol* gsym);
+
+    static void
+    unsupported_reloc_local(Sized_relobj<size, big_endian>*,
+                           unsigned int r_type);
+
+    static void
+    unsupported_reloc_global(Sized_relobj<size, big_endian>*,
+                            unsigned int r_type, Symbol*);
+
+    static void
+    generate_tls_call(Symbol_table* symtab, Layout* layout,
+                     Target_sparc* target);
+  };
+
+  // The class which implements relocation.
+  class Relocate
+  {
+   public:
+    Relocate()
+      : ignore_gd_add_(false)
+    { }
+
+    ~Relocate()
+    {
+      if (this->ignore_gd_add_)
+       {
+         // FIXME: This needs to specify the location somehow.
+         gold_error(_("missing expected TLS relocation"));
+       }
+    }
+
+    // Do a relocation.  Return false if the caller should not issue
+    // any warnings about this relocation.
+    inline bool
+    relocate(const Relocate_info<size, big_endian>*, Target_sparc*,
+            size_t relnum, const elfcpp::Rela<size, big_endian>&,
+            unsigned int r_type, const Sized_symbol<size>*,
+            const Symbol_value<size>*,
+            unsigned char*,
+            typename elfcpp::Elf_types<size>::Elf_Addr,
+            section_size_type);
+
+   private:
+    // Do a TLS relocation.
+    inline void
+    relocate_tls(const Relocate_info<size, big_endian>*, Target_sparc* target,
+                 size_t relnum, const elfcpp::Rela<size, big_endian>&,
+                unsigned int r_type, const Sized_symbol<size>*,
+                const Symbol_value<size>*,
+                unsigned char*,
+                typename elfcpp::Elf_types<size>::Elf_Addr,
+                section_size_type);
+
+    // Ignore the next relocation which should be R_SPARC_TLS_GD_ADD
+    bool ignore_gd_add_;
+  };
+
+  // A class which returns the size required for a relocation type,
+  // used while scanning relocs during a relocatable link.
+  class Relocatable_size_for_reloc
+  {
+   public:
+    unsigned int
+    get_size_for_reloc(unsigned int, Relobj*);
+  };
+
+  // Get the GOT section, creating it if necessary.
+  Output_data_got<size, big_endian>*
+  got_section(Symbol_table*, Layout*);
+
+  // Create a PLT entry for a global symbol.
+  void
+  make_plt_entry(Symbol_table*, Layout*, Symbol*);
+
+  // Create a GOT entry for the TLS module index.
+  unsigned int
+  got_mod_index_entry(Symbol_table* symtab, Layout* layout,
+                     Sized_relobj<size, big_endian>* object);
+
+  // Return the gsym for "__tls_get_addr".  Cache if not already
+  // cached.
+  Symbol*
+  tls_get_addr_sym(Symbol_table* symtab)
+  {
+    if (!this->tls_get_addr_sym_)
+      this->tls_get_addr_sym_ = symtab->lookup("__tls_get_addr", NULL);
+    gold_assert(this->tls_get_addr_sym_);
+    return this->tls_get_addr_sym_;
+  }
+
+  // Get the PLT section.
+  const Output_data_plt_sparc<size, big_endian>*
+  plt_section() const
+  {
+    gold_assert(this->plt_ != NULL);
+    return this->plt_;
+  }
+
+  // Get the dynamic reloc section, creating it if necessary.
+  Reloc_section*
+  rela_dyn_section(Layout*);
+
+  // Return true if the symbol may need a COPY relocation.
+  // References from an executable object to non-function symbols
+  // defined in a dynamic object may need a COPY relocation.
+  bool
+  may_need_copy_reloc(Symbol* gsym)
+  {
+    return (!parameters->options().shared()
+            && gsym->is_from_dynobj()
+            && gsym->type() != elfcpp::STT_FUNC);
+  }
+
+  // Copy a relocation against a global symbol.
+  void
+  copy_reloc(const General_options*, Symbol_table*, Layout*,
+            Sized_relobj<size, big_endian>*, unsigned int,
+            Output_section*, Symbol*, const elfcpp::Rela<size, big_endian>&);
+
+  // Information about this specific target which we pass to the
+  // general Target structure.
+  static Target::Target_info sparc_info;
+
+  // The types of GOT entries needed for this platform.
+  enum Got_type
+  {
+    GOT_TYPE_STANDARD = 0,      // GOT entry for a regular symbol
+    GOT_TYPE_TLS_OFFSET = 1,    // GOT entry for TLS offset
+    GOT_TYPE_TLS_PAIR = 2,      // GOT entry for TLS module/offset pair
+  };
+
+  // The GOT section.
+  Output_data_got<size, big_endian>* got_;
+  // The PLT section.
+  Output_data_plt_sparc<size, big_endian>* plt_;
+  // The dynamic reloc section.
+  Reloc_section* rela_dyn_;
+  // Relocs saved to avoid a COPY reloc.
+  Copy_relocs<size, big_endian>* copy_relocs_;
+  // Space for variables copied with a COPY reloc.
+  Output_data_space* dynbss_;
+  // Offset of the GOT entry for the TLS module index;
+  unsigned int got_mod_index_offset_;
+  // Cached pointer to __tls_get_addr symbol
+  Symbol* tls_get_addr_sym_;
+};
+
+template<>
+Target::Target_info Target_sparc<32, true>::sparc_info =
+{
+  32,                  // size
+  true,                        // is_big_endian
+  elfcpp::EM_SPARC,    // machine_code
+  false,               // has_make_symbol
+  false,               // has_resolve
+  false,               // has_code_fill
+  true,                        // is_default_stack_executable
+  '\0',                        // wrap_char
+  "/usr/lib/ld.so.1",  // dynamic_linker
+  0x00010000,          // default_text_segment_address
+  64 * 1024,           // abi_pagesize (overridable by -z max-page-size)
+  8 * 1024             // common_pagesize (overridable by -z common-page-size)
+};
+
+template<>
+Target::Target_info Target_sparc<64, true>::sparc_info =
+{
+  64,                  // size
+  true,                        // is_big_endian
+  elfcpp::EM_SPARCV9,  // machine_code
+  false,               // has_make_symbol
+  false,               // has_resolve
+  false,               // has_code_fill
+  true,                        // is_default_stack_executable
+  '\0',                        // wrap_char
+  "/usr/lib/sparcv9/ld.so.1",  // dynamic_linker
+  0x100000,            // default_text_segment_address
+  64 * 1024,           // abi_pagesize (overridable by -z max-page-size)
+  8 * 1024             // common_pagesize (overridable by -z common-page-size)
+};
+
+// We have to take care here, even when operating in little-endian
+// mode, sparc instructions are still big endian.
+template<int size, bool big_endian>
+class Sparc_relocate_functions
+{
+private:
+  // Do a simple relocation with the addend in the relocation.
+  template<int valsize>
+  static inline void
+  rela(unsigned char* view,
+       unsigned int right_shift,
+       typename elfcpp::Elf_types<valsize>::Elf_Addr dst_mask,
+       typename elfcpp::Swap<size, big_endian>::Valtype value,
+       typename elfcpp::Swap<size, big_endian>::Valtype addend)
+  {
+    typedef typename elfcpp::Swap<valsize, big_endian>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<valsize, big_endian>::readval(wv);
+    Valtype reloc = ((value + addend) >> right_shift);
+
+    val &= ~dst_mask;
+    reloc &= dst_mask;
+
+    elfcpp::Swap<valsize, big_endian>::writeval(wv, val | reloc);
+  }
+
+  // Do a simple relocation using a symbol value with the addend in
+  // the relocation.
+  template<int valsize>
+  static inline void
+  rela(unsigned char* view,
+       unsigned int right_shift,
+       typename elfcpp::Elf_types<valsize>::Elf_Addr dst_mask,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Swap<valsize, big_endian>::Valtype addend)
+  {
+    typedef typename elfcpp::Swap<valsize, big_endian>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<valsize, big_endian>::readval(wv);
+    Valtype reloc = (psymval->value(object, addend) >> right_shift);
+
+    val &= ~dst_mask;
+    reloc &= dst_mask;
+
+    elfcpp::Swap<valsize, big_endian>::writeval(wv, val | reloc);
+  }
+
+  // Do a simple relocation using a symbol value with the addend in
+  // the relocation, unaligned.
+  template<int valsize>
+  static inline void
+  rela_ua(unsigned char* view,
+         unsigned int right_shift, elfcpp::Elf_Xword dst_mask,
+         const Sized_relobj<size, big_endian>* object,
+         const Symbol_value<size>* psymval,
+         typename elfcpp::Swap<size, big_endian>::Valtype addend)
+  {
+    typedef typename elfcpp::Swap_unaligned<valsize,
+           big_endian>::Valtype Valtype;
+    unsigned char* wv = view;
+    Valtype val = elfcpp::Swap_unaligned<valsize, big_endian>::readval(wv);
+    Valtype reloc = (psymval->value(object, addend) >> right_shift);
+
+    val &= ~dst_mask;
+    reloc &= dst_mask;
+
+    elfcpp::Swap_unaligned<valsize, big_endian>::writeval(wv, val | reloc);
+  }
+
+  // Do a simple PC relative relocation with a Symbol_value with the
+  // addend in the relocation.
+  template<int valsize>
+  static inline void
+  pcrela(unsigned char* view,
+        unsigned int right_shift,
+        typename elfcpp::Elf_types<valsize>::Elf_Addr dst_mask,
+        const Sized_relobj<size, big_endian>* object,
+        const Symbol_value<size>* psymval,
+        typename elfcpp::Swap<size, big_endian>::Valtype addend,
+        typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    typedef typename elfcpp::Swap<valsize, big_endian>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<valsize, big_endian>::readval(wv);
+    Valtype reloc = ((psymval->value(object, addend) - address)
+                    >> right_shift);
+
+    val &= ~dst_mask;
+    reloc &= dst_mask;
+
+    elfcpp::Swap<valsize, big_endian>::writeval(wv, val | reloc);
+  }
+
+  template<int valsize>
+  static inline void
+  pcrela_unaligned(unsigned char* view,
+                  const Sized_relobj<size, big_endian>* object,
+                  const Symbol_value<size>* psymval,
+                  typename elfcpp::Swap<size, big_endian>::Valtype addend,
+                  typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    typedef typename elfcpp::Swap_unaligned<valsize,
+           big_endian>::Valtype Valtype;
+    unsigned char* wv = view;
+    Valtype reloc = (psymval->value(object, addend) - address);
+
+    elfcpp::Swap_unaligned<valsize, big_endian>::writeval(wv, reloc);
+  }
+
+  typedef Sparc_relocate_functions<size, big_endian> This;
+  typedef Sparc_relocate_functions<size, true> This_insn;
+
+public:
+  // R_SPARC_WDISP30: (Symbol + Addend - Address) >> 2
+  static inline void
+  wdisp30(unsigned char* view,
+          const Sized_relobj<size, big_endian>* object,
+          const Symbol_value<size>* psymval,
+          typename elfcpp::Elf_types<size>::Elf_Addr addend,
+          typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 2, 0x3fffffff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_WDISP22: (Symbol + Addend - Address) >> 2
+  static inline void
+  wdisp22(unsigned char* view,
+          const Sized_relobj<size, big_endian>* object,
+          const Symbol_value<size>* psymval,
+          typename elfcpp::Elf_types<size>::Elf_Addr addend,
+          typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 2, 0x003fffff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_WDISP19: (Symbol + Addend - Address) >> 2
+  static inline void
+  wdisp19(unsigned char* view,
+         const Sized_relobj<size, big_endian>* object,
+         const Symbol_value<size>* psymval,
+         typename elfcpp::Elf_types<size>::Elf_Addr addend,
+         typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 2, 0x0007ffff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_WDISP16: (Symbol + Addend - Address) >> 2
+  static inline void
+  wdisp16(unsigned char* view,
+         const Sized_relobj<size, big_endian>* object,
+         const Symbol_value<size>* psymval,
+         typename elfcpp::Elf_types<size>::Elf_Addr addend,
+         typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = ((psymval->value(object, addend) - address)
+                    >> 2);
+
+    // The relocation value is split between the low 14 bits,
+    // and bits 20-21.
+    val &= ~((0x3 << 20) | 0x3fff);
+    reloc = (((reloc & 0xc000) << (20 - 14))
+            | (reloc & 0x3ffff));
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+
+  // R_SPARC_PC22: (Symbol + Addend - Address) >> 10
+  static inline void
+  pc22(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend,
+       typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 10, 0x003fffff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_PC10: (Symbol + Addend - Address) & 0x3ff
+  static inline void
+  pc10(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend,
+       typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 0, 0x000003ff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_HI22: (Symbol + Addend) >> 10
+  static inline void
+  hi22(unsigned char* view,
+       typename elfcpp::Elf_types<size>::Elf_Addr value,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 10, 0x003fffff, value, addend);
+  }
+
+  // R_SPARC_HI22: (Symbol + Addend) >> 10
+  static inline void
+  hi22(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 10, 0x003fffff, object, psymval, addend);
+  }
+
+  // R_SPARC_PCPLT22: (Symbol + Addend - Address) >> 10
+  static inline void
+  pcplt22(unsigned char* view,
+         const Sized_relobj<size, big_endian>* object,
+         const Symbol_value<size>* psymval,
+         typename elfcpp::Elf_types<size>::Elf_Addr addend,
+         typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 10, 0x003fffff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_LO10: (Symbol + Addend) & 0x3ff
+  static inline void
+  lo10(unsigned char* view,
+       typename elfcpp::Elf_types<size>::Elf_Addr value,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x000003ff, value, addend);
+  }
+
+  // R_SPARC_LO10: (Symbol + Addend) & 0x3ff
+  static inline void
+  lo10(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x000003ff, object, psymval, addend);
+  }
+
+  // R_SPARC_LO10: (Symbol + Addend) & 0x3ff
+  static inline void
+  lo10(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend,
+       typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 0, 0x000003ff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_OLO10: ((Symbol + Addend) & 0x3ff) + Addend2
+  static inline void
+  olo10(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend2)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = psymval->value(object, addend);
+
+    val &= ~0x1fff;
+    reloc &= 0x3ff;
+    reloc += addend2;
+    reloc &= 0x1fff;
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+
+  // R_SPARC_22: (Symbol + Addend)
+  static inline void
+  rela32_22(unsigned char* view,
+           const Sized_relobj<size, big_endian>* object,
+           const Symbol_value<size>* psymval,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x003fffff, object, psymval, addend);
+  }
+
+  // R_SPARC_13: (Symbol + Addend)
+  static inline void
+  rela32_13(unsigned char* view,
+           typename elfcpp::Elf_types<size>::Elf_Addr value,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x00001fff, value, addend);
+  }
+
+  // R_SPARC_13: (Symbol + Addend)
+  static inline void
+  rela32_13(unsigned char* view,
+           const Sized_relobj<size, big_endian>* object,
+           const Symbol_value<size>* psymval,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x00001fff, object, psymval, addend);
+  }
+
+  // R_SPARC_UA16: (Symbol + Addend)
+  static inline void
+  ua16(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This::template rela_ua<16>(view, 0, 0xffff, object, psymval, addend);
+  }
+
+  // R_SPARC_UA32: (Symbol + Addend)
+  static inline void
+  ua32(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This::template rela_ua<32>(view, 0, 0xffffffff, object, psymval, addend);
+  }
+
+  // R_SPARC_UA64: (Symbol + Addend)
+  static inline void
+  ua64(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This::template rela_ua<64>(view, 0, ~(elfcpp::Elf_Xword) 0,
+                              object, psymval, addend);
+  }
+
+  // R_SPARC_DISP8: (Symbol + Addend - Address)
+  static inline void
+  disp8(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend,
+       typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This::template pcrela_unaligned<8>(view, object, psymval,
+                                      addend, address);
+  }
+
+  // R_SPARC_DISP16: (Symbol + Addend - Address)
+  static inline void
+  disp16(unsigned char* view,
+        const Sized_relobj<size, big_endian>* object,
+        const Symbol_value<size>* psymval,
+        typename elfcpp::Elf_types<size>::Elf_Addr addend,
+        typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This::template pcrela_unaligned<16>(view, object, psymval,
+                                       addend, address);
+  }
+
+  // R_SPARC_DISP32: (Symbol + Addend - Address)
+  static inline void
+  disp32(unsigned char* view,
+        const Sized_relobj<size, big_endian>* object,
+        const Symbol_value<size>* psymval,
+        typename elfcpp::Elf_types<size>::Elf_Addr addend,
+        typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This::template pcrela_unaligned<32>(view, object, psymval,
+                                       addend, address);
+  }
+
+  // R_SPARC_DISP64: (Symbol + Addend - Address)
+  static inline void
+  disp64(unsigned char* view,
+        const Sized_relobj<size, big_endian>* object,
+        const Symbol_value<size>* psymval,
+        elfcpp::Elf_Xword addend,
+        typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This::template pcrela_unaligned<64>(view, object, psymval,
+                                       addend, address);
+  }
+
+  // R_SPARC_H44: (Symbol + Addend) >> 22
+  static inline void
+  h44(unsigned char* view,
+      const Sized_relobj<size, big_endian>* object,
+      const Symbol_value<size>* psymval,
+      typename elfcpp::Elf_types<size>::Elf_Addr  addend)
+  {
+    This_insn::template rela<32>(view, 22, 0x003fffff, object, psymval, addend);
+  }
+
+  // R_SPARC_M44: ((Symbol + Addend) >> 12) & 0x3ff
+  static inline void
+  m44(unsigned char* view,
+      const Sized_relobj<size, big_endian>* object,
+      const Symbol_value<size>* psymval,
+      typename elfcpp::Elf_types<size>::Elf_Addr  addend)
+  {
+    This_insn::template rela<32>(view, 12, 0x000003ff, object, psymval, addend);
+  }
+
+  // R_SPARC_L44: (Symbol + Addend) & 0xfff
+  static inline void
+  l44(unsigned char* view,
+      const Sized_relobj<size, big_endian>* object,
+      const Symbol_value<size>* psymval,
+      typename elfcpp::Elf_types<size>::Elf_Addr  addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x00000fff, object, psymval, addend);
+  }
+
+  // R_SPARC_HH22: (Symbol + Addend) >> 42
+  static inline void
+  hh22(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 42, 0x003fffff, object, psymval, addend);
+  }
+
+  // R_SPARC_PC_HH22: (Symbol + Addend - Address) >> 42
+  static inline void
+  pc_hh22(unsigned char* view,
+         const Sized_relobj<size, big_endian>* object,
+         const Symbol_value<size>* psymval,
+         typename elfcpp::Elf_types<size>::Elf_Addr addend,
+         typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 42, 0x003fffff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_HM10: ((Symbol + Addend) >> 32) & 0x3ff
+  static inline void
+  hm10(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 32, 0x000003ff, object, psymval, addend);
+  }
+
+  // R_SPARC_PC_HM10: ((Symbol + Addend - Address) >> 32) & 0x3ff
+  static inline void
+  pc_hm10(unsigned char* view,
+         const Sized_relobj<size, big_endian>* object,
+         const Symbol_value<size>* psymval,
+         typename elfcpp::Elf_types<size>::Elf_Addr addend,
+         typename elfcpp::Elf_types<size>::Elf_Addr address)
+  {
+    This_insn::template pcrela<32>(view, 32, 0x000003ff, object,
+                                  psymval, addend, address);
+  }
+
+  // R_SPARC_11: (Symbol + Addend)
+  static inline void
+  rela32_11(unsigned char* view,
+           const Sized_relobj<size, big_endian>* object,
+           const Symbol_value<size>* psymval,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x000007ff, object, psymval, addend);
+  }
+
+  // R_SPARC_10: (Symbol + Addend)
+  static inline void
+  rela32_10(unsigned char* view,
+           const Sized_relobj<size, big_endian>* object,
+           const Symbol_value<size>* psymval,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x000003ff, object, psymval, addend);
+  }
+
+  // R_SPARC_7: (Symbol + Addend)
+  static inline void
+  rela32_7(unsigned char* view,
+          const Sized_relobj<size, big_endian>* object,
+          const Symbol_value<size>* psymval,
+          typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x0000007f, object, psymval, addend);
+  }
+
+  // R_SPARC_6: (Symbol + Addend)
+  static inline void
+  rela32_6(unsigned char* view,
+          const Sized_relobj<size, big_endian>* object,
+          const Symbol_value<size>* psymval,
+          typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x0000003f, object, psymval, addend);
+  }
+
+  // R_SPARC_5: (Symbol + Addend)
+  static inline void
+  rela32_5(unsigned char* view,
+          const Sized_relobj<size, big_endian>* object,
+          const Symbol_value<size>* psymval,
+          typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::template rela<32>(view, 0, 0x0000001f, object, psymval, addend);
+  }
+
+  // R_SPARC_TLS_LDO_HIX22: @dtpoff(Symbol + Addend) >> 10
+  static inline void
+  ldo_hix22(unsigned char* view,
+           typename elfcpp::Elf_types<size>::Elf_Addr value,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    This_insn::hi22(view, value, addend);
+  }
+
+  // R_SPARC_TLS_LDO_LOX10: @dtpoff(Symbol + Addend) & 0x3ff
+  static inline void
+  ldo_lox10(unsigned char* view,
+           typename elfcpp::Elf_types<size>::Elf_Addr value,
+           typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = (value + addend);
+
+    val &= ~0x1fff;
+    reloc &= 0x3ff;
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+
+  // R_SPARC_TLS_LE_HIX22: (@tpoff(Symbol + Addend) ^ 0xffffffffffffffff) >> 10
+  static inline void
+  hix22(unsigned char* view,
+       typename elfcpp::Elf_types<size>::Elf_Addr value,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = (value + addend);
+
+    val &= ~0x3fffff;
+
+    reloc ^= ~(Valtype)0;
+    reloc >>= 10;
+
+    reloc &= 0x3fffff;
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+
+  // R_SPARC_HIX22: ((Symbol + Addend) ^ 0xffffffffffffffff) >> 10
+  static inline void
+  hix22(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = psymval->value(object, addend);
+
+    val &= ~0x3fffff;
+
+    reloc ^= ~(Valtype)0;
+    reloc >>= 10;
+
+    reloc &= 0x3fffff;
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+
+
+  // R_SPARC_TLS_LE_LOX10: (@tpoff(Symbol + Addend) & 0x3ff) | 0x1c00
+  static inline void
+  lox10(unsigned char* view,
+       typename elfcpp::Elf_types<size>::Elf_Addr value,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = (value + addend);
+
+    val &= ~0x1fff;
+    reloc &= 0x3ff;
+    reloc |= 0x1c00;
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+
+  // R_SPARC_LOX10: ((Symbol + Addend) & 0x3ff) | 0x1c00
+  static inline void
+  lox10(unsigned char* view,
+       const Sized_relobj<size, big_endian>* object,
+       const Symbol_value<size>* psymval,
+       typename elfcpp::Elf_types<size>::Elf_Addr addend)
+  {
+    typedef typename elfcpp::Swap<32, true>::Valtype Valtype;
+    Valtype* wv = reinterpret_cast<Valtype*>(view);
+    Valtype val = elfcpp::Swap<32, true>::readval(wv);
+    Valtype reloc = psymval->value(object, addend);
+
+    val &= ~0x1fff;
+    reloc &= 0x3ff;
+    reloc |= 0x1c00;
+
+    elfcpp::Swap<32, true>::writeval(wv, val | reloc);
+  }
+};
+
+// Get the GOT section, creating it if necessary.
+
+template<int size, bool big_endian>
+Output_data_got<size, big_endian>*
+Target_sparc<size, big_endian>::got_section(Symbol_table* symtab,
+                                           Layout* layout)
+{
+  if (this->got_ == NULL)
+    {
+      gold_assert(symtab != NULL && layout != NULL);
+
+      this->got_ = new Output_data_got<size, big_endian>();
+
+      layout->add_output_section_data(".got", elfcpp::SHT_PROGBITS,
+                                     elfcpp::SHF_ALLOC | elfcpp::SHF_WRITE,
+                                     this->got_);
+
+      // Define _GLOBAL_OFFSET_TABLE_ at the start of the .got section.
+      symtab->define_in_output_data("_GLOBAL_OFFSET_TABLE_", NULL,
+                                   this->got_,
+                                   0, 0, elfcpp::STT_OBJECT,
+                                   elfcpp::STB_LOCAL,
+                                   elfcpp::STV_HIDDEN, 0,
+                                   false, false);
+    }
+
+  return this->got_;
+}
+
+// Get the dynamic reloc section, creating it if necessary.
+
+template<int size, bool big_endian>
+typename Target_sparc<size, big_endian>::Reloc_section*
+Target_sparc<size, big_endian>::rela_dyn_section(Layout* layout)
+{
+  if (this->rela_dyn_ == NULL)
+    {
+      gold_assert(layout != NULL);
+      this->rela_dyn_ = new Reloc_section();
+      layout->add_output_section_data(".rela.dyn", elfcpp::SHT_RELA,
+                                     elfcpp::SHF_ALLOC, this->rela_dyn_);
+    }
+  return this->rela_dyn_;
+}
+
+// A class to handle the PLT data.
+
+template<int size, bool big_endian>
+class Output_data_plt_sparc : public Output_section_data
+{
+ public:
+  typedef Output_data_reloc<elfcpp::SHT_RELA, true,
+                           size, big_endian> Reloc_section;
+
+  Output_data_plt_sparc(Layout*);
+
+  // Add an entry to the PLT.
+  void add_entry(Symbol* gsym);
+
+  // Return the .rela.plt section data.
+  const Reloc_section* rel_plt() const
+  {
+    return this->rel_;
+  }
+
+ protected:
+  void do_adjust_output_section(Output_section* os);
+
+ private:
+  // The size of an entry in the PLT.
+  static const int base_plt_entry_size = (size == 32 ? 12 : 32);
+
+  static const unsigned int plt_entries_per_block = 160;
+  static const unsigned int plt_insn_chunk_size = 24;
+  static const unsigned int plt_pointer_chunk_size = 8;
+  static const unsigned int plt_block_size =
+    (plt_entries_per_block
+     * (plt_insn_chunk_size + plt_pointer_chunk_size));
+
+  // Set the final size.
+  void
+  set_final_data_size()
+  {
+    unsigned int full_count = this->count_ + 4;
+    unsigned int extra = (size == 32 ? 4 : 0);
+
+    if (size == 32 || full_count < 32768)
+      this->set_data_size((full_count * base_plt_entry_size) + extra);
+    else
+      {
+       unsigned int ext_cnt = full_count - 32768;
+
+       this->set_data_size((32768 * base_plt_entry_size)
+                           + (ext_cnt
+                              * (plt_insn_chunk_size
+                                 + plt_pointer_chunk_size)));
+      }
+  }
+
+  // Write out the PLT data.
+  void
+  do_write(Output_file*);
+
+  // The reloc section.
+  Reloc_section* rel_;
+  // The number of PLT entries.
+  unsigned int count_;
+};
+
+// Create the PLT section.  The ordinary .got section is an argument,
+// since we need to refer to the start.
+
+template<int size, bool big_endian>
+Output_data_plt_sparc<size, big_endian>::Output_data_plt_sparc(Layout* layout)
+  : Output_section_data(size == 32 ? 4 : 8), count_(0)
+{
+  this->rel_ = new Reloc_section();
+  layout->add_output_section_data(".rela.plt", elfcpp::SHT_RELA,
+                                 elfcpp::SHF_ALLOC, this->rel_);
+}
+
+template<int size, bool big_endian>
+void
+Output_data_plt_sparc<size, big_endian>::do_adjust_output_section(Output_section* os)
+{
+  os->set_entsize(0);
+}
+
+// Add an entry to the PLT.
+
+template<int size, bool big_endian>
+void
+Output_data_plt_sparc<size, big_endian>::add_entry(Symbol* gsym)
+{
+  gold_assert(!gsym->has_plt_offset());
+
+  unsigned int index = this->count_ + 4;
+  section_offset_type plt_offset;
+
+  if (size == 32 || index < 32768)
+    plt_offset = index * base_plt_entry_size;
+  else
+    {
+       unsigned int ext_index = index - 32768;
+
+       plt_offset = (32768 * base_plt_entry_size)
+         + ((ext_index / plt_entries_per_block)
+            * plt_block_size)
+         + ((ext_index % plt_entries_per_block)
+            * plt_insn_chunk_size);
+    }
+
+  gsym->set_plt_offset(plt_offset);
+
+  ++this->count_;
+
+  // Every PLT entry needs a reloc.
+  gsym->set_needs_dynsym_entry();
+  this->rel_->add_global(gsym, elfcpp::R_SPARC_JMP_SLOT, this,
+                        plt_offset, 0);
+
+  // Note that we don't need to save the symbol.  The contents of the
+  // PLT are independent of which symbols are used.  The symbols only
+  // appear in the relocations.
+}
+
+static const unsigned int sparc_nop = 0x01000000;
+static const unsigned int sparc_sethi_g1 = 0x03000000;
+static const unsigned int sparc_branch_always = 0x30800000;
+static const unsigned int sparc_branch_always_pt = 0x30680000;
+static const unsigned int sparc_mov = 0x80100000;
+static const unsigned int sparc_mov_g0_o0 = 0x90100000;
+static const unsigned int sparc_mov_o7_g5 = 0x8a10000f;
+static const unsigned int sparc_call_plus_8 = 0x40000002;
+static const unsigned int sparc_ldx_o7_imm_g1 = 0xc25be000;
+static const unsigned int sparc_jmpl_o7_g1_g1 = 0x83c3c001;
+static const unsigned int sparc_mov_g5_o7 = 0x9e100005;
+
+// Write out the PLT.
+
+template<int size, bool big_endian>
+void
+Output_data_plt_sparc<size, big_endian>::do_write(Output_file* of)
+{
+  const off_t offset = this->offset();
+  const section_size_type oview_size =
+    convert_to_section_size_type(this->data_size());
+  unsigned char* const oview = of->get_output_view(offset, oview_size);
+  unsigned char* pov = oview;
+
+  memset(pov, 0, base_plt_entry_size * 4);
+  pov += base_plt_entry_size * 4;
+
+  unsigned int plt_offset = base_plt_entry_size * 4;
+  const unsigned int count = this->count_;
+
+  if (size == 64)
+    {
+      unsigned int limit;
+
+      limit = (count > 32768 ? 32768 : count);
+
+      for (unsigned int i = 0; i < limit; ++i)
+       {
+         elfcpp::Swap<32, true>::writeval(pov + 0x00,
+                                          sparc_sethi_g1 + plt_offset);
+         elfcpp::Swap<32, true>::writeval(pov + 0x04,
+                                          sparc_branch_always_pt +
+                                          (((base_plt_entry_size -
+                                             (plt_offset + 4)) >> 2) &
+                                           0x7ffff));
+         elfcpp::Swap<32, true>::writeval(pov + 0x08, sparc_nop);
+         elfcpp::Swap<32, true>::writeval(pov + 0x0c, sparc_nop);
+         elfcpp::Swap<32, true>::writeval(pov + 0x10, sparc_nop);
+         elfcpp::Swap<32, true>::writeval(pov + 0x14, sparc_nop);
+         elfcpp::Swap<32, true>::writeval(pov + 0x18, sparc_nop);
+         elfcpp::Swap<32, true>::writeval(pov + 0x1c, sparc_nop);
+
+         pov += base_plt_entry_size;
+         plt_offset += base_plt_entry_size;
+       }
+
+      if (count > 32768)
+       {
+         unsigned int ext_cnt = count - 32768;
+         unsigned int blks = ext_cnt / plt_entries_per_block;
+
+         for (unsigned int i = 0; i < blks; ++i)
+           {
+             unsigned int data_off = (plt_entries_per_block
+                                      * plt_insn_chunk_size) - 4;
+
+             for (unsigned int j = 0; j < plt_entries_per_block; ++j)
+               {
+                 elfcpp::Swap<32, true>::writeval(pov + 0x00,
+                                                  sparc_mov_o7_g5);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x04,
+                                                  sparc_call_plus_8);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x08,
+                                                  sparc_nop);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x0c,
+                                                  sparc_ldx_o7_imm_g1 +
+                                                  (data_off & 0x1fff));
+                 elfcpp::Swap<32, true>::writeval(pov + 0x10,
+                                                  sparc_jmpl_o7_g1_g1);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x14,
+                                                  sparc_mov_g5_o7);
+
+                 elfcpp::Swap<64, big_endian>::writeval(
+                               pov + 0x4 + data_off,
+                               (elfcpp::Elf_Xword) (oview - (pov + 0x04)));
+
+                 pov += plt_insn_chunk_size;
+                 data_off -= 16;
+               }
+           }
+
+         unsigned int sub_blk_cnt = ext_cnt % plt_entries_per_block;
+         for (unsigned int i = 0; i < sub_blk_cnt; ++i)
+           {
+             unsigned int data_off = (sub_blk_cnt
+                                      * plt_insn_chunk_size) - 4;
+
+             for (unsigned int j = 0; j < plt_entries_per_block; ++j)
+               {
+                 elfcpp::Swap<32, true>::writeval(pov + 0x00,
+                                                  sparc_mov_o7_g5);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x04,
+                                                  sparc_call_plus_8);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x08,
+                                                  sparc_nop);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x0c,
+                                                  sparc_ldx_o7_imm_g1 +
+                                                  (data_off & 0x1fff));
+                 elfcpp::Swap<32, true>::writeval(pov + 0x10,
+                                                  sparc_jmpl_o7_g1_g1);
+                 elfcpp::Swap<32, true>::writeval(pov + 0x14,
+                                                  sparc_mov_g5_o7);
+
+                 elfcpp::Swap<64, big_endian>::writeval(
+                               pov + 0x4 + data_off,
+                               (elfcpp::Elf_Xword) (oview - (pov + 0x04)));
+
+                 pov += plt_insn_chunk_size;
+                 data_off -= 16;
+               }
+           }
+       }
+    }
+  else
+    {
+      for (unsigned int i = 0; i < count; ++i)
+       {
+         elfcpp::Swap<32, true>::writeval(pov + 0x00,
+                                          sparc_sethi_g1 + plt_offset);
+         elfcpp::Swap<32, true>::writeval(pov + 0x04,
+                                          sparc_branch_always +
+                                          (((- (plt_offset + 4)) >> 2) &
+                                           0x003fffff));
+         elfcpp::Swap<32, true>::writeval(pov + 0x08, sparc_nop);
+
+         pov += base_plt_entry_size;
+         plt_offset += base_plt_entry_size;
+       }
+
+      elfcpp::Swap<32, true>::writeval(pov, sparc_nop);
+      pov += 4;
+    }
+
+  gold_assert(static_cast<section_size_type>(pov - oview) == oview_size);
+
+  of->write_output_view(offset, oview_size, oview);
+}
+
+// Create a PLT entry for a global symbol.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::make_plt_entry(Symbol_table* symtab,
+                                              Layout* layout,
+                                              Symbol* gsym)
+{
+  if (gsym->has_plt_offset())
+    return;
+
+  if (this->plt_ == NULL)
+    {
+      // Create the GOT sections first.
+      this->got_section(symtab, layout);
+
+      this->plt_ = new Output_data_plt_sparc<size, big_endian>(layout);
+      layout->add_output_section_data(".plt", elfcpp::SHT_PROGBITS,
+                                     (elfcpp::SHF_ALLOC
+                                      | elfcpp::SHF_EXECINSTR
+                                      | elfcpp::SHF_WRITE),
+                                     this->plt_);
+
+      // Define _PROCEDURE_LINKAGE_TABLE_ at the start of the .plt section.
+      symtab->define_in_output_data("_PROCEDURE_LINKAGE_TABLE_", NULL,
+                                   this->plt_,
+                                   0, 0, elfcpp::STT_OBJECT,
+                                   elfcpp::STB_LOCAL,
+                                   elfcpp::STV_HIDDEN, 0,
+                                   false, false);
+    }
+
+  this->plt_->add_entry(gsym);
+}
+
+// Create a GOT entry for the TLS module index.
+
+template<int size, bool big_endian>
+unsigned int
+Target_sparc<size, big_endian>::got_mod_index_entry(Symbol_table* symtab,
+                                                   Layout* layout,
+                                                   Sized_relobj<size, big_endian>* object)
+{
+  if (this->got_mod_index_offset_ == -1U)
+    {
+      gold_assert(symtab != NULL && layout != NULL && object != NULL);
+      Reloc_section* rela_dyn = this->rela_dyn_section(layout);
+      Output_data_got<size, big_endian>* got;
+      unsigned int got_offset;
+
+      got = this->got_section(symtab, layout);
+      got_offset = got->add_constant(0);
+      rela_dyn->add_local(object, 0,
+                         (size == 64 ?
+                          elfcpp::R_SPARC_TLS_DTPMOD64 :
+                          elfcpp::R_SPARC_TLS_DTPMOD32), got,
+                         got_offset, 0);
+      got->add_constant(0);
+      this->got_mod_index_offset_ = got_offset;
+    }
+  return this->got_mod_index_offset_;
+}
+
+// Handle a relocation against a non-function symbol defined in a
+// dynamic object.  The traditional way to handle this is to generate
+// a COPY relocation to copy the variable at runtime from the shared
+// object into the executable's data segment.  However, this is
+// undesirable in general, as if the size of the object changes in the
+// dynamic object, the executable will no longer work correctly.  If
+// this relocation is in a writable section, then we can create a
+// dynamic reloc and the dynamic linker will resolve it to the correct
+// address at runtime.  However, we do not want do that if the
+// relocation is in a read-only section, as it would prevent the
+// readonly segment from being shared.  And if we have to eventually
+// generate a COPY reloc, then any dynamic relocations will be
+// useless.  So this means that if this is a writable section, we need
+// to save the relocation until we see whether we have to create a
+// COPY relocation for this symbol for any other relocation.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::copy_reloc(const General_options* options,
+                                          Symbol_table* symtab,
+                                          Layout* layout,
+                                          Sized_relobj<size, big_endian>* object,
+                                          unsigned int data_shndx,
+                                          Output_section* output_section,
+                                          Symbol* gsym,
+                                          const elfcpp::Rela<size, big_endian>& rel)
+{
+  Sized_symbol<size>* ssym = symtab->get_sized_symbol<size>(gsym);
+
+  if (!Copy_relocs<size, big_endian>::need_copy_reloc(options, object,
+                                                     data_shndx, ssym))
+    {
+      // So far we do not need a COPY reloc.  Save this relocation.
+      // If it turns out that we never need a COPY reloc for this
+      // symbol, then we will emit the relocation.
+      if (this->copy_relocs_ == NULL)
+       this->copy_relocs_ = new Copy_relocs<size, big_endian>();
+      this->copy_relocs_->save(ssym, object, data_shndx, output_section, rel);
+    }
+  else
+    {
+      // Allocate space for this symbol in the .bss section.
+
+      typename elfcpp::Elf_types<size>::Elf_WXword symsize = ssym->symsize();
+
+      // There is no defined way to determine the required alignment
+      // of the symbol.  We pick the alignment based on the size.  We
+      // set an arbitrary maximum of 256.
+      unsigned int align;
+      // XXX remove this when bss alignment issue is fixed...
+      for (align = (size == 32 ? 4 : 8); align < 512; align <<= 1)
+       if ((symsize & align) != 0)
+         break;
+
+      if (this->dynbss_ == NULL)
+       {
+         this->dynbss_ = new Output_data_space(align);
+         layout->add_output_section_data(".bss",
+                                         elfcpp::SHT_NOBITS,
+                                         (elfcpp::SHF_ALLOC
+                                          | elfcpp::SHF_WRITE),
+                                         this->dynbss_);
+       }
+
+      Output_data_space* dynbss = this->dynbss_;
+
+      if (align > dynbss->addralign())
+       dynbss->set_space_alignment(align);
+
+      section_size_type dynbss_size =
+       convert_to_section_size_type(dynbss->current_data_size());
+      dynbss_size = align_address(dynbss_size, align);
+      section_size_type offset = dynbss_size;
+      dynbss->set_current_data_size(dynbss_size + symsize);
+
+      symtab->define_with_copy_reloc(ssym, dynbss, offset);
+
+      // Add the COPY reloc.
+      Reloc_section* rela_dyn = this->rela_dyn_section(layout);
+      rela_dyn->add_global(ssym, elfcpp::R_SPARC_COPY, dynbss, offset, 0);
+    }
+}
+
+// Optimize the TLS relocation type based on what we know about the
+// symbol.  IS_FINAL is true if the final address of this symbol is
+// known at link time.
+
+static tls::Tls_optimization
+optimize_tls_reloc(bool is_final, int r_type)
+{
+  // If we are generating a shared library, then we can't do anything
+  // in the linker.
+  if (parameters->options().shared())
+    return tls::TLSOPT_NONE;
+
+  switch (r_type)
+    {
+    case elfcpp::R_SPARC_TLS_GD_HI22: // Global-dynamic
+    case elfcpp::R_SPARC_TLS_GD_LO10:
+    case elfcpp::R_SPARC_TLS_GD_ADD:
+    case elfcpp::R_SPARC_TLS_GD_CALL:
+      // These are General-Dynamic which permits fully general TLS
+      // access.  Since we know that we are generating an executable,
+      // we can convert this to Initial-Exec.  If we also know that
+      // this is a local symbol, we can further switch to Local-Exec.
+      if (is_final)
+       return tls::TLSOPT_TO_LE;
+      return tls::TLSOPT_TO_IE;
+
+    case elfcpp::R_SPARC_TLS_LDM_HI22: // Local-dynamic
+    case elfcpp::R_SPARC_TLS_LDM_LO10:
+    case elfcpp::R_SPARC_TLS_LDM_ADD:
+    case elfcpp::R_SPARC_TLS_LDM_CALL:
+      // This is Local-Dynamic, which refers to a local symbol in the
+      // dynamic TLS block.  Since we know that we generating an
+      // executable, we can switch to Local-Exec.
+      return tls::TLSOPT_TO_LE;
+
+    case elfcpp::R_SPARC_TLS_LDO_HIX22:        // Alternate local-dynamic
+    case elfcpp::R_SPARC_TLS_LDO_LOX10:
+    case elfcpp::R_SPARC_TLS_LDO_ADD:
+      // Another type of Local-Dynamic relocation.
+      return tls::TLSOPT_TO_LE;
+
+    case elfcpp::R_SPARC_TLS_IE_HI22:  // Initial-exec
+    case elfcpp::R_SPARC_TLS_IE_LO10:
+    case elfcpp::R_SPARC_TLS_IE_LD:
+    case elfcpp::R_SPARC_TLS_IE_LDX:
+      // These are Initial-Exec relocs which get the thread offset
+      // from the GOT.  If we know that we are linking against the
+      // local symbol, we can switch to Local-Exec, which links the
+      // thread offset into the instruction.
+      if (is_final)
+       return tls::TLSOPT_TO_LE;
+      return tls::TLSOPT_NONE;
+
+    case elfcpp::R_SPARC_TLS_LE_HIX22: // Local-exec
+    case elfcpp::R_SPARC_TLS_LE_LOX10:
+      // When we already have Local-Exec, there is nothing further we
+      // can do.
+      return tls::TLSOPT_NONE;
+
+    default:
+      gold_unreachable();
+    }
+}
+
+// Generate a PLT entry slot for a call to __tls_get_addr
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::Scan::generate_tls_call(Symbol_table* symtab,
+                                                       Layout* layout,
+                                                       Target_sparc<size, big_endian>* target)
+{
+  Symbol* gsym = target->tls_get_addr_sym(symtab);
+
+  target->make_plt_entry(symtab, layout, gsym);
+}
+
+// Report an unsupported relocation against a local symbol.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::Scan::unsupported_reloc_local(
+                       Sized_relobj<size, big_endian>* object,
+                       unsigned int r_type)
+{
+  gold_error(_("%s: unsupported reloc %u against local symbol"),
+            object->name().c_str(), r_type);
+}
+
+// Scan a relocation for a local symbol.
+
+template<int size, bool big_endian>
+inline void
+Target_sparc<size, big_endian>::Scan::local(
+                       const General_options&,
+                       Symbol_table* symtab,
+                       Layout* layout,
+                       Target_sparc<size, big_endian>* target,
+                       Sized_relobj<size, big_endian>* object,
+                       unsigned int data_shndx,
+                       Output_section* output_section,
+                       const elfcpp::Rela<size, big_endian>& reloc,
+                       unsigned int r_type,
+                       const elfcpp::Sym<size, big_endian>& lsym)
+{
+  unsigned int orig_r_type = r_type;
+
+  r_type &= 0xff;
+  switch (r_type)
+    {
+    case elfcpp::R_SPARC_NONE:
+    case elfcpp::R_SPARC_REGISTER:
+    case elfcpp::R_SPARC_GNU_VTINHERIT:
+    case elfcpp::R_SPARC_GNU_VTENTRY:
+      break;
+
+    case elfcpp::R_SPARC_64:
+    case elfcpp::R_SPARC_32:
+      // If building a shared library (or a position-independent
+      // executable), we need to create a dynamic relocation for
+      // this location. The relocation applied at link time will
+      // apply the link-time value, so we flag the location with
+      // an R_SPARC_RELATIVE relocation so the dynamic loader can
+      // relocate it easily.
+      if (parameters->options().output_is_position_independent())
+        {
+          Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+          unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+          rela_dyn->add_local_relative(object, r_sym, elfcpp::R_SPARC_RELATIVE,
+                                      output_section, data_shndx,
+                                      reloc.get_r_offset(),
+                                      reloc.get_r_addend());
+        }
+      break;
+
+    case elfcpp::R_SPARC_HIX22:
+    case elfcpp::R_SPARC_LOX10:
+    case elfcpp::R_SPARC_H44:
+    case elfcpp::R_SPARC_M44:
+    case elfcpp::R_SPARC_L44:
+    case elfcpp::R_SPARC_HH22:
+    case elfcpp::R_SPARC_HM10:
+    case elfcpp::R_SPARC_LM22:
+    case elfcpp::R_SPARC_UA64:
+    case elfcpp::R_SPARC_UA32:
+    case elfcpp::R_SPARC_UA16:
+    case elfcpp::R_SPARC_HI22:
+    case elfcpp::R_SPARC_LO10:
+    case elfcpp::R_SPARC_OLO10:
+    case elfcpp::R_SPARC_16:
+    case elfcpp::R_SPARC_11:
+    case elfcpp::R_SPARC_10:
+    case elfcpp::R_SPARC_8:
+    case elfcpp::R_SPARC_7:
+    case elfcpp::R_SPARC_6:
+    case elfcpp::R_SPARC_5:
+      // If building a shared library (or a position-independent
+      // executable), we need to create a dynamic relocation for
+      // this location.
+      if (parameters->options().output_is_position_independent())
+        {
+          Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+          if (lsym.get_st_type() != elfcpp::STT_SECTION)
+            {
+              unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+              rela_dyn->add_local(object, r_sym, orig_r_type, output_section,
+                                 data_shndx, reloc.get_r_offset(),
+                                 reloc.get_r_addend());
+            }
+          else
+            {
+             unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+              gold_assert(lsym.get_st_value() == 0);
+              rela_dyn->add_local_relative(object, r_sym, orig_r_type,
+                                          output_section, data_shndx,
+                                          reloc.get_r_offset(),
+                                          reloc.get_r_addend());
+            }
+        }
+      break;
+
+    case elfcpp::R_SPARC_WDISP30:
+    case elfcpp::R_SPARC_WDISP22:
+    case elfcpp::R_SPARC_WDISP19:
+    case elfcpp::R_SPARC_WDISP16:
+    case elfcpp::R_SPARC_DISP8:
+    case elfcpp::R_SPARC_DISP16:
+    case elfcpp::R_SPARC_DISP32:
+    case elfcpp::R_SPARC_DISP64:
+    case elfcpp::R_SPARC_PC10:
+    case elfcpp::R_SPARC_PC22:
+      break;
+
+    case elfcpp::R_SPARC_GOT10:
+    case elfcpp::R_SPARC_GOT13:
+    case elfcpp::R_SPARC_GOT22:
+      {
+        // The symbol requires a GOT entry.
+        Output_data_got<size, big_endian>* got;
+        unsigned int r_sym;
+
+       got = target->got_section(symtab, layout);
+       r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+
+       // If we are generating a shared object, we need to add a
+       // dynamic relocation for this symbol's GOT entry.
+       if (parameters->options().output_is_position_independent())
+         {
+           if (!object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD))
+             {
+               Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+               unsigned int off;
+
+               off = got->add_constant(0);
+               object->set_local_got_offset(r_sym, GOT_TYPE_STANDARD, off);
+               rela_dyn->add_local_relative(object, r_sym,
+                                            elfcpp::R_SPARC_RELATIVE,
+                                            got, off, 0);
+             }
+         }
+       else
+         got->add_local(object, r_sym, GOT_TYPE_STANDARD);
+      }
+      break;
+
+      // These are initial TLS relocs, which are expected when
+      // linking.
+    case elfcpp::R_SPARC_TLS_GD_HI22: // Global-dynamic
+    case elfcpp::R_SPARC_TLS_GD_LO10:
+    case elfcpp::R_SPARC_TLS_GD_ADD:
+    case elfcpp::R_SPARC_TLS_GD_CALL:
+    case elfcpp::R_SPARC_TLS_LDM_HI22 :        // Local-dynamic
+    case elfcpp::R_SPARC_TLS_LDM_LO10:
+    case elfcpp::R_SPARC_TLS_LDM_ADD:
+    case elfcpp::R_SPARC_TLS_LDM_CALL:
+    case elfcpp::R_SPARC_TLS_LDO_HIX22:        // Alternate local-dynamic
+    case elfcpp::R_SPARC_TLS_LDO_LOX10:
+    case elfcpp::R_SPARC_TLS_LDO_ADD:
+    case elfcpp::R_SPARC_TLS_IE_HI22:  // Initial-exec
+    case elfcpp::R_SPARC_TLS_IE_LO10:
+    case elfcpp::R_SPARC_TLS_IE_LD:
+    case elfcpp::R_SPARC_TLS_IE_LDX:
+    case elfcpp::R_SPARC_TLS_LE_HIX22: // Local-exec
+    case elfcpp::R_SPARC_TLS_LE_LOX10:
+      {
+       bool output_is_shared = parameters->options().shared();
+       const tls::Tls_optimization optimized_type
+            = optimize_tls_reloc(!output_is_shared, r_type);
+       switch (r_type)
+         {
+         case elfcpp::R_SPARC_TLS_GD_HI22: // Global-dynamic
+         case elfcpp::R_SPARC_TLS_GD_LO10:
+         case elfcpp::R_SPARC_TLS_GD_ADD:
+         case elfcpp::R_SPARC_TLS_GD_CALL:
+           if (optimized_type == tls::TLSOPT_NONE)
+             {
+               // Create a pair of GOT entries for the module index and
+               // dtv-relative offset.
+                Output_data_got<size, big_endian>* got
+                    = target->got_section(symtab, layout);
+                unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+                got->add_local_pair_with_rela(object, r_sym, 
+                                             lsym.get_st_shndx(),
+                                             GOT_TYPE_TLS_PAIR,
+                                             target->rela_dyn_section(layout),
+                                             (size == 64 ?
+                                              elfcpp::R_SPARC_TLS_DTPMOD64 :
+                                              elfcpp::R_SPARC_TLS_DTPMOD32), 0);
+               if (r_type == elfcpp::R_SPARC_TLS_GD_CALL)
+                 generate_tls_call(symtab, layout, target);
+             }
+           else if (optimized_type != tls::TLSOPT_TO_LE)
+             unsupported_reloc_local(object, r_type);
+           break;
+
+         case elfcpp::R_SPARC_TLS_LDM_HI22 :   // Local-dynamic
+         case elfcpp::R_SPARC_TLS_LDM_LO10:
+         case elfcpp::R_SPARC_TLS_LDM_ADD:
+         case elfcpp::R_SPARC_TLS_LDM_CALL:
+           if (optimized_type == tls::TLSOPT_NONE)
+             {
+               // Create a GOT entry for the module index.
+               target->got_mod_index_entry(symtab, layout, object);
+
+               if (r_type == elfcpp::R_SPARC_TLS_LDM_CALL)
+                 generate_tls_call(symtab, layout, target);
+             }
+           else if (optimized_type != tls::TLSOPT_TO_LE)
+             unsupported_reloc_local(object, r_type);
+           break;
+
+         case elfcpp::R_SPARC_TLS_LDO_HIX22:   // Alternate local-dynamic
+         case elfcpp::R_SPARC_TLS_LDO_LOX10:
+         case elfcpp::R_SPARC_TLS_LDO_ADD:
+           break;
+
+         case elfcpp::R_SPARC_TLS_IE_HI22:     // Initial-exec
+         case elfcpp::R_SPARC_TLS_IE_LO10:
+         case elfcpp::R_SPARC_TLS_IE_LD:
+         case elfcpp::R_SPARC_TLS_IE_LDX:
+           layout->set_has_static_tls();
+           if (optimized_type == tls::TLSOPT_NONE)
+             {
+               // Create a GOT entry for the tp-relative offset.
+               Output_data_got<size, big_endian>* got
+                 = target->got_section(symtab, layout);
+               unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+
+               if (!object->local_has_got_offset(r_sym, GOT_TYPE_TLS_OFFSET))
+                 {
+                   Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+                   unsigned int off = got->add_constant(0);
+
+                   object->set_local_got_offset(r_sym, GOT_TYPE_TLS_OFFSET,
+                                                off);
+                   rela_dyn->add_local_relative(object, r_sym,
+                                                (size == 64 ?
+                                                 elfcpp::R_SPARC_TLS_TPOFF64 :
+                                                 elfcpp::R_SPARC_TLS_TPOFF32),
+                                                got, off, 0);
+                 }
+             }
+           else if (optimized_type != tls::TLSOPT_TO_LE)
+             unsupported_reloc_local(object, r_type);
+           break;
+
+         case elfcpp::R_SPARC_TLS_LE_HIX22:    // Local-exec
+         case elfcpp::R_SPARC_TLS_LE_LOX10:
+           layout->set_has_static_tls();
+           if (output_is_shared)
+             {
+               // We need to create a dynamic relocation.
+                gold_assert(lsym.get_st_type() != elfcpp::STT_SECTION);
+                unsigned int r_sym = elfcpp::elf_r_sym<size>(reloc.get_r_info());
+                Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+                rela_dyn->add_local_relative(object, r_sym, r_type,
+                                            output_section, data_shndx,
+                                            reloc.get_r_offset(), 0);
+             }
+           break;
+         }
+      }
+      break;
+
+      // These are relocations which should only be seen by the
+      // dynamic linker, and should never be seen here.
+    case elfcpp::R_SPARC_COPY:
+    case elfcpp::R_SPARC_GLOB_DAT:
+    case elfcpp::R_SPARC_JMP_SLOT:
+    case elfcpp::R_SPARC_RELATIVE:
+    case elfcpp::R_SPARC_TLS_DTPMOD64:
+    case elfcpp::R_SPARC_TLS_DTPMOD32:
+    case elfcpp::R_SPARC_TLS_DTPOFF64:
+    case elfcpp::R_SPARC_TLS_DTPOFF32:
+    case elfcpp::R_SPARC_TLS_TPOFF64:
+    case elfcpp::R_SPARC_TLS_TPOFF32:
+      gold_error(_("%s: unexpected reloc %u in object file"),
+                object->name().c_str(), r_type);
+      break;
+
+    default:
+      unsupported_reloc_local(object, r_type);
+      break;
+    }
+}
+
+// Report an unsupported relocation against a global symbol.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::Scan::unsupported_reloc_global(
+                       Sized_relobj<size, big_endian>* object,
+                       unsigned int r_type,
+                       Symbol* gsym)
+{
+  gold_error(_("%s: unsupported reloc %u against global symbol %s"),
+            object->name().c_str(), r_type, gsym->demangled_name().c_str());
+}
+
+// Scan a relocation for a global symbol.
+
+template<int size, bool big_endian>
+inline void
+Target_sparc<size, big_endian>::Scan::global(
+                               const General_options& options,
+                               Symbol_table* symtab,
+                               Layout* layout,
+                               Target_sparc<size, big_endian>* target,
+                               Sized_relobj<size, big_endian>* object,
+                               unsigned int data_shndx,
+                               Output_section* output_section,
+                               const elfcpp::Rela<size, big_endian>& reloc,
+                               unsigned int r_type,
+                               Symbol* gsym)
+{
+  unsigned int orig_r_type = r_type;
+
+  r_type &= 0xff;
+  switch (r_type)
+    {
+    case elfcpp::R_SPARC_NONE:
+    case elfcpp::R_SPARC_REGISTER:
+    case elfcpp::R_SPARC_GNU_VTINHERIT:
+    case elfcpp::R_SPARC_GNU_VTENTRY:
+      break;
+
+    case elfcpp::R_SPARC_PLT64:
+    case elfcpp::R_SPARC_PLT32:
+    case elfcpp::R_SPARC_HIPLT22:
+    case elfcpp::R_SPARC_LOPLT10:
+    case elfcpp::R_SPARC_PCPLT32:
+    case elfcpp::R_SPARC_PCPLT22:
+    case elfcpp::R_SPARC_PCPLT10:
+    case elfcpp::R_SPARC_WPLT30:
+      // If the symbol is fully resolved, this is just a PC32 reloc.
+      // Otherwise we need a PLT entry.
+      if (gsym->final_value_is_known())
+       break;
+      // If building a shared library, we can also skip the PLT entry
+      // if the symbol is defined in the output file and is protected
+      // or hidden.
+      if (gsym->is_defined()
+          && !gsym->is_from_dynobj()
+          && !gsym->is_preemptible())
+       break;
+      target->make_plt_entry(symtab, layout, gsym);
+      break;
+
+    case elfcpp::R_SPARC_DISP8:
+    case elfcpp::R_SPARC_DISP16:
+    case elfcpp::R_SPARC_DISP32:
+    case elfcpp::R_SPARC_DISP64:
+    case elfcpp::R_SPARC_PC_HH22:
+    case elfcpp::R_SPARC_PC_HM10:
+    case elfcpp::R_SPARC_PC_LM22:
+    case elfcpp::R_SPARC_PC10:
+    case elfcpp::R_SPARC_PC22:
+    case elfcpp::R_SPARC_WDISP30:
+    case elfcpp::R_SPARC_WDISP22:
+    case elfcpp::R_SPARC_WDISP19:
+    case elfcpp::R_SPARC_WDISP16:
+      {
+       if (gsym->needs_plt_entry())
+         target->make_plt_entry(symtab, layout, gsym);
+       // Make a dynamic relocation if necessary.
+       int flags = Symbol::NON_PIC_REF;
+       if (gsym->type() == elfcpp::STT_FUNC)
+         flags |= Symbol::FUNCTION_CALL;
+       if (gsym->needs_dynamic_reloc(flags))
+         {
+           if (target->may_need_copy_reloc(gsym))
+             {
+               target->copy_reloc(&options, symtab, layout, object,
+                                  data_shndx, output_section, gsym,
+                                  reloc);
+             }
+           else
+             {
+               Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+               rela_dyn->add_global(gsym, orig_r_type, output_section, object,
+                                    data_shndx, reloc.get_r_offset(),
+                                    reloc.get_r_addend());
+             }
+         }
+      }
+      break;
+
+    case elfcpp::R_SPARC_UA64:
+    case elfcpp::R_SPARC_64:
+    case elfcpp::R_SPARC_HIX22:
+    case elfcpp::R_SPARC_LOX10:
+    case elfcpp::R_SPARC_H44:
+    case elfcpp::R_SPARC_M44:
+    case elfcpp::R_SPARC_L44:
+    case elfcpp::R_SPARC_HH22:
+    case elfcpp::R_SPARC_HM10:
+    case elfcpp::R_SPARC_LM22:
+    case elfcpp::R_SPARC_HI22:
+    case elfcpp::R_SPARC_LO10:
+    case elfcpp::R_SPARC_OLO10:
+    case elfcpp::R_SPARC_UA32:
+    case elfcpp::R_SPARC_32:
+    case elfcpp::R_SPARC_UA16:
+    case elfcpp::R_SPARC_16:
+    case elfcpp::R_SPARC_11:
+    case elfcpp::R_SPARC_10:
+    case elfcpp::R_SPARC_8:
+    case elfcpp::R_SPARC_7:
+    case elfcpp::R_SPARC_6:
+    case elfcpp::R_SPARC_5:
+      {
+        // Make a PLT entry if necessary.
+        if (gsym->needs_plt_entry())
+          {
+            target->make_plt_entry(symtab, layout, gsym);
+            // Since this is not a PC-relative relocation, we may be
+            // taking the address of a function. In that case we need to
+            // set the entry in the dynamic symbol table to the address of
+            // the PLT entry.
+            if (gsym->is_from_dynobj() && !parameters->options().shared())
+              gsym->set_needs_dynsym_value();
+          }
+        // Make a dynamic relocation if necessary.
+        if (gsym->needs_dynamic_reloc(Symbol::ABSOLUTE_REF))
+          {
+            if (target->may_need_copy_reloc(gsym))
+              {
+               target->copy_reloc(&options, symtab, layout, object,
+                                  data_shndx, output_section, gsym, reloc);
+              }
+            else if ((r_type == elfcpp::R_SPARC_32
+                     || r_type == elfcpp::R_SPARC_64)
+                     && gsym->can_use_relative_reloc(false))
+              {
+                Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+                rela_dyn->add_global_relative(gsym, elfcpp::R_SPARC_RELATIVE,
+                                             output_section, object,
+                                             data_shndx, reloc.get_r_offset(),
+                                             reloc.get_r_addend());
+              }
+            else
+              {
+                Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+
+               if (gsym->is_from_dynobj()
+                   || gsym->is_undefined()
+                   || gsym->is_preemptible())
+                 rela_dyn->add_global(gsym, orig_r_type, output_section,
+                                      object, data_shndx,
+                                      reloc.get_r_offset(),
+                                      reloc.get_r_addend());
+               else
+                 rela_dyn->add_global_relative(gsym, orig_r_type,
+                                               output_section, object,
+                                               data_shndx,
+                                               reloc.get_r_offset(),
+                                               reloc.get_r_addend());
+              }
+          }
+      }
+      break;
+
+    case elfcpp::R_SPARC_GOT10:
+    case elfcpp::R_SPARC_GOT13:
+    case elfcpp::R_SPARC_GOT22:
+      {
+        // The symbol requires a GOT entry.
+        Output_data_got<size, big_endian>* got;
+
+       got = target->got_section(symtab, layout);
+        if (gsym->final_value_is_known())
+          got->add_global(gsym, GOT_TYPE_STANDARD);
+        else
+          {
+            // If this symbol is not fully resolved, we need to add a
+            // dynamic relocation for it.
+            Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+            if (gsym->is_from_dynobj()
+                || gsym->is_undefined()
+                || gsym->is_preemptible())
+              got->add_global_with_rela(gsym, GOT_TYPE_STANDARD, rela_dyn,
+                                        elfcpp::R_SPARC_GLOB_DAT);
+            else if (!gsym->has_got_offset(GOT_TYPE_STANDARD))
+              {
+               unsigned int off = got->add_constant(0);
+
+               gsym->set_got_offset(GOT_TYPE_STANDARD, off);
+               rela_dyn->add_global_relative(gsym, elfcpp::R_SPARC_RELATIVE,
+                                             got, off, 0);
+             }
+          }
+      }
+      break;
+
+      // These are initial tls relocs, which are expected when
+      // linking.
+    case elfcpp::R_SPARC_TLS_GD_HI22: // Global-dynamic
+    case elfcpp::R_SPARC_TLS_GD_LO10:
+    case elfcpp::R_SPARC_TLS_GD_ADD:
+    case elfcpp::R_SPARC_TLS_GD_CALL:
+    case elfcpp::R_SPARC_TLS_LDM_HI22: // Local-dynamic
+    case elfcpp::R_SPARC_TLS_LDM_LO10:
+    case elfcpp::R_SPARC_TLS_LDM_ADD:
+    case elfcpp::R_SPARC_TLS_LDM_CALL:
+    case elfcpp::R_SPARC_TLS_LDO_HIX22:        // Alternate local-dynamic
+    case elfcpp::R_SPARC_TLS_LDO_LOX10:
+    case elfcpp::R_SPARC_TLS_LDO_ADD:
+    case elfcpp::R_SPARC_TLS_LE_HIX22:
+    case elfcpp::R_SPARC_TLS_LE_LOX10:
+    case elfcpp::R_SPARC_TLS_IE_HI22:  // Initial-exec
+    case elfcpp::R_SPARC_TLS_IE_LO10:
+    case elfcpp::R_SPARC_TLS_IE_LD:
+    case elfcpp::R_SPARC_TLS_IE_LDX:
+      {
+       const bool is_final = gsym->final_value_is_known();
+       const tls::Tls_optimization optimized_type
+            = optimize_tls_reloc(is_final, r_type);
+       switch (r_type)
+         {
+         case elfcpp::R_SPARC_TLS_GD_HI22: // Global-dynamic
+         case elfcpp::R_SPARC_TLS_GD_LO10:
+         case elfcpp::R_SPARC_TLS_GD_ADD:
+         case elfcpp::R_SPARC_TLS_GD_CALL:
+           if (optimized_type == tls::TLSOPT_NONE)
+             {
+                // Create a pair of GOT entries for the module index and
+                // dtv-relative offset.
+                Output_data_got<size, big_endian>* got
+                    = target->got_section(symtab, layout);
+                got->add_global_pair_with_rela(gsym, GOT_TYPE_TLS_PAIR,
+                                               target->rela_dyn_section(layout),
+                                              (size == 64 ?
+                                               elfcpp::R_SPARC_TLS_DTPMOD64 :
+                                               elfcpp::R_SPARC_TLS_DTPMOD32),
+                                              (size == 64 ?
+                                               elfcpp::R_SPARC_TLS_DTPOFF64 :
+                                               elfcpp::R_SPARC_TLS_DTPOFF32));
+
+               // Emit R_SPARC_WPLT30 against "__tls_get_addr"
+               if (r_type == elfcpp::R_SPARC_TLS_GD_CALL)
+                 generate_tls_call(symtab, layout, target);
+             }
+           else if (optimized_type == tls::TLSOPT_TO_IE)
+             {
+                // Create a GOT entry for the tp-relative offset.
+                Output_data_got<size, big_endian>* got
+                    = target->got_section(symtab, layout);
+                got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+                                          target->rela_dyn_section(layout),
+                                         (size == 64 ?
+                                          elfcpp::R_SPARC_TLS_TPOFF64 :
+                                          elfcpp::R_SPARC_TLS_TPOFF32));
+             }
+           else if (optimized_type != tls::TLSOPT_TO_LE)
+             unsupported_reloc_global(object, r_type, gsym);
+           break;
+
+         case elfcpp::R_SPARC_TLS_LDM_HI22:    // Local-dynamic
+         case elfcpp::R_SPARC_TLS_LDM_LO10:
+         case elfcpp::R_SPARC_TLS_LDM_ADD:
+         case elfcpp::R_SPARC_TLS_LDM_CALL:
+           if (optimized_type == tls::TLSOPT_NONE)
+             {
+               // Create a GOT entry for the module index.
+               target->got_mod_index_entry(symtab, layout, object);
+
+               if (r_type == elfcpp::R_SPARC_TLS_LDM_CALL)
+                 generate_tls_call(symtab, layout, target);
+             }
+           else if (optimized_type != tls::TLSOPT_TO_LE)
+             unsupported_reloc_global(object, r_type, gsym);
+           break;
+
+         case elfcpp::R_SPARC_TLS_LDO_HIX22:   // Alternate local-dynamic
+         case elfcpp::R_SPARC_TLS_LDO_LOX10:
+         case elfcpp::R_SPARC_TLS_LDO_ADD:
+           break;
+
+         case elfcpp::R_SPARC_TLS_LE_HIX22:
+         case elfcpp::R_SPARC_TLS_LE_LOX10:
+           layout->set_has_static_tls();
+           if (parameters->options().shared())
+             {
+               Reloc_section* rela_dyn = target->rela_dyn_section(layout);
+               rela_dyn->add_global_relative(gsym, orig_r_type,
+                                             output_section, object,
+                                             data_shndx, reloc.get_r_offset(),
+                                             0);
+             }
+           break;
+
+         case elfcpp::R_SPARC_TLS_IE_HI22:     // Initial-exec
+         case elfcpp::R_SPARC_TLS_IE_LO10:
+         case elfcpp::R_SPARC_TLS_IE_LD:
+         case elfcpp::R_SPARC_TLS_IE_LDX:
+           layout->set_has_static_tls();
+           if (optimized_type == tls::TLSOPT_NONE)
+             {
+               // Create a GOT entry for the tp-relative offset.
+               Output_data_got<size, big_endian>* got
+                 = target->got_section(symtab, layout);
+               got->add_global_with_rela(gsym, GOT_TYPE_TLS_OFFSET,
+                                         target->rela_dyn_section(layout),
+                                         (size == 64 ?
+                                          elfcpp::R_SPARC_TLS_TPOFF64 :
+                                          elfcpp::R_SPARC_TLS_TPOFF32));
+             }
+           else if (optimized_type != tls::TLSOPT_TO_LE)
+             unsupported_reloc_global(object, r_type, gsym);
+           break;
+         }
+      }
+      break;
+
+      // These are relocations which should only be seen by the
+      // dynamic linker, and should never be seen here.
+    case elfcpp::R_SPARC_COPY:
+    case elfcpp::R_SPARC_GLOB_DAT:
+    case elfcpp::R_SPARC_JMP_SLOT:
+    case elfcpp::R_SPARC_RELATIVE:
+    case elfcpp::R_SPARC_TLS_DTPMOD64:
+    case elfcpp::R_SPARC_TLS_DTPMOD32:
+    case elfcpp::R_SPARC_TLS_DTPOFF64:
+    case elfcpp::R_SPARC_TLS_DTPOFF32:
+    case elfcpp::R_SPARC_TLS_TPOFF64:
+    case elfcpp::R_SPARC_TLS_TPOFF32:
+      gold_error(_("%s: unexpected reloc %u in object file"),
+                object->name().c_str(), r_type);
+      break;
+
+    default:
+      unsupported_reloc_global(object, r_type, gsym);
+      break;
+    }
+}
+
+// Scan relocations for a section.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::scan_relocs(
+                       const General_options& options,
+                       Symbol_table* symtab,
+                       Layout* layout,
+                       Sized_relobj<size, big_endian>* object,
+                       unsigned int data_shndx,
+                       unsigned int sh_type,
+                       const unsigned char* prelocs,
+                       size_t reloc_count,
+                       Output_section* output_section,
+                       bool needs_special_offset_handling,
+                       size_t local_symbol_count,
+                       const unsigned char* plocal_symbols)
+{
+  typedef Target_sparc<size, big_endian> Sparc;
+  typedef typename Target_sparc<size, big_endian>::Scan Scan;
+
+  if (sh_type == elfcpp::SHT_REL)
+    {
+      gold_error(_("%s: unsupported REL reloc section"),
+                object->name().c_str());
+      return;
+    }
+
+  gold::scan_relocs<size, big_endian, Sparc, elfcpp::SHT_RELA, Scan>(
+    options,
+    symtab,
+    layout,
+    this,
+    object,
+    data_shndx,
+    prelocs,
+    reloc_count,
+    output_section,
+    needs_special_offset_handling,
+    local_symbol_count,
+    plocal_symbols);
+}
+
+// Finalize the sections.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::do_finalize_sections(Layout* layout)
+{
+  // Fill in some more dynamic tags.
+  Output_data_dynamic* const odyn = layout->dynamic_data();
+  if (odyn != NULL)
+    {
+      if (this->plt_ != NULL)
+       {
+         const Output_data* od = this->plt_->rel_plt();
+         odyn->add_section_size(elfcpp::DT_PLTRELSZ, od);
+         odyn->add_section_address(elfcpp::DT_JMPREL, od);
+         odyn->add_constant(elfcpp::DT_PLTREL, elfcpp::DT_RELA);
+
+         odyn->add_section_address(elfcpp::DT_PLTGOT, this->plt_);
+       }
+
+      if (this->rela_dyn_ != NULL)
+       {
+         const Output_data* od = this->rela_dyn_;
+         odyn->add_section_address(elfcpp::DT_RELA, od);
+         odyn->add_section_size(elfcpp::DT_RELASZ, od);
+         odyn->add_constant(elfcpp::DT_RELAENT,
+                            elfcpp::Elf_sizes<size>::rela_size);
+       }
+
+      if (!parameters->options().shared())
+       {
+         // The value of the DT_DEBUG tag is filled in by the dynamic
+         // linker at run time, and used by the debugger.
+         odyn->add_constant(elfcpp::DT_DEBUG, 0);
+       }
+    }
+
+  // Emit any relocs we saved in an attempt to avoid generating COPY
+  // relocs.
+  if (this->copy_relocs_ == NULL)
+    return;
+  if (this->copy_relocs_->any_to_emit())
+    {
+      Reloc_section* rela_dyn = this->rela_dyn_section(layout);
+      this->copy_relocs_->emit(rela_dyn);
+    }
+  delete this->copy_relocs_;
+  this->copy_relocs_ = NULL;
+}
+
+// Perform a relocation.
+
+template<int size, bool big_endian>
+inline bool
+Target_sparc<size, big_endian>::Relocate::relocate(
+                       const Relocate_info<size, big_endian>* relinfo,
+                       Target_sparc* target,
+                       size_t relnum,
+                       const elfcpp::Rela<size, big_endian>& rela,
+                       unsigned int r_type,
+                       const Sized_symbol<size>* gsym,
+                       const Symbol_value<size>* psymval,
+                       unsigned char* view,
+                       typename elfcpp::Elf_types<size>::Elf_Addr address,
+                       section_size_type view_size)
+{
+  r_type &= 0xff;
+
+  if (this->ignore_gd_add_)
+    {
+      if (r_type != elfcpp::R_SPARC_TLS_GD_ADD)
+       gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                              _("missing expected TLS relocation"));
+      else
+       {
+         this->ignore_gd_add_ = false;
+         return false;
+       }
+    }
+
+  typedef Sparc_relocate_functions<size, big_endian> Reloc;
+
+  // Pick the value to use for symbols defined in shared objects.
+  Symbol_value<size> symval;
+  if (gsym != NULL
+      && (gsym->is_from_dynobj()
+          || (parameters->options().shared()
+              && (gsym->is_undefined() || gsym->is_preemptible())))
+      && gsym->has_plt_offset())
+    {
+      elfcpp::Elf_Xword value;
+
+      value = target->plt_section()->address() + gsym->plt_offset();
+
+      symval.set_output_value(value);
+
+      psymval = &symval;
+    }
+
+  const Sized_relobj<size, big_endian>* object = relinfo->object;
+  const elfcpp::Elf_Xword addend = rela.get_r_addend();
+
+  // Get the GOT offset if needed.  Unlike i386 and x86_64, our GOT
+  // pointer points to the beginning, not the end, of the table.
+  // So we just use the plain offset.
+  bool have_got_offset = false;
+  unsigned int got_offset = 0;
+  switch (r_type)
+    {
+    case elfcpp::R_SPARC_GOT10:
+    case elfcpp::R_SPARC_GOT13:
+    case elfcpp::R_SPARC_GOT22:
+      if (gsym != NULL)
+        {
+          gold_assert(gsym->has_got_offset(GOT_TYPE_STANDARD));
+          got_offset = gsym->got_offset(GOT_TYPE_STANDARD);
+        }
+      else
+        {
+          unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+          gold_assert(object->local_has_got_offset(r_sym, GOT_TYPE_STANDARD));
+          got_offset = object->local_got_offset(r_sym, GOT_TYPE_STANDARD);
+        }
+      have_got_offset = true;
+      break;
+
+    default:
+      break;
+    }
+
+  switch (r_type)
+    {
+    case elfcpp::R_SPARC_NONE:
+    case elfcpp::R_SPARC_REGISTER:
+    case elfcpp::R_SPARC_GNU_VTINHERIT:
+    case elfcpp::R_SPARC_GNU_VTENTRY:
+      break;
+
+    case elfcpp::R_SPARC_8:
+      Relocate_functions<size, big_endian>::rela8(view, object,
+                                                 psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_16:
+      Relocate_functions<size, big_endian>::rela16(view, object,
+                                                  psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_32:
+      if (!parameters->options().output_is_position_independent())
+             Relocate_functions<size, big_endian>::rela32(view, object,
+                                                          psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_DISP8:
+      Reloc::disp8(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_DISP16:
+      Reloc::disp16(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_DISP32:
+      Reloc::disp32(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_DISP64:
+      Reloc::disp64(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_WDISP30:
+    case elfcpp::R_SPARC_WPLT30:
+      Reloc::wdisp30(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_WDISP22:
+      Reloc::wdisp22(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_WDISP19:
+      Reloc::wdisp19(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_WDISP16:
+      Reloc::wdisp16(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_HI22:
+      Reloc::hi22(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_22:
+      Reloc::rela32_22(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_13:
+      Reloc::rela32_13(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_LO10:
+      Reloc::lo10(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_GOT10:
+      Reloc::lo10(view, got_offset, addend);
+      break;
+
+    case elfcpp::R_SPARC_GOT13:
+      Reloc::rela32_13(view, got_offset, addend);
+      break;
+
+    case elfcpp::R_SPARC_GOT22:
+      Reloc::hi22(view, got_offset, addend);
+      break;
+
+    case elfcpp::R_SPARC_PC10:
+      Reloc::pc10(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_PC22:
+      Reloc::pc22(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_TLS_DTPOFF32:
+    case elfcpp::R_SPARC_UA32:
+      Reloc::ua32(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_PLT64:
+      Relocate_functions<size, big_endian>::rela64(view, object,
+                                                  psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_PLT32:
+      Relocate_functions<size, big_endian>::rela32(view, object,
+                                                  psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_HIPLT22:
+      Reloc::hi22(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_LOPLT10:
+      Reloc::lo10(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_PCPLT32:
+      Reloc::disp32(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_PCPLT22:
+      Reloc::pcplt22(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_PCPLT10:
+      Reloc::lo10(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_64:
+      if (!parameters->options().output_is_position_independent())
+             Relocate_functions<size, big_endian>::rela64(view, object,
+                                                          psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_OLO10:
+      {
+       unsigned int addend2 = rela.get_r_info() & 0xffffffff;
+       addend2 = ((addend2 >> 8) ^ 0x800000) - 0x800000;
+       Reloc::olo10(view, object, psymval, addend, addend2);
+      }
+      break;
+
+    case elfcpp::R_SPARC_HH22:
+      Reloc::hh22(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_PC_HH22:
+      Reloc::pc_hh22(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_HM10:
+      Reloc::hm10(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_PC_HM10:
+      Reloc::pc_hm10(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_LM22:
+      Reloc::hi22(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_PC_LM22:
+      Reloc::pcplt22(view, object, psymval, addend, address);
+      break;
+
+    case elfcpp::R_SPARC_11:
+      Reloc::rela32_11(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_10:
+      Reloc::rela32_10(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_7:
+      Reloc::rela32_7(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_6:
+      Reloc::rela32_6(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_5:
+      Reloc::rela32_5(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_HIX22:
+      Reloc::hix22(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_LOX10:
+      Reloc::lox10(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_H44:
+      Reloc::h44(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_M44:
+      Reloc::m44(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_L44:
+      Reloc::l44(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_TLS_DTPOFF64:
+    case elfcpp::R_SPARC_UA64:
+      Reloc::ua64(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_UA16:
+      Reloc::ua16(view, object, psymval, addend);
+      break;
+
+    case elfcpp::R_SPARC_TLS_GD_HI22:
+    case elfcpp::R_SPARC_TLS_GD_LO10:
+    case elfcpp::R_SPARC_TLS_GD_ADD:
+    case elfcpp::R_SPARC_TLS_GD_CALL:
+    case elfcpp::R_SPARC_TLS_LDM_HI22:
+    case elfcpp::R_SPARC_TLS_LDM_LO10:
+    case elfcpp::R_SPARC_TLS_LDM_ADD:
+    case elfcpp::R_SPARC_TLS_LDM_CALL:
+    case elfcpp::R_SPARC_TLS_LDO_HIX22:
+    case elfcpp::R_SPARC_TLS_LDO_LOX10:
+    case elfcpp::R_SPARC_TLS_LDO_ADD:
+    case elfcpp::R_SPARC_TLS_IE_HI22:
+    case elfcpp::R_SPARC_TLS_IE_LO10:
+    case elfcpp::R_SPARC_TLS_IE_LD:
+    case elfcpp::R_SPARC_TLS_IE_LDX:
+    case elfcpp::R_SPARC_TLS_LE_HIX22:
+    case elfcpp::R_SPARC_TLS_LE_LOX10:
+      this->relocate_tls(relinfo, target, relnum, rela,
+                        r_type, gsym, psymval, view,
+                        address, view_size);
+      break;
+
+    case elfcpp::R_SPARC_COPY:
+    case elfcpp::R_SPARC_GLOB_DAT:
+    case elfcpp::R_SPARC_JMP_SLOT:
+    case elfcpp::R_SPARC_RELATIVE:
+      // These are outstanding tls relocs, which are unexpected when
+      // linking.
+    case elfcpp::R_SPARC_TLS_DTPMOD64:
+    case elfcpp::R_SPARC_TLS_DTPMOD32:
+    case elfcpp::R_SPARC_TLS_TPOFF64:
+    case elfcpp::R_SPARC_TLS_TPOFF32:
+      gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                            _("unexpected reloc %u in object file"),
+                            r_type);
+      break;
+
+    default:
+      gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                            _("unsupported reloc %u"),
+                            r_type);
+      break;
+    }
+
+  return true;
+}
+
+// Perform a TLS relocation.
+
+template<int size, bool big_endian>
+inline void
+Target_sparc<size, big_endian>::Relocate::relocate_tls(
+                       const Relocate_info<size, big_endian>* relinfo,
+                       Target_sparc<size, big_endian>* target,
+                       size_t relnum,
+                       const elfcpp::Rela<size, big_endian>& rela,
+                       unsigned int r_type,
+                       const Sized_symbol<size>* gsym,
+                       const Symbol_value<size>* psymval,
+                       unsigned char* view,
+                       typename elfcpp::Elf_types<size>::Elf_Addr address,
+                       section_size_type)
+{
+  Output_segment* tls_segment = relinfo->layout->tls_segment();
+  typedef Sparc_relocate_functions<size, big_endian> Reloc;
+  const Sized_relobj<size, big_endian>* object = relinfo->object;
+  typedef typename elfcpp::Swap<32, true>::Valtype Insntype;
+
+  const elfcpp::Elf_Xword addend = rela.get_r_addend();
+  typename elfcpp::Elf_types<size>::Elf_Addr value = psymval->value(object, 0);
+
+  const bool is_final =
+    (gsym == NULL
+     ? !parameters->options().output_is_position_independent()
+     : gsym->final_value_is_known());
+  const tls::Tls_optimization optimized_type
+      = optimize_tls_reloc(is_final, r_type);
+
+  switch (r_type)
+    {
+    case elfcpp::R_SPARC_TLS_GD_HI22:
+    case elfcpp::R_SPARC_TLS_GD_LO10:
+    case elfcpp::R_SPARC_TLS_GD_ADD:
+    case elfcpp::R_SPARC_TLS_GD_CALL:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         Insntype* wv = reinterpret_cast<Insntype*>(view);
+         Insntype val;
+
+         value -= tls_segment->memsz();
+
+         switch (r_type)
+           {
+           case elfcpp::R_SPARC_TLS_GD_HI22:
+             // TLS_GD_HI22 --> TLS_LE_HIX22
+             Reloc::hix22(view, value, addend);
+             break;
+
+           case elfcpp::R_SPARC_TLS_GD_LO10:
+             // TLS_GD_LO10 --> TLS_LE_LOX10
+             Reloc::lox10(view, value, addend);
+             break;
+
+           case elfcpp::R_SPARC_TLS_GD_ADD:
+             // add %reg1, %reg2, %reg3 --> mov %g7, %reg2, %reg3
+             val = elfcpp::Swap<32, true>::readval(wv);
+             val = (val & ~0x7c000) | 0x1c000;
+             elfcpp::Swap<32, true>::writeval(wv, val);
+             break;
+           case elfcpp::R_SPARC_TLS_GD_CALL:
+             // call __tls_get_addr --> nop
+             elfcpp::Swap<32, true>::writeval(wv, sparc_nop);
+             break;
+           }
+         break;
+       }
+      else
+        {
+          unsigned int got_type = (optimized_type == tls::TLSOPT_TO_IE
+                                   ? GOT_TYPE_TLS_OFFSET
+                                   : GOT_TYPE_TLS_PAIR);
+          if (gsym != NULL)
+            {
+              gold_assert(gsym->has_got_offset(got_type));
+              value = gsym->got_offset(got_type);
+            }
+          else
+            {
+              unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+              gold_assert(object->local_has_got_offset(r_sym, got_type));
+              value = object->local_got_offset(r_sym, got_type);
+            }
+          if (optimized_type == tls::TLSOPT_TO_IE)
+           {
+             Insntype* wv = reinterpret_cast<Insntype*>(view);
+             Insntype val;
+
+             switch (r_type)
+               {
+               case elfcpp::R_SPARC_TLS_GD_HI22:
+                 // TLS_GD_HI22 --> TLS_IE_HI22
+                 Reloc::hi22(view, value, addend);
+                 break;
+
+               case elfcpp::R_SPARC_TLS_GD_LO10:
+                 // TLS_GD_LO10 --> TLS_IE_LO10
+                 Reloc::lo10(view, value, addend);
+                 break;
+
+               case elfcpp::R_SPARC_TLS_GD_ADD:
+                 // add %reg1, %reg2, %reg3 --> ld [%reg1 + %reg2], %reg3
+                 val = elfcpp::Swap<32, true>::readval(wv);
+
+                 if (size == 64)
+                   val |= 0xc0580000;
+                 else
+                   val |= 0xc0000000;
+
+                 elfcpp::Swap<32, true>::writeval(wv, val);
+                 break;
+
+               case elfcpp::R_SPARC_TLS_GD_CALL:
+                 // The compiler can put the TLS_GD_ADD instruction
+                 // into the delay slot of the call.  If so, we need
+                 // to transpose the two instructions so that the
+                 // the new sequence works properly.
+                 //
+                 // The test we use is if the instruction in the
+                 // delay slot is an add with destination register
+                 // equal to %o0
+                 val = elfcpp::Swap<32, true>::readval(wv + 1);
+                 if ((val & 0x81f80000) == 0x80000000
+                     && ((val >> 25) & 0x1f) == 0x8)
+                   {
+                     if (size == 64)
+                       val |= 0xc0580000;
+                     else
+                       val |= 0xc0000000;
+
+                     elfcpp::Swap<32, true>::writeval(wv, val);
+
+                     wv += 1;
+                     this->ignore_gd_add_ = true;
+                   }
+
+                 // call __tls_get_addr --> add %g7, %o0, %o0
+                 elfcpp::Swap<32, true>::writeval(wv, 0x9001c008);
+                 break;
+               }
+              break;
+           }
+          else if (optimized_type == tls::TLSOPT_NONE)
+            {
+             switch (r_type)
+               {
+               case elfcpp::R_SPARC_TLS_GD_HI22:
+                 Reloc::hi22(view, value, addend);
+                 break;
+               case elfcpp::R_SPARC_TLS_GD_LO10:
+                 Reloc::lo10(view, value, addend);
+                 break;
+               case elfcpp::R_SPARC_TLS_GD_ADD:
+                 break;
+               case elfcpp::R_SPARC_TLS_GD_CALL:
+                 {
+                   Symbol_value<size> symval;
+                   elfcpp::Elf_Xword value;
+                   Symbol* tsym;
+
+                   tsym = target->tls_get_addr_sym_;
+                   gold_assert(tsym);
+                   value = (target->plt_section()->address() +
+                            tsym->plt_offset());
+                   symval.set_output_value(value);
+                   Reloc::wdisp30(view, object, &symval, addend, address);
+                 }
+                 break;
+               }
+             break;
+            }
+        }
+      gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                            _("unsupported reloc %u"),
+                            r_type);
+      break;
+
+    case elfcpp::R_SPARC_TLS_LDM_HI22:
+    case elfcpp::R_SPARC_TLS_LDM_LO10:
+    case elfcpp::R_SPARC_TLS_LDM_ADD:
+    case elfcpp::R_SPARC_TLS_LDM_CALL:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         Insntype* wv = reinterpret_cast<Insntype*>(view);
+
+         switch (r_type)
+           {
+           case elfcpp::R_SPARC_TLS_LDM_HI22:
+           case elfcpp::R_SPARC_TLS_LDM_LO10:
+           case elfcpp::R_SPARC_TLS_LDM_ADD:
+             elfcpp::Swap<32, true>::writeval(wv, sparc_nop);
+             break;
+
+           case elfcpp::R_SPARC_TLS_LDM_CALL:
+             elfcpp::Swap<32, true>::writeval(wv, sparc_mov_g0_o0);
+             break;
+           }
+         break;
+       }
+      else if (optimized_type == tls::TLSOPT_NONE)
+        {
+          // Relocate the field with the offset of the GOT entry for
+          // the module index.
+          unsigned int got_offset;
+
+         got_offset = target->got_mod_index_entry(NULL, NULL, NULL);
+         switch (r_type)
+           {
+           case elfcpp::R_SPARC_TLS_LDM_HI22:
+             Reloc::hi22(view, got_offset, addend);
+             break;
+           case elfcpp::R_SPARC_TLS_LDM_LO10:
+             Reloc::lo10(view, got_offset, addend);
+             break;
+           case elfcpp::R_SPARC_TLS_LDM_ADD:
+             break;
+           case elfcpp::R_SPARC_TLS_LDM_CALL:
+             {
+               Symbol_value<size> symval;
+               elfcpp::Elf_Xword value;
+               Symbol* tsym;
+
+               tsym = target->tls_get_addr_sym_;
+               gold_assert(tsym);
+               value = (target->plt_section()->address() +
+                        tsym->plt_offset());
+               symval.set_output_value(value);
+               Reloc::wdisp30(view, object, &symval, addend, address);
+             }
+             break;
+           }
+          break;
+        }
+      gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                            _("unsupported reloc %u"),
+                            r_type);
+      break;
+
+      // These relocs can appear in debugging sections, in which case
+      // we won't see the TLS_LDM relocs.  The local_dynamic_type
+      // field tells us this.
+    case elfcpp::R_SPARC_TLS_LDO_HIX22:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         value -= tls_segment->memsz();
+         Reloc::hix22(view, value, addend);
+       }
+      else
+       Reloc::ldo_hix22(view, value, addend);
+      break;
+    case elfcpp::R_SPARC_TLS_LDO_LOX10:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         value -= tls_segment->memsz();
+         Reloc::lox10(view, value, addend);
+       }
+      else
+       Reloc::ldo_lox10(view, value, addend);
+      break;
+    case elfcpp::R_SPARC_TLS_LDO_ADD:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         Insntype* wv = reinterpret_cast<Insntype*>(view);
+         Insntype val;
+
+         // add %reg1, %reg2, %reg3 --> add %g7, %reg2, %reg3
+         val = elfcpp::Swap<32, true>::readval(wv);
+         val = (val & ~0x7c000) | 0x1c000;
+         elfcpp::Swap<32, true>::writeval(wv, val);
+       }
+      break;
+
+      // When optimizing IE --> LE, the only relocation that is handled
+      // differently is R_SPARC_TLS_IE_LD, it is rewritten from
+      // 'ld{,x} [rs1 + rs2], rd' into 'mov rs2, rd' or simply a NOP is
+      // rs2 and rd are the same.
+    case elfcpp::R_SPARC_TLS_IE_LD:
+    case elfcpp::R_SPARC_TLS_IE_LDX:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         Insntype* wv = reinterpret_cast<Insntype*>(view);
+         Insntype val = elfcpp::Swap<32, true>::readval(wv);
+         Insntype rs2 = val & 0x1f;
+         Insntype rd = (val >> 25) & 0x1f;
+
+         if (rs2 == rd)
+           val = sparc_nop;
+         else
+           val = sparc_mov | (val & 0x3e00001f);
+
+         elfcpp::Swap<32, true>::writeval(wv, val);
+       }
+      break;
+
+    case elfcpp::R_SPARC_TLS_IE_HI22:
+    case elfcpp::R_SPARC_TLS_IE_LO10:
+      if (optimized_type == tls::TLSOPT_TO_LE)
+       {
+         value -= tls_segment->memsz();
+         switch (r_type)
+           {
+           case elfcpp::R_SPARC_TLS_IE_HI22:
+             // IE_HI22 --> LE_HIX22
+             Reloc::hix22(view, value, addend);
+             break;
+           case elfcpp::R_SPARC_TLS_IE_LO10:
+             // IE_LO10 --> LE_LOX10
+             Reloc::lox10(view, value, addend);
+             break;
+           }
+         break;
+       }
+      else if (optimized_type == tls::TLSOPT_NONE)
+       {
+         // Relocate the field with the offset of the GOT entry for
+         // the tp-relative offset of the symbol.
+         if (gsym != NULL)
+           {
+             gold_assert(gsym->has_got_offset(GOT_TYPE_TLS_OFFSET));
+             value = gsym->got_offset(GOT_TYPE_TLS_OFFSET);
+           }
+         else
+           {
+             unsigned int r_sym = elfcpp::elf_r_sym<size>(rela.get_r_info());
+             gold_assert(object->local_has_got_offset(r_sym,
+                                                      GOT_TYPE_TLS_OFFSET));
+             value = object->local_got_offset(r_sym,
+                                              GOT_TYPE_TLS_OFFSET);
+           }
+         switch (r_type)
+           {
+           case elfcpp::R_SPARC_TLS_IE_HI22:
+             Reloc::hi22(view, value, addend);
+             break;
+           case elfcpp::R_SPARC_TLS_IE_LO10:
+             Reloc::lo10(view, value, addend);
+             break;
+           }
+         break;
+       }
+      gold_error_at_location(relinfo, relnum, rela.get_r_offset(),
+                            _("unsupported reloc %u"),
+                            r_type);
+      break;
+
+    case elfcpp::R_SPARC_TLS_LE_HIX22:
+      // If we're creating a shared library, a dynamic relocation will
+      // have been created for this location, so do not apply it now.
+      if (!parameters->options().shared())
+       {
+         value -= tls_segment->memsz();
+         Reloc::hix22(view, value, addend);
+       }
+      break;
+
+    case elfcpp::R_SPARC_TLS_LE_LOX10:
+      // If we're creating a shared library, a dynamic relocation will
+      // have been created for this location, so do not apply it now.
+      if (!parameters->options().shared())
+       {
+         value -= tls_segment->memsz();
+         Reloc::lox10(view, value, addend);
+       }
+      break;
+    }
+}
+
+// Relocate section data.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::relocate_section(
+                       const Relocate_info<size, big_endian>* relinfo,
+                       unsigned int sh_type,
+                       const unsigned char* prelocs,
+                       size_t reloc_count,
+                       Output_section* output_section,
+                       bool needs_special_offset_handling,
+                       unsigned char* view,
+                       typename elfcpp::Elf_types<size>::Elf_Addr address,
+                       section_size_type view_size)
+{
+  typedef Target_sparc<size, big_endian> Sparc;
+  typedef typename Target_sparc<size, big_endian>::Relocate Sparc_relocate;
+
+  gold_assert(sh_type == elfcpp::SHT_RELA);
+
+  gold::relocate_section<size, big_endian, Sparc, elfcpp::SHT_RELA,
+    Sparc_relocate>(
+    relinfo,
+    this,
+    prelocs,
+    reloc_count,
+    output_section,
+    needs_special_offset_handling,
+    view,
+    address,
+    view_size);
+}
+
+// Return the size of a relocation while scanning during a relocatable
+// link.
+
+template<int size, bool big_endian>
+unsigned int
+Target_sparc<size, big_endian>::Relocatable_size_for_reloc::get_size_for_reloc(
+    unsigned int,
+    Relobj*)
+{
+  // We are always SHT_RELA, so we should never get here.
+  gold_unreachable();
+  return 0;
+}
+
+// Scan the relocs during a relocatable link.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::scan_relocatable_relocs(
+                       const General_options& options,
+                       Symbol_table* symtab,
+                       Layout* layout,
+                       Sized_relobj<size, big_endian>* object,
+                       unsigned int data_shndx,
+                       unsigned int sh_type,
+                       const unsigned char* prelocs,
+                       size_t reloc_count,
+                       Output_section* output_section,
+                       bool needs_special_offset_handling,
+                       size_t local_symbol_count,
+                       const unsigned char* plocal_symbols,
+                       Relocatable_relocs* rr)
+{
+  gold_assert(sh_type == elfcpp::SHT_RELA);
+
+  typedef gold::Default_scan_relocatable_relocs<elfcpp::SHT_RELA,
+    Relocatable_size_for_reloc> Scan_relocatable_relocs;
+
+  gold::scan_relocatable_relocs<size, big_endian, elfcpp::SHT_RELA,
+      Scan_relocatable_relocs>(
+    options,
+    symtab,
+    layout,
+    object,
+    data_shndx,
+    prelocs,
+    reloc_count,
+    output_section,
+    needs_special_offset_handling,
+    local_symbol_count,
+    plocal_symbols,
+    rr);
+}
+
+// Relocate a section during a relocatable link.
+
+template<int size, bool big_endian>
+void
+Target_sparc<size, big_endian>::relocate_for_relocatable(
+    const Relocate_info<size, big_endian>* relinfo,
+    unsigned int sh_type,
+    const unsigned char* prelocs,
+    size_t reloc_count,
+    Output_section* output_section,
+    off_t offset_in_output_section,
+    const Relocatable_relocs* rr,
+    unsigned char* view,
+    typename elfcpp::Elf_types<size>::Elf_Addr view_address,
+    section_size_type view_size,
+    unsigned char* reloc_view,
+    section_size_type reloc_view_size)
+{
+  gold_assert(sh_type == elfcpp::SHT_RELA);
+
+  gold::relocate_for_relocatable<size, big_endian, elfcpp::SHT_RELA>(
+    relinfo,
+    prelocs,
+    reloc_count,
+    output_section,
+    offset_in_output_section,
+    rr,
+    view,
+    view_address,
+    view_size,
+    reloc_view,
+    reloc_view_size);
+}
+
+// Return the value to use for a dynamic which requires special
+// treatment.  This is how we support equality comparisons of function
+// pointers across shared library boundaries, as described in the
+// processor specific ABI supplement.
+
+template<int size, bool big_endian>
+uint64_t
+Target_sparc<size, big_endian>::do_dynsym_value(const Symbol* gsym) const
+{
+  gold_assert(gsym->is_from_dynobj() && gsym->has_plt_offset());
+  return this->plt_section()->address() + gsym->plt_offset();
+}
+
+// The selector for sparc object files.
+
+template<int size, bool big_endian>
+class Target_selector_sparc : public Target_selector
+{
+public:
+  Target_selector_sparc()
+    : Target_selector(elfcpp::EM_NONE, size, big_endian,
+                     (size == 64 ? "elf64-sparc" : "elf32-sparc"))
+  { }
+
+  Target* instantiated_target_;
+
+  Target* do_recognize(int machine, int, int)
+  {
+    switch (size)
+      {
+      case 64:
+       if (machine != elfcpp::EM_SPARCV9)
+         return NULL;
+       break;
+
+      case 32:
+       if (machine != elfcpp::EM_SPARC
+           && machine != elfcpp::EM_SPARC32PLUS)
+         return NULL;
+       break;
+
+      default:
+       return NULL;
+      }
+
+    return do_instantiate_target();
+  }
+
+  Target* do_instantiate_target()
+  {
+    if (this->instantiated_target_ == NULL)
+      this->instantiated_target_ = new Target_sparc<size, big_endian>();
+    return this->instantiated_target_;
+  }
+};
+
+Target_selector_sparc<32, true> target_selector_sparc32;
+Target_selector_sparc<64, true> target_selector_sparc64;
+
+} // End anonymous namespace.