X-Git-Url: http://git.samba.org/?a=blobdiff_plain;f=Makerules;h=b46b09b369b4e1c5c7a99e523f22e9f4a3d0969f;hb=384b7b4309cbbbe84481973b84ead98bb4fc54be;hp=f1807c2ee8c73d287e649760d15cf49fe27de011;hpb=4962050e9783502ec0465ae1b6a4103563385198;p=jlayton%2Fglibc.git diff --git a/Makerules b/Makerules index f1807c2ee8..b46b09b369 100644 --- a/Makerules +++ b/Makerules @@ -1,4 +1,4 @@ -# Copyright (C) 1991-2012 Free Software Foundation, Inc. +# Copyright (C) 1991-2014 Free Software Foundation, Inc. # This file is part of the GNU C Library. # The GNU C Library is free software; you can redistribute it and/or @@ -93,7 +93,7 @@ before-compile := $(filter $(common-objpfx)mach% $(common-objpfx)hurd%,\ $(before-compile)) # Even before that, we need abi-versions.h which is generated right here. -ifeq ($(versioning),yes) +ifeq ($(build-shared),yes) ifndef avoid-generated before-compile := $(common-objpfx)abi-versions.h $(before-compile) $(common-objpfx)abi-versions.h: $(..)scripts/abi-versions.awk \ @@ -106,7 +106,7 @@ $(common-objpfx)%.latest: $(common-objpfx)abi-versions.h $(common-objpfx)abi-versions.h > $@T mv -f $@T $@ endif # avoid-generated -endif # $(versioning) = yes +endif # $(build-shared) = yes ifndef avoid-generated before-compile := $(common-objpfx)libc-abis.h $(before-compile) @@ -217,14 +217,9 @@ endif # later directory would be chosen over a .c file in an earlier directory, # which does not preserve the desired sysdeps ordering behavior. -# System-dependent makefiles can put in `inhibit-sysdep-asm' wildcard -# patterns matching sysdep directories whose assembly source files should -# be suppressed. -ifdef inhibit-sysdep-asm -define check-inhibit-asm -case $$sysdir in $(subst $(empty) ,|,$(inhibit-sysdep-asm))) asm= ;; esac; -endef -endif +# System-dependent makefiles can put in `inhibit-sysdep-asm' regexps +# matching sysdep directories whose assembly source files should be +# suppressed. -include $(common-objpfx)sysd-rules ifneq ($(sysd-rules-sysdirs),$(config-sysdirs)) @@ -233,34 +228,16 @@ ifneq ($(sysd-rules-sysdirs),$(config-sysdirs)) sysd-rules-force = FORCE FORCE: endif -$(common-objpfx)sysd-rules: $(common-objpfx)config.make $(..)Makerules \ +$(common-objpfx)sysd-rules: $(..)scripts/sysd-rules.awk \ + $(common-objpfx)config.make $(..)Makerules \ $(sysdep-makefiles) $(sysdep-makeconfigs) \ $(sysd-rules-force) -@rm -f $@T - (echo 'sysd-rules-sysdirs := $(config-sysdirs)'; \ - for dir in $(config-sysdirs); do \ - case "$$dir" in \ - /*) ;; \ - *) dir="\$$(..)$$dir" ;; \ - esac; \ - asm='.S .s'; \ - $(check-inhibit-asm) \ - for o in $(all-object-suffixes); do \ - set $(subst :, ,$(sysd-rules-patterns)); \ - while [ $$# -ge 2 ]; do \ - t=$$1; shift; \ - d=$$1; shift; \ - v=$${t%%%}; [ x"$$v" = x ] || v="\$$($${v}CPPFLAGS)"; \ - for s in $$asm .c; do \ - echo "\$$(objpfx)$$t$$o: $$dir/$$d$$s \$$(before-compile)"; \ - echo " \$$(compile-command$$s) $$v"; \ - done; \ - done; \ - done; \ - echo "\$$(inst_includedir)/%.h: $$dir/%.h \$$(+force)"; \ - echo " \$$(do-install)"; \ - done; \ - echo 'sysd-rules-done = t') > $@T + LC_ALL=C $(AWK) -f $< > $@T \ + -v all_object_suffixes='$(all-object-suffixes)' \ + -v inhibit_sysdep_asm='$(inhibit-sysdep-asm)' \ + -v sysd_rules_patterns='$(sysd-rules-patterns)' \ + -v config_sysdirs='$(config-sysdirs)' mv -f $@T $@ ifndef sysd-rules-done @@ -274,12 +251,6 @@ endef object-suffixes-left := $(all-object-suffixes) include $(o-iterator) -define o-iterator-doit -$(objpfx)%$o: %.s $(before-compile); $$(compile-command.s) -endef -object-suffixes-left := $(all-object-suffixes) -include $(o-iterator) - define o-iterator-doit $(objpfx)%$o: %.c $(before-compile); $$(compile-command.c) endef @@ -303,12 +274,6 @@ endef object-suffixes-left := $(all-object-suffixes) include $(o-iterator) -define o-iterator-doit -$(objpfx)%$o: $(objpfx)%.s $(before-compile); $$(compile-command.s) -endef -object-suffixes-left := $(all-object-suffixes) -include $(o-iterator) - define o-iterator-doit $(objpfx)%$o: $(objpfx)%.c $(before-compile); $$(compile-command.c) endef @@ -318,7 +283,7 @@ endif # Generate version maps, but wait until sysdep-subdirs is known ifeq ($(sysd-sorted-done),t) -ifeq ($(versioning),yes) +ifeq ($(build-shared),yes) -include $(common-objpfx)sysd-versions $(addprefix $(common-objpfx),$(version-maps)): $(common-objpfx)sysd-versions common-generated += $(version-maps) @@ -359,30 +324,37 @@ $(common-objpfx)sysd-versions: $(common-objpfx)Versions.all \ ) > $@T mv -f $@T $@ endif # avoid-generated -endif # $(versioning) = yes +endif # $(build-shared) = yes endif # sysd-sorted-done # Generate .dT files as we compile. compile-mkdep-flags = -MD -MP -MF $@.dt -MT $@ compile-command.S = $(compile.S) $(OUTPUT_OPTION) $(compile-mkdep-flags) -compile-command.s = $(COMPILE.s) $< $(OUTPUT_OPTION) $(compile-mkdep-flags) compile-command.c = $(compile.c) $(OUTPUT_OPTION) $(compile-mkdep-flags) compile-command.cc = $(compile.cc) $(OUTPUT_OPTION) $(compile-mkdep-flags) +# Like compile-mkdep-flags, but for use with $(BUILD_CC). We don't want to +# track system includes here, they may spuriously trigger an install rule, +# and would cause the check-local-headers test to fail. +native-compile-mkdep-flags = -MMD -MP -MF $@.dt -MT $@ + # GCC can grok options after the file name, and it looks nicer that way. compile.c = $(CC) $< -c $(CFLAGS) $(CPPFLAGS) compile.cc = $(CXX) $< -c $(CXXFLAGS) $(CPPFLAGS) compile.S = $(CC) $< -c $(CPPFLAGS) $(S-CPPFLAGS) \ $(ASFLAGS) $(ASFLAGS-$(suffix $@)) +COMPILE.c = $(CC) -c $(CFLAGS) $(CPPFLAGS) COMPILE.S = $(CC) -c $(CPPFLAGS) $(S-CPPFLAGS) \ $(ASFLAGS) $(ASFLAGS-$(suffix $@)) -COMPILE.s = $(filter-out -pipe,$(CC)) -c $(ASFLAGS) # We need this for the output to go in the right place. It will default to # empty if make was configured to work with a cc that can't grok -c and -o # together. You can't compile the C library with such a compiler. OUTPUT_OPTION = -o $@ +# This is the end of the pipeline for compiling generated C code. +compile-stdin.c = $(COMPILE.c) -o $@ -x c - $(compile-mkdep-flags) + # We need the $(CFLAGS) to be in there to have the right predefines during # the dependency run for C sources. But having it for assembly sources can # get the wrong predefines. @@ -414,45 +386,60 @@ static-only-routines = endif endif -# Bounded pointer thunks are only built for *.ob -elide-bp-thunks = $(addprefix $(bppfx),$(bp-thunks)) - elide-routines.oS += $(filter-out $(static-only-routines),\ - $(routines) $(aux) $(sysdep_routines)) \ - $(elide-bp-thunks) -elide-routines.os += $(static-only-routines) $(elide-bp-thunks) + $(routines) $(aux) $(sysdep_routines)) +elide-routines.os += $(static-only-routines) # If we have versioned code we don't need the old versions in any of the # static libraries. -elide-routines.o += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.op += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.og += $(shared-only-routines) $(elide-bp-thunks) -elide-routines.ob += $(shared-only-routines) +elide-routines.o += $(shared-only-routines) +elide-routines.op += $(shared-only-routines) +elide-routines.og += $(shared-only-routines) # Shared library building. ifeq (yes,$(build-shared)) -# Reference map file only when versioning is selected and a map file name +# Reference map file only when shared libraries are built and a map file name # is given. -ifeq ($(versioning),yes) +ifeq ($(build-shared),yes) map-file = $(firstword $($(@F:.so=-map)) \ $(addprefix $(common-objpfx), \ $(filter $(@F:.so=.map),$(version-maps)))) load-map-file = $(map-file:%=-Wl,--version-script=%) endif +# Compiler arguments to use to link a shared object with libc and +# ld.so. This is intended to be as similar as possible to a default +# link with an installed libc. +link-libc-args = -Wl,--start-group \ + $(libc-for-link) \ + $(common-objpfx)libc_nonshared.a \ + $(as-needed) $(elfobjdir)/ld.so $(no-as-needed) \ + -Wl,--end-group + +# The corresponding shared libc to use. This may be modified for a +# particular target. +libc-for-link = $(common-objpfx)libc.so + +# The corresponding dependencies. As these are used in dependencies, +# not just commands, they cannot use target-specific variables so need +# to name both possible libc.so objects. +link-libc-deps = $(common-objpfx)libc.so $(common-objpfx)linkobj/libc.so \ + $(common-objpfx)libc_nonshared.a $(elfobjdir)/ld.so + # Pattern rule to build a shared object from an archive of PIC objects. # This must come after the installation rules so Make doesn't try to # build shared libraries in place from the installed *_pic.a files. # $(LDLIBS-%.so) may contain -l switches to generate run-time dependencies -# on other shared objects. -lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp) - $(build-shlib) +# on other shared objects. The linking with libc and ld.so is intended +# to be as similar as possible to a default link with an installed libc. +lib%.so: lib%_pic.a $(+preinit) $(+postinit) $(+interp) $(link-libc-deps) + $(build-shlib) $(link-libc-args) define build-shlib-helper $(LINK.o) -shared $(static-libgcc) -Wl,-O1 $(sysdep-LDFLAGS) \ - $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) $(config-LDFLAGS) \ + $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) $(rtld-LDFLAGS) \ $(extra-B-$(@F:lib%.so=%).so) -B$(csu-objpfx) \ $(extra-B-$(@F:lib%.so=%).so) $(load-map-file) \ -Wl,-soname=lib$(libprefix)$(@F:lib%.so=%).so$($(@F)-version) \ @@ -470,7 +457,7 @@ else $(common-objpfx)shlib.lds: $(common-objpfx)config.make $(..)Makerules $(LINK.o) -shared -Wl,-O1 \ -nostdlib -nostartfiles \ - $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \ + $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \ -Wl,--verbose 2>&1 | \ sed > $@T \ -e '/^=========/,/^=========/!d;/^=========/d' \ @@ -510,7 +497,7 @@ $(build-shlib-helper) -o $@ $(shlib-lds-flags) \ endef define build-module-helper -$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(config-LDFLAGS) \ +$(LINK.o) -shared $(static-libgcc) $(sysdep-LDFLAGS) $(rtld-LDFLAGS) \ $(if $($(@F)-no-z-defs)$(no-z-defs),,-Wl,-z,defs) \ -B$(csu-objpfx) $(load-map-file) \ $(LDFLAGS.so) $(LDFLAGS-$(@F:%.so=%).so) \ @@ -523,17 +510,19 @@ endef # not for shared objects define build-module $(build-module-helper) -o $@ $(shlib-lds-flags) \ - $(csu-objpfx)abi-note.o $(build-module-objlist) + $(csu-objpfx)abi-note.o $(build-module-objlist) $(link-libc-args) endef define build-module-asneeded $(build-module-helper) -o $@ $(shlib-lds-flags) \ $(csu-objpfx)abi-note.o \ - -Wl,--as-needed $(build-module-objlist) -Wl,--no-as-needed + -Wl,--as-needed $(build-module-objlist) -Wl,--no-as-needed \ + $(link-libc-args) endef build-module-helper-objlist = \ $(patsubst %_pic.a,$(whole-archive) %_pic.a $(no-whole-archive),\ - $(filter-out %.lds $(map-file) $(+preinit) $(+postinit),$^)) + $(filter-out %.lds $(map-file) $(+preinit) $(+postinit) \ + $(link-libc-deps),$^)) build-module-objlist = $(build-module-helper-objlist) $(LDLIBS-$(@F:%.so=%).so) build-shlib-objlist = $(build-module-helper-objlist) \ @@ -576,14 +565,48 @@ generated += libc_pic.opts libc_pic.os.clean libc_pic_clean := .clean endif -# Use our own special initializer and finalizer files for libc.so. +# Build a possibly-modified version of libc_pic.a for use in building +# linkobj/libc.so. +ifeq (,$(filter sunrpc,$(subdirs))) +$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a + $(make-target-directory) + ln -f $< $@ +else +$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \ + $(common-objpfx)sunrpc/librpc_compat_pic.a + $(make-target-directory) + (cd $(common-objpfx)linkobj; \ + $(AR) x ../libc_pic.a; \ + rm $$($(AR) t ../sunrpc/librpc_compat_pic.a | sed 's/^compat-//'); \ + $(AR) x ../sunrpc/librpc_compat_pic.a; \ + $(AR) cr libc_pic.a *.os; \ + rm *.os) +endif # $(subdirs) contains sunrpc + +# Clear link-libc-deps for the libc.so libraries so build-shlibs does not +# filter ld.so out of the list of linked objects. +$(common-objpfx)libc.so: link-libc-deps = # empty +$(common-objpfx)linkobj/libc.so: link-libc-deps = # empty + +# Use our own special initializer and finalizer files for the libc.so +# libraries. $(common-objpfx)libc.so: $(elfobjdir)/soinit.os \ $(common-objpfx)libc_pic.os$(libc_pic_clean) \ $(elfobjdir)/sofini.os \ - $(elfobjdir)/interp.os $(elfobjdir)/ld.so \ + $(elfobjdir)/interp.os \ + $(elfobjdir)/ld.so \ $(shlib-lds) $(build-shlib) -ifeq ($(versioning),yes) + +$(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \ + $(common-objpfx)linkobj/libc_pic.a \ + $(elfobjdir)/sofini.os \ + $(elfobjdir)/interp.os \ + $(elfobjdir)/ld.so \ + $(shlib-lds) + $(build-shlib) + +ifeq ($(build-shared),yes) $(common-objpfx)libc.so: $(common-objpfx)libc.map endif common-generated += libc.so libc_pic.os @@ -606,11 +629,7 @@ headers := $(headers) $(sysdep_headers) # This is the list of all object files, gotten by # replacing every ".c" in `sources' with a ".o". -# We also add bounded-pointer thunks, which are later -# elided for all suffixes except for `.ob'. -override objects := $(addprefix $(objpfx),$(sources:.c=.o) \ - $(patsubst %,$(bppfx)%.o,\ - $(filter $(routines) $(sysdep_routines),$(bp-thunks)))) +override objects := $(addprefix $(objpfx),$(sources:.c=.o)) # The makefile may define $(extra-libs) with `libfoo libbar' @@ -635,13 +654,13 @@ include $(patsubst %,$(..)extra-modules.mk,$(modules-names)) extra-modules-build := $(filter-out $(modules-names-nobuild),$(modules-names)) $(extra-modules-build:%=$(objpfx)%.so): $(objpfx)%.so: \ - $(objpfx)%.os $(shlib-lds) \ - $(common-objpfx)libc.so $(common-objpfx)libc_nonshared.a + $(objpfx)%.os $(shlib-lds) $(link-libs-deps) $(build-module) endif +depfiles := $(sources:.c=.d) \ $(patsubst %.o,%.d,$(filter %.o,$(extra-objs:.os=.o))) \ + $(patsubst %.oS,%.d,$(filter %.oS,$(extra-objs))) \ $(patsubst %.o,%.d,$(filter %.o,$(extra-test-objs:.os=.o))) \ $(addsuffix .d,$(tests) $(xtests) $(test-srcs)) ifeq ($(build-programs),yes) @@ -845,11 +864,11 @@ install-lib.so-unversioned := $(filter-out $(versioned), $(install-lib.so)) # $(inst_libdir)/libfoo.so -- for linking, symlink or ld script # $(inst_slibdir)/libfoo.so.NN -- for loading by SONAME, symlink # $(inst_slibdir)/libfoo-X.Y.Z.so -- the real shared object file -V := $(firstword $($(subdir)-version) $(version)) +lib-version := $(firstword $($(subdir)-version) $(version)) install-lib-nosubdir: $(install-lib.so-unversioned:%=$(inst_slibdir)/%) \ $(foreach L,$(install-lib.so-versioned),\ $(inst_libdir)/$L \ - $(inst_slibdir)/$(L:.so=)-$V.so \ + $(inst_slibdir)/$(L:.so=)-$(lib-version).so \ $(inst_slibdir)/$L$($L-version)) # Install all the unversioned shared libraries. @@ -877,7 +896,7 @@ ifeq (no,$(cross-compiling)) symbolic-link-prog := $(common-objpfx)elf/sln symbolic-link-list := $(common-objpfx)elf/symlink.list define make-shlib-link -echo $(> $(symbolic-link-list) +echo `$(..)scripts/rellns-sh -p $< $@` $@ >> $(symbolic-link-list) endef else # cross-compiling # We need a definition that can be used by elf/Makefile's install rules. @@ -887,7 +906,7 @@ endif ifndef make-shlib-link define make-shlib-link rm -f $@ -$(LN_S) $( $@.new 'OUTPUT_FORMAT($(output-format))' else - $(LINK.o) -shared $(sysdep-LDFLAGS) $(config-LDFLAGS) $(LDFLAGS.so) \ + $(LINK.o) -shared $(sysdep-LDFLAGS) $(rtld-LDFLAGS) $(LDFLAGS.so) \ -x c /dev/null -o $@.so -Wl,--verbose -v 2>&1 \ | sed -n -f $< > $@.new test -s $@.new @@ -941,7 +960,7 @@ $(inst_libdir)/libc.so: $(common-objpfx)format.lds \ cat $<; \ echo 'GROUP ( $(slibdir)/libc.so$(libc.so-version)' \ '$(libdir)/$(patsubst %,$(libtype.oS),$(libprefix)$(libc-name))'\ - ' AS_NEEDED (' $(slibdir)/$(rtld-installed-name) ') )' \ + ' AS_NEEDED (' $(rtlddir)/$(rtld-installed-name) ') )' \ ) > $@.new mv -f $@.new $@ @@ -1114,25 +1133,16 @@ install-no-libc.a-nosubdir: install-bin-nosubdir install-bin-script-nosubdir \ endif install: install-no-libc.a-nosubdir -# Command to compile $< in $(objdir) using the native libraries. +# Command to compile $< using the native libraries. define native-compile $(make-target-directory) -$(patsubst %/,cd % &&,$(objpfx)) \ $(BUILD_CC) $($(basename $( $@T + LC_ALL=C $(OBJDUMP) --dynamic-syms $< > $@T mv -f $@T $@ -check-abi-%: $(..)scripts/extract-abilist.awk $(common-objpfx)config.make \ - $(..)abilist/%.abilist $(objpfx)%.symlist +# A sysdeps/.../Makefile can set abilist-pattern to something like +# %-foo.abilist to look for libc-foo.abilist instead of libc.abilist. +# This makes sense if multiple ABIs can be most cleanly supported by a +# configuration without using separate sysdeps directories for each. +ifdef abilist-pattern +vpath $(abilist-pattern) $(+sysdep_dirs) +endif + +vpath %.abilist $(+sysdep_dirs) + +# The .PRECIOUS rule prevents the files built by an implicit rule whose +# target pattern is %.symlist from being considered "intermediate files" +# and automatically removed. We only want these files to be removed by +# 'make clean', which is handled by the 'generated' variable. +.PRECIOUS: %.symlist +generated += $(extra-libs:=.symlist) + +ifdef abilist-pattern +check-abi-%: $(common-objpfx)config.make $(abilist-pattern) $(objpfx)%.symlist + $(check-abi-pattern) +check-abi-%: $(common-objpfx)config.make $(abilist-pattern) \ + $(common-objpfx)%.symlist + $(check-abi-pattern) +endif +check-abi-%: $(common-objpfx)config.make %.abilist $(objpfx)%.symlist $(check-abi) -check-abi-%: $(..)scripts/extract-abilist.awk $(common-objpfx)config.make \ - $(..)abilist/%.abilist $(common-objpfx)%.symlist +check-abi-%: $(common-objpfx)config.make %.abilist $(common-objpfx)%.symlist $(check-abi) +define check-abi-pattern + diff -p -U 0 $(filter $(abilist-pattern),$^) $(filter %.symlist,$^) +endef define check-abi - LC_ALL=C \ - $(AWK) -f $< -v 'config=$(check-abi-config)' \ - $(patsubst %,-v 'lastversion=%',$($*-abi-frozen)) \ - $(filter %.abilist,$^) \ - | { diff -p -U 0 - $(filter %.symlist,$^) $(check-abi-warn) ; } + diff -p -U 0 $(filter %.abilist,$^) $(filter %.symlist,$^) endef -ifeq ($(enable-check-abi),warn) -check-abi-warn = || echo '*** WARNING: $*.so failed ABI check' -endif -ifeq ($(firstword $(sysd-sorted-done) f)$(firstword $(generating) f),tf) -config-tls := thread -check-abi-config := \ - $(config-machine)-$(config-vendor)-$(config-os)/$(config-tls) +ifdef abilist-pattern +update-abi-%: $(objpfx)%.symlist $(abilist-pattern) + $(update-abi-pattern) +update-abi-%: $(common-objpfx)%.symlist $(abilist-pattern) + $(update-abi-pattern) endif - -update-abi-%: $(..)scripts/merge-abilist.awk $(..)abilist/%.abilist \ - $(objpfx)%.symlist +update-abi-%: $(objpfx)%.symlist %.abilist $(update-abi) -update-abi-%: $(..)scripts/merge-abilist.awk $(..)abilist/%.abilist \ - $(common-objpfx)%.symlist +update-abi-%: $(common-objpfx)%.symlist %.abilist $(update-abi) -ifndef update-abi-config -define update-abi - @echo 'Run $(MAKE) $@ update-abi-config=REGEXP'; exit 2 +define update-abi-pattern +@if cmp -s $^ 2> /dev/null; \ + then \ + echo '+++ $(filter $(abilist-pattern),$^) is unchanged'; \ + else cp -f $^; \ + echo '*** Now check $(filter $(abilist-pattern),$^) changes for correctness ***'; \ + fi endef -else define update-abi -LC_ALL=C $(AWK) -v config='$(update-abi-config)' -f $^ \ - > $(..)abilist/$*.abilist.new -@if cmp -s $(..)abilist/$*.abilist.new $(..)abilist/$*.abilist 2> /dev/null; \ - then rm -f $(..)abilist/$*.abilist.new; \ - echo '+++ $(..)abilist/$*.abilist is unchanged'; \ - else mv -f $(..)abilist/$*.abilist.new $(..)abilist/$*.abilist; \ - echo '*** Now check $*.abilist changes for correctness ***'; \ +@if cmp -s $^ 2> /dev/null; \ + then \ + echo '+++ $(filter %.abilist,$^) is unchanged'; \ + else cp -f $^; \ + echo '*** Now check $(filter %.abilist,$^) changes for correctness ***'; \ fi endef -endif .PHONY: update-abi check-abi update-abi: $(patsubst %.so,update-abi-%,$(install-lib.so-versioned)) @@ -1229,12 +1255,10 @@ common-generated += libc.symlist endif ifeq ($(build-shared),yes) -ifneq ($(enable-check-abi),no) ifdef subdir tests: check-abi endif endif -endif endif @@ -1254,7 +1278,7 @@ $(stdio_lim:h=st): $(..)stdio-common/stdio_lim.h.in $(..)Rules \ echo '#define _LIBC 1'; \ echo '#include "$(..)misc/sys/uio.h"'; } | \ $(CC) -E -dM -MD -MP -MF $(@:st=dT) -MT '$(@:st=h) $(@:st=d)' \ - $(+includes) -xc - -o $(@:st=hT) + $(CPPUNDEFS) $(+includes) -xc - -o $(@:st=hT) sed $(sed-remove-objpfx) $(sed-remove-dotdot) \ $(@:st=dT) > $(@:st=dt) mv -f $(@:st=dt) $(@:st=d) @@ -1304,9 +1328,7 @@ mostlyclean: common-mostlyclean do-tests-clean: -rm -f $(addprefix $(objpfx),$(addsuffix .out,$(tests) $(xtests) \ - $(test-srcs)) \ - $(addsuffix -bp.out,$(tests) $(xtests) \ - $(test-srcs))) + $(test-srcs))) # Remove the object files. common-mostlyclean: @@ -1315,12 +1337,8 @@ common-mostlyclean: $(addsuffix .o,$(tests) $(xtests) \ $(test-srcs) $(others) \ $(sysdep-others)) \ - $(addsuffix -bp,$(tests) $(xtests) \ - $(test-srcs)) \ $(addsuffix .out,$(tests) $(xtests) \ - $(test-srcs)) \ - $(addsuffix -bp.out,$(tests) $(xtests) \ - $(test-srcs))) + $(test-srcs))) -rm -f $(addprefix $(objpfx),$(extra-objs) $(extra-test-objs) \ $(install-lib) $(install-lib.so) \ $(install-lib.so:%.so=%_pic.a)) @@ -1338,11 +1356,10 @@ common-clean: common-mostlyclean -rm -f $(objpfx)*.d $(objpfx)*.dt -rm -fr $(addprefix $(objpfx),$(generated-dirs)) -rm -f $(addprefix $(common-objpfx),$(common-generated)) + -rm -f $(gen-as-const-headers:%.sym=$(common-objpfx)%.h) # Produce a file `stubs' which contains `#define __stub_FUNCTION' -# for each function which is a stub. We grovel over all the .d files -# looking for references to . Then we grovel over each -# referenced source file to see what stub function it defines. +# for each function which is a stub. ifdef objpfx .PHONY: stubs # The parent Makefile calls this target.