[LTP] [PATCH 03/31] make: Remove UCLINUX (nommu detection)

Petr Vorel
2024-04-11T14:32:55Z

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(-)

diff --git a/Makefile b/Makefile
index 96edd5a80..d7d2815f1 100644
--- a/Makefile
+++ b/Makefile
@@ -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
diff --git a/include/mk/env_post.mk b/include/mk/env_post.mk
index a00f31b08..0bbbc3705 100644
--- a/include/mk/env_post.mk
+++ b/include/mk/env_post.mk
@@ -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
diff --git a/include/mk/features.mk.in b/include/mk/features.mk.in
index c2b64b549..73a2f6658 100644
--- a/include/mk/features.mk.in
+++ b/include/mk/features.mk.in
@@ -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@
diff --git a/testcases/kernel/Makefile b/testcases/kernel/Makefile
index 3ca0e74bd..98fd45a9d 100644
--- a/testcases/kernel/Makefile
+++ b/testcases/kernel/Makefile
@@ -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

diff --git a/testcases/kernel/syscalls/Makefile b/testcases/kernel/syscalls/Makefile
index c6dc8d9e7..b2e1b1caf 100644
--- a/testcases/kernel/syscalls/Makefile
+++ b/testcases/kernel/syscalls/Makefile
@@ -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
diff --git a/testcases/kernel/syscalls/access/Makefile b/testcases/kernel/syscalls/access/Makefile
index 5d89a6c05..044619fb8 100644
--- a/testcases/kernel/syscalls/access/Makefile
+++ b/testcases/kernel/syscalls/access/Makefile
@@ -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
diff --git a/testcases/kernel/syscalls/ipc/msgsnd/Makefile b/testcases/kernel/syscalls/ipc/msgsnd/Makefile
index 85017fe90..63aee01d4 100644
--- a/testcases/kernel/syscalls/ipc/msgsnd/Makefile
+++ b/testcases/kernel/syscalls/ipc/msgsnd/Makefile
@@ -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
diff --git a/testcases/kernel/syscalls/writev/Makefile b/testcases/kernel/syscalls/writev/Makefile
index 6627abaed..2eb46974e 100644
--- a/testcases/kernel/syscalls/writev/Makefile
+++ b/testcases/kernel/syscalls/writev/Makefile
@@ -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