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]
Other format: [Raw text]

Re: [PATCH]: Separate target and host config files


Zack Weinberg wrote:

From here, grepping the desired defines out of auto-host.h is
preferable, because it is then clear that the grep statement defines
the desired subset.  If we go with your template file, I for one will
forever be wondering whether the template file is up-to-date, and
furthermore whether we might somehow have (potential) macros in
auto-target.h that *aren't* in auto-host.h.

I'm not wedded to grep - I just want this done by means of a
transformation rule rather than a manually-created, to-be-hand-edited
subset file.

This patch implements the subset idea. Paolo had sufficient autoconf/m4-fu to create the right macros to do this. Each #define in the autoheader'd config.in gets wrapped in a #ifndef USED_FOR_TARGET, _unless_ we specifically ask it not to. The slightly funky formatting for the macro #endif ]))]) is necessary to stop autoheader's scanning of the configure file from barfing. This causes two blank lines between each entry of config.in. Paolo knows the details.

Rather than introduce a new #define to control these, I made mkconfig.sh
move the definition of USED_FOR_TARGET up.  The simplest way of doing that
was removing the explicit hack therein (and labeled 'most of this is
temporary'), and supply it in the DEFINES envionment variable.  This
does mean we get the slightly odd
	#ifndef USED_FOR_TARGET
	# define USED_FOR_TARGET
	#endif
in tconfig.h, but hey -- it works :)

booted and tested on i686-pc-linux-gnu, both checked and unchecked, ok?

nathan

--
Nathan Sidwell    ::   http://www.codesourcery.com   ::     CodeSourcery LLC
nathan@codesourcery.com    ::     http://www.planetfall.pwp.blueyonder.co.uk

2005-05-06  Nathan Sidwell  <nathan@codesourcery.com>
	    Paolo Bonzini  <bonzini@gnu.org>

	* Makefile.in (cs-tconfig.h): Pass USED_FOR_TARGET to mkconfig.sh
	* aclocal.m4 (GCC_TARGET_TEMPLATE, AH_TEMPLATE): New.
	* configure.ac (enable_checking): Fix typos in runtime_checking.
	(ENABLE_RUNTIME_CHECKING): Mark as target template.
	(xm_file): Prepend auto-host.h
	(HAVE_GAS_HIDDEN, HAVE_LD_EH_FRAME_HDR): Mark as target template.
	* mkconfig.sh: Do not automatically define USED_FOR_TARGET in
	tconfig.h.
	* crtstuff.c: Do not include auto-host.h.
	(IN_LIBGCC2): Do not define.
	* gcov-io.h: Include tconfig.h, not auto-host.h.
	* libgcc2.c: Do not include auto-host.h.
	(abort): Do not undefine.
	* libgcov.c: Remove unneeded comment about config.h.
	* unwind-dw2-fde-glibc: Do not inlude auto-host.h.
	* config.in, configure: Regenerated.

Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.1478
diff -c -3 -p -r1.1478 Makefile.in
*** Makefile.in	5 May 2005 03:04:15 -0000	1.1478
--- Makefile.in	6 May 2005 12:08:54 -0000
*************** cs-bconfig.h: Makefile
*** 1084,1090 ****
  
  cs-tconfig.h: Makefile
  	TARGET_CPU_DEFAULT="" \
! 	HEADERS="$(xm_include_list)" DEFINES="$(xm_defines)" \
  	$(SHELL) $(srcdir)/mkconfig.sh tconfig.h
  
  cs-tm.h: Makefile
--- 1084,1090 ----
  
  cs-tconfig.h: Makefile
  	TARGET_CPU_DEFAULT="" \
! 	HEADERS="$(xm_include_list)" DEFINES="USED_FOR_TARGET $(xm_defines)" \
  	$(SHELL) $(srcdir)/mkconfig.sh tconfig.h
  
  cs-tm.h: Makefile
