fixup! svm: merge src/svm/share/runtime/os.cpp into src/hotspot/share/runtime/os.cpp

zapster · zapster · commit 5f722f7af488 · 2024-07-09T14:27:57.000+02:00
diff --git a/substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/share/runtime/os.cpp b/substratevm/src/com.oracle.svm.native.libcontainer/src/hotspot/share/runtime/os.cpp
@@ -672,7 +672,6 @@ void  os::free(void *memblock) {
   ::free(memblock);
 }
 #else
-
 void* os::malloc(size_t size, MEMFLAGS flags) {
   return os::malloc(size, flags, CALLER_PC);
 }

Original file line number	Diff line number	Diff line change
`@@ -672,7 +672,6 @@ void os::free(void *memblock) {`
`672`	`672`	`::free(memblock);`
`673`	`673`	`}`
`674`	`674`	`#else`
`675`		`-`
`676`	`675`	`void* os::malloc(size_t size, MEMFLAGS flags) {`
`677`	`676`	`return os::malloc(size, flags, CALLER_PC);`
`678`	`677`	`}`