diff options
| author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
| commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
| tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/incpath.c | |
| parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
| download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip | |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/incpath.c')
| -rw-r--r-- | gcc-4.9/gcc/incpath.c | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/gcc-4.9/gcc/incpath.c b/gcc-4.9/gcc/incpath.c index f495c0a7f..ddd856cb7 100644 --- a/gcc-4.9/gcc/incpath.c +++ b/gcc-4.9/gcc/incpath.c @@ -453,6 +453,29 @@ add_path (char *path, int chain, int cxx_aware, bool user_supplied_p) add_cpp_dir_path (p, chain); } +/* Return the bracket and quote include search paths + in *BRACKETS and *QUOTES respectively. */ + +void +get_include_chains (cpp_dir **quotes, cpp_dir **brackets, cpp_dir **systems) +{ + *quotes = heads[QUOTE]; + *brackets = heads[BRACKET]; + *systems = heads[SYSTEM]; +} + +/* Make HEAD and TAIL pointers to include paths resynchronized + after appending new paths. */ + +void +clear_include_chains (void) +{ + heads[QUOTE] = tails[QUOTE] = NULL; + heads[BRACKET] = tails[BRACKET] = NULL; + heads[SYSTEM] = tails[SYSTEM] = NULL; + heads[AFTER] = tails[AFTER] = NULL; +} + /* Exported function to handle include chain merging, duplicate removal, and registration with cpplib. */ void @@ -514,4 +537,3 @@ static void hook_void_charptr_charptr_int (const char *sysroot ATTRIBUTE_UNUSED, #endif struct target_c_incpath_s target_c_incpath = { TARGET_EXTRA_PRE_INCLUDES, TARGET_EXTRA_INCLUDES }; - |