Index: aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/gcc/aclocal.m4,v
retrieving revision 1.103
diff -c -3 -p -r1.103 aclocal.m4
*** aclocal.m4	4 May 2005 01:14:41 -0000	1.103
--- aclocal.m4	6 May 2005 12:08:55 -0000
*************** AC_PREREQ([2.50])dnl
*** 654,656 ****
--- 654,678 ----
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  ])
+ 
+ 
+ dnl GCC_TARGET_TEMPLATE(KEY)
+ dnl ------------------------
+ dnl Define KEY as a valid configure key on the target machine.
+ 
+ m4_define([GCC_TARGET_TEMPLATE],
+ [m4_define([GCC_TARGET_TEMPLATE($1)],[])])
+ 
+ dnl AH_TEMPLATE(KEY, DESCRIPTION)
+ dnl -----------------------------
+ dnl Issue an autoheader template for KEY, i.e., a comment composed of
+ dnl DESCRIPTION (properly wrapped), and then #undef KEY.  Redefinition
+ dnl of the macro in autoheader.m4, to support definition of only a few
+ dnl keys while compiling target libraries.
+ 
+ m4_define([AH_TEMPLATE],
+ [AH_VERBATIM([$1],m4_text_wrap([$2 */], [   ], [/* ])
+ m4_ifdef([GCC_TARGET_TEMPLATE($1)],[],[#ifndef USED_FOR_TARGET
+ ])[#undef $1]m4_ifdef([GCC_TARGET_TEMPLATE($1)],[],[
+ #endif
+ ]))])
Index: config.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.in,v
retrieving revision 1.209
diff -c -3 -p -r1.209 config.in
*** config.in	4 May 2005 01:14:41 -0000	1.209
--- config.in	6 May 2005 12:08:58 -0000
***************
*** 1,55 ****
--- 1,94 ----
  /* config.in.  Generated from configure.ac by autoheader.  */
  
  /* Define as the number of bits in a byte, if \`limits.h' doesn't. */
+ #ifndef USED_FOR_TARGET
  #undef CHAR_BIT
+ #endif
+ 
  
  /* Define 0/1 to force the choice for exception handling model. */
+ #ifndef USED_FOR_TARGET
  #undef CONFIG_SJLJ_EXCEPTIONS
+ #endif
+ 
  
  /* Define to enable the use of a default assembler. */
+ #ifndef USED_FOR_TARGET
  #undef DEFAULT_ASSEMBLER
+ #endif
+ 
  
  /* Define to enable the use of a default linker. */
+ #ifndef USED_FOR_TARGET
  #undef DEFAULT_LINKER
+ #endif
+ 
  
  /* Define if you want to use __cxa_atexit, rather than atexit, to register C++
     destructors for local statics and global objects. This is essential for
     fully standards-compliant handling of destructors, but requires
     __cxa_atexit in libc. */
+ #ifndef USED_FOR_TARGET
  #undef DEFAULT_USE_CXA_ATEXIT
+ #endif
+ 
  
  /* Define if you want assertions enabled. This is a cheap check. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_ASSERT_CHECKING
+ #endif
+ 
  
  /* Define if you want more run-time sanity checks. This one gets a grab bag of
     miscellaneous but relatively cheap checks. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_CHECKING
+ #endif
+ 
  
  /* Define if you want fold checked that it never destructs its argument. This
     is quite expensive. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_FOLD_CHECKING
+ #endif
+ 
  
  /* Define if you want the garbage collector to operate in maximally paranoid
     mode, validating the entire heap and collecting garbage at every
     opportunity. This is extremely expensive. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_GC_ALWAYS_COLLECT
+ #endif
+ 
  
  /* Define if you want the garbage collector to do object poisoning and other
     memory allocation checks. This is quite expensive. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_GC_CHECKING
+ #endif
+ 
  
  /* Define to 1 if translation of program messages to the user's native
     language is requested. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_NLS
+ #endif
+ 
  
  /* Define if you want all operations on RTL (the basic data structure of the
     optimizer and back end) to be checked for dynamic type safety at runtime.
     This is quite expensive. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_RTL_CHECKING
+ #endif
+ 
  
  /* Define if you want RTL flag accesses to be checked against the RTL codes
     that are supported for each access macro. This is relatively cheap. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_RTL_FLAG_CHECKING
+ #endif
+ 
  
  /* Define if you want runtime assertions enabled. This is a cheap check. */
  #undef ENABLE_RUNTIME_CHECKING
***************
*** 58,693 ****
--- 97,1302 ----
     front ends) to be checked for dynamic type safety at runtime. This is
     moderately expensive. The tree browser debugging routines will also be
     enabled by this option. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_TREE_CHECKING
+ #endif
+ 
  
  /* Define if you want to run subprograms and generated programs through
     valgrind (a memory checker). This is extremely expensive. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_VALGRIND_CHECKING
+ #endif
+ 
  
  /* Define to 1 if installation paths should be looked up in the Windows
     Registry. Ignored on non-Windows hosts. */
+ #ifndef USED_FOR_TARGET
  #undef ENABLE_WIN32_REGISTRY
+ #endif
+ 
  
  /* Define to the name of a file containing a list of extra machine modes for
     this architecture. */
+ #ifndef USED_FOR_TARGET
  #undef EXTRA_MODES_FILE
+ #endif
+ 
  
  /* Define to enable detailed memory allocation stats gathering. */
+ #ifndef USED_FOR_TARGET
  #undef GATHER_STATISTICS
+ #endif
+ 
  
  /* Define to the type of elements in the array set by `getgroups'. Usually
     this is either `int' or `gid_t'. */
+ #ifndef USED_FOR_TARGET
  #undef GETGROUPS_T
+ #endif
+ 
  
  /* Define if the zone collector is in use */
+ #ifndef USED_FOR_TARGET
  #undef GGC_ZONE
+ #endif
+ 
  
  /* Define to 1 if you have the `alphasort' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_ALPHASORT
+ #endif
+ 
  
  /* Define if your assembler supports dwarf2 .file/.loc directives, and
     preserves file table indices exactly as given. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_DWARF2_DEBUG_LINE
+ #endif
+ 
  
  /* Define if your assembler supports explicit relocations. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_EXPLICIT_RELOCS
+ #endif
+ 
  
  /* Define if your assembler supports the --gdwarf2 option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_GDWARF2_DEBUG_FLAG
+ #endif
+ 
  
  /* Define true if the assembler supports '.long foo@GOTOFF'. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_GOTOFF_IN_DATA
+ #endif
+ 
  
  /* Define if your assembler supports the --gstabs option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_GSTABS_DEBUG_FLAG
+ #endif
+ 
  
  /* Define if your assembler supports the Sun syntax for cmov. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_IX86_CMOV_SUN_SYNTAX
+ #endif
+ 
  
  /* Define if your assembler supports .sleb128 and .uleb128. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_LEB128
+ #endif
+ 
  
  /* Define if your assembler supports ltoffx and ldxmov relocations. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_LTOFFX_LDXMOV_RELOCS
+ #endif
+ 
  
  /* Define if your assembler supports mfcr field. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_MFCRF
+ #endif
+ 
  
  /* Define if your assembler supports the -no-mul-bug-abort option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_NO_MUL_BUG_ABORT_OPTION
+ #endif
+ 
  
  /* Define if your assembler supports offsetable %lo(). */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_OFFSETABLE_LO10
+ #endif
+ 
  
  /* Define if your assembler supports .register. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_REGISTER_PSEUDO_OP
+ #endif
+ 
  
  /* Define if your assembler supports -relax option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_RELAX_OPTION
+ #endif
+ 
  
  /* Define if your assembler and linker support unaligned PC relative relocs.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_SPARC_UA_PCREL
+ #endif
+ 
  
  /* Define if your assembler and linker support unaligned PC relative relocs
     against hidden symbols. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_SPARC_UA_PCREL_HIDDEN
+ #endif
+ 
  
  /* Define if your assembler supports thread-local storage. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_AS_TLS
+ #endif
+ 
  
  /* Define to 1 if you have the `atoll' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_ATOLL
+ #endif
+ 
  
  /* Define to 1 if you have the `atoq' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_ATOQ
+ #endif
+ 
  
  /* Define to 1 if you have the `clearerr_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_CLEARERR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `clock' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_CLOCK
+ #endif
+ 
  
  /* Define if <time.h> defines clock_t. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_CLOCK_T
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'abort', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_ABORT
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'atof', otherwise define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_ATOF
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'atol', otherwise define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_ATOL
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'basename', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_BASENAME
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'calloc', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_CALLOC
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'clearerr_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_CLEARERR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'clock', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_CLOCK
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'errno', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_ERRNO
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'feof_unlocked', otherwise define
     to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FEOF_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'ferror_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FERROR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fflush_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FFLUSH_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fgetc_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FGETC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fgets_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FGETS_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fileno_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FILENO_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fprintf_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FPRINTF_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fputc_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FPUTC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fputs_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FPUTS_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fread_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FREAD_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'free', otherwise define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FREE
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'fwrite_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_FWRITE_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getchar_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETCHAR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getcwd', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETCWD
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getc_unlocked', otherwise define
     to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getenv', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETENV
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getopt', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETOPT
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getpagesize', otherwise define
     to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETPAGESIZE
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getrlimit', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETRLIMIT
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getrusage', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETRUSAGE
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'getwd', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_GETWD
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'ldgetname', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_LDGETNAME
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'malloc', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_MALLOC
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'putchar_unlocked', otherwise
     define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_PUTCHAR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'putc_unlocked', otherwise define
     to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_PUTC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'realloc', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_REALLOC
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'sbrk', otherwise define to 0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_SBRK
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'setrlimit', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_SETRLIMIT
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'snprintf', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_SNPRINTF
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'strsignal', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_STRSIGNAL
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'strstr', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_STRSTR
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'times', otherwise define to 0.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_TIMES
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'vasprintf', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_VASPRINTF
+ #endif
+ 
  
  /* Define to 1 if we found a declaration for 'vsnprintf', otherwise define to
     0. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DECL_VSNPRINTF
+ #endif
+ 
  
  /* Define to 1 if you have the <direct.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DIRECT_H
+ #endif
+ 
  
  /* Define to 1 if you have the `dup2' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_DUP2
+ #endif
+ 
  
  /* Define to 1 if you have the <fcntl.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FCNTL_H
+ #endif
+ 
  
  /* Define to 1 if you have the `feof_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FEOF_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `ferror_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FERROR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fflush_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FFLUSH_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fgetc_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FGETC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fgets_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FGETS_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fileno_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FILENO_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fork' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FORK
+ #endif
+ 
  
  /* Define to 1 if you have the `fprintf_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FPRINTF_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fputc_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FPUTC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fputs_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FPUTS_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fread_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FREAD_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `fwrite_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_FWRITE_UNLOCKED
+ #endif
+ 
  
  /* Define if your assembler supports .balign and .p2align. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_BALIGN_AND_P2ALIGN
+ #endif
+ 
  
  /* Define 0/1 if your assembler supports COMDAT group. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_COMDAT_GROUP
+ #endif
+ 
  
  /* Define if your assembler uses the new HImode fild and fist notation. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_FILDS_FISTS
+ #endif
+ 
  
  /* Define if your assembler and linker support .hidden. */
  #undef HAVE_GAS_HIDDEN
  
  /* Define if your assembler supports specifying the maximum number of bytes to
     skip when using the GAS .p2align command. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_MAX_SKIP_P2ALIGN
+ #endif
+ 
  
  /* Define if your assembler supports .nsubspa comdat option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_NSUBSPA_COMDAT
+ #endif
+ 
  
  /* Define if your assembler and linker support 32-bit section relative relocs
     via '.secrel32 label'. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_PE_SECREL32_RELOC
+ #endif
+ 
  
  /* Define 0/1 if your assembler supports marking sections with SHF_MERGE flag.
     */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_SHF_MERGE
+ #endif
+ 
  
  /* Define if your assembler supports .subsection and .subsection -1 starts
     emitting at the beginning of your section. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_SUBSECTION_ORDERING
+ #endif
+ 
  
  /* Define if your assembler supports .weak. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GAS_WEAK
+ #endif
+ 
  
  /* Define to 1 if you have the `getchar_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GETCHAR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `getc_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GETC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `getrlimit' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GETRLIMIT
+ #endif
+ 
  
  /* Define to 1 if you have the `getrusage' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GETRUSAGE
+ #endif
+ 
  
  /* Define to 1 if you have the `gettimeofday' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_GETTIMEOFDAY
+ #endif
+ 
  
  /* Define if you have the iconv() function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_ICONV
+ #endif
+ 
  
  /* Define to 1 if you have the <iconv.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_ICONV_H
+ #endif
+ 
  
  /* Define .init_array/.fini_array sections are available and working. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_INITFINI_ARRAY
+ #endif
+ 
  
  /* Define if you have a working <inttypes.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_INTTYPES_H
+ #endif
+ 
  
  /* Define to 1 if you have the `kill' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_KILL
+ #endif
+ 
  
  /* Define if you have <langinfo.h> and nl_langinfo(CODESET). */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LANGINFO_CODESET
+ #endif
+ 
  
  /* Define to 1 if you have the <langinfo.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LANGINFO_H
+ #endif
+ 
  
  /* Define if your <locale.h> file defines LC_MESSAGES. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LC_MESSAGES
+ #endif
+ 
  
  /* Define to 1 if you have the <ldfcn.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LDFCN_H
+ #endif
+ 
  
  /* Define if your linker supports --as-needed and --no-as-needed options. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_AS_NEEDED
+ #endif
+ 
  
  /* Define if your linker supports --demangle option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_DEMANGLE
+ #endif
+ 
  
  /* Define if your linker supports --eh-frame-hdr option. */
  #undef HAVE_LD_EH_FRAME_HDR
  
  /* Define if your PowerPC64 linker only needs function descriptor syms. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_NO_DOT_SYMS
+ #endif
+ 
  
  /* Define if your linker supports -pie option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_PIE
+ #endif
+ 
  
  /* Define if your linker links a mix of read-only and read-write sections into
     a read-write section. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_RO_RW_SECTION_MIXING
+ #endif
+ 
  
  /* Define if your linker supports -Bstatic/-Bdynamic option. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_STATIC_DYNAMIC
+ #endif
+ 
  
  /* Define if your linker supports --sysroot. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LD_SYSROOT
+ #endif
+ 
  
  /* Define to 1 if you have the <limits.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LIMITS_H
+ #endif
+ 
  
  /* Define to 1 if you have the <locale.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LOCALE_H
+ #endif
+ 
  
  /* Define if your compiler supports the \`long long' type. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_LONG_LONG
+ #endif
+ 
  
  /* Define to 1 if you have the <malloc.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MALLOC_H
+ #endif
+ 
  
  /* Define to 1 if you have the `mbstowcs' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MBSTOWCS
+ #endif
+ 
  
  /* Define if valgrind's memcheck.h header is installed. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MEMCHECK_H
+ #endif
+ 
  
  /* Define to 1 if you have the <memory.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MEMORY_H
+ #endif
+ 
  
  /* Define to 1 if you have the `mincore' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MINCORE
+ #endif
+ 
  
  /* Define to 1 if you have the `mmap' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MMAP
+ #endif
+ 
  
  /* Define if mmap with MAP_ANON(YMOUS) works. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MMAP_ANON
+ #endif
+ 
  
  /* Define if mmap of /dev/zero works. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MMAP_DEV_ZERO
+ #endif
+ 
  
  /* Define if read-only mmap of a plain file works. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_MMAP_FILE
+ #endif
+ 
  
  /* Define to 1 if you have the `nl_langinfo' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_NL_LANGINFO
+ #endif
+ 
  
  /* Define if printf supports "%p". */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_PRINTF_PTR
+ #endif
+ 
  
  /* Define to 1 if you have the `putchar_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_PUTCHAR_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `putc_unlocked' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_PUTC_UNLOCKED
+ #endif
+ 
  
  /* Define to 1 if you have the `scandir' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SCANDIR
+ #endif
+ 
  
  /* Define to 1 if you have the `setlocale' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SETLOCALE
+ #endif
+ 
  
  /* Define to 1 if you have the `setrlimit' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SETRLIMIT
+ #endif
+ 
  
  /* Define to 1 if you have the <stddef.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STDDEF_H
+ #endif
+ 
  
  /* Define to 1 if you have the <stdint.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STDINT_H
+ #endif
+ 
  
  /* Define to 1 if you have the <stdlib.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STDLIB_H
+ #endif
+ 
  
  /* Define to 1 if you have the <strings.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STRINGS_H
+ #endif
+ 
  
  /* Define to 1 if you have the <string.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STRING_H
+ #endif
+ 
  
  /* Define to 1 if you have the `strsignal' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STRSIGNAL
+ #endif
+ 
  
  /* Define if <sys/times.h> defines struct tms. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_STRUCT_TMS
+ #endif
+ 
  
  /* Define to 1 if you have the `sysconf' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYSCONF
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/file.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_FILE_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/mman.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_MMAN_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/param.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_PARAM_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/resource.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_RESOURCE_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/stat.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_STAT_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/times.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_TIMES_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/time.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_TIME_H
+ #endif
+ 
  
  /* Define to 1 if you have the <sys/types.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_TYPES_H
+ #endif
+ 
  
  /* Define to 1 if you have <sys/wait.h> that is POSIX.1 compatible. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_SYS_WAIT_H
+ #endif
+ 
  
  /* Define to 1 if you have the `times' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_TIMES
+ #endif
+ 
  
  /* Define to 1 if you have the <time.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_TIME_H
+ #endif
+ 
  
  /* Define to 1 if you have the <unistd.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_UNISTD_H
+ #endif
+ 
  
  /* Define if valgrind's valgrind/memcheck.h header is installed. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_VALGRIND_MEMCHECK_H
+ #endif
+ 
  
  /* Define to 1 if you have the `vfork' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_VFORK
+ #endif
+ 
  
  /* Define to 1 if you have the <vfork.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_VFORK_H
+ #endif
+ 
  
  /* Define to 1 if you have the <wchar.h> header file. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_WCHAR_H
+ #endif
+ 
  
  /* Define to 1 if you have the `wcswidth' function. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_WCSWIDTH
+ #endif
+ 
  
  /* Define to 1 if `fork' works. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_WORKING_FORK
+ #endif
+ 
  
  /* Define this macro if mbstowcs does not crash when its first argument is
     NULL. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_WORKING_MBSTOWCS
+ #endif
+ 
  
  /* Define to 1 if `vfork' works. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE_WORKING_VFORK
+ #endif
+ 
  
  /* Define if your compiler supports the \`__int64' type. */
+ #ifndef USED_FOR_TARGET
  #undef HAVE___INT64
+ #endif
+ 
  
  /* Define as const if the declaration of iconv() needs const. */
+ #ifndef USED_FOR_TARGET
  #undef ICONV_CONST
+ #endif
+ 
  
  /* Define if host mkdir takes a single argument. */
+ #ifndef USED_FOR_TARGET
  #undef MKDIR_TAKES_ONE_ARG
+ #endif
+ 
  
  /* Define to 1 if HOST_WIDE_INT must be 64 bits wide (see hwint.h). */
+ #ifndef USED_FOR_TARGET
  #undef NEED_64BIT_HOST_WIDE_INT
+ #endif
+ 
  
  /* Define to 1 if your C compiler doesn't accept -c and -o together. */
+ #ifndef USED_FOR_TARGET
  #undef NO_MINUS_C_MINUS_O
+ #endif
+ 
  
  /* Define to the address where bug reports for this package should be sent. */
+ #ifndef USED_FOR_TARGET
  #undef PACKAGE_BUGREPORT
+ #endif
+ 
  
  /* Define to the full name of this package. */
+ #ifndef USED_FOR_TARGET
  #undef PACKAGE_NAME
+ #endif
+ 
  
  /* Define to the full name and version of this package. */
+ #ifndef USED_FOR_TARGET
  #undef PACKAGE_STRING
+ #endif
+ 
  
  /* Define to the one symbol short name of this package. */
+ #ifndef USED_FOR_TARGET
  #undef PACKAGE_TARNAME
+ #endif
+ 
  
  /* Define to the version of this package. */
+ #ifndef USED_FOR_TARGET
  #undef PACKAGE_VERSION
+ #endif
+ 
  
  /* Define to PREFIX/include if cpp should also search that directory. */
+ #ifndef USED_FOR_TARGET
  #undef PREFIX_INCLUDE_DIR
+ #endif
+ 
  
  /* The size of a `int', as computed by sizeof. */
+ #ifndef USED_FOR_TARGET
  #undef SIZEOF_INT
+ #endif
+ 
  
  /* The size of a `long', as computed by sizeof. */
+ #ifndef USED_FOR_TARGET
  #undef SIZEOF_LONG
+ #endif
+ 
  
  /* The size of a `long long', as computed by sizeof. */
+ #ifndef USED_FOR_TARGET
  #undef SIZEOF_LONG_LONG
+ #endif
+ 
  
  /* The size of a `short', as computed by sizeof. */
+ #ifndef USED_FOR_TARGET
  #undef SIZEOF_SHORT
+ #endif
+ 
  
  /* The size of a `void *', as computed by sizeof. */
+ #ifndef USED_FOR_TARGET
  #undef SIZEOF_VOID_P
+ #endif
+ 
  
  /* The size of a `__int64', as computed by sizeof. */
+ #ifndef USED_FOR_TARGET
  #undef SIZEOF___INT64
+ #endif
+ 
  
  /* Define to 1 if you have the ANSI C header files. */
+ #ifndef USED_FOR_TARGET
  #undef STDC_HEADERS
+ #endif
+ 
  
  /* Define if you can safely include both <string.h> and <strings.h>. */
+ #ifndef USED_FOR_TARGET
  #undef STRING_WITH_STRINGS
+ #endif
+ 
  
  /* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+ #ifndef USED_FOR_TARGET
  #undef TIME_WITH_SYS_TIME
+ #endif
+ 
  
  /* Define if your assembler mis-optimizes .eh_frame data. */
+ #ifndef USED_FOR_TARGET
  #undef USE_AS_TRADITIONAL_FORMAT
+ #endif
+ 
  
  /* Define to 1 if the 'long long' (or '__int64') is wider than 'long' but
     still efficiently supported by the host hardware. */
+ #ifndef USED_FOR_TARGET
  #undef USE_LONG_LONG_FOR_WIDEST_FAST_INT
+ #endif
+ 
  
  /* Define if location_t is fileline integer cookie. */
+ #ifndef USED_FOR_TARGET
  #undef USE_MAPPED_LOCATION
+ #endif
+ 
  
  /* Define to be the last component of the Windows registry key under which to
     look for installation paths. The full key used will be
     HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}.
     The default is the GCC version number. */
+ #ifndef USED_FOR_TARGET
  #undef WIN32_REGISTRY_KEY
+ #endif
+ 
  
  /* Define to 1 if your processor stores words with the most significant byte
     first (like Motorola and SPARC, unlike Intel and VAX). */
+ #ifndef USED_FOR_TARGET
  #undef WORDS_BIGENDIAN
+ #endif
+ 
  
  /* Always define this when using the GNU C Library */
+ #ifndef USED_FOR_TARGET
  #undef _GNU_SOURCE
+ #endif
+ 
  
  /* Define to `int' if <sys/types.h> doesn't define. */
+ #ifndef USED_FOR_TARGET
  #undef gid_t
+ #endif
+ 
  
  /* Define to `__inline__' or `__inline' if that's what the C compiler
     calls it, or to nothing if 'inline' is not supported under any name.  */
***************
*** 696,711 ****
--- 1305,1335 ----
  #endif
  
  /* Define to `int' if <sys/types.h> does not define. */
+ #ifndef USED_FOR_TARGET
  #undef pid_t
+ #endif
+ 
  
  /* Define to \`long' if <sys/resource.h> doesn't define. */
+ #ifndef USED_FOR_TARGET
  #undef rlim_t
+ #endif
+ 
  
  /* Define to `int' if <sys/types.h> does not define. */
+ #ifndef USED_FOR_TARGET
  #undef ssize_t
+ #endif
+ 
  
  /* Define to `int' if <sys/types.h> doesn't define. */
+ #ifndef USED_FOR_TARGET
  #undef uid_t
+ #endif
+ 
  
  /* Define as `fork' if `vfork' does not work. */
+ #ifndef USED_FOR_TARGET
  #undef vfork
+ #endif
+ 
Index: configure
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure,v
retrieving revision 1.899
diff -c -3 -p -r1.899 configure
*** configure	4 May 2005 01:14:41 -0000	1.899
--- configure	6 May 2005 12:09:31 -0000
*************** do
*** 6292,6303 ****
  	yes)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking= ; ac_gc_checking=1 ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking=1 ; ac_runtime_chacking=1 ;
  			ac_tree_checking=1 ; ac_valgrind_checking= ;;
  	no|none)	ac_assert_checking= ; ac_checking= ;
  			ac_fold_checking= ; ac_gc_checking= ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking= ; ac_runtime_chacking= ;
  			ac_tree_checking= ; ac_valgrind_checking= ;;
  	all)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking=1 ; ac_gc_checking=1 ;
--- 6292,6303 ----
  	yes)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking= ; ac_gc_checking=1 ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking=1 ; ac_runtime_checking=1 ;
  			ac_tree_checking=1 ; ac_valgrind_checking= ;;
  	no|none)	ac_assert_checking= ; ac_checking= ;
  			ac_fold_checking= ; ac_gc_checking= ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking= ; ac_runtime_checking= ;
  			ac_tree_checking= ; ac_valgrind_checking= ;;
  	all)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking=1 ; ac_gc_checking=1 ;
