From 677b6e605be95f434602f19a627ea0dea2927ccd Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Thu, 20 Feb 2014 14:15:09 -0800 Subject: [PATCH] Move the upstream-netbsd libc files into the correct directory. I screwed up when I originally imported these files; they're in lib/libc/ in the upstream tree; there is no top-level libc/ (though there is a top-level common/, so those files stay where they are). Change-Id: I7c5e2224a4441ab0e33616a855a8c6aacfeac46f --- libc/Android.mk | 86 +++++++++---------- libc/upstream-netbsd/{ => lib}/libc/gen/ftw.c | 0 .../upstream-netbsd/{ => lib}/libc/gen/nftw.c | 0 .../upstream-netbsd/{ => lib}/libc/gen/nice.c | 0 .../{ => lib}/libc/gen/popen.c | 0 .../{ => lib}/libc/gen/psignal.c | 0 .../{ => lib}/libc/gen/setjmperr.c | 0 .../{ => lib}/libc/gen/utime.c | 0 .../{ => lib}/libc/include/isc/assertions.h | 0 .../{ => lib}/libc/include/isc/dst.h | 0 .../{ => lib}/libc/include/isc/eventlib.h | 0 .../{ => lib}/libc/include/isc/heap.h | 0 .../{ => lib}/libc/include/isc/list.h | 0 .../{ => lib}/libc/include/isc/memcluster.h | 0 .../{ => lib}/libc/inet/inet_ntoa.c | 0 .../{ => lib}/libc/inet/inet_ntop.c | 0 .../{ => lib}/libc/inet/inet_pton.c | 0 .../{ => lib}/libc/isc/ev_streams.c | 0 .../{ => lib}/libc/isc/ev_timers.c | 0 .../{ => lib}/libc/isc/eventlib_p.h | 0 .../{ => lib}/libc/regex/cclass.h | 0 .../{ => lib}/libc/regex/cname.h | 0 .../{ => lib}/libc/regex/engine.c | 0 .../{ => lib}/libc/regex/regcomp.c | 0 .../{ => lib}/libc/regex/regerror.c | 0 .../{ => lib}/libc/regex/regex2.h | 0 .../{ => lib}/libc/regex/regexec.c | 0 .../{ => lib}/libc/regex/regfree.c | 0 .../{ => lib}/libc/regex/utils.h | 0 .../{ => lib}/libc/stdio/getdelim.c | 0 .../{ => lib}/libc/stdio/getline.c | 0 .../{ => lib}/libc/stdlib/_rand48.c | 0 .../{ => lib}/libc/stdlib/bsearch.c | 0 .../{ => lib}/libc/stdlib/div.c | 0 .../{ => lib}/libc/stdlib/drand48.c | 0 .../{ => lib}/libc/stdlib/erand48.c | 0 .../{ => lib}/libc/stdlib/exit.c | 0 .../{ => lib}/libc/stdlib/jrand48.c | 0 .../{ => lib}/libc/stdlib/ldiv.c | 0 .../{ => lib}/libc/stdlib/lldiv.c | 0 .../{ => lib}/libc/stdlib/lrand48.c | 0 .../{ => lib}/libc/stdlib/mrand48.c | 0 .../{ => lib}/libc/stdlib/nrand48.c | 0 .../{ => lib}/libc/stdlib/seed48.c | 0 .../{ => lib}/libc/stdlib/srand48.c | 0 .../{ => lib}/libc/stdlib/tdelete.c | 0 .../{ => lib}/libc/stdlib/tfind.c | 0 .../{ => lib}/libc/stdlib/tsearch.c | 0 .../{ => lib}/libc/string/memccpy.c | 0 .../{ => lib}/libc/string/strcasestr.c | 0 .../{ => lib}/libc/string/strcoll.c | 0 .../{ => lib}/libc/string/strxfrm.c | 0 .../{ => lib}/libc/thread-stub/__isthreaded.c | 0 .../{ => lib}/libc/unistd/killpg.c | 0 54 files changed, 43 insertions(+), 43 deletions(-) rename libc/upstream-netbsd/{ => lib}/libc/gen/ftw.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/gen/nftw.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/gen/nice.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/gen/popen.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/gen/psignal.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/gen/setjmperr.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/gen/utime.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/include/isc/assertions.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/include/isc/dst.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/include/isc/eventlib.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/include/isc/heap.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/include/isc/list.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/include/isc/memcluster.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/inet/inet_ntoa.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/inet/inet_ntop.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/inet/inet_pton.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/isc/ev_streams.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/isc/ev_timers.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/isc/eventlib_p.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/cclass.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/cname.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/engine.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/regcomp.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/regerror.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/regex2.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/regexec.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/regfree.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/regex/utils.h (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdio/getdelim.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdio/getline.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/_rand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/bsearch.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/div.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/drand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/erand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/exit.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/jrand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/ldiv.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/lldiv.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/lrand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/mrand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/nrand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/seed48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/srand48.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/tdelete.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/tfind.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/stdlib/tsearch.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/string/memccpy.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/string/strcasestr.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/string/strcoll.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/string/strxfrm.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/thread-stub/__isthreaded.c (100%) rename libc/upstream-netbsd/{ => lib}/libc/unistd/killpg.c (100%) diff --git a/libc/Android.mk b/libc/Android.mk index cd8717091..9cde07310 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -345,47 +345,47 @@ libc_upstream_freebsd_src_files := \ libc_upstream_netbsd_src_files := \ upstream-netbsd/common/lib/libc/hash/sha1/sha1.c \ upstream-netbsd/common/lib/libc/inet/inet_addr.c \ - upstream-netbsd/libc/gen/ftw.c \ - upstream-netbsd/libc/gen/nftw.c \ - upstream-netbsd/libc/gen/nice.c \ - upstream-netbsd/libc/gen/popen.c \ - upstream-netbsd/libc/gen/psignal.c \ - upstream-netbsd/libc/gen/setjmperr.c \ - upstream-netbsd/libc/gen/utime.c \ - upstream-netbsd/libc/inet/inet_ntoa.c \ - upstream-netbsd/libc/inet/inet_ntop.c \ - upstream-netbsd/libc/inet/inet_pton.c \ - upstream-netbsd/libc/isc/ev_streams.c \ - upstream-netbsd/libc/isc/ev_timers.c \ - upstream-netbsd/libc/regex/regcomp.c \ - upstream-netbsd/libc/regex/regerror.c \ - upstream-netbsd/libc/regex/regexec.c \ - upstream-netbsd/libc/regex/regfree.c \ - upstream-netbsd/libc/stdio/getdelim.c \ - upstream-netbsd/libc/stdio/getline.c \ - upstream-netbsd/libc/stdlib/bsearch.c \ - upstream-netbsd/libc/stdlib/div.c \ - upstream-netbsd/libc/stdlib/drand48.c \ - upstream-netbsd/libc/stdlib/erand48.c \ - upstream-netbsd/libc/stdlib/exit.c \ - upstream-netbsd/libc/stdlib/jrand48.c \ - upstream-netbsd/libc/stdlib/ldiv.c \ - upstream-netbsd/libc/stdlib/lldiv.c \ - upstream-netbsd/libc/stdlib/lrand48.c \ - upstream-netbsd/libc/stdlib/mrand48.c \ - upstream-netbsd/libc/stdlib/nrand48.c \ - upstream-netbsd/libc/stdlib/_rand48.c \ - upstream-netbsd/libc/stdlib/seed48.c \ - upstream-netbsd/libc/stdlib/srand48.c \ - upstream-netbsd/libc/stdlib/tdelete.c \ - upstream-netbsd/libc/stdlib/tfind.c \ - upstream-netbsd/libc/stdlib/tsearch.c \ - upstream-netbsd/libc/string/memccpy.c \ - upstream-netbsd/libc/string/strcasestr.c \ - upstream-netbsd/libc/string/strcoll.c \ - upstream-netbsd/libc/string/strxfrm.c \ - upstream-netbsd/libc/thread-stub/__isthreaded.c \ - upstream-netbsd/libc/unistd/killpg.c \ + upstream-netbsd/lib/libc/gen/ftw.c \ + upstream-netbsd/lib/libc/gen/nftw.c \ + upstream-netbsd/lib/libc/gen/nice.c \ + upstream-netbsd/lib/libc/gen/popen.c \ + upstream-netbsd/lib/libc/gen/psignal.c \ + upstream-netbsd/lib/libc/gen/setjmperr.c \ + upstream-netbsd/lib/libc/gen/utime.c \ + upstream-netbsd/lib/libc/inet/inet_ntoa.c \ + upstream-netbsd/lib/libc/inet/inet_ntop.c \ + upstream-netbsd/lib/libc/inet/inet_pton.c \ + upstream-netbsd/lib/libc/isc/ev_streams.c \ + upstream-netbsd/lib/libc/isc/ev_timers.c \ + upstream-netbsd/lib/libc/regex/regcomp.c \ + upstream-netbsd/lib/libc/regex/regerror.c \ + upstream-netbsd/lib/libc/regex/regexec.c \ + upstream-netbsd/lib/libc/regex/regfree.c \ + upstream-netbsd/lib/libc/stdio/getdelim.c \ + upstream-netbsd/lib/libc/stdio/getline.c \ + upstream-netbsd/lib/libc/stdlib/bsearch.c \ + upstream-netbsd/lib/libc/stdlib/div.c \ + upstream-netbsd/lib/libc/stdlib/drand48.c \ + upstream-netbsd/lib/libc/stdlib/erand48.c \ + upstream-netbsd/lib/libc/stdlib/exit.c \ + upstream-netbsd/lib/libc/stdlib/jrand48.c \ + upstream-netbsd/lib/libc/stdlib/ldiv.c \ + upstream-netbsd/lib/libc/stdlib/lldiv.c \ + upstream-netbsd/lib/libc/stdlib/lrand48.c \ + upstream-netbsd/lib/libc/stdlib/mrand48.c \ + upstream-netbsd/lib/libc/stdlib/nrand48.c \ + upstream-netbsd/lib/libc/stdlib/_rand48.c \ + upstream-netbsd/lib/libc/stdlib/seed48.c \ + upstream-netbsd/lib/libc/stdlib/srand48.c \ + upstream-netbsd/lib/libc/stdlib/tdelete.c \ + upstream-netbsd/lib/libc/stdlib/tfind.c \ + upstream-netbsd/lib/libc/stdlib/tsearch.c \ + upstream-netbsd/lib/libc/string/memccpy.c \ + upstream-netbsd/lib/libc/string/strcasestr.c \ + upstream-netbsd/lib/libc/string/strcoll.c \ + upstream-netbsd/lib/libc/string/strxfrm.c \ + upstream-netbsd/lib/libc/thread-stub/__isthreaded.c \ + upstream-netbsd/lib/libc/unistd/killpg.c \ libc_arch_static_src_files := \ bionic/dl_iterate_phdr_static.cpp \ @@ -508,7 +508,7 @@ LOCAL_CFLAGS := \ $(libc_common_cflags) \ -DINET6 \ -I$(LOCAL_PATH)/private \ - -I$(LOCAL_PATH)/upstream-netbsd/libc/include # for NetBSD private headers + -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include # for NetBSD private headers LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) LOCAL_C_INCLUDES := $(libc_common_c_includes) @@ -560,7 +560,7 @@ LOCAL_CFLAGS := \ $(libc_common_cflags) \ -DPOSIX_MISTAKE \ -I$(LOCAL_PATH)/upstream-netbsd \ - -I$(LOCAL_PATH)/upstream-netbsd/libc/include \ + -I$(LOCAL_PATH)/upstream-netbsd/lib/libc/include \ -include upstream-netbsd/netbsd-compat.h LOCAL_CONLYFLAGS := $(libc_common_conlyflags) LOCAL_CPPFLAGS := $(libc_common_cppflags) diff --git a/libc/upstream-netbsd/libc/gen/ftw.c b/libc/upstream-netbsd/lib/libc/gen/ftw.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/ftw.c rename to libc/upstream-netbsd/lib/libc/gen/ftw.c diff --git a/libc/upstream-netbsd/libc/gen/nftw.c b/libc/upstream-netbsd/lib/libc/gen/nftw.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/nftw.c rename to libc/upstream-netbsd/lib/libc/gen/nftw.c diff --git a/libc/upstream-netbsd/libc/gen/nice.c b/libc/upstream-netbsd/lib/libc/gen/nice.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/nice.c rename to libc/upstream-netbsd/lib/libc/gen/nice.c diff --git a/libc/upstream-netbsd/libc/gen/popen.c b/libc/upstream-netbsd/lib/libc/gen/popen.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/popen.c rename to libc/upstream-netbsd/lib/libc/gen/popen.c diff --git a/libc/upstream-netbsd/libc/gen/psignal.c b/libc/upstream-netbsd/lib/libc/gen/psignal.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/psignal.c rename to libc/upstream-netbsd/lib/libc/gen/psignal.c diff --git a/libc/upstream-netbsd/libc/gen/setjmperr.c b/libc/upstream-netbsd/lib/libc/gen/setjmperr.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/setjmperr.c rename to libc/upstream-netbsd/lib/libc/gen/setjmperr.c diff --git a/libc/upstream-netbsd/libc/gen/utime.c b/libc/upstream-netbsd/lib/libc/gen/utime.c similarity index 100% rename from libc/upstream-netbsd/libc/gen/utime.c rename to libc/upstream-netbsd/lib/libc/gen/utime.c diff --git a/libc/upstream-netbsd/libc/include/isc/assertions.h b/libc/upstream-netbsd/lib/libc/include/isc/assertions.h similarity index 100% rename from libc/upstream-netbsd/libc/include/isc/assertions.h rename to libc/upstream-netbsd/lib/libc/include/isc/assertions.h diff --git a/libc/upstream-netbsd/libc/include/isc/dst.h b/libc/upstream-netbsd/lib/libc/include/isc/dst.h similarity index 100% rename from libc/upstream-netbsd/libc/include/isc/dst.h rename to libc/upstream-netbsd/lib/libc/include/isc/dst.h diff --git a/libc/upstream-netbsd/libc/include/isc/eventlib.h b/libc/upstream-netbsd/lib/libc/include/isc/eventlib.h similarity index 100% rename from libc/upstream-netbsd/libc/include/isc/eventlib.h rename to libc/upstream-netbsd/lib/libc/include/isc/eventlib.h diff --git a/libc/upstream-netbsd/libc/include/isc/heap.h b/libc/upstream-netbsd/lib/libc/include/isc/heap.h similarity index 100% rename from libc/upstream-netbsd/libc/include/isc/heap.h rename to libc/upstream-netbsd/lib/libc/include/isc/heap.h diff --git a/libc/upstream-netbsd/libc/include/isc/list.h b/libc/upstream-netbsd/lib/libc/include/isc/list.h similarity index 100% rename from libc/upstream-netbsd/libc/include/isc/list.h rename to libc/upstream-netbsd/lib/libc/include/isc/list.h diff --git a/libc/upstream-netbsd/libc/include/isc/memcluster.h b/libc/upstream-netbsd/lib/libc/include/isc/memcluster.h similarity index 100% rename from libc/upstream-netbsd/libc/include/isc/memcluster.h rename to libc/upstream-netbsd/lib/libc/include/isc/memcluster.h diff --git a/libc/upstream-netbsd/libc/inet/inet_ntoa.c b/libc/upstream-netbsd/lib/libc/inet/inet_ntoa.c similarity index 100% rename from libc/upstream-netbsd/libc/inet/inet_ntoa.c rename to libc/upstream-netbsd/lib/libc/inet/inet_ntoa.c diff --git a/libc/upstream-netbsd/libc/inet/inet_ntop.c b/libc/upstream-netbsd/lib/libc/inet/inet_ntop.c similarity index 100% rename from libc/upstream-netbsd/libc/inet/inet_ntop.c rename to libc/upstream-netbsd/lib/libc/inet/inet_ntop.c diff --git a/libc/upstream-netbsd/libc/inet/inet_pton.c b/libc/upstream-netbsd/lib/libc/inet/inet_pton.c similarity index 100% rename from libc/upstream-netbsd/libc/inet/inet_pton.c rename to libc/upstream-netbsd/lib/libc/inet/inet_pton.c diff --git a/libc/upstream-netbsd/libc/isc/ev_streams.c b/libc/upstream-netbsd/lib/libc/isc/ev_streams.c similarity index 100% rename from libc/upstream-netbsd/libc/isc/ev_streams.c rename to libc/upstream-netbsd/lib/libc/isc/ev_streams.c diff --git a/libc/upstream-netbsd/libc/isc/ev_timers.c b/libc/upstream-netbsd/lib/libc/isc/ev_timers.c similarity index 100% rename from libc/upstream-netbsd/libc/isc/ev_timers.c rename to libc/upstream-netbsd/lib/libc/isc/ev_timers.c diff --git a/libc/upstream-netbsd/libc/isc/eventlib_p.h b/libc/upstream-netbsd/lib/libc/isc/eventlib_p.h similarity index 100% rename from libc/upstream-netbsd/libc/isc/eventlib_p.h rename to libc/upstream-netbsd/lib/libc/isc/eventlib_p.h diff --git a/libc/upstream-netbsd/libc/regex/cclass.h b/libc/upstream-netbsd/lib/libc/regex/cclass.h similarity index 100% rename from libc/upstream-netbsd/libc/regex/cclass.h rename to libc/upstream-netbsd/lib/libc/regex/cclass.h diff --git a/libc/upstream-netbsd/libc/regex/cname.h b/libc/upstream-netbsd/lib/libc/regex/cname.h similarity index 100% rename from libc/upstream-netbsd/libc/regex/cname.h rename to libc/upstream-netbsd/lib/libc/regex/cname.h diff --git a/libc/upstream-netbsd/libc/regex/engine.c b/libc/upstream-netbsd/lib/libc/regex/engine.c similarity index 100% rename from libc/upstream-netbsd/libc/regex/engine.c rename to libc/upstream-netbsd/lib/libc/regex/engine.c diff --git a/libc/upstream-netbsd/libc/regex/regcomp.c b/libc/upstream-netbsd/lib/libc/regex/regcomp.c similarity index 100% rename from libc/upstream-netbsd/libc/regex/regcomp.c rename to libc/upstream-netbsd/lib/libc/regex/regcomp.c diff --git a/libc/upstream-netbsd/libc/regex/regerror.c b/libc/upstream-netbsd/lib/libc/regex/regerror.c similarity index 100% rename from libc/upstream-netbsd/libc/regex/regerror.c rename to libc/upstream-netbsd/lib/libc/regex/regerror.c diff --git a/libc/upstream-netbsd/libc/regex/regex2.h b/libc/upstream-netbsd/lib/libc/regex/regex2.h similarity index 100% rename from libc/upstream-netbsd/libc/regex/regex2.h rename to libc/upstream-netbsd/lib/libc/regex/regex2.h diff --git a/libc/upstream-netbsd/libc/regex/regexec.c b/libc/upstream-netbsd/lib/libc/regex/regexec.c similarity index 100% rename from libc/upstream-netbsd/libc/regex/regexec.c rename to libc/upstream-netbsd/lib/libc/regex/regexec.c diff --git a/libc/upstream-netbsd/libc/regex/regfree.c b/libc/upstream-netbsd/lib/libc/regex/regfree.c similarity index 100% rename from libc/upstream-netbsd/libc/regex/regfree.c rename to libc/upstream-netbsd/lib/libc/regex/regfree.c diff --git a/libc/upstream-netbsd/libc/regex/utils.h b/libc/upstream-netbsd/lib/libc/regex/utils.h similarity index 100% rename from libc/upstream-netbsd/libc/regex/utils.h rename to libc/upstream-netbsd/lib/libc/regex/utils.h diff --git a/libc/upstream-netbsd/libc/stdio/getdelim.c b/libc/upstream-netbsd/lib/libc/stdio/getdelim.c similarity index 100% rename from libc/upstream-netbsd/libc/stdio/getdelim.c rename to libc/upstream-netbsd/lib/libc/stdio/getdelim.c diff --git a/libc/upstream-netbsd/libc/stdio/getline.c b/libc/upstream-netbsd/lib/libc/stdio/getline.c similarity index 100% rename from libc/upstream-netbsd/libc/stdio/getline.c rename to libc/upstream-netbsd/lib/libc/stdio/getline.c diff --git a/libc/upstream-netbsd/libc/stdlib/_rand48.c b/libc/upstream-netbsd/lib/libc/stdlib/_rand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/_rand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/_rand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/bsearch.c b/libc/upstream-netbsd/lib/libc/stdlib/bsearch.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/bsearch.c rename to libc/upstream-netbsd/lib/libc/stdlib/bsearch.c diff --git a/libc/upstream-netbsd/libc/stdlib/div.c b/libc/upstream-netbsd/lib/libc/stdlib/div.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/div.c rename to libc/upstream-netbsd/lib/libc/stdlib/div.c diff --git a/libc/upstream-netbsd/libc/stdlib/drand48.c b/libc/upstream-netbsd/lib/libc/stdlib/drand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/drand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/drand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/erand48.c b/libc/upstream-netbsd/lib/libc/stdlib/erand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/erand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/erand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/exit.c b/libc/upstream-netbsd/lib/libc/stdlib/exit.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/exit.c rename to libc/upstream-netbsd/lib/libc/stdlib/exit.c diff --git a/libc/upstream-netbsd/libc/stdlib/jrand48.c b/libc/upstream-netbsd/lib/libc/stdlib/jrand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/jrand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/jrand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/ldiv.c b/libc/upstream-netbsd/lib/libc/stdlib/ldiv.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/ldiv.c rename to libc/upstream-netbsd/lib/libc/stdlib/ldiv.c diff --git a/libc/upstream-netbsd/libc/stdlib/lldiv.c b/libc/upstream-netbsd/lib/libc/stdlib/lldiv.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/lldiv.c rename to libc/upstream-netbsd/lib/libc/stdlib/lldiv.c diff --git a/libc/upstream-netbsd/libc/stdlib/lrand48.c b/libc/upstream-netbsd/lib/libc/stdlib/lrand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/lrand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/lrand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/mrand48.c b/libc/upstream-netbsd/lib/libc/stdlib/mrand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/mrand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/mrand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/nrand48.c b/libc/upstream-netbsd/lib/libc/stdlib/nrand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/nrand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/nrand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/seed48.c b/libc/upstream-netbsd/lib/libc/stdlib/seed48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/seed48.c rename to libc/upstream-netbsd/lib/libc/stdlib/seed48.c diff --git a/libc/upstream-netbsd/libc/stdlib/srand48.c b/libc/upstream-netbsd/lib/libc/stdlib/srand48.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/srand48.c rename to libc/upstream-netbsd/lib/libc/stdlib/srand48.c diff --git a/libc/upstream-netbsd/libc/stdlib/tdelete.c b/libc/upstream-netbsd/lib/libc/stdlib/tdelete.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/tdelete.c rename to libc/upstream-netbsd/lib/libc/stdlib/tdelete.c diff --git a/libc/upstream-netbsd/libc/stdlib/tfind.c b/libc/upstream-netbsd/lib/libc/stdlib/tfind.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/tfind.c rename to libc/upstream-netbsd/lib/libc/stdlib/tfind.c diff --git a/libc/upstream-netbsd/libc/stdlib/tsearch.c b/libc/upstream-netbsd/lib/libc/stdlib/tsearch.c similarity index 100% rename from libc/upstream-netbsd/libc/stdlib/tsearch.c rename to libc/upstream-netbsd/lib/libc/stdlib/tsearch.c diff --git a/libc/upstream-netbsd/libc/string/memccpy.c b/libc/upstream-netbsd/lib/libc/string/memccpy.c similarity index 100% rename from libc/upstream-netbsd/libc/string/memccpy.c rename to libc/upstream-netbsd/lib/libc/string/memccpy.c diff --git a/libc/upstream-netbsd/libc/string/strcasestr.c b/libc/upstream-netbsd/lib/libc/string/strcasestr.c similarity index 100% rename from libc/upstream-netbsd/libc/string/strcasestr.c rename to libc/upstream-netbsd/lib/libc/string/strcasestr.c diff --git a/libc/upstream-netbsd/libc/string/strcoll.c b/libc/upstream-netbsd/lib/libc/string/strcoll.c similarity index 100% rename from libc/upstream-netbsd/libc/string/strcoll.c rename to libc/upstream-netbsd/lib/libc/string/strcoll.c diff --git a/libc/upstream-netbsd/libc/string/strxfrm.c b/libc/upstream-netbsd/lib/libc/string/strxfrm.c similarity index 100% rename from libc/upstream-netbsd/libc/string/strxfrm.c rename to libc/upstream-netbsd/lib/libc/string/strxfrm.c diff --git a/libc/upstream-netbsd/libc/thread-stub/__isthreaded.c b/libc/upstream-netbsd/lib/libc/thread-stub/__isthreaded.c similarity index 100% rename from libc/upstream-netbsd/libc/thread-stub/__isthreaded.c rename to libc/upstream-netbsd/lib/libc/thread-stub/__isthreaded.c diff --git a/libc/upstream-netbsd/libc/unistd/killpg.c b/libc/upstream-netbsd/lib/libc/unistd/killpg.c similarity index 100% rename from libc/upstream-netbsd/libc/unistd/killpg.c rename to libc/upstream-netbsd/lib/libc/unistd/killpg.c