@@ -24,10 +24,6 @@ vpath %.in $(top_srcdir)/include
vpath %.m4 $(top_srcdir)/m4
vpath %.mk $(top_srcdir)/mk:$(top_srcdir)/mk/include
-# User wants uclinux binaries?
-UCLINUX ?= 0
-export UCLINUX
-
# CLEAN_TARGETS: Targets which exist solely in clean.
# COMMON_TARGETS: Targets which exist in all, clean, and install.
# INSTALL_TARGETS: Targets which exist in clean and install (contains
@@ -35,10 +31,7 @@ export UCLINUX
# BOOTSTRAP_TARGETS: Directories required to bootstrap out-of-build-tree
# support.
-# We're not using uclinux based targets (default).
-ifneq ($(UCLINUX),1)
COMMON_TARGETS := pan utils
-endif
define target_to_dir_dep_mapping
ifeq ($$(filter %-clean,$(1)),) # not *-clean
@@ -39,10 +39,6 @@ CPPFLAGS += -I$(top_srcdir)/include -I$(top_builddir)/include -I$(top_srcdir)/
LDFLAGS += -L$(top_builddir)/lib
-ifeq ($(UCLINUX),1)
-CPPFLAGS += -D__UCLIBC__ -DUCLINUX
-endif
-
ifeq ($(ANDROID),1)
LDFLAGS += -L$(top_builddir)/lib/android_libpthread
LDFLAGS += -L$(top_builddir)/lib/android_librt
@@ -40,11 +40,7 @@ WITH_METADATA_PDF := @WITH_METADATA_PDF@
WITH_OPEN_POSIX_TESTSUITE := @WITH_OPEN_POSIX_TESTSUITE@
# Enable testcases/realtime's compile and install?
-ifeq ($(UCLINUX),1)
-WITH_REALTIME_TESTSUITE := no
-else
WITH_REALTIME_TESTSUITE := @WITH_REALTIME_TESTSUITE@
-endif
# Enable testcases/kernel/kvm compile and install?
WITH_KVM_TESTSUITE := @WITH_KVM_TESTSUITE@
@@ -15,7 +15,6 @@ SUBDIRS := syscalls
# Build lib
SUBDIRS += lib
-ifneq ($(UCLINUX),1)
# KEEP THIS LIST ALPHABETIZED PLEASE!
SUBDIRS += connectors \
containers \
@@ -43,7 +42,6 @@ SUBDIRS += connectors \
ifeq ($(WITH_KVM_TESTSUITE),yes)
SUBDIRS += kvm
-endif
endif
@@ -10,11 +10,6 @@ top_srcdir ?= ../../..
include $(top_srcdir)/include/mk/env_pre.mk
-ifeq ($(UCLINUX),1)
-FILTER_OUT_DIRS += capget capset chmod chown clone fork getcontext llseek \
- mincore mprotect nftw profil remap_file_pages sbrk
-endif
-
ifeq ($(UCLIBC),1)
FILTER_OUT_DIRS += profil
endif
@@ -3,10 +3,6 @@
top_srcdir ?= ../../../..
-ifeq ($(UCLINUX),1)
-FILTER_OUT_MAKE_TARGETS += access02 access03
-endif
-
include $(top_srcdir)/include/mk/testcases.mk
include $(top_srcdir)/include/mk/generic_leaf_target.mk
@@ -5,10 +5,6 @@ top_srcdir ?= ../../../../..
LTPLIBS = ltpnewipc
-ifeq ($(UCLINUX),1)
-FILTER_OUT_MAKE_TARGETS += msgsnd05 msgsnd06
-endif
-
include $(top_srcdir)/include/mk/testcases.mk
LTPLDLIBS += -lltpnewipc
@@ -3,10 +3,6 @@
top_srcdir ?= ../../../..
-ifeq ($(UCLINUX),1)
-FILTER_OUT_MAKE_TARGETS += writev02
-endif
-
include $(top_srcdir)/include/mk/testcases.mk
writev03: CFLAGS += -pthread
nommu detection was written for UCLINUX distribution, which is not active any more. While there are still some used nommu kernel architectures (m68k and other), there is missing support in the new C API and nobody from the community did not stand to implement and maintain it. Therefore removing all UCLINUX/nommu related code also from makefiles. Signed-off-by: Petr Vorel <pvorel@suse.cz> --- Makefile | 7 ------- include/mk/env_post.mk | 4 ---- include/mk/features.mk.in | 4 ---- testcases/kernel/Makefile | 2 -- testcases/kernel/syscalls/Makefile | 5 ----- testcases/kernel/syscalls/access/Makefile | 4 ---- testcases/kernel/syscalls/ipc/msgsnd/Makefile | 4 ---- testcases/kernel/syscalls/writev/Makefile | 4 ---- 8 files changed, 34 deletions(-)