Index: libcpp/macro.c
===================================================================
RCS file: /p/gcc-4.8.1/cvsroot/gcc/dist/libcpp/macro.c,v
retrieving revision 1.5
diff -u -p -r1.5 macro.c
--- libcpp/macro.c	7 Dec 2013 15:05:57 -0000	1.5
+++ libcpp/macro.c	14 Dec 2013 12:23:04 -0000
@@ -254,7 +254,7 @@ cpp_remap_file (const char *arg, char **
 		if (strncmp (remap_src[i], arg, len))
 			continue;
 		if (arg[len] == '\0')
-			return xstrdup (remap_dst[i]);
+			return remap_dst[i];
 		if (arg[len] != '/')
 			continue;
 		arg += len;
@@ -340,6 +340,8 @@ _cpp_builtin_macro_text (cpp_reader *pfi
 	    if (!name)
 	      abort ();
 	  }
+	tmp_name = NULL;
+	name = cpp_remap_file (name, &tmp_name);
 	len = strlen (name);
 	buf = _cpp_unaligned_alloc (pfile, len * 2 + 3);
 	result = buf;