ld: Set COMMONPAGESIZE for i386 Solaris

Since COMMONPAGESIZE is set for other Solaris targets, including x86-64
Solaris, also set COMMONPAGESIZE for i386 Solaris to fix

FAIL: Build pr20995-2.so
FAIL: pr20995-2

	PR 25732
	* emulparams/elf_i386_ldso.sh (COMMONPAGESIZE): New.
	* testsuite/ld-elf/shared.exp:Don't xfail pr20995-2 tests for
	Solaris.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 09b01b902516947b9a31cec5e066866e06136d24..1227113d00c06214d7a7264027111e0b80de7da3 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2020-03-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR 25732
+       * emulparams/elf_i386_ldso.sh (COMMONPAGESIZE): New.
+       * testsuite/ld-elf/shared.exp:Don't xfail pr20995-2 tests for
+       Solaris.
+
 2020-03-27  H.J. Lu  <hongjiu.lu@intel.com>
 
        PR 25732

diff --git a/ld/emulparams/elf_i386_ldso.sh b/ld/emulparams/elf_i386_ldso.sh
index 7ed810e5ac6e8cd37ff0bac6209a0353fc10f10f..081de5f8e71f3c9f7ffb228b875789aebadd7de3 100644 (file)
--- a/ld/emulparams/elf_i386_ldso.sh
+++ b/ld/emulparams/elf_i386_ldso.sh
@@ -8,6 +8,7 @@ EXTRA_EM_FILE="elf-x86"
 NO_RELA_RELOCS=yes
 TEXT_START_ADDR=0x08048000
 MAXPAGESIZE="CONSTANT (MAXPAGESIZE)"
+COMMONPAGESIZE="CONSTANT (COMMONPAGESIZE)"
 ARCH=i386
 MACHINE=
 TEMPLATE_NAME=elf

diff --git a/ld/testsuite/ld-elf/shared.exp b/ld/testsuite/ld-elf/shared.exp
index e9f229838f7a5d02005c156ddc77521fad128dae..b1762aff9be16b94503676e4bdc5bc2a20199ce4 100644 (file)
--- a/ld/testsuite/ld-elf/shared.exp
+++ b/ld/testsuite/ld-elf/shared.exp
@@ -465,7 +465,7 @@ run_ld_link_tests [list \
        "-shared -z relro" "" "$AFLAGS_PIC" \
        {pr20995c.s} {{readelf {-l --wide} pr20995-2so.r}} "pr20995-2.so"] \
 ] "tic6x-*-*" "arm*-*-eabi*" "hppa*64*-*-hpux*" "aarch64*-*-elf*" \
-  "*-*-lynxos*" "arm*-*-nto*" "i?86-*-nto*" "sh*-*-nto*" "*-*-solaris*"
+  "*-*-lynxos*" "arm*-*-nto*" "i?86-*-nto*" "sh*-*-nto*"
 
 # These targets don't copy dynamic variables into .bss.
 setup_xfail "alpha-*-*" "bfin-*-*" "ia64-*-*" "xtensa-*-*"
@@ -486,7 +486,7 @@ run_ld_link_tests [list \
        "pr20995-2" \
        "$LFLAGS" "tmpdir/pr20995-2.so" "$AFLAGS_NONPIC" \
        {pr20995a.s} {{readelf {-S --wide} pr20995.r}} "pr20995-2"]
-] "*-*-lynxos*" "arm*-*-nto*" "i?86-*-nto*" "sh*-*-nto*" "*-*-solaris*"
+] "*-*-lynxos*" "arm*-*-nto*" "i?86-*-nto*" "sh*-*-nto*"
 
 run_ld_link_tests [list \
     [list "Build pr22374 shared library" \