#--------------------------------------------------------------
# You shouldn't need to mess with anything beyond this point...
#--------------------------------------------------------------
-clean_targets := clean realclean distclean \
- objclean-y headers_clean-y CLEAN_utils
-noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \
- defconfig allyesconfig allnoconfig \
- release dist tags help
-
include $(top_srcdir)Rules.mak
sub_headers := headers
-ifndef KCONFIG_CONFIG
-KCONFIG_CONFIG := $(top_builddir).config
-endif
-export KCONFIG_CONFIG
ifeq ($(HAVE_DOT_CONFIG),y)
conf := $(top_builddir)extra/config/conf
mconf := $(top_builddir)extra/config/mconf
+nconf := $(top_builddir)extra/config/nconf
ifeq ($(HAVE_DOT_CONFIG),y)
# If the .config changes then we have to make sure that our includes are
# have uClibc_config.h as prerequisite but since we _symlink_ the headers
# and do not (?) want to rely on 'make -L' we better update them right here,
# on spot to save us from alot of hazzle.
-$(top_builddir)include/bits/uClibc_config.h: $(conf) $(KCONFIG_CONFIG) $(top_srcdir)extra/scripts/conf-header.sh | $(top_builddir)include/bits $(top_builddir)include/config
+$(top_builddir)include/bits/uClibc_config.h: $(conf) $(KCONFIG_CONFIG) $(top_srcdir)extra/scripts/conf-header.sh | $(top_builddir)include/bits
@$(disp_gen)
- $(Q)@$< -s $(top_srcdir)extra/Configs/Config.in
+ $(Q)$< -s $(Kconfig)
$(Q)$(top_srcdir)extra/scripts/conf-header.sh $(KCONFIG_CONFIG) > $@
$(Q)$(MAKE) headers-y
$(top_builddir)include/config/linuxthreads/old.h $(top_builddir)include/config/linuxthreads/new.h:
@true
+$(top_builddir)include/generated/unifdef_config.h: $(top_builddir)include/bits/uClibc_config.h | $(top_builddir)include/generated
+ @$(disp_gen)
+ $(Q)$(SED) -e '1,3d' $^ > $@
+
# For the moment, we have to keep re-running this target
# because the fix includes scripts rely on pre-processers
# in order to generate the headers correctly :(. That
export header_extra_args = -n
endif
HEADERS_BITS_COMMON := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common/bits/*.h))
+ifneq ($(ARCH_HAS_DEPRECATED_SYSCALLS),y)
+HEADERS_BITS_COMMON_NO_LEGACY := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common-generic/bits/*.h))
+HEADERS_BITS_COMMON := $(filter-out $(HEADERS_BITS_COMMON_NO_LEGACY),$(HEADERS_BITS_COMMON))
+ALL_HEADERS_BITS_COMMON_NO_LEGACY := $(addprefix $(top_builddir)include/bits/,$(HEADERS_BITS_COMMON_NO_LEGACY))
+endif
+
HEADERS_BITS_ARCH := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/*.h))
HEADERS_BITS_SUBARCH :=
ifneq ($(TARGET_SUBARCH),)
HEADERS_BITS_SUBARCH := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/*.h))
endif
+ifneq ($(HEADERS_BITS_PTHREAD),)
+HEADERS_BITS_ARCH := $(filter-out $(HEADERS_BITS_PTHREAD),$(HEADERS_BITS_ARCH))
+HEADERS_BITS_SUBARCH:= $(filter-out $(HEADERS_BITS_PTHREAD),$(HEADERS_BITS_SUBARCH))
+endif
HEADERS_BITS_COMMON := $(filter-out $(HEADERS_BITS_ARCH) $(HEADERS_BITS_SUBARCH) $(HEADERS_BITS_PTHREAD),$(HEADERS_BITS_COMMON))
HEADERS_SYS_COMMON := $(notdir $(wildcard $(top_srcdir)libc/sysdeps/linux/common/sys/*.h))
HEADERS_SYS_COMMON := $(filter-out $(HEADERS_SYS_ARCH),$(HEADERS_SYS_COMMON))
ALL_HEADERS_COMMON := $(top_builddir)include/fpu_control.h \
+ $(top_builddir)include/jmpbuf-offsets.h \
+ $(top_builddir)include/jmpbuf-unwind.h \
$(top_builddir)include/dl-osinfo.h \
- $(top_builddir)include/hp-timing.h
+ $(top_builddir)include/hp-timing.h \
+ $(top_builddir)include/not-cancel.h
ALL_HEADERS_BITS_COMMON := $(addprefix $(top_builddir)include/bits/,$(HEADERS_BITS_COMMON))
ALL_HEADERS_BITS_ARCH := $(addprefix $(top_builddir)include/bits/,$(HEADERS_BITS_ARCH))
ifneq ($(TARGET_SUBARCH),)
$(ALL_HEADERS_SYS_ARCH) \
$(ALL_HEADERS_BITS_PTHREAD)
-$(top_builddir)include/fpu_control.h:
+ifneq ($(ARCH_HAS_DEPRECATED_SYSCALLS),y)
+ target-headers-sysdep += $(ALL_HEADERS_BITS_COMMON_NO_LEGACY)
+endif
+
+$(top_builddir)include/fpu_control.h $(top_builddir)include/jmpbuf-offsets.h $(top_builddir)include/jmpbuf-unwind.h:
@$(disp_ln)
$(Q)[ -r $(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) ] && \
$(LN) -fs $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) $@ || \
$(LN) -fs $(call rel_srcdir)libc/sysdeps/linux/common/$(@F) $@
-$(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h:
+$(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h $(top_builddir)include/not-cancel.h:
$(do_ln) $(call rel_srcdir)libc/sysdeps/linux/common/$(@F) $@
$(ALL_HEADERS_BITS_COMMON):
$(ALL_HEADERS_BITS_ARCH):
$(do_ln) $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(@F) $@
+ifneq ($(ARCH_HAS_DEPRECATED_SYSCALLS),y)
+$(ALL_HEADERS_BITS_COMMON_NO_LEGACY):
+ $(do_ln) $(call rel_srcdir)libc/sysdeps/linux/common-generic/bits/$(@F) $@
+endif
+
ifneq ($(TARGET_SUBARCH),)
$(ALL_HEADERS_BITS_SUBARCH):
$(do_ln) $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/bits/$(TARGET_SUBARCH)/$(@F) $@
HEADERCLEAN_common:
$(do_rm) $(ALL_HEADERS_COMMON)
headers_clean-y += HEADERCLEAN_common
+HEADERCLEAN_config:
+ $(do_rm) -r $(addprefix $(top_builddir)include/,config generated)
+menuconfig-clean-y: HEADERCLEAN_config
# The headers. Arch specific headers are specified via ARCH_HEADERS in
# libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch which appends those via
$(top_builddir)include/bits/sysnum.h: $(top_srcdir)extra/scripts/gen_bits_syscall_h.sh | $(top_builddir)include/bits
@$(disp_gen)
$(Q)set -e; \
- tmp=`mktemp $(top_builddir)include/bits/sysnum.h.XXXXXX 2>/dev/null || true`; \
- [ -z "$$tmp" ] && tmp='$(top_builddir)include/bits/sysnum.h.new'; \
- KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir="$(top_builddir)" CC="$(CC) $(CPU_CFLAGS)" $(SHELL) $< > $$tmp; \
- if cmp $(top_builddir)include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \
- $(RM) $$tmp; \
- else \
- mv -f $$tmp $(top_builddir)include/bits/sysnum.h; \
- fi
+ KERNEL_HEADERS="${KERNEL_HEADERS}" CC="$(CC) $(CPU_CFLAGS)" $(SHELL) $< > $@.new; \
+ cmp -s $@ $@.new && $(RM) $@.new || mv -f $@.new $@
@# Ugly linux specific hack..
$(Q)if grep -q __NR_ $@; then true; else \
rm -f $@; \
echo "ERROR: Could not generate syscalls."; \
- echo "Make sure that you have proper kernel headers."; \
- echo "Your .config in KERNEL_HEADERS=\"\" was set to:"; \
+ echo "Make sure that you have properly installed kernel headers."; \
+ echo "Your .config KERNEL_HEADERS=\"\" was set to:"; \
echo "${KERNEL_HEADERS}"; \
exit 1; \
fi
.PHONY: $(LOCAL_INSTALL_PATH)
$(LOCAL_INSTALL_PATH):
- $(Q)$(MAKE) PREFIX=$(shell pwd)/$(LOCAL_INSTALL_PATH) RUNTIME_PREFIX=/ \
+ $(Q)$(MAKE) PREFIX=$(LOCAL_INSTALL_PATH) \
+ RUNTIME_PREFIX=/ \
DEVEL_PREFIX=/usr/ \
HOSTCC="$(HOSTCC)" \
install
# a "y" here means the feature is enabled and so we should *not* rm it.
# if the option expands to nothing though, we can punt the headers.
HEADERS_RM- := \
+ config \
+ generated \
+ internal \
+ cancel.h \
dl-osinfo.h \
+ jmpbuf-offsets.h \
+ jmpbuf-unwind.h \
hp-timing.h \
+ not-cancel.h \
_lfs_64.h \
bits/uClibc_arch_features.h \
bits/kernel_sigaction.h \
bits/kernel_stat.h \
bits/kernel_types.h \
+ bits/libc-lock.h \
+ bits/stdio-lock.h \
bits/syscalls.h \
bits/syscalls-common.h \
bits/uClibc_fpmax.h \
+ bits/uClibc_mutex.h \
+ bits/uClibc_pthread.h \
bits/uClibc_uintmaxtostr.h \
bits/uClibc_uwchar.h \
bits/uClibc_va_copy.h \
bits/sigcontextinfo.h \
bits/stackinfo.h \
+ atomic.h \
+ bits/atomic.h \
tls.h \
rpc/des_crypt.h \
rpc/key_prot.h \
HEADERS_RM-$(UCLIBC_HAS_REGEX) += regex.h regexp.h
HEADERS_RM-$(UCLIBC_HAS_RPC) += rpc
HEADERS_RM-$(UCLIBC_HAS_SHADOW) += shadow.h
-HEADERS_RM-$(UCLIBC_HAS_SOCKET) += sys/socket.h bits/socket.h sys/socketvar.h
+HEADERS_RM-$(UCLIBC_HAS_SOCKET) += sys/socket.h bits/socket.h sys/socketvar.h bits/socket_type.h
HEADERS_RM-$(UCLIBC_HAS_SYSLOG) += syslog.h sys/syslog.h bits/syslog*.h
HEADERS_RM-$(UCLIBC_HAS_THREADS) += *thread*.h semaphore.h \
bits/*thread*.h \
bits/initspin.h
HEADERS_RM-$(UCLIBC_HAS_THREADS_NATIVE) += atomic.h bits/atomic.h
+HEADERS_RM-$(UCLIBC_HAS_OBSTACK) += obstack.h
HEADERS_RM-$(UCLIBC_HAS_UTMPX) += bits/utmpx.h utmpx.h
HEADERS_RM-$(UCLIBC_HAS_WCHAR) += wchar.h wctype.h
HEADERS_RM-$(UCLIBC_HAS_WORDEXP) += wordexp.h
HEADERS_RM-$(UCLIBC_HAS_XATTR) += sys/xattr.h
HEADERS_RM-$(UCLIBC_HAS_XLOCALE) += xlocale.h
-HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += sys/fsuid.h \
+HEADERS_RM-$(UCLIBC_LINUX_SPECIFIC) += \
+ sys/cachectl.h \
+ bits/eventfd.h \
+ sys/eventfd.h \
+ sys/fsuid.h \
+ bits/inotify.h \
sys/inotify.h \
sys/kdaemon.h \
sys/perm.h \
sys/prctl.h \
sys/reboot.h \
sys/sendfile.h \
+ bits/signalfd.h \
sys/signalfd.h \
bits/statfs.h \
sys/statfs.h \
sys/swap.h \
sys/sysctl.h \
sys/sysinfo.h \
+ bits/timerfd.h \
sys/timerfd.h \
+ sys/sysmips.h \
sys/vfs.h
HEADERS_RM-$(UCLIBC_SUPPORT_AI_ADDRCONFIG) += ifaddrs.h
HEADERS_RM-$(UCLIBC_SV4_DEPRECATED) += ustat.h sys/ustat.h bits/ustat.h
HEADERS_RM-$(UCLIBC_SUSV3_LEGACY) += sys/timeb.h regexp.h
HEADERS_RM-$(UCLIBC_SUSV4_LEGACY) += utime.h ucontext.h
+HEADERS_RM-$(UCLIBC_HAS_ADVANCED_REALTIME) += spawn.h
ifneq ($(findstring install,$(MAKECMDGOALS)),)
$(addprefix $(PREFIX)$(DEVEL_PREFIX),include $(MULTILIB_DIR)):
$(do_mkdir)
endif
endif
-install_headers: headers $(top_builddir)extra/scripts/unifdef | $(PREFIX)$(DEVEL_PREFIX)include
+
+
+install_headers: headers $(top_builddir)extra/scripts/unifdef $(top_builddir)include/generated/unifdef_config.h | $(PREFIX)$(DEVEL_PREFIX)include
@$(call disp_install,"include -> $(PREFIX)$(DEVEL_PREFIX)include")
$(Q)top_builddir=$(top_builddir) \
$(top_srcdir)extra/scripts/install_headers.sh \
else
-$(INSTALL) -m 755 $(top_builddir)lib/libc.so $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/
endif
-ifeq ($(UCLIBC_HAS_BACKTRACE),y)
-# Add the AS_NEEDED entry for libubacktrace.so
- if [ -f $(top_builddir)lib/libc.so -a -f $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)/$(SHARED_LIBNAME) ] ; then \
- echo "GROUP ( $(UBACKTRACE_ASNEEDED) )" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so; \
- fi
-endif
+ echo "$(UBACKTRACE_ASNEEDED)" >> $(PREFIX)$(DEVEL_PREFIX)$(MULTILIB_DIR)/libc.so
ifeq ($(UCLIBC_HAS_THREADS),y)
ifneq ($(LINUXTHREADS_OLD),y)
ifeq ($(HARDWIRED_ABSPATH),y)
ifeq ($(HAVE_SHARED),y)
$(INSTALL) -m 755 $(top_builddir)lib/lib*-$(VERSION).so \
$(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
- (cd $(top_builddir)lib && $(TAR) -cf - *.so.*) | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
+ (cd $(top_builddir)lib && $(TAR) --exclude=$(UCLIBC_LDSO_NAME).so.lds -cf - *.so.*) \
+ | $(TAR) -xf - -C $(PREFIX)$(RUNTIME_PREFIX)$(MULTILIB_DIR)
@if [ -x $(top_builddir)lib/$(UCLIBC_LDSO_NAME)-$(VERSION).so ] ; then \
set -e; \
$(SHELL_SET_X); \
endif
utils: | pregen
- $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils $@
+ $(Q)$(MAKE) CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(CC)" -C utils $@
# Installs helper applications, such as 'ldd' and 'ldconfig'
install_utils: utils
- $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" -C utils utils_install
+ $(Q)$(MAKE) CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(CC)" -C utils utils_install
endif # ifeq ($(HAVE_DOT_CONFIG),y)
hostutils: | pregen
- $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@
+ $(Q)$(MAKE) CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils $@
install_hostutils: hostutils
- $(Q)$(MAKE) CROSS="$(CROSS)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils utils_install
+ $(Q)$(MAKE) CROSS_COMPILE="$(CROSS_COMPILE)" CC="$(CC)" HOSTCC="$(HOSTCC)" DOTHOST=.host -C utils utils_install
-$(addprefix $(top_builddir),include include/bits include/sys include/config lib extra/config/lxdialog extra/locale extra/scripts $(subdirs)):
+$(addprefix $(top_builddir),include include/bits include/sys include/config include/generated lib extra/config/lxdialog extra/locale extra/scripts $(subdirs)):
$(do_mkdir)
# configuration
# ---------------------------------------------------------------------------
-$(conf) $(mconf): | $(top_builddir)include/config $(top_builddir)extra/config/lxdialog
+$(conf) $(mconf) $(nconf): | $(top_builddir)include/config $(top_builddir)include/generated $(top_builddir)extra/config/lxdialog
$(Q)$(MAKE) -C extra/config $(@F)
arch-defconfigs := $(notdir $(wildcard $(top_srcdir)extra/Configs/defconfigs/$(ARCH)/*_defconfig))
menuconfig: $(mconf)
- $(Q)$< extra/Configs/Config.in
-
+ $(Q)$< $(Kconfig)
config: $(conf)
- $(Q)$< extra/Configs/Config.in
-
-oldconfig: $(conf)
- $(Q)$< -o extra/Configs/Config.in
+ $(Q)$< $(Kconfig)
+nconfig: $(nconf)
+ $(Q)$< $(Kconfig)
+oldaskconfig: $(conf)
+ $(Q)$< -a $(Kconfig)
silentoldconfig: $(conf)
- $(Q)$< -s extra/Configs/Config.in
-
-randconfig: $(conf)
- $(Q)$< -r extra/Configs/Config.in
-
+ $(Q)$< -s $(Kconfig)
+oldconfig: $(conf)
+ $(Q)$< -o $(Kconfig)
+allnoconfig: $(conf)
+ $(Q)$< -n $(Kconfig)
allyesconfig: $(conf)
- $(Q)$< -y extra/Configs/Config.in
+ $(Q)$< -y $(Kconfig)
$(SED) -i -e "s/^DODEBUG=.*/# DODEBUG is not set/" \
-e "s/^DOASSERTS=.*/# DOASSERTS is not set/" \
-e "s/^SUPPORT_LD_DEBUG_EARLY=.*/# SUPPORT_LD_DEBUG_EARLY is not set/" \
-e "s/^SUPPORT_LD_DEBUG=.*/# SUPPORT_LD_DEBUG is not set/" \
-e "s/^UCLIBC_MJN3_ONLY=.*/# UCLIBC_MJN3_ONLY is not set/" \
$(KCONFIG_CONFIG)
- $(Q)$< -o extra/Configs/Config.in
-
-allnoconfig: $(conf)
- $(Q)$< -n extra/Configs/Config.in
+ $(Q)$< -o $(Kconfig)
+alldefconfig: $(conf)
+ $(Q)$< -A $(Kconfig)
+randconfig: $(conf)
+ $(Q)$< -r $(Kconfig)
-defconfig: $(conf)
- $(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ extra/Configs/Config.in
+cmd_defconfig = $(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ $(Kconfig)
+defconfig: $(conf) ; $(cmd_defconfig)
+%_defconfig: $(conf) ; $(cmd_defconfig)
-%_defconfig: $(conf)
- $(Q)$< -D extra/Configs/defconfigs/$(ARCH)/$@ extra/Configs/Config.in
+savedefconfig: $(conf)
+ $(Q)$< -S defconfig $(Kconfig)
+listnewconfig: $(conf)
+ $(Q)$< -l $(Kconfig)
+olddefconfig: $(conf)
+ $(Q)$< -d $(Kconfig)
menuconfig-clean-y:
$(Q)$(MAKE) -C extra/config CLEAN_extra/config
+# The find here should continue to work as long as we are only symlinking
+# headers in to include/. I don't see this changing to anything else, so
+# it should be fine.
include_clean:
- $(Q)$(RM) $(top_builddir)include/fpu_control.h $(top_builddir)include/dl-osinfo.h $(top_builddir)include/hp-timing.h
- @set -e; \
- for i in `(cd libc/sysdeps/linux/common/sys; ls *.h)` ; do \
- $(RM) $(top_builddir)include/sys/$$i; \
- done; \
- if [ -d libc/sysdeps/linux/$(TARGET_ARCH)/sys ] ; then \
- for i in `(cd libc/sysdeps/linux/$(TARGET_ARCH)/sys; ls *.h)` ; do \
- $(RM) $(top_builddir)include/sys/$$i; \
- done; \
- fi
+ $(SECHO) " CLEAN include"
+ $(Q)$(RM) -r $(top_builddir)include/bits
+ $(Q)find $(top_builddir)include/ -type l -exec rm -f {} +
clean: include_clean
- $(Q)$(RM) -r $(top_builddir)lib $(top_builddir)include/bits
+ $(Q)$(RM) -r $(top_builddir)lib
@$(MAKE) -C utils CLEAN_utils
+$(MAKE) -s -C test clean
- @$(RM) $(top_builddir)include/linux $(top_builddir)include/asm*
$(Q)$(RM) $(top_builddir)extra/scripts/unifdef
$(Q)$(RM) -r $(LOCAL_INSTALL_PATH)
-distclean: clean
+distclean: realclean
-find . \( -name core -o -name \*.orig -o -name \*~ -o -name .\*.dep \) -exec $(RM) {} \;
$(RM) $(top_builddir).config $(top_builddir).config.old $(top_builddir).config.cmd
- $(RM) $(top_builddir)extra/locale/*.tgz
- $(MAKE) -C extra/config distclean
+ $(Q)$(RM) $(top_builddir)extra/locale/*.tgz
+ @$(MAKE) -C extra/config distclean
dist release:
$(RM) ../uClibc-$(VERSION).tar
du -b ../uClibc-$(VERSION).tar.{bz2,xz}
test check: test_compile
- $(Q)$(MAKE) -C test
+ $(Q)$(MAKE) -C test \
+ $(if $(O),top_builddir=$(O)/)
test_compile: $(LOCAL_INSTALL_PATH)
- $(Q)$(MAKE) -C test compile
+ $(Q)$(MAKE) -C test compile \
+ $(if $(O),top_builddir=$(O)/)
OSDN Git Service
