[llvm-commits] [parallel] CVS: llvm/runtime/GCCLibraries/crtend/Makefile crtend.c

[Misha Brukman]

Changes in directory llvm/runtime/GCCLibraries/crtend:

Makefile updated: 1.12 -> 1.12.4.1
crtend.c updated: 1.3 -> 1.3.2.1

---
Log message:

Merge from trunk

---
Diffs of the changes:  (+5 -4)

Index: llvm/runtime/GCCLibraries/crtend/Makefile
diff -u llvm/runtime/GCCLibraries/crtend/Makefile:1.12 llvm/runtime/GCCLibraries/crtend/Makefile:1.12.4.1
--- llvm/runtime/GCCLibraries/crtend/Makefile:1.12	Sun Nov 30 03:22:42 2003
+++ llvm/runtime/GCCLibraries/crtend/Makefile	Mon Mar  1 17:58:45 2004
@@ -31,10 +31,10 @@
 all:: $(CRTEND_A)
 
 # Installation simply requires copying the archive to it's new home.
-$(LLVMGCCDIR)/bytecode-libs/libcrtend.a: $(CRTEND_A)
+$(DESTDIR)$(bytecode_libdir)/libcrtend.a: $(CRTEND_A) $(DESTDIR)$(bytecode_libdir)
 	cp $< $@
 
-install:: $(LLVMGCCDIR)/bytecode-libs/libcrtend.a
+install:: $(DESTDIR)$(bytecode_libdir)/libcrtend.a
 
 
 # The four components described in the README


Index: llvm/runtime/GCCLibraries/crtend/crtend.c
diff -u llvm/runtime/GCCLibraries/crtend/crtend.c:1.3 llvm/runtime/GCCLibraries/crtend/crtend.c:1.3.2.1
--- llvm/runtime/GCCLibraries/crtend/crtend.c:1.3	Fri Dec 19 01:51:46 2003
+++ llvm/runtime/GCCLibraries/crtend/crtend.c	Mon Mar  1 17:58:45 2004
@@ -49,8 +49,9 @@
       abort();  /* Should be able to install ONE atexit handler! */
 
   /* FIXME: This should sort the list by priority! */
-  for (; R->FP; ++R)
-    R->FP();
+  if (R->FP)
+    for (; R->FP; ++R)
+      R->FP();
 }
 
 static void run_destructors(void) {