[llvm-commits] [llvm-gcc-4.2] r97588 - in /llvm-gcc-4.2/trunk/gcc: Makefile.in config.gcc

[Eric Christopher]

Author: echristo
Date: Tue Mar  2 15:17:44 2010
New Revision: 97588

URL: http://llvm.org/viewvc/llvm-project?rev=97588&view=rev
Log:
Revert my last patch, it broke self-hosting on darwin10.

Modified:
    llvm-gcc-4.2/trunk/gcc/Makefile.in
    llvm-gcc-4.2/trunk/gcc/config.gcc

Modified: llvm-gcc-4.2/trunk/gcc/Makefile.in
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/Makefile.in?rev=97588&r1=97587&r2=97588&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/Makefile.in (original)
+++ llvm-gcc-4.2/trunk/gcc/Makefile.in Tue Mar  2 15:17:44 2010
@@ -476,11 +476,6 @@
 # each of $(system_prefix)/usr/include, $(system_prefix)/usr/lib, etc.
 TARGET_SYSTEM_ROOT = @TARGET_SYSTEM_ROOT@
 
-# LLVM LOCAL begin
-# Whether to install unwind.h
-INSTALL_UNWIND_H = @install_unwind_h@
-# LLVM LOCAL end
-
 xmake_file=@xmake_file@
 tmake_file=@tmake_file@
 out_file=$(srcdir)/config/@out_file@
@@ -3555,10 +3550,8 @@
 	done
 	rm -f include/limits.h
 	cp xlimits.h include/limits.h
-	if [ $(INSTALL_UNWIND_H) = yes ]; then \
-	  rm -f include/unwind.h; \
-	  cp $(UNWIND_H) include/unwind.h; \
-	fi;
+	rm -f include/unwind.h
+	cp $(UNWIND_H) include/unwind.h
 	chmod a+r include/limits.h
 # Install the README
 	rm -f include/README
@@ -4315,9 +4308,7 @@
 	    $(DESTDIR)$(itoolsdatadir)/include/$$realfile ; \
 	done
 	$(INSTALL_DATA) xlimits.h $(DESTDIR)$(itoolsdatadir)/include/limits.h
-	if [ $(INSTALL_UNWIND_H) = yes ]; then \
-	  $(INSTALL_DATA) $(UNWIND_H) $(DESTDIR)$(itoolsdatadir)/include/unwind.h; \
-	fi
+	$(INSTALL_DATA) $(UNWIND_H) $(DESTDIR)$(itoolsdatadir)/include/unwind.h
 	$(INSTALL_DATA) $(srcdir)/gsyslimits.h \
 	  $(DESTDIR)$(itoolsdatadir)/gsyslimits.h
 	$(INSTALL_DATA) macro_list $(DESTDIR)$(itoolsdatadir)/macro_list

Modified: llvm-gcc-4.2/trunk/gcc/config.gcc
URL: http://llvm.org/viewvc/llvm-project/llvm-gcc-4.2/trunk/gcc/config.gcc?rev=97588&r1=97587&r2=97588&view=diff
==============================================================================
--- llvm-gcc-4.2/trunk/gcc/config.gcc (original)
+++ llvm-gcc-4.2/trunk/gcc/config.gcc Tue Mar  2 15:17:44 2010
@@ -146,12 +146,6 @@
 #
 #  use_fixproto		Set to "yes" if fixproto should be run normally,
 #			"no" if fixproto should never be run.
-#  LLVM LOCAL begin
-#
-#  install_unwind_h  Set to "no" if you are using a libunwind based
-#  header and already have one installed on the system.
-#
-#  LLVM LOCAL end
 
 # The following variables are used in each case-construct to build up the
 # outgoing variables:
@@ -194,12 +188,6 @@
 # specifically set this to 'yes'.
 use_fixproto=no
 
-# LLVM LOCAL begin
-# Default to installing unwind.h.  Targets which don't want to install
-# this header should specifically set this to 'no'.
-install_unwind_h=yes
-# LLVM LOCAL end
-
 # Don't carry these over build->host->target.  Please.
 xm_file=
 md_file=
@@ -435,8 +423,6 @@
     # APPLE LOCAL begin .file/.loc 6349436
   *-*-darwin[12][0-9]*)
     tm_file="${tm_file} darwin9.h darwin10.h"
-    # LLVM LOCAL
-    install_unwind_h=no
     ;;
     # APPLE LOCAL end .file/.loc 6349436
   esac