[prev in list] [next in list] [prev in thread] [next in thread] 

List:       binutils-cvs
Subject:    [binutils-gdb] ld: Set COMMONPAGESIZE for i386 Solaris
From:       "H.J. Lu via Binutils-cvs" <binutils-cvs () sourceware ! org>
Date:       2020-03-28 12:09:58
Message-ID: 20200328120958.A3285385E009 () sourceware ! org
[Download RAW message or body]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=767be9d907ae92a943cec9d2de4f52e077335ba7

commit 767be9d907ae92a943cec9d2de4f52e077335ba7
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Sat Mar 28 05:06:58 2020 -0700

    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:
---
 ld/ChangeLog                   | 7 +++++++
 ld/emulparams/elf_i386_ldso.sh | 1 +
 ld/testsuite/ld-elf/shared.exp | 4 ++--
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 09b01b90251..1227113d00c 100644
--- 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 7ed810e5ac6..081de5f8e71 100644
--- 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 e9f229838f7..b1762aff9be 100644
--- 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" \
[prev in list] [next in list] [prev in thread] [next in thread]