libroot/os: Reshuffle stack_trace.cpp a little more.

* Add missing "generic" inclusion on x86; fixes the build there.
 * Name the file the same way as the other files in its directory.
This commit is contained in:
Augustin Cavalier
2019-04-04 19:26:01 -04:00
parent 0f856497bd
commit 936e89e19d
5 changed files with 10 additions and 7 deletions
+2 -1
View File
@@ -25,8 +25,9 @@ for architectureObject in [ MultiArchSubDirSetup ppc ] {
time.c
tls.c
# sources from generic
generic_system_time_nsecs.cpp
stack_trace.cpp
generic_stack_trace.cpp
;
}
}
+2 -1
View File
@@ -25,9 +25,10 @@ for architectureObject in [ MultiArchSubDirSetup sparc ] {
fpu_add.c fpu_compare.c fpu_div.c fpu_explode.c fpu_implode.c
fpu_mul.c fpu_reg.S fpu_sqrt.c fpu_subr.c
# sources from generic
generic_atomic.cpp
generic_system_time_nsecs.cpp
stack_trace.cpp
generic_stack_trace.cpp
;
}
}
+4 -1
View File
@@ -10,6 +10,8 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
# TODO in time.c!
UsePrivateSystemHeaders ;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
local compatibilitySources ;
if $(TARGET_GCC_VERSION_$(architecture)[1]) = 2 {
compatibilitySources =
@@ -29,7 +31,8 @@ for architectureObject in [ MultiArchSubDirSetup x86 x86_gcc2 ] {
$(compatibilitySources)
stack_trace.cpp
# sources from generic
generic_stack_trace.cpp
;
}
}
+2 -4
View File
@@ -10,9 +10,7 @@ for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
# TODO in time.c!
UsePrivateSystemHeaders ;
SEARCH_SOURCE +=
[ FDirName $(SUBDIR) $(DOTDOT) generic ]
;
SEARCH_SOURCE += [ FDirName $(SUBDIR) $(DOTDOT) generic ] ;
MergeObject <$(architecture)>os_arch_$(TARGET_ARCH).o :
byteorder.S
@@ -25,7 +23,7 @@ for architectureObject in [ MultiArchSubDirSetup x86_64 ] {
# sources from generic
generic_atomic.cpp
stack_trace.cpp
generic_stack_trace.cpp
;
}
}