*************** cat >>confdefs.h <<\_ACEOF
*** 6344,6349 ****
--- 6344,6350 ----
  _ACEOF
  
  fi
+ 
  if test x$ac_runtime_checking != x ; then
  
  cat >>confdefs.h <<\_ACEOF
*************** if test "${gcc_cv_prog_makeinfo_modern+s
*** 7399,7405 ****
  else
      ac_prog_version=`$MAKEINFO --version 2>&1 |
                     sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
!   echo "configure:7402: version of makeinfo is $ac_prog_version" >&5
    case $ac_prog_version in
      '')     gcc_cv_prog_makeinfo_modern=no;;
      4.[2-9]*)
--- 7400,7406 ----
  else
      ac_prog_version=`$MAKEINFO --version 2>&1 |
                     sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
!   echo "configure:7403: version of makeinfo is $ac_prog_version" >&5
    case $ac_prog_version in
      '')     gcc_cv_prog_makeinfo_modern=no;;
      4.[2-9]*)
*************** host_xm_file="auto-host.h ansidecl.h ${h
*** 12256,12262 ****
  build_xm_file="${build_auto} ansidecl.h ${build_xm_file}"
  # We don't want ansidecl.h in target files, write code there in ISO/GNU C.
  # put this back in temporarily.
! xm_file="ansidecl.h ${xm_file}"
  
  # --------
  # UNSORTED
