X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=libgcc%2FMakefile.in;h=d6075d32bd4834edbfd820ee76bacec20ae4ba02;hb=4f97bed9a7989e14cbb53e405fbd8b3c08aa75ec;hp=e10a197a4efd2d8957b517ec0b91de3070d90452;hpb=5a4602805eb3ebddbc935b102481e63bffc7c5e6;p=gcc.git diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index e10a197a4ef..d6075d32bd4 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -1,6 +1,6 @@ # Makefile.in -# Copyright (C) 2005-2019 Free Software Foundation, Inc. +# Copyright (C) 2005-2020 Free Software Foundation, Inc. # # This file is part of GCC. # @@ -165,6 +165,7 @@ AUTOCONF = autoconf configure_deps = \ $(srcdir)/../config/enable.m4 \ $(srcdir)/../config/tls.m4 \ + $(srcdir)/../config/toolexeclibdir.m4 \ $(srcdir)/../config/acx.m4 \ $(srcdir)/../config/no-executables.m4 \ $(srcdir)/../config/lib-ld.m4 \ @@ -372,7 +373,7 @@ gthr-default.h: $(srcdir)/$(thread_header) -$(LN_S) $< $@ tmake_file = @tmake_file@ -include $(srcdir)/empty.mk $(tmake_file) +-include $(tmake_file) # Collect target defines and headers from config.host. libgcc_tm_defines = @tm_defines@ @@ -392,7 +393,7 @@ ifeq ($(SHLIB_LINK),) endif ifeq ($(enable_shared),yes) - iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/shared-object.mk,$(iter-items)) + iterator = $(patsubst %,$(srcdir)/shared-object.mk,$(iter-items)) install-shared = install-shared @@ -424,7 +425,7 @@ gen-hide-list = echo > $@ endif ifneq ($(enable_shared),yes) -iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) +iterator = $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) endif LIB2ADD += enable-execute-stack.c @@ -521,7 +522,7 @@ iter-items := $(sifuncs) $(difuncs) $(tifuncs) iter-labels := $(sifuncs) $(difuncs) $(difuncs) iter-sizes := $(patsubst %,4,$(sifuncs) $(difuncs)) $(patsubst %,8,$(tifuncs)) -include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/siditi-object.mk,$(iter-items)) +-include $(patsubst %,$(srcdir)/siditi-object.mk,$(iter-items)) libgcc-objects += $(patsubst %,%$(objext),$(sifuncs) $(difuncs) $(tifuncs)) ifeq ($(enable_shared),yes) @@ -804,7 +805,7 @@ iter-items := $(fixed-funcs) iter-labels := $(fixed-labels) iter-from := $(fixed-modes) iter-to := $(fixed-modes) -include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) +-include $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) # Add arithmetic functions to list of objects to be built libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-funcs))) @@ -823,7 +824,7 @@ iter-items := $(fixed-conv-funcs) iter-labels := $(fixed-conv-labels) iter-from := $(fixed-conv-from) iter-to := $(fixed-conv-to) -include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) +-include $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) # Add conversion functions to list of objects to be built libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-conv-funcs))) @@ -843,7 +844,7 @@ libgcc-objects += $(addsuffix $(objext),$(basename $(notdir $(LIB2ADD_ST)))) c_flags := iter-items := $(LIB2ADD) $(LIB2ADD_ST) -include $(iterator) +-include $(iterator) ifeq ($(enable_shared),yes) libgcc-s-objects += $(addsuffix _s$(objext),$(basename $(notdir $(LIB2ADD)))) @@ -861,7 +862,7 @@ libgcc-eh-objects += $(addsuffix $(objext),$(basename $(notdir $(LIB2ADDEHSTATIC libgcc-s-objects += $(addsuffix _s$(objext),$(basename $(notdir $(LIB2ADDEHSHARED)))) iter-items := $(sort $(LIB2ADDEHSTATIC) $(LIB2ADDEHSHARED)) -include $(iterator) +-include $(iterator) else # Not shared. LIB2ADDEH are added to libgcc.a. @@ -869,7 +870,7 @@ else libgcc-objects += $(addsuffix $(objext),$(basename $(notdir $(LIB2ADDEH)))) iter-items := $(LIB2ADDEH) -include $(iterator) +-include $(iterator) endif @@ -885,27 +886,28 @@ libunwind-s-objects += $(addsuffix _s$(objext),$(basename $(notdir $(LIBUNWIND)) endif iter-items := $(LIBUNWIND) -include $(iterator) +-include $(iterator) # Build libgcov components. -LIBGCOV_MERGE = _gcov_merge_add _gcov_merge_single \ +LIBGCOV_MERGE = _gcov_merge_add _gcov_merge_topn \ _gcov_merge_ior _gcov_merge_time_profile LIBGCOV_PROFILER = _gcov_interval_profiler \ _gcov_interval_profiler_atomic \ _gcov_pow2_profiler \ _gcov_pow2_profiler_atomic \ - _gcov_one_value_profiler_v2 \ - _gcov_one_value_profiler_v2_atomic \ + _gcov_topn_values_profiler \ + _gcov_topn_values_profiler_atomic \ _gcov_average_profiler \ _gcov_average_profiler_atomic \ _gcov_ior_profiler \ _gcov_ior_profiler_atomic \ _gcov_indirect_call_profiler_v4 \ _gcov_time_profiler -LIBGCOV_INTERFACE = _gcov_dump _gcov_flush _gcov_fork \ +LIBGCOV_INTERFACE = _gcov_dump _gcov_fork \ _gcov_execl _gcov_execlp \ - _gcov_execle _gcov_execv _gcov_execvp _gcov_execve _gcov_reset + _gcov_execle _gcov_execv _gcov_execvp _gcov_execve _gcov_reset \ + _gcov_lock_unlock LIBGCOV_DRIVER = _gcov libgcov-merge-objects = $(patsubst %,%$(objext),$(LIBGCOV_MERGE)) @@ -1201,4 +1203,4 @@ install-strip: install # configure. .NOEXPORT: -include $(srcdir)/empty.mk $(wildcard *.dep) +-include $(wildcard *.dep)