hrev53998 adds 3 changesets to branch 'master'
old head: 625dc38a28c0f6345adfdd4eb0b89b340a420ac0
new head: cc0823d82e2ed00b8904822a0af028fa1df57e73
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=cc0823d82e2e+%5E625dc38a28c0
----------------------------------------------------------------------------
515ec4734001: ArchitectureRules: Make HAIKU_KERNEL_PIC_CCFLAGS empty by default.
This makes it entirely up to the per-architecture setup as to
what to put into it.
No functional change.
9c878a9a89f2: nvme_disk: Use addr_t for pointer arithmetic.
No functional change (intended).
cc0823d82e2e: nvme_disk: Undefine PTHREAD_MUTEX_INITIALIZER before defining it.
Some things seem to indirectly include <thread_types> which includes
<pthread.h>.
Fixes a warning.
[ Augustin Cavalier <waddlesplash@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 5 insertions(+), 4 deletions(-)
build/jam/ArchitectureRules | 4 ++--
src/add-ons/kernel/drivers/disk/nvme/compat/nvme_platform.h | 1 +
src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp | 4 ++--
############################################################################
Commit: 515ec4734001b998074473c63cf197d2b62382b2
URL: https://git.haiku-os.org/haiku/commit/?id=515ec4734001
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Mar 23 00:49:55 2020 UTC
ArchitectureRules: Make HAIKU_KERNEL_PIC_CCFLAGS empty by default.
This makes it entirely up to the per-architecture setup as to
what to put into it.
No functional change.
----------------------------------------------------------------------------
diff --git a/build/jam/ArchitectureRules b/build/jam/ArchitectureRules
index 3208f2e1b9..4b93e08ec9 100644
--- a/build/jam/ArchitectureRules
+++ b/build/jam/ArchitectureRules
@@ -379,7 +379,7 @@ rule KernelArchitectureSetup architecture
HAIKU_KERNEL_CCFLAGS = $(HAIKU_CCFLAGS_$(architecture)) $(ccBaseFlags) ;
HAIKU_KERNEL_C++FLAGS = $(HAIKU_C++FLAGS_$(architecture))
$(c++BaseFlags) ;
- HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic ;
+ HAIKU_KERNEL_PIC_CCFLAGS = ;
HAIKU_KERNEL_PIC_LINKFLAGS = ;
HAIKU_KERNEL_ADDON_LINKFLAGS = ;
@@ -458,7 +458,7 @@ rule KernelArchitectureSetup architecture
case x86_64 :
# Kernel lives in the top 2GB of the address space, use
kernel code
# model.
- HAIKU_KERNEL_PIC_CCFLAGS += -mcmodel=kernel ;
+ HAIKU_KERNEL_PIC_CCFLAGS = -fno-pic -mcmodel=kernel ;
# Disable the red zone, which cannot be used in kernel
code due to
# interrupts, and always enable the frame pointer so
stack traces
############################################################################
Commit: 9c878a9a89f281a2a785f930c4768faa03bd91ea
URL: https://git.haiku-os.org/haiku/commit/?id=9c878a9a89f2
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Mar 23 00:52:01 2020 UTC
nvme_disk: Use addr_t for pointer arithmetic.
No functional change (intended).
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
index 2e5b449f08..cfb284ce2e 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
+++ b/src/add-ons/kernel/drivers/disk/nvme/nvme_disk.cpp
@@ -471,7 +471,7 @@ nvme_disk_read(void* cookie, off_t pos, void* buffer,
size_t* length)
return status;
}
- void* offsetBuffer = ((int8*)bounceBuffer) + (pos -
rounded_pos);
+ void* offsetBuffer = (void*)((addr_t)bounceBuffer + (pos -
rounded_pos));
if (IS_USER_ADDRESS(buffer))
status = user_memcpy(buffer, offsetBuffer, *length);
else
@@ -536,7 +536,7 @@ nvme_disk_write(void* cookie, off_t pos, const void*
buffer, size_t* length)
}
// Now we can copy in the actual data to be written.
- void* offsetBuffer = ((int8*)bounceBuffer) + (pos -
rounded_pos);
+ void* offsetBuffer = (void*)((addr_t)bounceBuffer + (pos -
rounded_pos));
if (IS_USER_ADDRESS(buffer))
status = user_memcpy(offsetBuffer, buffer, *length);
else
############################################################################
Revision: hrev53998
Commit: cc0823d82e2ed00b8904822a0af028fa1df57e73
URL: https://git.haiku-os.org/haiku/commit/?id=cc0823d82e2e
Author: Augustin Cavalier <waddlesplash@xxxxxxxxx>
Date: Mon Mar 23 00:52:37 2020 UTC
nvme_disk: Undefine PTHREAD_MUTEX_INITIALIZER before defining it.
Some things seem to indirectly include <thread_types> which includes
<pthread.h>.
Fixes a warning.
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_platform.h
b/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_platform.h
index 90418e2f8b..41a4ddb8c1 100644
--- a/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_platform.h
+++ b/src/add-ons/kernel/drivers/disk/nvme/compat/nvme_platform.h
@@ -12,6 +12,7 @@
#define pthread_mutex_t mutex
+#undef PTHREAD_MUTEX_INITIALIZER
#define PTHREAD_MUTEX_INITIALIZER MUTEX_INITIALIZER(__FILE__)
#define pthread_mutex_init(mtx, attr) mutex_init(mtx, __FILE__)
#define pthread_mutex_destroy mutex_destroy