--- 12257,12263 ----
  build_xm_file="${build_auto} ansidecl.h ${build_xm_file}"
  # We don't want ansidecl.h in target files, write code there in ISO/GNU C.
  # put this back in temporarily.
! xm_file="auto-host.h ansidecl.h ${xm_file}"
  
  # --------
  # UNSORTED
*************** echo "$as_me:$LINENO: result: $gcc_cv_ld
*** 13394,13399 ****
--- 13395,13401 ----
  echo "${ECHO_T}$gcc_cv_ld_hidden" >&6
  libgcc_visibility=no
  
+ 
  if test $gcc_cv_as_hidden = yes && test $gcc_cv_ld_hidden = yes; then
    libgcc_visibility=yes
  
*************** elif test x$gcc_cv_ld != x; then
*** 14953,14958 ****
--- 14955,14961 ----
  		gcc_cv_ld_eh_frame_hdr=yes
  	fi
  fi
+ 
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  
  cat >>confdefs.h <<\_ACEOF
Index: configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.107
diff -c -3 -p -r2.107 configure.ac
*** configure.ac	4 May 2005 01:14:48 -0000	2.107
--- configure.ac	6 May 2005 12:09:39 -0000
*************** do
*** 421,432 ****
  	yes)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking= ; ac_gc_checking=1 ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking=1 ; ac_runtime_chacking=1 ;
  			ac_tree_checking=1 ; ac_valgrind_checking= ;;
  	no|none)	ac_assert_checking= ; ac_checking= ;
  			ac_fold_checking= ; ac_gc_checking= ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking= ; ac_runtime_chacking= ;
  			ac_tree_checking= ; ac_valgrind_checking= ;;
  	all)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking=1 ; ac_gc_checking=1 ;
