diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-07 13:31:34 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-07 13:31:34 +0000 |
| commit | 8f78d2ac93161dc7602378401f4d520e96fc5cb2 (patch) | |
| tree | 42212a3e689de70cfdfff26a258c8ac0cad00364 /libjava | |
| parent | 0356b3a3150abd70534261dda1ed91d265d5089c (diff) | |
| download | gcc-8f78d2ac93161dc7602378401f4d520e96fc5cb2.tar.gz | |
2011-07-07 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 175963 using svnmerge.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@175972 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/configure.host | 9 |
2 files changed, 15 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index dfaa803c0a1..cac38751080 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,10 @@ +2011-07-07 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + PR target/39150 + * configure.host (x86_64-*): Add -Usun to libgcj_flags. + (x86_64-*-solaris2.1[0-9]*): New case. + (i?86-*-solaris2*): Also accept x86_64-*-solaris2.1[0-9]*. + 2011-06-21 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> PR libgcj/49314 diff --git a/libjava/configure.host b/libjava/configure.host index fab8c603a81..105785e5434 100644 --- a/libjava/configure.host +++ b/libjava/configure.host @@ -141,6 +141,9 @@ case "${host}" in libgcj_flags="${libgcj_flags} -ffloat-store" ;; esac libgcj_flags="${libgcj_flags} -fomit-frame-pointer" + # On Solaris we have defined 'sun' which later conflicts with + # namespace usage. So to work this away we use the below undefine. + libgcj_flags="${libgcj_flags} -Usun" libgcj_cxxflags= libgcj_cflags= DIVIDESPEC=-fno-use-divide-subroutine @@ -285,6 +288,10 @@ EOF sysdeps_dir=i386 DIVIDESPEC=-f%{m32:no-}%{!m32:%{!m64:no-}}%{m64:}use-divide-subroutine ;; + x86_64-*-solaris2.1[0-9]* ) + sysdeps_dir=i386 + DIVIDESPEC=-f%{m32:no-}use-divide-subroutine + ;; mips-sgi-irix6* ) can_unwind_signal=yes sysdeps_dir=mips @@ -322,7 +329,7 @@ EOF DIVIDESPEC=-fuse-divide-subroutine CHECKREFSPEC=-fcheck-references ;; - i?86-*-solaris2*) + i?86-*-solaris2* | x86_64-*-solaris2.1[0-9]*) can_unwind_signal=yes ;; *-*-freebsd*) |