diff options
| author | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-28 15:01:42 +0000 |
|---|---|---|
| committer | dnovillo <dnovillo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-10-28 15:01:42 +0000 |
| commit | ac3506085d39a22c452d6b6a65263aa03f1e66b9 (patch) | |
| tree | 91a4e1dbdedca3bdb0a6b828162323fd33b00276 /libobjc | |
| parent | 4505280bc7fc957db091370d17998fbbe9540e2b (diff) | |
Mainline merge as of 2003-10-26.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/tree-ssa-20020619-branch@73009 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 16 | ||||
| -rw-r--r-- | libobjc/Makefile.in | 14 | ||||
| -rw-r--r-- | libobjc/objc/hash.h | 6 |
3 files changed, 22 insertions, 14 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b7226be1c69..3032e7a40dd 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,19 @@ +2003-10-24 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * Makefile.in (runtime-info.h): Remove -Wp. + +2003-10-21 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> + + * Makefile.in (CC1OBJ): Remove. + (runtime-info.h): Invoke $(CC) so all MULTIFLAGS are handled + correctly. + Use .m extension for temporary file. + Remove assembler temp file. + +2003-10-20 Joseph S. Myers <jsm@polyomino.org.uk> + + * objc/hash.h (hash_string): Don't use a cast as an lvalue. + 2003-10-17 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE> * Makefile.in (runtime-info.h): Use MULTIFLAGS. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 85894698222..1e6c337a6e0 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -88,14 +88,6 @@ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install LIBTOOL_CLEAN = $(LIBTOOL) --mode=clean #LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall -# -# Define the cc1obj in terms of the CC that is passed on from higher -# level make. This is needed to make sure we can create runtime-info.h -# when doing canadian cross builds where running ../../gcc/cc1obj -# does not make any sense. -# -CC1OBJ = `$(CC) -print-prog-name=cc1obj` - INCLUDES = -I$(srcdir)/objc -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config -I$(MULTIBUILDTOP)../../gcc \ -I$(srcdir)/$(MULTISRCTOP)../include @@ -161,10 +153,10 @@ OBJS_GC = archive_gc.lo class_gc.lo encoding_gc.lo gc_gc.lo hash_gc.lo \ $(OBJC_THREAD_FILE)_gc.lo runtime-info.h: - echo "" > tmp-runtime + echo "" > tmp-runtime.m echo "/* This file is automatically generated */" > $@ - $(CC1OBJ) $(MULTIFLAGS) -print-objc-runtime-info tmp-runtime >> $@ - rm -f tmp-runtime + $(CC) $(MULTIFLAGS) -print-objc-runtime-info -S tmp-runtime.m >> $@ + rm -f tmp-runtime.m tmp-runtime.s archive_gc.lo: archive.c $(LIBTOOL_COMPILE) $(CC) -c -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \ diff --git a/libobjc/objc/hash.h b/libobjc/objc/hash.h index acb6c9979d4..02aca6e8765 100644 --- a/libobjc/objc/hash.h +++ b/libobjc/objc/hash.h @@ -172,10 +172,10 @@ hash_string (cache_ptr cache, const void *key) { unsigned int ret = 0; unsigned int ctr = 0; + const char *ckey = key; - - while (*(const char *) key) { - ret ^= *((const char *) key)++ << ctr; + while (*ckey) { + ret ^= *ckey++ << ctr; ctr = (ctr + 1) % sizeof (void *); } |