--- 421,432 ----
  	yes)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking= ; ac_gc_checking=1 ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking=1 ; ac_runtime_checking=1 ;
  			ac_tree_checking=1 ; ac_valgrind_checking= ;;
  	no|none)	ac_assert_checking= ; ac_checking= ;
  			ac_fold_checking= ; ac_gc_checking= ;
  			ac_gc_always_collect= ; ac_rtl_checking= ;
! 			ac_rtlflag_checking= ; ac_runtime_checking= ;
  			ac_tree_checking= ; ac_valgrind_checking= ;;
  	all)		ac_assert_checking=1 ; ac_checking=1 ;
  			ac_fold_checking=1 ; ac_gc_checking=1 ;
*************** if test x$ac_assert_checking != x ; then
*** 466,471 ****
--- 466,472 ----
    AC_DEFINE(ENABLE_ASSERT_CHECKING, 1,
  [Define if you want assertions enabled.  This is a cheap check.])
  fi
+ GCC_TARGET_TEMPLATE(ENABLE_RUNTIME_CHECKING)
  if test x$ac_runtime_checking != x ; then
    AC_DEFINE(ENABLE_RUNTIME_CHECKING, 1,
  [Define if you want runtime assertions enabled.  This is a cheap check.])
*************** host_xm_file="auto-host.h ansidecl.h ${h
*** 1402,1408 ****
  build_xm_file="${build_auto} ansidecl.h ${build_xm_file}"
  # We don't want ansidecl.h in target files, write code there in ISO/GNU C.
  # put this back in temporarily.
