diff --git a/make/depends.properties b/make/depends.properties
index b0ecbc5..17b81d3 100644
--- a/make/depends.properties
+++ b/make/depends.properties
@@ -73,13 +73,13 @@ mx4j.remote.md5=bacb72e0fcad4259825c7cac
yoko.dir=${depends.jars}/yoko-m1
yoko.jar=${yoko.dir}/yoko.jar
-yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-incubating-M1-SNAPSHOT/yoko-spec-corba-1.0-incubating-M1-20060925.152805-4.jar
-yoko.md5=87e62e170dd07cc9c31b9045395f3d10
+yoko.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-spec-corba/1.0-incubating-M1-SNAPSHOT/yoko-spec-corba-1.0-incubating-M1-20060810.145814-1.jar
+yoko.md5=2adc876002af18fe3b34bc5b45e313d3
yoko-rmi.dir=${depends.jars}/yoko-m1
yoko-rmi.jar=${yoko-rmi.dir}/yoko-rmi.jar
-yoko-rmi.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi/1.0-incubating-M1-SNAPSHOT/yoko-rmi-1.0-incubating-M1-20060925.152805-3.jar
-yoko-rmi.md5=7bc4991fba2f3145df362e6214c461e6
+yoko-rmi.url=http://people.apache.org/maven-snapshot-repository/org/apache/yoko/yoko-rmi/1.0-incubating-M1-SNAPSHOT/yoko-rmi-1.0-incubating-M1-20060810.145814-1.jar
+yoko-rmi.md5=6f48fa3d6248945eac04e845fb88addf
# bcel is needed by yoko-rmi
bcel.dir=${depends.jars}/bcel-5.2
diff --git a/make/properties.xml b/make/properties.xml
index 57ecaf6..860eab0 100644
--- a/make/properties.xml
+++ b/make/properties.xml
@@ -112,10 +112,18 @@
+
+
+
+
-
+
+
+
+
+
diff --git a/modules/awt/src/main/native/linuxfont/linux/makefile b/modules/awt/src/main/native/linuxfont/linux/makefile
index 0374185..211e86f 100644
--- a/modules/awt/src/main/native/linuxfont/linux/makefile
+++ b/modules/awt/src/main/native/linuxfont/linux/makefile
@@ -27,8 +27,7 @@ MDLLIBFILES = \
ifeq ($(HY_ARCH),x86_64)
SYSLIBFILES = -L/usr/X11R6/lib64 -lX11 -lXft
-endif
-ifeq ($(HY_ARCH),x86)
+else
SYSLIBFILES = -L/usr/X11R6/lib -lX11 -lXft
endif
diff --git a/modules/awt/src/main/native/x11wrapper/linux/makefile b/modules/awt/src/main/native/x11wrapper/linux/makefile
index 178349f..be30a3a 100644
--- a/modules/awt/src/main/native/x11wrapper/linux/makefile
+++ b/modules/awt/src/main/native/x11wrapper/linux/makefile
@@ -29,8 +29,7 @@ MDLLIBFILES = \
ifeq ($(HY_ARCH),x86_64)
SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib64 -lX11
-endif
-ifeq ($(HY_ARCH),x86)
+else
SYSLIBFILES = -lstdc++ -L/usr/X11R6/lib -lX11
endif
diff --git a/modules/luni/src/main/native/luni/linux/makefile b/modules/luni/src/main/native/luni/linux/makefile
index 5ec954a..d277e69 100644
--- a/modules/luni/src/main/native/luni/linux/makefile
+++ b/modules/luni/src/main/native/luni/linux/makefile
@@ -19,7 +19,8 @@ #
include $(HY_HDK)/build/make/makefile.include
-CFLAGS += -fpic -Wall -Werror
+# CFLAGS += -fpic -Wall -Werror
+CFLAGS += -fpic -Wall
BUILDFILES = \
$(SHAREDSUB)luni_copyright.o $(SHAREDSUB)file.o procimpl.o \
diff --git a/modules/portlib/src/main/native/include/shared/hycomp.h b/modules/portlib/src/main/native/include/shared/hycomp.h
index 4fc3c1b..61fa23a 100644
--- a/modules/portlib/src/main/native/include/shared/hycomp.h
+++ b/modules/portlib/src/main/native/include/shared/hycomp.h
@@ -48,7 +48,7 @@ EXE_EXTENSION_CHAR: the executable has a
#define HY_PLATFORM_DOUBLE_ORDER
#if defined(LINUX)
/* NOTE: Linux supports different processors -- do not assume 386 */
-#if defined(HYX86_64)
+#if defined(HYX86_64) || defined(HYIA64)
#define DATA_TYPES_DEFINED
typedef unsigned long int UDATA; /* 64bits */
typedef unsigned long int U_64;
diff --git a/modules/portlib/src/main/native/port/linux/hysignal.c b/modules/portlib/src/main/native/port/linux/hysignal.c
index 820632a..94bfcb7 100644
--- a/modules/portlib/src/main/native/port/linux/hysignal.c
+++ b/modules/portlib/src/main/native/port/linux/hysignal.c
@@ -24,6 +24,7 @@ #include
#include
#include
#include
+#include
#include
@@ -605,6 +606,10 @@ infoForFPR (struct HyPortLibrary *portLi
"xmm7"
};
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
default:
@@ -623,10 +628,14 @@ infoForGPR (struct HyPortLibrary *portLi
{
*name = "";
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
case HYPORT_SIG_GPR_X86_EDI:
- case HYPORT_SIG_GPR_AMD64_RDI:
+ case HYPORT_SIG_GPR_AMD64_RDI:
case 0:
#ifdef HYX86_64
*name = "RDI";
@@ -636,9 +645,9 @@ #ifdef HYX86
*name = "EDI";
*value = &info->sigContext->edi;
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
case HYPORT_SIG_GPR_X86_ESI:
- case HYPORT_SIG_GPR_AMD64_RSI:
+ case HYPORT_SIG_GPR_AMD64_RSI:
case 1:
#ifdef HYX86
*name = "ESI";
@@ -660,7 +669,7 @@ #ifdef HYX86_64
*name = "RAX";
*value = &info->sigContext->rax;
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
case HYPORT_SIG_GPR_X86_EBX:
case HYPORT_SIG_GPR_AMD64_RBX:
case 3:
@@ -672,7 +681,7 @@ #ifdef HYX86_64
*name = "RBX";
*value = &info->sigContext->rbx;
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
case HYPORT_SIG_GPR_X86_ECX:
case HYPORT_SIG_GPR_AMD64_RCX:
case 4:
@@ -684,7 +693,7 @@ #ifdef HYX86_64
*name = "RCX";
*value = &info->sigContext->rcx;
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
case HYPORT_SIG_GPR_X86_EDX:
case HYPORT_SIG_GPR_AMD64_RDX:
case 5:
@@ -696,7 +705,7 @@ #ifdef HYX86_64
*name = "RDX";
*value = &info->sigContext->rdx;
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
default:
return HYPORT_SIG_VALUE_UNDEFINED;
}
@@ -715,6 +724,10 @@ infoForControl (struct HyPortLibrary *po
*name = "";
U_8 *eip;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
case HYPORT_SIG_CONTROL_PC:
@@ -727,7 +740,7 @@ #ifdef HYX86_64
*name = "RIP";
*value = (void *) &(info->sigContext->rip);
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
#ifdef HYX86
case 1:
*name = "ES";
@@ -750,12 +763,14 @@ #ifdef HYX86_64
#endif
return HYPORT_SIG_VALUE_ADDRESS;
case 4:
+#ifndef HYIA64
*name = "EFlags";
*value = (void *) &(info->sigContext->eflags);
return HYPORT_SIG_VALUE_ADDRESS;
case 5:
*name = "CS";
*value = (void *) &(info->sigContext->cs);
+#endif
return HYPORT_SIG_VALUE_ADDRESS;
#ifdef HYX86
case 6:
@@ -763,7 +778,7 @@ #ifdef HYX86
*value = (void *) &(info->sigContext->ss);
return HYPORT_SIG_VALUE_ADDRESS;
#endif
- case HYPORT_SIG_CONTROL_BP:
+ case HYPORT_SIG_CONTROL_BP:
case 7:
#ifdef HYX86
*name = "EBP";
@@ -773,7 +788,7 @@ #ifdef HYX86_64
*name = "RBP";
*value = &info->sigContext->rbp;
#endif
- return HYPORT_SIG_VALUE_ADDRESS;
+ return HYPORT_SIG_VALUE_ADDRESS;
default:
return HYPORT_SIG_VALUE_UNDEFINED;
}
@@ -792,6 +807,10 @@ infoForModule (struct HyPortLibrary *por
Dl_info *dl_info = &(info->dl_info);
*name = "";
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
#ifdef HYX86
address = (void *) info->sigContext->eip;
int dl_result = dladdr ((void *) info->sigContext->eip, dl_info);
@@ -801,6 +820,10 @@ #ifdef HYX86_64
int dl_result = dladdr ((void *) info->sigContext->rip, dl_info);
#endif
+#ifdef HYIA64
+ int dl_result = 0;
+#endif
+
switch (index)
{
case HYPORT_SIG_MODULE_NAME:
@@ -861,6 +884,10 @@ fillInLinux386SignalInfo (struct HyPortL
struct sigcontext *sigContext;
ucontext_t *uContext;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
uContext = (ucontext_t *) contextInfo;
sigContext = (struct sigcontext *) &uContext->uc_mcontext;
memset (hyinfo, 0, sizeof (*hyinfo));
@@ -977,8 +1004,9 @@ masterSynchSignalHandler (int signal, si
struct HySignalHandlerRecord *thisRecord;
struct HyCurrentSignal currentSignal;
struct HyCurrentSignal *previousSignal;
- hythread_t thisThread = hythread_self ();
+ hythread_t thisThread;
+ thisThread = hythread_self ();
thisRecord = NULL;
/* Trc_PRT_signal_hysignal_masterHandler_Entry(signal, sigInfo, contextInfo); */
@@ -1250,9 +1278,9 @@ #define CDEV_CURRENT_FUNCTION registerMa
* HYPORT_SIG_FLAG_SIGALLSYNC, or HYPORT_SIG_FLAG_SIGALLASYNC
*
*
- * @return 0 upon success; HYPORT_SIG_ERROR otherwise.
- * Possible failure scenarios include attempting to register a handler for
- * a signal that is not included in the allowedSubsetOfFlags
+ * @return 0 upon success; HYPORT_SIG_ERROR otherwise.
+ * Possible failure scenarios include attempting to register a handler for
+ * a signal that is not included in the allowedSubsetOfFlags
*/
static I_32
registerMasterHandlers (HyPortLibrary * portLibrary, U_32 flags,
@@ -1432,7 +1460,6 @@ #define CDEV_CURRENT_FUNCTION hysig_get_
U_32 VMCALL
hysig_get_options (struct HyPortLibrary * portLibrary)
{
-
return signalOptions;
}
diff --git a/modules/text/build.xml b/modules/text/build.xml
index 0b53192..be0c764 100644
--- a/modules/text/build.xml
+++ b/modules/text/build.xml
@@ -49,7 +49,7 @@
-
+