procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

protoize.c: Match include directory usage with cppdefault.c.

Browse source 
2002-04-02  David O'Brien  <obrien@FreeBSD.org>
	* protoize.c: Match include directory usage with cppdefault.c.

Approved by:  Richard Henderson <rth@redhat.com>
              Message-ID: <20020329131400.C19829@redhat.com>

From-SVN: r51787
This commit is contained in:
David O'Brien 2002-04-03 03:40:56 +00:00 • committed by David O'Brien
parent 5add6d1a6d
commit 058b12757e
2 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gcc/ChangeLog
View file

@ -1,3 +1,7 @@
2002-04-02 David O'Brien <obrien@FreeBSD.org>
* protoize.c: Match include directory usage with cppdefault.c.
2002-04-03 Jeffrey A Law (law@redhat.com) 2002-04-03 Jeffrey A Law (law@redhat.com)
Hans-Peter Nilsson <hp@bitrange.com> Hans-Peter Nilsson <hp@bitrange.com>

22
gcc/protoize.c
View file

@ -197,14 +197,6 @@ static const int hash_mask = (HASH_TABLE_SIZE - 1);
/* Make a table of default system include directories /* Make a table of default system include directories
just as it is done in cpp. */ just as it is done in cpp. */
#ifndef STANDARD_INCLUDE_DIR
#define STANDARD_INCLUDE_DIR "/usr/include"
#endif
#ifndef LOCAL_INCLUDE_DIR
#define LOCAL_INCLUDE_DIR "/usr/local/include"
#endif
static const struct default_include { const char *const fname; static const struct default_include { const char *const fname;
const char *const component; const char *const component;
const int x1, x2; } include_defaults[] const int x1, x2; } include_defaults[]
@ -215,29 +207,43 @@ static const struct default_include { const char *const fname;
/* Pick up GNU C++ specific include files. */ /* Pick up GNU C++ specific include files. */
{ GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 }, { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1 },
#ifdef CROSS_COMPILE #ifdef CROSS_COMPILE
#ifdef GCC_INCLUDE_DIR
/* This is the dir for fixincludes. Put it just before /* This is the dir for fixincludes. Put it just before
the files that we fix. */ the files that we fix. */
{ GCC_INCLUDE_DIR, "GCC", 0, 0 }, { GCC_INCLUDE_DIR, "GCC", 0, 0 },
#endif
#ifdef CROSS_INCLUDE_DIR
/* For cross-compilation, this dir name is generated /* For cross-compilation, this dir name is generated
automatically in Makefile.in. */ automatically in Makefile.in. */
{ CROSS_INCLUDE_DIR, 0, 0, 0 }, { CROSS_INCLUDE_DIR, 0, 0, 0 },
#endif
#ifdef TOOL_INCLUDE_DIR
/* This is another place that the target system's headers might be. */ /* This is another place that the target system's headers might be. */
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 }, { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 },
#endif
#else /* not CROSS_COMPILE */ #else /* not CROSS_COMPILE */
#ifdef LOCAL_INCLUDE_DIR
/* This should be /use/local/include and should come before /* This should be /use/local/include and should come before
the fixincludes-fixed header files. */ the fixincludes-fixed header files. */
{ LOCAL_INCLUDE_DIR, 0, 0, 1 }, { LOCAL_INCLUDE_DIR, 0, 0, 1 },
#endif
#ifdef TOOL_INCLUDE_DIR
/* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here. /* This is here ahead of GCC_INCLUDE_DIR because assert.h goes here.
Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h. */ Likewise, behind LOCAL_INCLUDE_DIR, where glibc puts its assert.h. */
{ TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 }, { TOOL_INCLUDE_DIR, "BINUTILS", 0, 0 },
#endif
#ifdef GCC_INCLUDE_DIR
/* This is the dir for fixincludes. Put it just before /* This is the dir for fixincludes. Put it just before
the files that we fix. */ the files that we fix. */
{ GCC_INCLUDE_DIR, "GCC", 0, 0 }, { GCC_INCLUDE_DIR, "GCC", 0, 0 },
#endif
/* Some systems have an extra dir of include files. */ /* Some systems have an extra dir of include files. */
#ifdef SYSTEM_INCLUDE_DIR #ifdef SYSTEM_INCLUDE_DIR
{ SYSTEM_INCLUDE_DIR, 0, 0, 0 }, { SYSTEM_INCLUDE_DIR, 0, 0, 0 },
#endif #endif
#ifdef STANDARD_INCLUDE_DIR
{ STANDARD_INCLUDE_DIR, 0, 0, 0}, { STANDARD_INCLUDE_DIR, 0, 0, 0},
#endif
#endif /* not CROSS_COMPILE */ #endif /* not CROSS_COMPILE */
{ 0, 0, 0, 0} { 0, 0, 0, 0}
}; };