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 470861)
+++ modules/text/build.xml (working copy)
@@ -50,7 +50,7 @@
-
+
Index: modules/awt/src/main/native/linuxfont/linux/makefile
===================================================================
--- modules/awt/src/main/native/linuxfont/linux/makefile (revision 470861)
+++ 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 470861)
+++ 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 470861)
+++ 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 470861)
+++ 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(HYIA64)
#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 470861)
+++ modules/portlib/src/main/native/port/linux/hysignal.c (working copy)
@@ -24,6 +24,7 @@
#include
#include
#include
+#include
#include
@@ -605,6 +606,10 @@
"xmm7"
};
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
default:
@@ -623,6 +628,10 @@
{
*name = "";
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
case HYPORT_SIG_GPR_X86_EDI:
@@ -715,6 +724,10 @@
*name = "";
U_8 *eip;
+#ifdef HYIA64
+ assert(0); // should never be here
+#endif
+
switch (index)
{
case HYPORT_SIG_CONTROL_PC:
@@ -750,12 +763,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:
@@ -792,6 +807,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);
@@ -800,7 +819,9 @@
address = (void *) info->sigContext->rip;
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 +882,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));
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
+}
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
+}
Index: make/properties.xml
===================================================================
--- make/properties.xml (revision 470861)
+++ make/properties.xml (working copy)
@@ -112,10 +112,18 @@
+
+
+
+
-
+
+
+
+
+