git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gcc.c (do_spec_1): Add %M spec token to output multilib_os_dir. 

2012-05-22  Steven Drake <sbd@NetBSD.org>

	* gcc.c (do_spec_1): Add %M spec token to output multilib_os_dir.

From-SVN: r187775
This commit is contained in:
Steven Drake 2012-05-22 15:17:55 +00:00 committed by Joseph Myers
parent f8dc1d832e
commit 3cd50158f5
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gcc/ChangeLog
View File

@ -1,3 +1,7 @@
2012-05-22 Steven Drake <sbd@NetBSD.org>
* gcc.c (do_spec_1): Add %M spec token to output multilib_os_dir.
2012-05-22 David Edelsohn <dje.gcc@gmail.com> 2012-05-22 David Edelsohn <dje.gcc@gmail.com>
* config/rs6000/rs6000.c (rs6000_aix_asm_output_dwarf_table_ref): * config/rs6000/rs6000.c (rs6000_aix_asm_output_dwarf_table_ref):

9
gcc/gcc.c
View File

@ -377,6 +377,7 @@ or with constant text in a single argument.
If multilib_dir is set, extra entries are generated with it affixed. If multilib_dir is set, extra entries are generated with it affixed.
%l process LINK_SPEC as a spec. %l process LINK_SPEC as a spec.
%L process LIB_SPEC as a spec. %L process LIB_SPEC as a spec.
%M Output multilib_os_dir.
%G process LIBGCC_SPEC as a spec. %G process LIBGCC_SPEC as a spec.
%R Output the concatenation of target_system_root and %R Output the concatenation of target_system_root and
target_sysroot_suffix. target_sysroot_suffix.
@ -5115,6 +5116,14 @@ do_spec_1 (const char *spec, int inswitch, const char *soft_matched_part)
return value; return value;
break; break;
case 'M':
if (multilib_os_dir == NULL)
obstack_1grow (&obstack, '.');
else
obstack_grow (&obstack, multilib_os_dir,
strlen (multilib_os_dir));
break;
case 'G': case 'G':
value = do_spec_1 (libgcc_spec, 0, NULL); value = do_spec_1 (libgcc_spec, 0, NULL);
if (value != 0) if (value != 0)