[PATCH 06/25] Rename files to make them unique within cpukit

Sebastian Huber sebastian.huber at embedded-brains.de
Fri Sep 14 13:18:34 UTC 2018


This allows to build librtemscpu.a in one rush in the future.
---
 cpukit/posix/Makefile.am                               | 4 ++--
 cpukit/posix/src/{semaphore.c => psxsemaphore.c}       | 0
 cpukit/posix/src/{timercreate.c => psxtimercreate.c}   | 0
 cpukit/posix/src/{timerdelete.c => psxtimerdelete.c}   | 0
 cpukit/sapi/Makefile.am                                | 2 +-
 cpukit/sapi/src/{rbtreeinsert.c => sapirbtreeinsert.c} | 0
 cpukit/score/cpu/sparc/Makefile.am                     | 2 +-
 cpukit/score/cpu/sparc/{access.S => sparc-access.S}    | 0
 8 files changed, 4 insertions(+), 4 deletions(-)
 rename cpukit/posix/src/{semaphore.c => psxsemaphore.c} (100%)
 rename cpukit/posix/src/{timercreate.c => psxtimercreate.c} (100%)
 rename cpukit/posix/src/{timerdelete.c => psxtimerdelete.c} (100%)
 rename cpukit/sapi/src/{rbtreeinsert.c => sapirbtreeinsert.c} (100%)
 rename cpukit/score/cpu/sparc/{access.S => sparc-access.S} (100%)

diff --git a/cpukit/posix/Makefile.am b/cpukit/posix/Makefile.am
index 5935efa568..12d7c0def4 100644
--- a/cpukit/posix/Makefile.am
+++ b/cpukit/posix/Makefile.am
@@ -168,7 +168,7 @@ libposix_a_SOURCES += src/sigpending.c \
     src/sigwait.c src/sigwaitinfo.c src/signal_2.c src/ualarm.c
 
 ## SEMAPHORE_C_FILES
-libposix_a_SOURCES += src/semaphore.c
+libposix_a_SOURCES += src/psxsemaphore.c
 libposix_a_SOURCES += src/semaphoredeletesupp.c
 libposix_a_SOURCES += src/semclose.c
 libposix_a_SOURCES += src/semopen.c
@@ -178,7 +178,7 @@ libposix_a_SOURCES += src/semunlink.c
 libposix_a_SOURCES += src/adjtime.c src/clockgetcpuclockid.c
 
 ## TIMER_C_FILES
-libposix_a_SOURCES += src/ptimer.c src/timercreate.c src/timerdelete.c \
+libposix_a_SOURCES += src/ptimer.c src/psxtimercreate.c src/psxtimerdelete.c \
     src/timergetoverrun.c src/timergettime.c src/timersettime.c
 
 ## ITIMER_C_FILES
diff --git a/cpukit/posix/src/semaphore.c b/cpukit/posix/src/psxsemaphore.c
similarity index 100%
rename from cpukit/posix/src/semaphore.c
rename to cpukit/posix/src/psxsemaphore.c
diff --git a/cpukit/posix/src/timercreate.c b/cpukit/posix/src/psxtimercreate.c
similarity index 100%
rename from cpukit/posix/src/timercreate.c
rename to cpukit/posix/src/psxtimercreate.c
diff --git a/cpukit/posix/src/timerdelete.c b/cpukit/posix/src/psxtimerdelete.c
similarity index 100%
rename from cpukit/posix/src/timerdelete.c
rename to cpukit/posix/src/psxtimerdelete.c
diff --git a/cpukit/sapi/Makefile.am b/cpukit/sapi/Makefile.am
index 4848e64f3b..0fef05de7d 100644
--- a/cpukit/sapi/Makefile.am
+++ b/cpukit/sapi/Makefile.am
@@ -18,7 +18,7 @@ libsapi_a_SOURCES += src/delayticks.c
 libsapi_a_SOURCES += src/delaynano.c
 libsapi_a_SOURCES += src/rbtree.c
 libsapi_a_SOURCES += src/rbtreefind.c
-libsapi_a_SOURCES += src/rbtreeinsert.c
+libsapi_a_SOURCES += src/sapirbtreeinsert.c
 libsapi_a_SOURCES += src/panic.c
 libsapi_a_SOURCES += src/profilingiterate.c
 libsapi_a_SOURCES += src/profilingreportxml.c
diff --git a/cpukit/sapi/src/rbtreeinsert.c b/cpukit/sapi/src/sapirbtreeinsert.c
similarity index 100%
rename from cpukit/sapi/src/rbtreeinsert.c
rename to cpukit/sapi/src/sapirbtreeinsert.c
diff --git a/cpukit/score/cpu/sparc/Makefile.am b/cpukit/score/cpu/sparc/Makefile.am
index 0f77880cd9..2e0ab5999d 100644
--- a/cpukit/score/cpu/sparc/Makefile.am
+++ b/cpukit/score/cpu/sparc/Makefile.am
@@ -3,9 +3,9 @@ include $(top_srcdir)/automake/compile.am
 noinst_LIBRARIES = libscorecpu.a
 libscorecpu_a_SOURCES =
 libscorecpu_a_SOURCES += access_le.c
-libscorecpu_a_SOURCES += access.S
 libscorecpu_a_SOURCES += cpu.c
 libscorecpu_a_SOURCES += cpu_asm.S
+libscorecpu_a_SOURCES += sparc-access.S
 libscorecpu_a_SOURCES += sparc-context-validate.S
 libscorecpu_a_SOURCES += sparc-context-volatile-clobber.S
 libscorecpu_a_SOURCES += sparc-counter-asm.S
diff --git a/cpukit/score/cpu/sparc/access.S b/cpukit/score/cpu/sparc/sparc-access.S
similarity index 100%
rename from cpukit/score/cpu/sparc/access.S
rename to cpukit/score/cpu/sparc/sparc-access.S
-- 
2.13.7




More information about the devel mailing list