diff --git a/arch/sim/src/Makefile b/arch/sim/src/Makefile index bbfed35b942..2afb1a5a7b4 100644 --- a/arch/sim/src/Makefile +++ b/arch/sim/src/Makefile @@ -75,7 +75,8 @@ CSRCS += up_vfork.c endif endif -VPATH = sim +VPATH = :sim +VPATH += :sim/posix DEPPATH = $(patsubst %,--dep-path %,$(subst :, ,$(VPATH))) CFLAGS += -fvisibility=default @@ -84,6 +85,7 @@ HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) \ -fvisibility=default HOSTCFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)} +HOSTCFLAGS += ${shell $(INCDIR) "$(CC)" $(ARCH_SRCDIR)$(DELIM)chip} ifeq ($(CONFIG_HOST_MACOS),y) HOSTCFLAGS += -Wno-deprecated-declarations endif diff --git a/arch/sim/src/sim/up_hcisocket_host.c b/arch/sim/src/sim/posix/up_hcisocket_host.c similarity index 99% rename from arch/sim/src/sim/up_hcisocket_host.c rename to arch/sim/src/sim/posix/up_hcisocket_host.c index e03284e2cbc..ece872896af 100644 --- a/arch/sim/src/sim/up_hcisocket_host.c +++ b/arch/sim/src/sim/posix/up_hcisocket_host.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_hcisocket_host.c + * arch/sim/src/sim/posix/up_hcisocket_host.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_hostfs.c b/arch/sim/src/sim/posix/up_hostfs.c similarity index 99% rename from arch/sim/src/sim/up_hostfs.c rename to arch/sim/src/sim/posix/up_hostfs.c index 607f04212c8..a53320c0fdc 100644 --- a/arch/sim/src/sim/up_hostfs.c +++ b/arch/sim/src/sim/posix/up_hostfs.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_hostfs.c + * arch/sim/src/sim/posix/up_hostfs.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_hostirq.c b/arch/sim/src/sim/posix/up_hostirq.c similarity index 99% rename from arch/sim/src/sim/up_hostirq.c rename to arch/sim/src/sim/posix/up_hostirq.c index 2e05b94f4e3..bd8c31f2e29 100644 --- a/arch/sim/src/sim/up_hostirq.c +++ b/arch/sim/src/sim/posix/up_hostirq.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_hostirq.c + * arch/sim/src/sim/posix/up_hostirq.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_hostmemory.c b/arch/sim/src/sim/posix/up_hostmemory.c similarity index 99% rename from arch/sim/src/sim/up_hostmemory.c rename to arch/sim/src/sim/posix/up_hostmemory.c index 5875c8e8281..86e98d8bd01 100644 --- a/arch/sim/src/sim/up_hostmemory.c +++ b/arch/sim/src/sim/posix/up_hostmemory.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_hostmemory.c + * arch/sim/src/sim/posix/up_hostmemory.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_hostmisc.c b/arch/sim/src/sim/posix/up_hostmisc.c similarity index 97% rename from arch/sim/src/sim/up_hostmisc.c rename to arch/sim/src/sim/posix/up_hostmisc.c index 75b7e665fe7..159aea197e2 100644 --- a/arch/sim/src/sim/up_hostmisc.c +++ b/arch/sim/src/sim/posix/up_hostmisc.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_hostmisc.c + * arch/sim/src/sim/posix/up_hostmisc.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_hosttime.c b/arch/sim/src/sim/posix/up_hosttime.c similarity index 98% rename from arch/sim/src/sim/up_hosttime.c rename to arch/sim/src/sim/posix/up_hosttime.c index 4e6e0dbb534..ff148cb9bfa 100644 --- a/arch/sim/src/sim/up_hosttime.c +++ b/arch/sim/src/sim/posix/up_hosttime.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_hosttime.c + * arch/sim/src/sim/posix/up_hosttime.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_i2cbus.h b/arch/sim/src/sim/posix/up_i2cbus.h similarity index 100% rename from arch/sim/src/sim/up_i2cbus.h rename to arch/sim/src/sim/posix/up_i2cbus.h diff --git a/arch/sim/src/sim/up_i2cbuslinux.c b/arch/sim/src/sim/posix/up_i2cbuslinux.c similarity index 99% rename from arch/sim/src/sim/up_i2cbuslinux.c rename to arch/sim/src/sim/posix/up_i2cbuslinux.c index 09512b41712..9a4574090d5 100644 --- a/arch/sim/src/sim/up_i2cbuslinux.c +++ b/arch/sim/src/sim/posix/up_i2cbuslinux.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_i2cbuslinux.c + * arch/sim/src/sim/posix/up_i2cbuslinux.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_simsmp.c b/arch/sim/src/sim/posix/up_simsmp.c similarity index 99% rename from arch/sim/src/sim/up_simsmp.c rename to arch/sim/src/sim/posix/up_simsmp.c index c802675efbd..0cfc35d3bad 100644 --- a/arch/sim/src/sim/up_simsmp.c +++ b/arch/sim/src/sim/posix/up_simsmp.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_simsmp.c + * arch/sim/src/sim/posix/up_simsmp.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_simuart.c b/arch/sim/src/sim/posix/up_simuart.c similarity index 99% rename from arch/sim/src/sim/up_simuart.c rename to arch/sim/src/sim/posix/up_simuart.c index 5e2aa56db55..dc1ab199fa4 100644 --- a/arch/sim/src/sim/up_simuart.c +++ b/arch/sim/src/sim/posix/up_simuart.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_simuart.c + * arch/sim/src/sim/posix/up_simuart.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_spi.h b/arch/sim/src/sim/posix/up_spi.h similarity index 100% rename from arch/sim/src/sim/up_spi.h rename to arch/sim/src/sim/posix/up_spi.h diff --git a/arch/sim/src/sim/up_spilinux.c b/arch/sim/src/sim/posix/up_spilinux.c similarity index 99% rename from arch/sim/src/sim/up_spilinux.c rename to arch/sim/src/sim/posix/up_spilinux.c index 488a0bb8be6..6504f009ff8 100644 --- a/arch/sim/src/sim/up_spilinux.c +++ b/arch/sim/src/sim/posix/up_spilinux.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_spilinux.c + * arch/sim/src/sim/posix/up_spilinux.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_tapdev.c b/arch/sim/src/sim/posix/up_tapdev.c similarity index 99% rename from arch/sim/src/sim/up_tapdev.c rename to arch/sim/src/sim/posix/up_tapdev.c index f1fcd1aaaab..d56b19286e7 100644 --- a/arch/sim/src/sim/up_tapdev.c +++ b/arch/sim/src/sim/posix/up_tapdev.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_tapdev.c + * arch/sim/src/sim/posix/up_tapdev.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_testset.c b/arch/sim/src/sim/posix/up_testset.c similarity index 98% rename from arch/sim/src/sim/up_testset.c rename to arch/sim/src/sim/posix/up_testset.c index 4716ecfdc76..798331a2908 100644 --- a/arch/sim/src/sim/up_testset.c +++ b/arch/sim/src/sim/posix/up_testset.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_testset.c + * arch/sim/src/sim/posix/up_testset.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_usrsock_host.c b/arch/sim/src/sim/posix/up_usrsock_host.c similarity index 99% rename from arch/sim/src/sim/up_usrsock_host.c rename to arch/sim/src/sim/posix/up_usrsock_host.c index 6494ecb613b..a52b78d23bc 100644 --- a/arch/sim/src/sim/up_usrsock_host.c +++ b/arch/sim/src/sim/posix/up_usrsock_host.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_usrsock_host.c + * arch/sim/src/sim/posix/up_usrsock_host.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_vpnkit.c b/arch/sim/src/sim/posix/up_vpnkit.c similarity index 99% rename from arch/sim/src/sim/up_vpnkit.c rename to arch/sim/src/sim/posix/up_vpnkit.c index e144be376cd..fc9d3d864b0 100644 --- a/arch/sim/src/sim/up_vpnkit.c +++ b/arch/sim/src/sim/posix/up_vpnkit.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_vpnkit.c + * arch/sim/src/sim/posix/up_vpnkit.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_wpcap.c b/arch/sim/src/sim/posix/up_wpcap.c similarity index 99% rename from arch/sim/src/sim/up_wpcap.c rename to arch/sim/src/sim/posix/up_wpcap.c index 2d0b0e04934..7915aa7d88c 100644 --- a/arch/sim/src/sim/up_wpcap.c +++ b/arch/sim/src/sim/posix/up_wpcap.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_wpcap.c + * arch/sim/src/sim/posix/up_wpcap.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_x11eventloop.c b/arch/sim/src/sim/posix/up_x11eventloop.c similarity index 98% rename from arch/sim/src/sim/up_x11eventloop.c rename to arch/sim/src/sim/posix/up_x11eventloop.c index 4bf95ebf322..6f4fa69750d 100644 --- a/arch/sim/src/sim/up_x11eventloop.c +++ b/arch/sim/src/sim/posix/up_x11eventloop.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_x11eventloop.c + * arch/sim/src/sim/posix/up_x11eventloop.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with diff --git a/arch/sim/src/sim/up_x11framebuffer.c b/arch/sim/src/sim/posix/up_x11framebuffer.c similarity index 99% rename from arch/sim/src/sim/up_x11framebuffer.c rename to arch/sim/src/sim/posix/up_x11framebuffer.c index 3ba4255ca00..cee426b9538 100644 --- a/arch/sim/src/sim/up_x11framebuffer.c +++ b/arch/sim/src/sim/posix/up_x11framebuffer.c @@ -1,5 +1,5 @@ /**************************************************************************** - * arch/sim/src/sim/up_x11framebuffer.c + * arch/sim/src/sim/posix/up_x11framebuffer.c * * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with