[llvm-commits] [llvm-gcc-4.2] r41766 - in /llvm-gcc-4.2/trunk/gcc/ada: Makefile.in raise-gcc.c

[Duncan Sands]

Author: baldrick
Date: Fri Sep  7 07:14:39 2007
New Revision: 41766

URL: http://llvm.org/viewvc/llvm-project?rev=41766&view=rev
Log:
Revert r40096.  It turns out that raise-gcc does use
tm.h after all, for checking whether EH_RETURN_DATA_REGNO
is defined.  Instead, work around the Apple changes to
options.h by defining IN_TARGET_LIBS when compiling the
Ada runtime.

Modified:
    llvm-gcc-4.2/trunk/gcc/ada/Makefile.in
    llvm-gcc-4.2/trunk/gcc/ada/raise-gcc.c

Modified: llvm-gcc-4.2/trunk/gcc/ada/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ada/Makefile.in?rev=41766&r1=41765&r2=41766&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ada/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/ada/Makefile.in Fri Sep  7 07:14:39 2007
@@ -123,8 +123,10 @@
 FORCE_DEBUG_ADAFLAGS = -g
 GNATLIBFLAGS = -gnatpg -nostdinc
 GNATLIBCFLAGS = -g -O2
+# LLVM local begin
 GNATLIBCFLAGS_FOR_C = $(GNATLIBCFLAGS) $(TARGET_LIBGCC2_CFLAGS) -fexceptions \
-	-DIN_RTS
+	-DIN_RTS -DIN_TARGET_LIBS
+# LLVM local end
 ALL_ADA_CFLAGS = $(X_ADA_CFLAGS) $(T_ADA_CFLAGS) $(ADA_CFLAGS)
 ALL_ADAFLAGS = $(CFLAGS) $(ALL_ADA_CFLAGS) $(X_ADAFLAGS) $(T_ADAFLAGS) \
 	$(ADAFLAGS)

Modified: llvm-gcc-4.2/trunk/gcc/ada/raise-gcc.c
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/ada/raise-gcc.c?rev=41766&r1=41765&r2=41766&view=diff

==============================================================================
--- llvm-gcc-4.2/trunk/gcc/ada/raise-gcc.c (original)
+++ llvm-gcc-4.2/trunk/gcc/ada/raise-gcc.c Fri Sep  7 07:14:39 2007
@@ -39,14 +39,10 @@
    it does.  To avoid branching raise.c just for that purpose, we kludge by
    looking for a symbol always defined by tm.h and if it's not defined,
    we include it.  */
-/* LLVM LOCAL begin */
-/*
 #ifndef FIRST_PSEUDO_REGISTER
 #include "coretypes.h"
 #include "tm.h"
 #endif
-*/
-/* LLVM LOCAL end */
 #include "tsystem.h"
 #include <sys/stat.h>
 #include <stdarg.h>