This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

ia64 eh fallout


Oops.  It would appear that after the last Makefile tweek I'd
made, I only tested --{enable,disable}-sjlj-exceptions and 
didn't test a default configuration.  This made libgcc on x86
and powerpc be built wrong.



r~


        * Makefile.in (cs-tconfig.h): Depend on CONFIG_H, not GCONFIG_H.
        Use ALL_CFLAGS not HOST_CFLAGS for sjlj detection.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.632
diff -c -p -d -r1.632 Makefile.in
*** Makefile.in	2001/03/28 11:03:47	1.632
--- Makefile.in	2001/03/28 22:18:22
*************** cs-hconfig.h: Makefile
*** 887,893 ****
  	TARGET_CPU_DEFAULT="$(target_cpu_default)" \
  	$(SHELL) $(srcdir)/mkconfig.sh hconfig.h
  
! cs-tconfig.h: Makefile $(GCONFIG_H) insn-flags.h except.h
  	HEADERS="$(xm_file)" DEFINES="$(xm_defines)" \
  	TARGET_CPU_DEFAULT="" \
  	$(SHELL) $(srcdir)/mkconfig.sh tconfig.h
--- 887,893 ----
  	TARGET_CPU_DEFAULT="$(target_cpu_default)" \
  	$(SHELL) $(srcdir)/mkconfig.sh hconfig.h
  
! cs-tconfig.h: Makefile $(CONFIG_H) except.h
  	HEADERS="$(xm_file)" DEFINES="$(xm_defines)" \
  	TARGET_CPU_DEFAULT="" \
  	$(SHELL) $(srcdir)/mkconfig.sh tconfig.h
*************** cs-tconfig.h: Makefile $(GCONFIG_H) insn
*** 896,902 ****
  	echo '#include "config.h"' > conftest.c
  	echo '#include "except.h"' >> conftest.c
  	echo 'xyzzy USING_SJLJ_EXCEPTIONS' >> conftest.c
! 	$(HOST_CC) -E conftest.c $(HOST_CFLAGS) $(INCLUDES) > conftest.out
  	sed -e 's/xyzzy/#define USING_SJLJ_EXCEPTIONS/' -e '/#define/p' \
  		-e d conftest.out >> tconfig.h
  	rm conftest.*
--- 896,902 ----
  	echo '#include "config.h"' > conftest.c
  	echo '#include "except.h"' >> conftest.c
  	echo 'xyzzy USING_SJLJ_EXCEPTIONS' >> conftest.c
! 	$(HOST_CC) -E conftest.c $(ALL_CFLAGS) $(INCLUDES) > conftest.out
  	sed -e 's/xyzzy/#define USING_SJLJ_EXCEPTIONS/' -e '/#define/p' \
  		-e d conftest.out >> tconfig.h
  	rm conftest.*


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]