You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2006/12/06 15:32:25 UTC
svn commit: r483094 - in
/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native:
include/shared/hyport.h port/unix/hysysinfo.c
Author: hindessm
Date: Wed Dec 6 06:32:24 2006
New Revision: 483094
URL: http://svn.apache.org/viewvc?view=rev&rev=483094
Log:
Make CPU arch function more consistent and support more platforms.
Modified:
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyport.h
harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hysysinfo.c
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyport.h
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyport.h?view=diff&rev=483094&r1=483093&r2=483094
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyport.h (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/include/shared/hyport.h Wed Dec 6 06:32:24 2006
@@ -1017,7 +1017,7 @@
#define HYPORT_ARCH_S390 "s390"
#define HYPORT_ARCH_S390X "s390x"
#define HYPORT_ARCH_PARISC "PA-RISC"
-#define HYPORT_ARCH_HAMMER "amd64"
+#define HYPORT_ARCH_X86_64 "amd64"
#define HYPORT_TTY_IN 0
#define HYPORT_TTY_OUT 1
#define HYPORT_TTY_ERR 2
Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hysysinfo.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hysysinfo.c?view=diff&rev=483094&r1=483093&r2=483094
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hysysinfo.c (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/main/native/port/unix/hysysinfo.c Wed Dec 6 06:32:24 2006
@@ -98,14 +98,18 @@
const char *VMCALL
hysysinfo_get_CPU_architecture (struct HyPortLibrary *portLibrary)
{
-#if defined(LINUXPPC)
-#if defined(PPC64)
- return HYPORT_ARCH_PPC64;
-#else
+#if defined(HYPPC32)
return HYPORT_ARCH_PPC;
-#endif
+#elif defined(HYPPC64)
+ return HYPORT_ARCH_PPC64;
+#elif defined(HYS390)
+ return HYPORT_ARCH_S390;
+#elif defined(HYS390X)
+ return HYPORT_ARCH_S390X;
#elif defined(HYX86)
return HYPORT_ARCH_X86;
+#elif defined(HYX86_64)
+ return HYPORT_ARCH_X86_64;
#elif defined(ARMGNU)
return HYPORT_ARCH_ARM;
#else