<no subject>

[Neale Ferguson]

On 4/6/09 9:14 AM, "Gary Benson" <gbenson at redhat.com> wrote:

> Neale Ferguson wrote:
>> 2. Update Defs-linux.gmk so OPENWIN_LIB points to /usr/lib64 for
>> s390x (like amd64)
> 
> Could you provide a patch for this?
--- openjdk/corba/make/common/Defs-linux.gmk.orig    2009-04-06
09:30:55.000000000 -0400
+++ openjdk/corba/make/common/Defs-linux.gmk    2009-04-03
16:54:34.000000000 -0400
@@ -306,13 +306,17 @@
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 override NO_INTERRUPTIBLE_IO     = true
 override OPENWIN_HOME            = /usr/X11R6
 ifeq ($(ARCH), amd64)
-override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+    override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
 else
-override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
+    ifeq ($(ARCH), s390x)
+        override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+    else
+        override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
+    endif
 endif
 override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
 override SUN_CMM_SUBDIR          =
 override THREADS_FLAG            = native
 override USE_GNU_M4              = true

--- ./openjdk/jdk/make/common/Defs-linux.gmk.orig    2009-04-06
09:32:16.000000000 -0400
+++ ./openjdk/jdk/make/common/Defs-linux.gmk    2009-04-03
16:54:55.000000000 -0400
@@ -316,13 +316,17 @@
 override LIBTHREAD               =
 override MOOT_PRIORITIES         = true
 override NO_INTERRUPTIBLE_IO     = true
 override OPENWIN_HOME            = /usr/X11R6
 ifeq ($(ARCH), amd64)
-override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+    override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
 else
-override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
+    ifeq ($(ARCH), s390x)
+        override OPENWIN_LIB             = $(OPENWIN_HOME)/lib64
+    else
+        override OPENWIN_LIB             = $(OPENWIN_HOME)/lib
+    endif
 endif
 override OTHER_M4FLAGS           = -D__GLIBC__ -DGNU_ASSEMBLER
 override SUN_CMM_SUBDIR          =
 override THREADS_FLAG            = native
 override USE_GNU_M4              = true

>> 3. s390x is a big endian system so contrib/templater/generate.py
>> needs to reflect this [I built before finding this but it didn't
>> appear to hurt things]
> 
> The templater is old code, and not used for Zero builds.
Ok

>> Now for LLVM and Shark...
> 
> LLVM doesn't have JIT support on zSeries, so you won't be able to
> run Shark.
I mean providing LLVM with the necessary support so we can build Shark.
This'll be the 4th or 5th time I've had to do something like this. I did it
for 32-bit and 64-bit System z for the mono project, the 1.2.2 and 1.3
Blackdown JDKs, and did the 1st implementation of libffi for System z many
years ago now.