summaryrefslogtreecommitdiff
path: root/libjava/classpath
diff options
context:
space:
mode:
authordje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>2008-10-24 02:44:26 +0000
committerdje <dje@138bc75d-0d04-0410-961f-82ee72b054a4>2008-10-24 02:44:26 +0000
commitf00ad21f9735625bdafd29c11bc6db0491d8fe2a (patch)
treecdff866a281ed7a6ebc131100612f4a22c136c64 /libjava/classpath
parentd8ff58268091282d724fa7735ad02b0b33b78f47 (diff)
downloadgcc-f00ad21f9735625bdafd29c11bc6db0491d8fe2a.tar.gz
PR target/35485
* configure.ac: AIX threads are Posix threads. Set signal handler to aix-signal.h * configure: Regenerate. * classpath/native/fdlibm/fdlibm.h: Undef hz. * include/aix-signal.h: New file. * sysdep/powerpc/locks.h: Avoid GNU Assembler syntax. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@141335 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath')
-rw-r--r--libjava/classpath/native/fdlibm/fdlibm.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/libjava/classpath/native/fdlibm/fdlibm.h b/libjava/classpath/native/fdlibm/fdlibm.h
index 112504e4cc4..fc10ecc9ce4 100644
--- a/libjava/classpath/native/fdlibm/fdlibm.h
+++ b/libjava/classpath/native/fdlibm/fdlibm.h
@@ -24,6 +24,14 @@
#include <config.h>
#include <stdlib.h>
+/*
+ * AIX includes a header that defines hz,
+ * which conflicts with an fdlibm variable in some functions.
+ */
+#ifdef _AIX
+#undef hz
+#endif
+
/* GCJ LOCAL: Include files. */
#include "ieeefp.h"
/* CLASSPATH LOCAL: */