summaryrefslogtreecommitdiff
path: root/libjava
diff options
context:
space:
mode:
authorro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2007-07-02 14:48:28 +0000
committerro <ro@138bc75d-0d04-0410-961f-82ee72b054a4>2007-07-02 14:48:28 +0000
commit35ab36626c11fcbbcaee742f279cde163d681ae3 (patch)
tree5f26e56ec5fe9a7cf3b5e28240bfec5f37d08e91 /libjava
parentb131297d8eaf229d8fc1d1c4b149663ba805b9a2 (diff)
downloadgcc-35ab36626c11fcbbcaee742f279cde163d681ae3.tar.gz
PR libgcj/30513
* configure.host (i[3-6]86-*): Undef sun. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@126210 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/configure.host3
2 files changed, 8 insertions, 0 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 00e67ec1ae5..a7850682f5a 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-02 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
+
+ PR libgcj/30513
+ * configure.host (i[3-6]86-*): Undef sun.
+
2007-06-28 H.J. Lu <hongjiu.lu@intel.com>
* testsuite/libjava.jvmti/jvmti-interp.exp (gij_jvmti_test_one):
diff --git a/libjava/configure.host b/libjava/configure.host
index edaa679b44e..cb076528e74 100644
--- a/libjava/configure.host
+++ b/libjava/configure.host
@@ -101,6 +101,9 @@ case "${host}" in
# the .text section of libgcj.so is 30k larger, and the .eh_frame
# section is 1.4M smaller.
libgcj_flags="${libgcj_flags} -ffloat-store -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_interpreter=yes
libgcj_cxxflags=
libgcj_cflags=