From de490d90c482bd49a218cff13c3c69f81aabc99d Mon Sep 17 00:00:00 2001 From: Ethan Benson Date: Thu, 19 May 2005 04:26:37 +0000 Subject: [PATCH] gcc-3.4 fix * GCC 3.4 compilation fix. (Paul Nasrat) git-archimport-id: erbenson@alaska.net--public/yaboot--devel--1.3--patch-79 --- 0arch-timestamps0 | 240 +++++++++++++++++++++++----------------------- ChangeLog | 13 +++ lib/strstr.c | 3 +- 3 files changed, 135 insertions(+), 121 deletions(-) diff --git a/0arch-timestamps0 b/0arch-timestamps0 index abcf624..b264f19 100644 --- a/0arch-timestamps0 +++ b/0arch-timestamps0 @@ -1,120 +1,120 @@ -./0arch-timestamps0 1107321971 1107321987 -./BUGS 1107321971 1000991730 -./COPYING 1107321971 1000991730 -./ChangeLog 1107321966 1107321962 -./Config 1107321971 1002101497 -./INSTALL 1107321971 1000991730 -./Makefile 1107321503 1089576723 -./README 1107321971 1044766458 -./README.man.patch 1107321971 1000991730 -./THANKS 1107321971 1006350263 -./TODO 1107321971 1044766566 -./changelog 1107321971 1089576078 -./doc/Makefile 1107321978 1019310768 -./doc/README.ofboot 1107321971 1000991730 -./doc/README.ofpath 1107321971 1000991730 -./doc/README.rs6000 1107321971 1007200689 -./doc/examples/README.dualboot.chrp 1107321971 1000991730 -./doc/examples/README.mbicons 1107321971 1000991730 -./doc/examples/README.simpleboot.chrp 1107321971 1000991730 -./doc/examples/dualboot.chrp 1107321971 1068017741 -./doc/examples/large-penguin.mbicon 1107321971 1000991730 -./doc/examples/simpleboot.chrp 1107321971 1068017750 -./doc/examples/yaboot.conf.multi-boot 1107321971 1006348765 -./doc/examples/yaboot.conf.rs6000 1107321971 1006348765 -./doc/examples 1107321966 1068017750 -./doc/yaboot-howto.de.sgml 1107321978 1096186109 -./doc/yaboot-howto.sgml 1107321978 1096186082 -./doc 1107321966 1096186109 -./etc/yaboot.conf 1107321971 1006348765 -./etc 1107321967 1007269243 -./first/ofboot 1107321971 1065311880 -./first 1107321967 1071492158 -./include/asm/elf.h 1107321971 1000991730 -./include/asm/ppc_asm.tmpl 1107321971 1000991730 -./include/asm/processor.h 1107321971 1000991730 -./include/asm 1107321967 1007269243 -./include/bootinfo.h 1107321971 1007200690 -./include/byteorder.h 1107321971 1000991730 -./include/cfg.h 1107321971 1007200690 -./include/cmdline.h 1107321971 1007200690 -./include/ctype.h 1107321971 1003656411 -./include/debug.h 1107321978 1007200690 -./include/errors.h 1107321971 1007200690 -./include/et/com_err.h 1107321971 1000991731 -./include/et 1107321967 1007269243 -./include/ext2fs/bitops.h 1107321972 1003927524 -./include/ext2fs/ext2_err.h 1107321972 1003927524 -./include/ext2fs/ext2_io.h 1107321972 1003927524 -./include/ext2fs/ext2fs.h 1107321972 1003927524 -./include/ext2fs 1107321967 1007269243 -./include/fdisk-part.h 1107321972 1007200690 -./include/file.h 1107321972 1007200690 -./include/fs.h 1107321972 1007200690 -./include/linux/elf.h 1107321973 1000991731 -./include/linux/ext2_fs.h 1107321973 1000991731 -./include/linux/iso_fs.h 1107321973 1000991731 -./include/linux/stat.h 1107321973 1000991731 -./include/linux/types.h 1107321973 1000991731 -./include/linux 1107321967 1007269243 -./include/mac-part.h 1107321973 1007200690 -./include/md5.h 1107321973 1000991730 -./include/partition.h 1107321973 1007200690 -./include/prom.h 1107321974 1007200690 -./include/reiserfs/reiserfs.h 1107321974 1025684115 -./include/reiserfs 1107321967 1025684115 -./include/setjm2.h 1107321974 1000991730 -./include/setjmp.h 1107321974 1000991730 -./include/stdlib.h 1107321974 1000991730 -./include/string.h 1107321974 1002620217 -./include/swab.h 1107321974 1000991730 -./include/types.h 1107321974 1000991730 -./include/xfs/xfs.h 1107321971 1002101334 -./include/xfs 1107321967 1007269244 -./include/yaboot.h 1107321974 1007200690 -./include 1107321967 1007269244 -./lib/ctype.c 1107321974 1000991731 -./lib/libext2fs.a 1107321975 1003927524 -./lib/malloc.c 1107321975 1007200690 -./lib/nosys.c 1107321975 1000991731 -./lib/string.S 1107321975 1007200690 -./lib/strstr.c 1107321975 1000991731 -./lib/strtol.c 1107321975 1000991731 -./lib/vsprintf.c 1107321975 1000991731 -./lib 1107321967 1069320301 -./man/bootstrap.8 1107321975 1000991731 -./man/mkofboot.8 1107321976 1006348765 -./man/ofpath.8 1107321976 1000991731 -./man/yaboot.conf.5 1107321976 1004256691 -./man/yabootconfig.8 1107321976 1027929577 -./man/ybin.8 1107321977 1006348765 -./man/yaboot.8 1107321976 1090699543 -./man 1107321967 1090699543 -./man.patch 1107321977 1006348761 -./second/cache.S 1107321977 1007200690 -./second/cfg.c 1107321977 1007200690 -./second/cmdline.c 1107321977 1032059589 -./second/crt0.S 1107320453 1000991731 -./second/file.c 1107321977 1044868693 -./second/fs.c 1107321977 1032059574 -./second/fs_ext2.c 1107321977 1032059564 -./second/fs_iso.c 1107321977 1007200690 -./second/fs_of.c 1107321977 1089575693 -./second/fs_reiserfs.c 1107321977 1007200690 -./second/fs_xfs.c 1107321971 1032059541 -./second/iso_util.c 1107321977 1003656415 -./second/md5.c 1107321977 1032059532 -./second/partition.c 1107321977 1032059525 -./second/prom.c 1107321977 1067937197 -./second/setjmp.S 1107321977 1000991732 -./second/yaboot.c 1107321977 1032059504 -./second 1107320452 1089575693 -./util/elfextract.c 1107321977 1007303237 -./util/addnote.c 1107321977 1107321884 -./util 1107321967 1107321884 -./ybin/mkofboot 1107321967 1073219938 -./ybin/ofpath 1107321977 1089576762 -./ybin/ybin 1107321978 1089576732 -./ybin/yabootconfig 1107321978 1089576743 -./ybin 1107321967 1089576762 -. 1107321968 1107321967 +./0arch-timestamps0 1109049412 1116476790 +./BUGS 1109049412 1000991730 +./COPYING 1109049412 1000991730 +./ChangeLog 1116476729 1116476779 +./Config 1109049412 1002101497 +./INSTALL 1109049412 1000991730 +./Makefile 1109049412 1089576723 +./README 1109049412 1044766458 +./README.man.patch 1109049412 1000991730 +./THANKS 1109049412 1006350263 +./TODO 1109049412 1044766566 +./changelog 1109049412 1089576078 +./doc/Makefile 1109049412 1019310768 +./doc/README.ofboot 1109049412 1000991730 +./doc/README.ofpath 1109049412 1000991730 +./doc/README.rs6000 1109049412 1007200689 +./doc/examples/README.dualboot.chrp 1109049412 1000991730 +./doc/examples/README.mbicons 1109049412 1000991730 +./doc/examples/README.simpleboot.chrp 1109049412 1000991730 +./doc/examples/dualboot.chrp 1109049412 1068017741 +./doc/examples/large-penguin.mbicon 1109049412 1000991730 +./doc/examples/simpleboot.chrp 1109049412 1068017750 +./doc/examples/yaboot.conf.multi-boot 1109049412 1006348765 +./doc/examples/yaboot.conf.rs6000 1109049412 1006348765 +./doc/examples 1116476789 1068017750 +./doc/yaboot-howto.de.sgml 1109049413 1096186109 +./doc/yaboot-howto.sgml 1109049413 1096186082 +./doc 1116476789 1096186109 +./etc/yaboot.conf 1109049413 1006348765 +./etc 1116476789 1007269243 +./first/ofboot 1109049413 1065311880 +./first 1116476789 1071492158 +./include/asm/elf.h 1109049413 1000991730 +./include/asm/ppc_asm.tmpl 1109049413 1000991730 +./include/asm/processor.h 1109049413 1000991730 +./include/asm 1116476789 1007269243 +./include/bootinfo.h 1109049413 1007200690 +./include/byteorder.h 1109049413 1000991730 +./include/cfg.h 1109049413 1007200690 +./include/cmdline.h 1109049413 1007200690 +./include/ctype.h 1109049413 1003656411 +./include/debug.h 1109049413 1007200690 +./include/errors.h 1109049413 1007200690 +./include/et/com_err.h 1109049413 1000991731 +./include/et 1116476790 1007269243 +./include/ext2fs/bitops.h 1109049413 1003927524 +./include/ext2fs/ext2_err.h 1109049413 1003927524 +./include/ext2fs/ext2_io.h 1109049413 1003927524 +./include/ext2fs/ext2fs.h 1109049413 1003927524 +./include/ext2fs 1116476790 1007269243 +./include/fdisk-part.h 1109049413 1007200690 +./include/file.h 1109049413 1007200690 +./include/fs.h 1109049413 1007200690 +./include/linux/elf.h 1109049413 1000991731 +./include/linux/ext2_fs.h 1109049413 1000991731 +./include/linux/iso_fs.h 1109049413 1000991731 +./include/linux/stat.h 1109049413 1000991731 +./include/linux/types.h 1109049413 1000991731 +./include/linux 1116476790 1007269243 +./include/mac-part.h 1109049413 1007200690 +./include/md5.h 1109049413 1000991730 +./include/partition.h 1109049413 1007200690 +./include/prom.h 1109049413 1007200690 +./include/reiserfs/reiserfs.h 1109049413 1025684115 +./include/reiserfs 1116476790 1025684115 +./include/setjm2.h 1109049413 1000991730 +./include/setjmp.h 1109049413 1000991730 +./include/stdlib.h 1109049413 1000991730 +./include/string.h 1109049413 1002620217 +./include/swab.h 1109049413 1000991730 +./include/types.h 1109049413 1000991730 +./include/xfs/xfs.h 1109049413 1002101334 +./include/xfs 1116476790 1007269244 +./include/yaboot.h 1109049413 1007200690 +./include 1116476789 1007269244 +./lib/ctype.c 1109049413 1000991731 +./lib/libext2fs.a 1109049413 1003927524 +./lib/malloc.c 1109049413 1007200690 +./lib/nosys.c 1109049413 1000991731 +./lib/string.S 1109049413 1007200690 +./lib/strtol.c 1109049413 1000991731 +./lib/vsprintf.c 1109049413 1000991731 +./lib/strstr.c 1116476589 1116476589 +./lib 1116476790 1116476589 +./man/bootstrap.8 1109049413 1000991731 +./man/mkofboot.8 1109049413 1006348765 +./man/ofpath.8 1109049413 1000991731 +./man/yaboot.conf.5 1109049413 1004256691 +./man/yabootconfig.8 1109049413 1027929577 +./man/ybin.8 1109049413 1006348765 +./man/yaboot.8 1116476644 1090699543 +./man 1116476680 1116476667 +./man.patch 1109049413 1006348761 +./second/cache.S 1109049413 1007200690 +./second/cfg.c 1109049413 1007200690 +./second/cmdline.c 1109049413 1032059589 +./second/crt0.S 1109049413 1000991731 +./second/file.c 1109049413 1044868693 +./second/fs.c 1109049413 1032059574 +./second/fs_ext2.c 1109049413 1032059564 +./second/fs_iso.c 1109049413 1007200690 +./second/fs_of.c 1109049413 1089575693 +./second/fs_reiserfs.c 1109049413 1007200690 +./second/fs_xfs.c 1109049413 1032059541 +./second/iso_util.c 1109049413 1003656415 +./second/md5.c 1109049413 1032059532 +./second/partition.c 1109049413 1032059525 +./second/prom.c 1109049413 1067937197 +./second/setjmp.S 1109049413 1000991732 +./second/yaboot.c 1113696387 1032059504 +./second 1116476790 1089575693 +./util/elfextract.c 1109049413 1007303237 +./util/addnote.c 1109049413 1107321884 +./util 1116476790 1107321884 +./ybin/mkofboot 1116476790 1073219938 +./ybin/ofpath 1109049414 1089576762 +./ybin/ybin 1109049414 1089576732 +./ybin/yabootconfig 1109049414 1089576743 +./ybin 1116476790 1089576762 +. 1116476789 1116476779 diff --git a/ChangeLog b/ChangeLog index d28c86a..97531dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,19 @@ # arch-tag: automatic-ChangeLog--erbenson@alaska.net--public/yaboot--devel--1.3 # +2005-05-19 04:26:37 GMT Ethan Benson patch-79 + + Summary: + gcc-3.4 fix + Revision: + yaboot--devel--1.3--patch-79 + + * GCC 3.4 compilation fix. (Paul Nasrat) + + modified files: + 0arch-timestamps0 ChangeLog lib/strstr.c + + 2005-02-02 05:26:31 GMT Ethan Benson patch-78 Summary: diff --git a/lib/strstr.c b/lib/strstr.c index fbe7cfb..e31e20d 100644 --- a/lib/strstr.c +++ b/lib/strstr.c @@ -76,7 +76,8 @@ strstr (phaystack, pneedle) a = *++haystack; if (a == '\0') goto ret0; -shloop: } +shloop: ; + } while (a != b); jin: a = *++haystack; -- 2.39.2