merge ia64 changes to HEAD

7 files changed, 25 insertions, 8 deletions

diff --git a/loader/Makefile b/loader/Makefile
index d74723dc6..7cdcf9bce 100644
--- a/loader/Makefile
+++ b/loader/Makefile
@@ -28,12 +28,17 @@ MODULELINKAGE :=-lmodutils -lmodutilutil -lmodutilobj
 
 COPTS = $(DEBUG) -Wall -DVERSION='"$(VERSION)"' 
 
-CFLAGS = $(COPTS) $(OPTS) -ffunction-sections -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I/usr/include/kudzu -I/usr/include/rpm -I.. -DHAVE_LIBIO_H -DPRODUCTNAME='$(PRODUCTNAME)' -DGZLIB=1
+CFLAGS = $(COPTS) $(OPTS) -ffunction-sections -D_GNU_SOURCE=1 -D_FILE_OFFSET_BITS=64 -I/usr/include/kudzu -I/usr/include/rpm -I.. -I../isys -DHAVE_LIBIO_H -DPRODUCTNAME='$(PRODUCTNAME)'
+
+# XXX diet is i386 only at the moment
+ifeq (i386, $(ARCH))
+CFLAGS += -DGZLIB=1
+endif
 
 ALLOBJS = $(OBJS) $(PCMCIAOBJS)
 
 ISYS = ../isys/libisys.a
-GUNZIP = ../isys/gzlib/libgunzip.a
+GUNZIP = -lz
 LOADERLIBS = -lpci
 
 # XXX Japanese is i386 only at the moment
@@ -95,6 +100,7 @@ REALCC=gcc
 CC=$(DIET) $(REALCC)
 STATIC=-static
 else
+REALCC=$(CC)
 ifeq (sparc, $(ARCH))
 MINILIBC=minilibc.o /usr/lib/libc.a
 CFLAGS+=-DUSE_MINILIBC=1 -DUSE_LOGDEV
@@ -148,13 +154,13 @@ loader: loader.o $(OBJS) $(NETOBJS)
 	$(CC) -g $(STATIC) -o $@ $^ -lpopt     \
 	-lkudzu_loader $(ISYS) ../balkan/libbalkan.a \
 	$(MODULELINKAGE) $(GUNZIP) \
-	-lpump -lz $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS)
+	-lpump $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS)
 
 loader-local: loader-local.o $(OBJS)
 	$(CC) -g $(STATIC) -o $@ $^ -lpopt     \
 	-lkudzu_loader $(ISYS) ../balkan/libbalkan.a \
 	$(MODULELINKAGE) $(GUNZIP) \
-        -L ../stubs -lz $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS)
+        -L ../stubs $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS)
 
 loader-network: loader-net.o $(OBJS) $(NETOBJS)
 	$(CC) -g $(STATIC) -o $@ $^ -lpopt     \
@@ -168,7 +174,7 @@ loader-pcmcia: loader-pcmcia.o pcmcia.o popen.o $(OBJS) $(PCMCIAOBJS)
         -lpopt     \
         -lkudzu_loader $(ISYS) ../balkan/libbalkan.a \
 	$(MODULELINKAGE) $(GUNZIP) \
-        -lpump -lz -lresolv $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS)
+        -lpump -lresolv $(NEWTLIB) $(SLANGLIB) $(LOADERLIBS) $(KONOBJS)
 
 loader.o: loader.c
 	$(CC) -DINCLUDE_LOCAL -DINCLUDE_NETWORK $(CFLAGS) -o $@ -c $<
diff --git a/loader/lang.c b/loader/lang.c
index 98d6ed189..1c979d6d0 100644
--- a/loader/lang.c
+++ b/loader/lang.c
@@ -21,7 +21,7 @@
 #include "log.h"
 #include "misc.h"
 #include "windows.h"
-#include "isys/gzlib/gzlib.h"
+#include "stubs.h"
 #include "kickstart.h"
 
 #define errorWindow(String) \
diff --git a/loader/loader.c b/loader/loader.c
index f66eea9ce..8c796ca30 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -65,7 +65,7 @@
 #include "isys/imount.h"
 #include "isys/isys.h"
 #include "isys/probe.h"
-#include "isys/gzlib/gzlib.h"
+#include "stubs.h"
 
 #include "cdrom.h"
 #include "devices.h"
@@ -144,9 +144,11 @@ static struct installMethod installMethods[] = {
     { "FTP", 1, CLASS_NETWORK, mountUrlImage },
     { "HTTP", 1, CLASS_NETWORK, mountUrlImage },
 #endif
+#if !defined(__ia64__)
 #if defined(INCLUDE_LOCAL)
     { N_("Hard drive"), 0, CLASS_HD, mountHardDrive },
 #endif
+#endif
 };
 static int numMethods = sizeof(installMethods) / sizeof(struct installMethod);
 
@@ -1976,7 +1978,7 @@ static char * doMountImage(char * location,
 
 #if defined(__alpha__) || defined(__ia64__) \
     || defined(__s390__ ) || defined(__s390x__)
-    for (i = ; i < numMethods; i++) {
+    for (i = 0; i < numMethods; i++) {
 	installNames[numValidMethods] = _(installMethods[i].name);
 	validMethods[numValidMethods++] = i;
     }
diff --git a/loader/loader.h b/loader/loader.h
index 88836603d..aa97da452 100644
--- a/loader/loader.h
+++ b/loader/loader.h
@@ -1,3 +1,5 @@
+#include "stubs.h"
+
 #define LOADER_OK 0
 #define LOADER_BACK 1
 #define LOADER_NOOP 2
diff --git a/loader/md5.c b/loader/md5.c
index fe032ebba..559298b6c 100644
--- a/loader/md5.c
+++ b/loader/md5.c
@@ -43,6 +43,8 @@ static void byteReverse(unsigned char *buf, unsigned longs)
 #endif
 #endif
 
+void MD5_Transform(uint32 buf[4], uint32 const in[16]);
+
 /*
  * Start MD5 accumulation.  Set bit count to 0 and buffer to mysterious
  * initialization constants.
diff --git a/loader/module-info b/loader/module-info
index 2e70167c1..a2f7b9a29 100644
--- a/loader/module-info
+++ b/loader/module-info
@@ -750,6 +750,10 @@ sym53c8xx
 	scsi_hostadapter
 	"Symbios 53C896"
 
+sym53c8xx_2
+	scsi_hostadapter
+	"Alternate Symbios 53C896 Driver"
+
 tmscsim
 	scsi_hostadapter
 	"Tekram DC-390(T) PCI"
diff --git a/loader/modules.c b/loader/modules.c
index acd1b811e..ccacfe574 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -24,6 +24,7 @@
 #include "moduledeps.h"
 #include "devices.h"
 #include "windows.h"
+#include "stubs.h"
 
 static int ethCount(void);
 static int scsiCount(void);