2009-08-31  H.J. Lu  <hongjiu.lu@intel.com>

	* ld.h (ld_config_type): Add maxpagesize_set and
	commonpagesize_set.

	* ldemul.c (set_output_arch_default): Call
	bfd_emul_set_commonpagesize/bfd_emul_set_commonpagesize only
	if config.maxpagesize_set/config.commonpagesize_set is TRUE.

	* ldmain.c (main): Initialize config.maxpagesize_set and
	config.commonpagesize_set to FALSE.

	* emultempl/elf32.em (gld${EMULATION_NAME}_handle_option): Set
	config.maxpagesize_set/config.commonpagesize_set to TRUE when
	config.maxpagesize/config.commonpagesize is set.

Index: ld/emultempl/elf32.em
===================================================================
--- ld/emultempl/elf32.em	(revision 6667)
+++ ld/emultempl/elf32.em	(working copy)
@@ -2178,6 +2178,7 @@ fragment <<EOF
 	  if (*end || (config.maxpagesize & (config.maxpagesize - 1)) != 0)
 	    einfo (_("%P%F: invalid maxium page size \`%s'\n"),
 		   optarg + 14);
+	  config.maxpagesize_set = TRUE;
 	}
       else if (CONST_STRNEQ (optarg, "common-page-size="))
 	{
@@ -2187,6 +2188,7 @@ fragment <<EOF
 	      || (config.commonpagesize & (config.commonpagesize - 1)) != 0)
 	    einfo (_("%P%F: invalid common page size \`%s'\n"),
 		   optarg + 17);
+	  config.commonpagesize_set = TRUE;
 	}
       /* What about the other Solaris -z options? FIXME.  */
       break;
Index: ld/ld.h
===================================================================
--- ld/ld.h	(revision 6665)
+++ ld/ld.h	(working copy)
@@ -280,8 +280,14 @@ typedef struct {
   /* The maximum page size for ELF.  */
   bfd_vma maxpagesize;
 
+  /* The maximum page size for ELF is set.  */
+  bfd_boolean maxpagesize_set;
+
   /* The common page size for ELF.  */
   bfd_vma commonpagesize;
+
+  /* The common page size for ELF is set.  */
+  bfd_boolean commonpagesize_set;
 } ld_config_type;
 
 extern ld_config_type config;
Index: ld/ldmain.c
===================================================================
--- ld/ldmain.c	(revision 6667)
+++ ld/ldmain.c	(working copy)
@@ -281,7 +281,9 @@ main (int argc, char **argv)
   ldemul_choose_mode (emulation);
   default_target = ldemul_choose_target (argc, argv);
   config.maxpagesize = bfd_emul_get_maxpagesize (default_target);
+  config.maxpagesize_set = FALSE;
   config.commonpagesize = bfd_emul_get_commonpagesize (default_target);
+  config.commonpagesize_set = FALSE;
   lang_init ();
   ldemul_before_parse ();
   lang_has_input_file = FALSE;
Index: ld/ldemul.c
===================================================================
--- ld/ldemul.c	(revision 6667)
+++ ld/ldemul.c	(working copy)
@@ -229,8 +229,10 @@ set_output_arch_default (void)
   bfd_set_arch_mach (link_info.output_bfd,
 		     ldfile_output_architecture, ldfile_output_machine);
 
-  bfd_emul_set_maxpagesize (output_target, config.maxpagesize);
-  bfd_emul_set_commonpagesize (output_target, config.commonpagesize);
+  if (config.maxpagesize_set)
+    bfd_emul_set_maxpagesize (output_target, config.maxpagesize);
+  if (config.commonpagesize_set)
+    bfd_emul_set_commonpagesize (output_target, config.commonpagesize);
 }
 
 void