Commit d11bf18f by Bernd Schmidt Committed by Bernd Schmidt

Makefile.in (srcdirify): Change order so that libgcc_objdir is substituted first.

	* Makefile.in (srcdirify): Change order so that libgcc_objdir is
	substituted first.
	* libgcc-std.ver: Delete file.

From-SVN: r174284
parent ac8e1875
2011-05-26 Bernd Schmidt <bernds@codesourcery.com>
* Makefile.in (srcdirify): Change order so that libgcc_objdir is
substituted first.
* libgcc-std.ver: Delete file.
2011-05-26 Richard Guenther <rguenther@suse.de> 2011-05-26 Richard Guenther <rguenther@suse.de>
PR tree-optimization/48702 PR tree-optimization/48702
......
...@@ -1894,13 +1894,15 @@ cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS) ...@@ -1894,13 +1894,15 @@ cc1$(exeext): $(C_OBJS) cc1-checksum.o $(BACKEND) $(LIBDEPS)
LIB2ADD = $(LIB2FUNCS_EXTRA) LIB2ADD = $(LIB2FUNCS_EXTRA)
LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA) LIB2ADD_ST = $(LIB2FUNCS_STATIC_EXTRA)
# All source files for libgcc are either in the source directory (in # All source files for libgcc are either generated in the libgcc build
# which case they will start with $(srcdir)), or generated into the build # directory which will be substituted for $$(libgcc_objdir), in the
# directory (in which case they will be relative paths). # source directory (in which case they will start with $(srcdir)), or
srcdirify = $(patsubst $(srcdir)%,$$(gcc_srcdir)%,$(filter $(srcdir)%,$(1))) \ # generated into the build directory (in which case they will be
$(patsubst $$(libgcc_objdir)/%,%, \ # relative paths).
srcdirify = $(patsubst $$(libgcc_objdir)/%,%, \
$(filter $$(libgcc_objdir)%,$(1))) \ $(filter $$(libgcc_objdir)%,$(1))) \
$(patsubst %,$$(gcc_objdir)/%, \ $(patsubst $(srcdir)%,$$(gcc_srcdir)%,$(filter $(srcdir)%,$(1))) \
$(patsubst %,$$(gcc_objdir)/%, \
$(filter-out $(srcdir)% $$(libgcc_objdir)%,$(1))) $(filter-out $(srcdir)% $$(libgcc_objdir)%,$(1)))
# The distinction between these two variables is no longer relevant, # The distinction between these two variables is no longer relevant,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment