Index: depends/libs/linux.ia64/libICUInterface34d.so
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: depends/libs/linux.ia64/libICUInterface34d.so
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Index: depends/libs/linux.ia64/libicuuc.so.34
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: depends/libs/linux.ia64/libicuuc.so.34
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Index: depends/libs/linux.ia64/libicudata.so.34
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: depends/libs/linux.ia64/libicudata.so.34
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Index: depends/libs/linux.ia64/libicui18n.so.34
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: depends/libs/linux.ia64/libicui18n.so.34
___________________________________________________________________
Name: svn:executable
+ *
Name: svn:mime-type
+ application/octet-stream
Index: modules/text/build.xml
===================================================================
--- modules/text/build.xml (revision 467925)
+++ modules/text/build.xml (working copy)
@@ -49,7 +49,7 @@
-
+
Index: modules/awt/src/main/native/linuxfont/linux/makefile
===================================================================
--- modules/awt/src/main/native/linuxfont/linux/makefile (revision 467925)
+++ modules/awt/src/main/native/linuxfont/linux/makefile (working copy)
@@ -27,8 +27,7 @@
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
Index: modules/awt/src/main/native/x11wrapper/linux/makefile
===================================================================
--- modules/awt/src/main/native/x11wrapper/linux/makefile (revision 467925)
+++ modules/awt/src/main/native/x11wrapper/linux/makefile (working copy)
@@ -29,8 +29,7 @@
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
Index: modules/luni/src/main/native/luni/linux/makefile
===================================================================
--- modules/luni/src/main/native/luni/linux/makefile (revision 467925)
+++ modules/luni/src/main/native/luni/linux/makefile (working copy)
@@ -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 \
Index: modules/portlib/src/main/native/include/shared/hycomp.h
===================================================================
--- modules/portlib/src/main/native/include/shared/hycomp.h (revision 467925)
+++ modules/portlib/src/main/native/include/shared/hycomp.h (working copy)
@@ -48,7 +48,7 @@
#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(IA64)
#define DATA_TYPES_DEFINED
typedef unsigned long int UDATA; /* 64bits */
typedef unsigned long int U_64;
Index: modules/portlib/src/main/native/port/linux/hysignal.c
===================================================================
--- modules/portlib/src/main/native/port/linux/hysignal.c (revision 467925)
+++ modules/portlib/src/main/native/port/linux/hysignal.c (working copy)
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
@@ -204,6 +205,10 @@
U_32 supportedFlags =
HYPORT_SIG_FLAG_MAY_RETURN | HYPORT_SIG_FLAG_MAY_CONTINUE_EXECUTION;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
if (0 == (signalOptions & HYPORT_SIG_OPTIONS_REDUCED_SIGNALS))
{
supportedFlags |=
@@ -230,6 +235,10 @@
{
*name = "";
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (category)
{
case HYPORT_SIG_SIGNAL:
@@ -277,6 +286,10 @@
U_32 rc = 0;
U_32 allowHandlers;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
hythread_monitor_enter (masterHandlerMonitor);
if (HYPORT_SIG_OPTIONS_REDUCED_SIGNALS & signalOptions)
{
@@ -353,6 +366,10 @@
HyLinux386AsyncHandlerRecord *cursor;
HyLinux386AsyncHandlerRecord **previousLink;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
hythread_monitor_enter (masterHandlerMonitor);
if (HYPORT_SIG_OPTIONS_REDUCED_SIGNALS & signalOptions)
{
@@ -448,6 +465,10 @@
void VMCALL
hysig_shutdown (struct HyPortLibrary *portLibrary)
{
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
return;
}
@@ -470,6 +491,10 @@
hythread_monitor_t globalMonitor = hythread_global_monitor ();
U_32 index;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
hythread_monitor_enter (globalMonitor);
if (attachedPortLibraries++ == 0)
{
@@ -506,6 +531,10 @@
const char *name;
U_32 count = 0;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
while (portLibrary->
sig_info (portLibrary, info, category, count, &name,
&value) != HYPORT_SIG_VALUE_UNDEFINED)
@@ -527,6 +556,10 @@
{
*name = "";
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
@@ -605,6 +638,10 @@
"xmm7"
};
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
default:
@@ -623,10 +660,14 @@
{
*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 +677,9 @@
*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 +701,7 @@
*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 +713,7 @@
*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 +725,7 @@
*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 +737,7 @@
*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 +756,10 @@
*name = "";
U_8 *eip;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
case HYPORT_SIG_CONTROL_PC:
@@ -727,7 +772,7 @@
*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 +795,14 @@
#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 +810,7 @@
*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 +820,7 @@
*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 +839,10 @@
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 +852,10 @@
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 +916,10 @@
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));
@@ -888,6 +947,10 @@
U_32 result = FALSE;
U_32 asyncSignalFlag = 0;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
/* Trc_PRT_signal_hysignal_asynchSignalReporter_Entry(signal); */
/* Need an exit condition... */
@@ -977,8 +1040,13 @@
struct HySignalHandlerRecord *thisRecord;
struct HyCurrentSignal currentSignal;
struct HyCurrentSignal *previousSignal;
- hythread_t thisThread = hythread_self ();
+ hythread_t thisThread;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
+ thisThread = hythread_self ();
thisRecord = NULL;
/* Trc_PRT_signal_hysignal_masterHandler_Entry(signal, sigInfo, contextInfo); */
@@ -1074,6 +1142,10 @@
U_32 portLibSignalType;
U_32 index = -1;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
portLibSignalType = mapUnixSignalToPortLib (signal, sigInfo);
switch (portLibSignalType)
@@ -1123,6 +1195,10 @@
struct sigaction newAction;
U_32 unixSignalNo;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
unixSignalNo = mapPortLibSignalToUnix (portLibrarySignalNo);
/* do not block any signals */
@@ -1176,6 +1252,10 @@
{
U_32 index;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
for (index = 0; index < sizeof (signalMap) / sizeof (signalMap[0]); index++)
{
if (signalMap[index].unixSignalNo == signalNo)
@@ -1218,6 +1298,10 @@
{
U_32 index;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
/* mask out subtypes */
portLibSignal &=
HYPORT_SIG_FLAG_SIGALLSYNC | HYPORT_SIG_FLAG_SIGQUIT |
@@ -1250,9 +1334,9 @@
* 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,
@@ -1261,6 +1345,10 @@
U_32 flagsSignalsOnly, flagsWithoutHandlers;
linux386_sigaction handler;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
if (allowedSubsetOfFlags == HYPORT_SIG_FLAG_SIGALLSYNC)
{
handler = masterSynchSignalHandler;
@@ -1317,6 +1405,10 @@
initializeSignalTools (HyPortLibrary * portLibrary)
{
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
/* use this to record the end of the list of signal infos */
if (hythread_tls_alloc (&tlsKey))
{
@@ -1388,6 +1480,10 @@
static U_32
destroySignalTools (HyPortLibrary * portLibrary)
{
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
hythread_tls_free (tlsKey);
hythread_monitor_destroy (masterHandlerMonitor);
hythread_monitor_destroy (asyncReporterShutdownMonitor);
@@ -1407,6 +1503,10 @@
hysig_set_options (struct HyPortLibrary * portLibrary, U_32 options)
{
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
if (HYPORT_SIG_OPTIONS_REDUCED_SIGNALS & options)
{
/* check that we haven't already set any master handlers */
@@ -1432,6 +1532,9 @@
U_32 VMCALL
hysig_get_options (struct HyPortLibrary * portLibrary)
{
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
return signalOptions;
@@ -1447,6 +1550,10 @@
hythread_monitor_t globalMonitor = hythread_global_monitor ();
U_32 index;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
hythread_monitor_enter (globalMonitor);
if (--attachedPortLibraries == 0)
{
@@ -1493,6 +1600,10 @@
HyLinux386AsyncHandlerRecord *cursor;
HyLinux386AsyncHandlerRecord **previousLink;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
hythread_monitor_enter (asyncMonitor);
/* wait until no signals are being reported */
@@ -1539,6 +1650,10 @@
HyCurrentSignal *currentSignal =
hythread_tls_get (hythread_self (), tlsKeyCurrentSignal);
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
if (currentSignal != NULL)
{
/* we are shutting down due to a signal, forward it to the application handlers */
Index: modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
===================================================================
--- modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c (revision 0)
+++ modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c (revision 0)
@@ -0,0 +1,22 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "assert.h"
+
+void thrspinlock_foo() {
+ assert(0); // should never be executed
+}
Property changes on: modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
___________________________________________________________________
Name: svn:executable
+ *
Index: modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
===================================================================
--- modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c (revision 0)
+++ modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c (revision 0)
@@ -0,0 +1,40 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "hycomp.h"
+#include "hythread.h"
+#include "assert.h"
+
+HY_CFUNC void VMCALL hythread_monitor_unpin (hythread_monitor_t monitor,
+ hythread_t osThread) {
+ assert(0); // should never be executed
+}
+
+HY_CFUNC void VMCALL hythread_monitor_pin (hythread_monitor_t monitor,
+ hythread_t osThread) {
+ assert(0); // should never be executed
+}
+
+HY_CFUNC IDATA VMCALL hythread_spinlock_acquire (hythread_t self,
+ hythread_monitor_t monitor) {
+ assert(0); // should never be executed
+}
+
+HY_CFUNC UDATA VMCALL hythread_spinlock_swapState (hythread_monitor_t monitor,
+ UDATA newState) {
+ assert(0); // should never be executed
+}
Property changes on: modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
___________________________________________________________________
Name: svn:executable
+ *
Index: make/properties.xml
===================================================================
--- make/properties.xml (revision 467925)
+++ make/properties.xml (working copy)
@@ -112,10 +112,18 @@
+
+
+
+
-
+
+
+
+
+
Index: make/depends.properties
===================================================================
--- make/depends.properties (revision 467925)
+++ make/depends.properties (working copy)
@@ -73,13 +73,13 @@
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