! xm_file="ansidecl.h ${xm_file}"
  
  # --------
  # UNSORTED
--- 1403,1409 ----
  build_xm_file="${build_auto} ansidecl.h ${build_xm_file}"
  # We don't want ansidecl.h in target files, write code there in ISO/GNU C.
  # put this back in temporarily.
! xm_file="auto-host.h ansidecl.h ${xm_file}"
  
  # --------
  # UNSORTED
*************** changequote([,])dnl
*** 2140,2145 ****
--- 2141,2147 ----
  fi])
  libgcc_visibility=no
  AC_SUBST(libgcc_visibility)
+ GCC_TARGET_TEMPLATE([HAVE_GAS_HIDDEN])
  if test $gcc_cv_as_hidden = yes && test $gcc_cv_ld_hidden = yes; then
    libgcc_visibility=yes
    AC_DEFINE(HAVE_GAS_HIDDEN, 1,
*************** elif test x$gcc_cv_ld != x; then
*** 2934,2939 ****
--- 2936,2942 ----
  		gcc_cv_ld_eh_frame_hdr=yes
  	fi
  fi
+ GCC_TARGET_TEMPLATE([HAVE_LD_EH_FRAME_HDR])
  if test x"$gcc_cv_ld_eh_frame_hdr" = xyes; then
  	AC_DEFINE(HAVE_LD_EH_FRAME_HDR, 1,
  [Define if your linker supports --eh-frame-hdr option.])
Index: crtstuff.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/crtstuff.c,v
retrieving revision 1.71
diff -c -3 -p -r1.71 crtstuff.c
*** crtstuff.c	29 Apr 2005 14:09:36 -0000	1.71
--- crtstuff.c	6 May 2005 12:09:40 -0000
*************** Software Foundation, 59 Temple Place - S
*** 51,65 ****
  
     This file must be compiled with gcc.  */
  
- /* It is incorrect to include config.h here, because this file is being
-    compiled for the target, and hence definitions concerning only the host
-    do not apply.  */
- 
- #define IN_LIBGCC2
- 
- /* We include auto-host.h here to get HAVE_GAS_HIDDEN.  This is
-    supposedly valid even though this is a "target" file.  */
- #include "auto-host.h"
  #include "tconfig.h"
  #include "tsystem.h"
  #include "coretypes.h"
--- 51,56 ----
Index: gcov-io.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/gcov-io.h,v
retrieving revision 1.57
diff -c -3 -p -r1.57 gcov-io.h
*** gcov-io.h	2 May 2005 18:01:56 -0000	1.57
--- gcov-io.h	6 May 2005 12:09:41 -0000
*************** typedef HOST_WIDEST_INT gcov_type;
*** 232,238 ****
     is not also used in a DSO.  */
  #if IN_LIBGCOV
  
! #include "auto-host.h"   /* for HAVE_GAS_HIDDEN */
  
  #define gcov_var __gcov_var
  #define gcov_open __gcov_open
--- 232,238 ----
     is not also used in a DSO.  */
  #if IN_LIBGCOV
  
! #include "tconfig.h"
  
  #define gcov_var __gcov_var
  #define gcov_open __gcov_open
Index: libgcc2.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/libgcc2.c,v
retrieving revision 1.189
diff -c -3 -p -r1.189 libgcc2.c
*** libgcc2.c	29 Apr 2005 14:09:38 -0000	1.189
--- libgcc2.c	6 May 2005 12:09:46 -0000
*************** along with GCC; see the file COPYING.  I
*** 29,52 ****
  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.  */
  
- 
- /* We include auto-host.h here to get HAVE_GAS_HIDDEN.  This is
-    supposedly valid even though this is a "target" file.  */
- #include "auto-host.h"
- 
- /* It is incorrect to include config.h here, because this file is being
-    compiled for the target, and hence definitions concerning only the host
-    do not apply.  */
  #include "tconfig.h"
  #include "tsystem.h"
  #include "coretypes.h"
  #include "tm.h"
  
- /* Don't use `fancy_abort' here even if config.h says to use it.  */
- #ifdef abort
- #undef abort
- #endif
- 
  #ifdef HAVE_GAS_HIDDEN
  #define ATTRIBUTE_HIDDEN  __attribute__ ((__visibility__ ("hidden")))
  #else
--- 29,39 ----
Index: libgcov.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/libgcov.c,v
retrieving revision 1.29
diff -c -3 -p -r1.29 libgcov.c
*** libgcov.c	28 Apr 2005 05:38:32 -0000	1.29
--- libgcov.c	6 May 2005 12:09:47 -0000
*************** along with GCC; see the file COPYING.  I
*** 29,38 ****
  Software Foundation, 59 Temple Place - Suite 330, Boston, MA
  02111-1307, USA.  */
  
- /* It is incorrect to include config.h here, because this file is being
-    compiled for the target, and hence definitions concerning only the host
-    do not apply.  */
- 
  #include "tconfig.h"
  #include "tsystem.h"
  #include "coretypes.h"
--- 29,34 ----
Index: mkconfig.sh
===================================================================
RCS file: /cvs/gcc/gcc/gcc/mkconfig.sh,v
retrieving revision 1.13
diff -c -3 -p -r1.13 mkconfig.sh
*** mkconfig.sh	21 Jun 2003 05:20:05 -0000	1.13
--- mkconfig.sh	6 May 2005 12:09:48 -0000
*************** for def in $DEFINES; do
*** 54,60 ****
      echo "#endif" >> ${output}T
  done
  
! # The first entry in HEADERS may be auto-host.h or auto-build.h;
  # it wants to be included even when not -DIN_GCC.
  if [ -n "$HEADERS" ]; then
      set $HEADERS
--- 54,60 ----
      echo "#endif" >> ${output}T
  done
  
! # The first entry in HEADERS may be auto-FOO.h ;
  # it wants to be included even when not -DIN_GCC.
  if [ -n "$HEADERS" ]; then
      set $HEADERS
*************** if [ -n "$HEADERS" ]; then
*** 72,88 ****
      fi
  fi
  
! # If this is tconfig.h, now define USED_FOR_TARGET.  If this is tm.h,
! # now include insn-constants.h and insn-flags.h only if IN_GCC is
! # defined but neither GENERATOR_FILE nor USED_FOR_TARGET is defined.
! # (Much of this is temporary.)
  
  case $output in
-     tconfig.h )
- 	cat >> ${output}T <<EOF
- #define USED_FOR_TARGET
- EOF
-     ;;
      tm.h )
          cat >> ${output}T <<EOF
  #if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET
--- 72,82 ----
      fi
  fi
  
! # If this is tm.h, now include insn-constants.h and insn-flags.h only
! # if IN_GCC is defined but neither GENERATOR_FILE nor USED_FOR_TARGET
! # is defined.  (Much of this is temporary.)
  
  case $output in
      tm.h )
          cat >> ${output}T <<EOF
  #if defined IN_GCC && !defined GENERATOR_FILE && !defined USED_FOR_TARGET
Index: unwind-dw2-fde-glibc.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/unwind-dw2-fde-glibc.c,v
retrieving revision 1.17
diff -c -3 -p -r1.17 unwind-dw2-fde-glibc.c
*** unwind-dw2-fde-glibc.c	5 Mar 2005 14:01:02 -0000	1.17
--- unwind-dw2-fde-glibc.c	6 May 2005 12:09:54 -0000
***************
*** 33,39 ****
  #define _GNU_SOURCE 1
  #endif
  
- #include "auto-host.h" /* For HAVE_LD_EH_FRAME_HDR.  */
  #include "tconfig.h"
  #include "tsystem.h"
  #ifndef inhibit_libc
--- 33,38 ----

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