diff options
author | pfg <pfg@FreeBSD.org> | 2013-12-18 19:07:29 +0000 |
---|---|---|
committer | pfg <pfg@FreeBSD.org> | 2013-12-18 19:07:29 +0000 |
commit | 6f93e9ad10bb17a8b07e0cab16df0097d5ba6090 (patch) | |
tree | 234e9f04b601b7b9c9ff48f56f79bcd379485350 /contrib/gcc/cppdefault.c | |
parent | a70f2adf579c967cdf8017632ea2266fe2e9eb4a (diff) | |
download | FreeBSD-src-6f93e9ad10bb17a8b07e0cab16df0097d5ba6090.zip FreeBSD-src-6f93e9ad10bb17a8b07e0cab16df0097d5ba6090.tar.gz |
MFC r258428, r258445
gcc: another round of merges from the gcc pre-43 branch.
Bring The following revisions from the gcc43 branch[1]:
118360, 118361, 118363, 118576, 119820,
123906, 125246, and 125721.
They all have in common that the were merged long ago
into Apple's gcc and should help improve the general
quality of the compiler and make it easier to bring
new features from Apple's gcc42.
For details please review the additions to the files:
gcc/ChangeLog.gcc43
gcc/cp/ChangeLog.gcc43 (new, adds previous revisions)
Fix crosscompilation (r258445 by andreast)
Reference:
[1] http://gcc.gnu.org/viewcvs/gcc/trunk/?pathrev=126700
Obtained from: gcc pre4.3 (GPLv2) branch
MFC after: 3 weeks
Diffstat (limited to 'contrib/gcc/cppdefault.c')
-rw-r--r-- | contrib/gcc/cppdefault.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gcc/cppdefault.c b/contrib/gcc/cppdefault.c index d040558..4346660 100644 --- a/contrib/gcc/cppdefault.c +++ b/contrib/gcc/cppdefault.c @@ -33,7 +33,7 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #define STANDARD_INCLUDE_COMPONENT 0 #endif -#if defined (CROSS_COMPILE) && !defined (TARGET_SYSTEM_ROOT) +#if defined (CROSS_DIRECTORY_STRUCTURE) && !defined (TARGET_SYSTEM_ROOT) # undef LOCAL_INCLUDE_DIR # undef SYSTEM_INCLUDE_DIR # undef STANDARD_INCLUDE_DIR |