Set GOLD_DEFAULT_SIZE to 32 for x32

Cherry-pick from master:
	* configure.ac (default_size): Set to 32 for x32.
	* configure: Regenerated.

diff --git a/gold/ChangeLog b/gold/ChangeLog
index 2c4a8c3c007af6f3df7a215477ad7046ef101168..29b6f3ad3ad7f5103fdab2df2ef4558addaa20d3 100644 (file)
--- a/gold/ChangeLog
+++ b/gold/ChangeLog
@@ -1,3 +1,11 @@
+2015-02-22  H.J. Lu  <hongjiu.lu@intel.com>
+
+       Cherry-pick from master
+       2015-02-21  H.J. Lu  <hongjiu.lu@intel.com>
+
+       * configure.ac (default_size): Set to 32 for x32.
+       * configure: Regenerated.
+
 2015-02-11  Alan Modra  <amodra@gmail.com>
 
        Apply from master

diff --git a/gold/configure b/gold/configure
index 23e473542e811d266bc2e67c657db586d30e54b6..3427074672688f04acd0cda5925c375f9e6acf52 100755 (executable)
--- a/gold/configure
+++ b/gold/configure
@@ -3483,6 +3483,7 @@ fi
          case "$target" in
          x86_64*-linux-gnux32)
            target_x32=yes
+           default_size=32
            ;;
          *)
            target_x86_64=yes

diff --git a/gold/configure.ac b/gold/configure.ac
index 64e603a375e1e796afeada9f8c2c7958b56a67b7..e0ac1df56ef80cb96ea915427a0d28d1336eb2d3 100644 (file)
--- a/gold/configure.ac
+++ b/gold/configure.ac
@@ -210,6 +210,7 @@ for targ in $target $canon_targets; do
          case "$target" in
          x86_64*-linux-gnux32)
            target_x32=yes
+           default_size=32
            ;;
          *)
            target_x86_64=yes