summaryrefslogtreecommitdiffstats
path: root/libjava
diff options
context:
space:
mode:
authorandreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>2008-12-02 18:04:30 +0000
committerandreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>2008-12-02 18:04:30 +0000
commit2fac06593e567d1ae16cb20e5d32a94dd1f3840c (patch)
tree7aabfc552f60a2782bc7c0ac1e44945d40faa726 /libjava
parent64df1ecf72565c689bfbf5d18a2392239756102f (diff)
downloadppe42-gcc-2fac06593e567d1ae16cb20e5d32a94dd1f3840c.tar.gz
ppe42-gcc-2fac06593e567d1ae16cb20e5d32a94dd1f3840c.zip
2008-12-02 Jack Howarth <howarth@bromo.med.uc.edu>
* configure.ac: Expand to darwin10 and later. * configure: Regenerate. * testsuite/lib/libjava.exp: Expand to darwin10 and later. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142369 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava')
-rw-r--r--libjava/ChangeLog6
-rwxr-xr-xlibjava/configure2
-rw-r--r--libjava/configure.ac2
-rw-r--r--libjava/testsuite/lib/libjava.exp2
4 files changed, 9 insertions, 3 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index e6ec30e843e..9cc0907b1b7 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-02 Jack Howarth <howarth@bromo.med.uc.edu>
+
+ * configure.ac: Expand to darwin10 and later.
+ * configure: Regenerate.
+ * testsuite/lib/libjava.exp: Expand to darwin10 and later.
+
2008-11-12 Steve Ellcey <sje@cup.hp.com>
* configure: Regenerate to get new GCC_CHECK_UNWIND_GETIPINFO.
diff --git a/libjava/configure b/libjava/configure
index ecaa36ce046..42803833083 100755
--- a/libjava/configure
+++ b/libjava/configure
@@ -20608,7 +20608,7 @@ case "${host}" in
# on Darwin -single_module speeds up loading of the dynamic libraries.
extra_ldflags_libjava=-Wl,-single_module
;;
-*-*-darwin[9]*)
+*-*-darwin912*)
extra_gij_ldflags=-Wl,-allow_stack_execute
;;
arm*linux*eabi)
diff --git a/libjava/configure.ac b/libjava/configure.ac
index ade98b9c976..6c7abb40666 100644
--- a/libjava/configure.ac
+++ b/libjava/configure.ac
@@ -867,7 +867,7 @@ case "${host}" in
# on Darwin -single_module speeds up loading of the dynamic libraries.
extra_ldflags_libjava=-Wl,-single_module
;;
-*-*-darwin[[9]]*)
+*-*-darwin[912]*)
extra_gij_ldflags=-Wl,-allow_stack_execute
;;
arm*linux*eabi)
diff --git a/libjava/testsuite/lib/libjava.exp b/libjava/testsuite/lib/libjava.exp
index 332c07270c8..a31c2bc63d3 100644
--- a/libjava/testsuite/lib/libjava.exp
+++ b/libjava/testsuite/lib/libjava.exp
@@ -430,7 +430,7 @@ proc libjava_arguments {{mode compile}} {
lappend args "additional_flags=-bind_at_load"
lappend args "additional_flags=-multiply_defined suppress"
}
- if { [istarget "*-*-darwin9*"] } {
+ if { [istarget "*-*-darwin9*"] || [istarget "*-*-darwin1*"] || [istarget "*-*-darwin2*"] } {
lappend args "additional_flags=-Wl,-allow_stack_execute"
}
OpenPOWER on IntegriCloud