DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-09 02:46:47 +00:00
Code Issues Releases Wiki Activity

解决relibc的头文件没能识别__dragonos__定义的问题 (#315)

Browse Source
This commit is contained in:
LoGin 2023-08-02 18:11:05 +08:00 committed by GitHub
parent 0650030330
commit 1a62e7767c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.vscode/settings.json vendored
View File

@ -175,7 +175,8 @@
"net.h": "c", "net.h": "c",
"lz4.h": "c", "lz4.h": "c",
"cmd_test.h": "c", "cmd_test.h": "c",
"cmpxchg.h": "c" "cmpxchg.h": "c",
"mman.h": "c"
}, },
"C_Cpp.errorSquiggles": "enabled", "C_Cpp.errorSquiggles": "enabled",
"esbonio.sphinx.confDir": "", "esbonio.sphinx.confDir": "",

4
kernel/src/mm/ucontext.rs
View File

@ -842,6 +842,8 @@ impl LockedVMA {
} }
pub fn unmap(&self, mapper: &mut PageMapper, mut flusher: impl Flusher<MMArch>) { pub fn unmap(&self, mapper: &mut PageMapper, mut flusher: impl Flusher<MMArch>) {
// todo: 如果当前vma与文件相关，完善文件相关的逻辑
let mut guard = self.lock(); let mut guard = self.lock();
assert!(guard.mapped); assert!(guard.mapped);
for page in guard.region.pages() { for page in guard.region.pages() {
@ -1116,7 +1118,7 @@ impl VMA {
// kdebug!("VMA::zeroed: flusher dropped"); // kdebug!("VMA::zeroed: flusher dropped");
// 清空这些内存 // 清空这些内存
let virt_iter = VirtPageFrameIter::new(destination, destination.add(page_count)); let virt_iter: VirtPageFrameIter = VirtPageFrameIter::new(destination, destination.add(page_count));
for frame in virt_iter { for frame in virt_iter {
let paddr = mapper.translate(frame.virt_address()).unwrap().0; let paddr = mapper.translate(frame.virt_address()).unwrap().0;

2
user/apps/http_server/Makefile
View File

@ -3,7 +3,7 @@ LD=ld
OBJCOPY=objcopy OBJCOPY=objcopy
# 修改这里，把它改为你的relibc的sysroot路径 # 修改这里，把它改为你的relibc的sysroot路径
RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0) RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0)
CFLAGS=-I $(RELIBC_OPT)/include CFLAGS=-I $(RELIBC_OPT)/include -D__dragonos__
tmp_output_dir=$(ROOT_PATH)/bin/tmp/user tmp_output_dir=$(ROOT_PATH)/bin/tmp/user
output_dir=$(DADK_BUILD_CACHE_DIR_HTTP_SERVER_0_1_0) output_dir=$(DADK_BUILD_CACHE_DIR_HTTP_SERVER_0_1_0)

4
user/apps/test_bind/Makefile
View File

@ -3,10 +3,10 @@ LD=ld
OBJCOPY=objcopy OBJCOPY=objcopy
# 修改这里，把它改为你的relibc的sysroot路径 # 修改这里，把它改为你的relibc的sysroot路径
RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0) RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0)
CFLAGS=-I $(RELIBC_OPT)/include CFLAGS=-I $(RELIBC_OPT)/include -D__dragonos__
tmp_output_dir=$(ROOT_PATH)/bin/tmp/user tmp_output_dir=$(ROOT_PATH)/bin/tmp/user
output_dir=$(DADK_BUILD_CACHE_DIR_HTTP_SERVER_0_1_0) output_dir=$(DADK_BUILD_CACHE_DIR_TEST_BIND_0_1_0)
LIBC_OBJS:=$(shell find $(RELIBC_OPT)/lib -name "*.o" | sort ) LIBC_OBJS:=$(shell find $(RELIBC_OPT)/lib -name "*.o" | sort )
LIBC_OBJS+=$(RELIBC_OPT)/lib/libc.a LIBC_OBJS+=$(RELIBC_OPT)/lib/libc.a

2
user/apps/test_gettimeofday/Makefile
View File

@ -3,7 +3,7 @@ LD=ld
OBJCOPY=objcopy OBJCOPY=objcopy
# 修改这里，把它改为你的relibc的sysroot路径 # 修改这里，把它改为你的relibc的sysroot路径
RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0) RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0)
CFLAGS=-I $(RELIBC_OPT)/include CFLAGS=-I $(RELIBC_OPT)/include -D__dragonos__
tmp_output_dir=$(ROOT_PATH)/bin/tmp/user tmp_output_dir=$(ROOT_PATH)/bin/tmp/user
output_dir=$(DADK_BUILD_CACHE_DIR_TEST_GETTIMEOFDAY_0_1_0) output_dir=$(DADK_BUILD_CACHE_DIR_TEST_GETTIMEOFDAY_0_1_0)

2
user/apps/test_relibc/Makefile
View File

@ -3,7 +3,7 @@ LD=ld
OBJCOPY=objcopy OBJCOPY=objcopy
# 修改这里，把它改为你的relibc的sysroot路径 # 修改这里，把它改为你的relibc的sysroot路径
RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0) RELIBC_OPT=$(DADK_BUILD_CACHE_DIR_RELIBC_0_1_0)
CFLAGS=-I $(RELIBC_OPT)/include CFLAGS=-I $(RELIBC_OPT)/include -D__dragonos__
tmp_output_dir=$(ROOT_PATH)/bin/tmp/user tmp_output_dir=$(ROOT_PATH)/bin/tmp/user
output_dir=$(DADK_BUILD_CACHE_DIR_TEST_RELIBC_0_1_0) output_dir=$(DADK_BUILD_CACHE_DIR_TEST_RELIBC_0_1_0)