mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 15:27:35 +00:00
Ports: Update openttd's patches to use git patches
This commit is contained in:
parent
2c71a62e09
commit
32c380b7f9
11 changed files with 201 additions and 78 deletions
|
@ -0,0 +1,25 @@
|
|||
From 4cf117000029c0620085bd273776dc704e6ebc91 Mon Sep 17 00:00:00 2001
|
||||
From: Gunnar Beutner <gbeutner@serenityos.org>
|
||||
Date: Sat, 17 Apr 2021 15:40:17 +0200
|
||||
Subject: [PATCH 5/6] Don't use the asm version of rdtsc
|
||||
|
||||
---
|
||||
src/cpu.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/cpu.cpp b/src/cpu.cpp
|
||||
index d95c704..762da79 100644
|
||||
--- a/src/cpu.cpp
|
||||
+++ b/src/cpu.cpp
|
||||
@@ -40,7 +40,7 @@ unsigned __int64 ottd_rdtsc();
|
||||
#endif
|
||||
|
||||
/* rdtsc for all other *nix-en (hopefully). Use GCC syntax */
|
||||
-#if (defined(__i386__) || defined(__x86_64__)) && !defined(RDTSC_AVAILABLE)
|
||||
+#if (defined(__i386__) || defined(__x86_64__)) && !defined(__serenity__) && !defined(RDTSC_AVAILABLE)
|
||||
uint64 ottd_rdtsc()
|
||||
{
|
||||
uint32 high, low;
|
||||
--
|
||||
2.36.1
|
||||
|
Loading…
Add table
Add a link
Reference in a new issue