diff options
| author | Gary Funck <gary@intrepid.com> | 2012-01-09 08:48:43 +0000 |
|---|---|---|
| committer | Gary Funck <gfunck@gcc.gnu.org> | 2012-01-09 08:48:43 +0000 |
| commit | b492b6862ef38c3a8c7a67f4c410dcf69434507d (patch) | |
| tree | 2b2f237168b3048e8f7a77942d33aaf369c7cae0 /libcpp/macro.c | |
| parent | fdff9f3d33732e60f9c1a22e4a3c40a3aeea7447 (diff) | |
re PR preprocessor/33919 (__BASE_FILE__ does not expand correctly when included from the command line)
libcpp/
PR preprocessor/33919
* files.c (_cpp_get_file_name): New. Implement file name
access function.
* internal.h (_cpp_get_file_name): New prototype.
* macro.c (_cpp_builtin_macro_text): Call _cpp_get_file_name()
to use pfile->main_file in lieu of traversing INCLUDED_FROM chain.
gcc/testsuite/
PR preprocessor/33919
* gcc.dg/pr33919.c: New test.
* gcc.dg/pr33919-0.h: New test header file.
* gcc.dg/pr33919-1.h: Ditto.
* gcc.dg/pr33919-2.h: Ditto.
From-SVN: r183003
Diffstat (limited to 'libcpp/macro.c')
| -rw-r--r-- | libcpp/macro.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libcpp/macro.c b/libcpp/macro.c index d96b2631a86..32f99ca030a 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -1,7 +1,7 @@ /* Part of CPP library. (Macro and #define handling.) Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. Written by Per Bothner, 1994. Based on CCCP program by Paul Rubin, June 1986 Adapted to ANSI C, Richard Stallman, Jan 1987 @@ -278,10 +278,9 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) pfile->line_table->highest_line); else { - map = linemap_lookup (pfile->line_table, pfile->line_table->highest_line); - while (! MAIN_FILE_P (map)) - map = INCLUDED_FROM (pfile->line_table, map); - name = ORDINARY_MAP_FILE_NAME (map); + name = _cpp_get_file_name (pfile->main_file); + if (!name) + abort (); } len = strlen (name); buf = _cpp_unaligned_alloc (pfile, len * 2 + 3); |