harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mloe...@apache.org
Subject svn commit: r472434 - in /incubator/harmony/enhanced/classlib/trunk: make/ modules/awt/src/main/native/linuxfont/linux/ modules/awt/src/main/native/x11wrapper/linux/ modules/luni/src/main/native/luni/linux/ modules/portlib/src/main/native/include/share...
Date Wed, 08 Nov 2006 09:17:15 GMT
Author: mloenko
Date: Wed Nov  8 01:17:14 2006
New Revision: 472434

URL: http://svn.apache.org/viewvc?view=rev&rev=472434
Log:
applied newest patch for HARMONY-1989
[classlib] initial port to IPF

Added:
    incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
  (with props)
    incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
  (with props)
Modified:
    incubator/harmony/enhanced/classlib/trunk/make/properties.xml
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
    incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hycomp.h
    incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/hysignal.c
    incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml

Modified: incubator/harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/make/properties.xml Wed Nov  8 01:17:14 2006
@@ -112,10 +112,18 @@
     <condition property="hy.arch.define" value="HYX86_64">
         <equals arg1="${hy.arch}" arg2="x86_64"/>
     </condition>
+    <condition property="hy.arch.define" value="HYIA64">
+        <equals arg1="${hy.arch}" arg2="ia64"/>
+    </condition>
+
     <condition property="hy.cflags" value="-fpic">
         <equals arg1="${hy.arch}" arg2="x86_64"/>
     </condition>
-    <property name="hy.cflags" value="-march=pentium3"/>
+    <condition property="hy.cflags" value="-march=pentium3">
+        <not>
+            <equals arg1="${hy.arch}" arg2="ia64"/>
+        </not>
+    </condition>
     
     <!-- Normalized platform name -->
     <property name="hy.platform" value="${hy.os}.${hy.arch}"/>

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/linuxfont/linux/makefile
Wed Nov  8 01:17:14 2006
@@ -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
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/awt/src/main/native/x11wrapper/linux/makefile
Wed Nov  8 01:17:14 2006
@@ -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
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/native/luni/linux/makefile
Wed Nov  8 01:17:14 2006
@@ -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 \

Modified: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hycomp.h
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hycomp.h?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hycomp.h
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hycomp.h
Wed Nov  8 01:17:14 2006
@@ -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;

Modified: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/hysignal.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/hysignal.c?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/hysignal.c
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/linux/hysignal.c
Wed Nov  8 01:17:14 2006
@@ -24,6 +24,7 @@
 #include <semaphore.h>
 #include <string.h>
 #include <stdlib.h>
+#include <assert.h>
 
 #include <jsig.h>
 
@@ -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:
@@ -860,6 +881,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;

Added: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c?view=auto&rev=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
Wed Nov  8 01:17:14 2006
@@ -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
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrhelp.c
------------------------------------------------------------------------------
    svn:eol-style = native

Added: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c?view=auto&rev=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
(added)
+++ incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
Wed Nov  8 01:17:14 2006
@@ -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
+}

Propchange: incubator/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/thread/linux/ia64/thrspinlock.c
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml?view=diff&rev=472434&r1=472433&r2=472434
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/text/build.xml Wed Nov  8 01:17:14 2006
@@ -50,7 +50,7 @@
         <antcall target="copy-libs" inheritall="true" />
     </target>
 
-    <target name="copy-libs" if="is.x86_64">
+    <target name="copy-libs" if="is.64bit">
         <copy todir="${hy.text.src.main.native}/icu4c/unicode" overwrite="yes">
                 <fileset dir="${depends.libs}" includes="*${shlib.suffix}*" />
         </copy>



Mime
View raw message