Author: jim Date: 2005-07-03 12:51:31 -0600 (Sun, 03 Jul 2005) New Revision: 1002
Added: trunk/silo/silo-1.4.9-fixes-2.patch Removed: trunk/silo/silo-1.4.9-fixes-1.patch Modified: trunk/ Log: [EMAIL PROTECTED]: jim | 2005-07-03 11:51:15 -0700 Updated silo patch Property changes on: trunk ___________________________________________________________________ Name: svk:merge - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1035 + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1037 Deleted: trunk/silo/silo-1.4.9-fixes-1.patch =================================================================== --- trunk/silo/silo-1.4.9-fixes-1.patch 2005-07-03 09:07:59 UTC (rev 1001) +++ trunk/silo/silo-1.4.9-fixes-1.patch 2005-07-03 18:51:31 UTC (rev 1002) @@ -1,88 +0,0 @@ -Submitted By: Jim Gifford (patches at jg555 dot com) -Date: 2005-07-02 -Initial Package Version: 1.4.9 -Origin: Jbit, mdh, and Jim Gifford -Upstream Status: Sent -Description: Allows Silo to be built under Cross-LFS - -diff -Naur silo-1.4.9.orig/Rules.make silo-1.4.9/Rules.make ---- silo-1.4.9.orig/Rules.make 2005-03-15 16:41:01.000000000 +0000 -+++ silo-1.4.9/Rules.make 2005-07-03 06:54:38.000000000 +0000 -@@ -3,7 +3,8 @@ - RM=rm -f - # We want to force 32-bit builds - CC=gcc -m32 --LD=ld -+BUILD_CC=gcc -+LD=ld -m elf32_sparc - AS=as - STRIP=strip - NM=nm -diff -Naur silo-1.4.9.orig/common/Makefile silo-1.4.9/common/Makefile ---- silo-1.4.9.orig/common/Makefile 2004-06-20 17:16:32.000000000 +0000 -+++ silo-1.4.9/common/Makefile 2005-07-03 06:06:45.000000000 +0000 -@@ -12,12 +12,15 @@ - - OBJS = sdiv.o rem.o udiv.o urem.o jmp.o printf.o console.o prom.o tree.o stringops2.o\ - stringops1.o ffs.o divdi3.o udivdi3.o --PROGRAMS = bin2h - --all: $(OBJS) $(PROGRAMS) -+bin2h: -+ $(BUILD_CC) $(CFLAGS) -o bin2h bin2h.c -+ -+all: $(OBJS) bin2h - - prom.o: prom.c - $(CC) $(CFLAGS) -c -Wa,-Av9 -o prom.o prom.c - - clean: - $(RM) $(PROGRAMS) *.o -+ -diff -Naur silo-1.4.9.orig/first/Makefile silo-1.4.9/first/Makefile ---- silo-1.4.9.orig/first/Makefile 2003-12-04 02:29:23.000000000 +0000 -+++ silo-1.4.9/first/Makefile 2005-07-03 08:42:18.000000000 +0000 -@@ -10,7 +10,7 @@ - # Relocate to 2.5MB. The Hitchhiker's Guide to Open Boot Rev 3 claims - # that 3MB are guaranteed to be mapped. - # Changing this value will require changing a bunch of other constants throughout the code --LDFLAGS=-N -Ttext 0x4000 -+LDFLAGS=-N -Ttext 0x4000 -m elf32_sparc - - .S.o: - $(CC) $(CFLAGS) -c $*.S -diff -Naur silo-1.4.9.orig/first-isofs/Makefile silo-1.4.9/first-isofs/Makefile ---- silo-1.4.9.orig/first-isofs/Makefile 2003-04-14 13:21:41.000000000 +0000 -+++ silo-1.4.9/first-isofs/Makefile 2005-07-03 09:04:41.000000000 +0000 -@@ -4,7 +4,7 @@ - - include ../Rules.make - --LDFLAGS = -N -Ttext 0x4000 -+LDFLAGS = -N -Ttext 0x4000 -m elf32_sparc - - NAME = isofs - -diff -Naur silo-1.4.9.orig/second/Makefile silo-1.4.9/second/Makefile ---- silo-1.4.9.orig/second/Makefile 2004-06-20 17:16:32.000000000 +0000 -+++ silo-1.4.9/second/Makefile 2005-07-03 08:42:02.000000000 +0000 -@@ -23,8 +23,8 @@ - # that 3MB are guaranteed to be mapped. - # - # XXX: We seem to be going 4Megs here for LARGE? -- BenC --LDFLAGS_SMALL=-N -Ttext $(SMALL_RELOC) --LDFLAGS_LARGE=-N -Ttext $(LARGE_RELOC) -+LDFLAGS_SMALL=-N -Ttext $(SMALL_RELOC) -m elf32_sparc -+LDFLAGS_LARGE=-N -Ttext $(LARGE_RELOC) -m elf32_sparc - - .c.o: - $(CC) $(CFLAGS) -c $*.c -o $@ -@@ -85,7 +85,7 @@ - $(CC) $(CFLAGS) -c -o $@ $< - - util: util.c -- $(CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< -+ $(BUILD_CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< - - clean: - $(RM) *.o fs/*.o second* silotftp* util fs/libfs.a Added: trunk/silo/silo-1.4.9-fixes-2.patch =================================================================== --- trunk/silo/silo-1.4.9-fixes-2.patch 2005-07-03 09:07:59 UTC (rev 1001) +++ trunk/silo/silo-1.4.9-fixes-2.patch 2005-07-03 18:51:31 UTC (rev 1002) @@ -0,0 +1,75 @@ +Submitted By: Jim Gifford (patches at jg555 dot com) +Date: 2005-07-03 +Initial Package Version: 1.4.9 +Origin: Jbit, mdh, and Jim Gifford +Upstream Status: Sent +Description: Allows Silo to be built under Cross-LFS + +diff -Naur silo-1.4.9.orig/Rules.make silo-1.4.9/Rules.make +--- silo-1.4.9.orig/Rules.make 2005-03-15 16:41:01.000000000 +0000 ++++ silo-1.4.9/Rules.make 2005-07-03 18:02:16.000000000 +0000 +@@ -2,11 +2,12 @@ + IMGVERSION=0.99 + RM=rm -f + # We want to force 32-bit builds +-CC=gcc -m32 +-LD=ld +-AS=as +-STRIP=strip +-NM=nm ++CC=$(CROSS_COMPILE)gcc -m32 ++BUILD_CC=gcc ++LD=$(CROSS_COMPILE)ld -m elf32_sparc ++AS=$(CROSS_COMPILE)as ++STRIP=$(CROSS_COMPILE)strip ++NM=$(CROSS_COMPILE)nm + ELFTOAOUT=elftoaout + BIN2H=../common/bin2h + +diff -Naur silo-1.4.9.orig/common/Makefile silo-1.4.9/common/Makefile +--- silo-1.4.9.orig/common/Makefile 2004-06-20 17:16:32.000000000 +0000 ++++ silo-1.4.9/common/Makefile 2005-07-03 06:06:45.000000000 +0000 +@@ -12,12 +12,15 @@ + + OBJS = sdiv.o rem.o udiv.o urem.o jmp.o printf.o console.o prom.o tree.o stringops2.o\ + stringops1.o ffs.o divdi3.o udivdi3.o +-PROGRAMS = bin2h + +-all: $(OBJS) $(PROGRAMS) ++bin2h: ++ $(BUILD_CC) $(CFLAGS) -o bin2h bin2h.c ++ ++all: $(OBJS) bin2h + + prom.o: prom.c + $(CC) $(CFLAGS) -c -Wa,-Av9 -o prom.o prom.c + + clean: + $(RM) $(PROGRAMS) *.o ++ +diff -Naur silo-1.4.9.orig/second/Makefile silo-1.4.9/second/Makefile +--- silo-1.4.9.orig/second/Makefile 2004-06-20 17:16:32.000000000 +0000 ++++ silo-1.4.9/second/Makefile 2005-07-03 18:03:52.000000000 +0000 +@@ -3,13 +3,9 @@ + ## + ## + +-AS=as +-AR=ar +-NM=nm + DD=dd + AWK=awk + LS=ls +-STRIP=strip + GZIP=gzip + GDB=gdb + ECHO=echo +@@ -85,7 +81,7 @@ + $(CC) $(CFLAGS) -c -o $@ $< + + util: util.c +- $(CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< ++ $(BUILD_CC) -DSMALL_RELOC=$(SMALL_RELOC) -DLARGE_RELOC=$(LARGE_RELOC) -o $@ $< + + clean: + $(RM) *.o fs/*.o second* silotftp* util fs/libfs.a -- http://linuxfromscratch.org/mailman/listinfo/patches FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page
