git.ucc.asn.au
/
tpg
/
acess2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a78ee34
)
Usermode - Slight fixes in preparation for armv6
author
John Hodge
<
[email protected]
>
Fri, 3 Aug 2012 05:37:47 +0000
(13:37 +0800)
committer
John Hodge
<
[email protected]
>
Fri, 3 Aug 2012 05:37:47 +0000
(13:37 +0800)
Usermode/Applications/Makefile.cfg
patch
|
blob
|
history
Usermode/Applications/Makefile.tpl
patch
|
blob
|
history
Usermode/Libraries/ld-acess.so_src/_stublib.c
patch
|
blob
|
history
Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
patch
|
blob
|
history
diff --git
a/Usermode/Applications/Makefile.cfg
b/Usermode/Applications/Makefile.cfg
index
5ee4b73
..
0e89a7c
100644
(file)
--- a/
Usermode/Applications/Makefile.cfg
+++ b/
Usermode/Applications/Makefile.cfg
@@
-8,7
+8,8
@@
ASFLAGS = -felf
CPPFLAGS = -ffreestanding -I$(ACESSUSERDIR)/include/ -DARCHDIR_is_$(ARCHDIR)
CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
CFLAGS = -fno-stack-protector $(CPPFLAGS)
CPPFLAGS = -ffreestanding -I$(ACESSUSERDIR)/include/ -DARCHDIR_is_$(ARCHDIR)
CPPFLAGS += $(addprefix -I,$(wildcard $(ACESSUSERDIR)Libraries/*/include_exp/))
CFLAGS = -fno-stack-protector $(CPPFLAGS)
-LDFLAGS = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc $(OUTPUTDIR)Libs/crtbegin.o $(OUTPUTDIR)Libs/crtend.o $(shell $(CC) -print-libgcc-file-name)
+LDFLAGS = -T $(OUTPUTDIR)Libs/acess.ld -rpath-link $(OUTPUTDIR)Libs -L $(OUTPUTDIR)Libs -I /Acess/Libs/ld-acess.so -lld-acess -lc $(OUTPUTDIR)Libs/crtbegin.o $(OUTPUTDIR)Libs/crtend.o
+LIBGCC_PATH = $(shell $(CC) -print-libgcc-file-name)
# Extra-verbose errors!
#CFLAGS += -Wall -Wextra -Wwrite-strings -Wshadow -Wswitch-default -Wswitch-enum -Wstrict-overflow=5 -Wfloat-equal -Wundef -Wmissing-declarations -Wlogical-op
# Extra-verbose errors!
#CFLAGS += -Wall -Wextra -Wwrite-strings -Wshadow -Wswitch-default -Wswitch-enum -Wstrict-overflow=5 -Wfloat-equal -Wundef -Wmissing-declarations -Wlogical-op
diff --git
a/Usermode/Applications/Makefile.tpl
b/Usermode/Applications/Makefile.tpl
index
27cf9e5
..
c1245ae
100644
(file)
--- a/
Usermode/Applications/Makefile.tpl
+++ b/
Usermode/Applications/Makefile.tpl
@@
-35,9
+35,9
@@
$(_BIN): $(OUTPUTDIR)Libs/acess.ld $(OUTPUTDIR)Libs/crt0.o $(_LIBS) $(OBJ)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $@
ifneq ($(_DBGMAKEFILE),)
@mkdir -p $(dir $(_BIN))
@echo [LD] -o $@
ifneq ($(_DBGMAKEFILE),)
- $(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
+ $(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
$(LIBGCC_PATH)
else
else
- @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
+ @$(LD) -g $(LDFLAGS) -o $@ $(OBJ) -Map $(_OBJPREFIX)Map.txt
$(LIBGCC_PATH)
endif
@$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
endif
@$(DISASM) $(_BIN) > $(_OBJPREFIX)$(BIN).dsm
diff --git
a/Usermode/Libraries/ld-acess.so_src/_stublib.c
b/Usermode/Libraries/ld-acess.so_src/_stublib.c
index
4096768
..
1136226
100644
(file)
--- a/
Usermode/Libraries/ld-acess.so_src/_stublib.c
+++ b/
Usermode/Libraries/ld-acess.so_src/_stublib.c
@@
-25,4
+25,5
@@
uint32_t __umodsi3(uint32_t Num, uint32_t Den){return 0;}
#endif
void *_crt0_exit_handler;
#endif
void *_crt0_exit_handler;
+void abort(void){}
diff --git
a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
index
46a06c4
..
36086d0
100644
(file)
--- a/
Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
+++ b/
Usermode/Libraries/ld-acess.so_src/include_exp/acess/intdefs.h
@@
-22,7
+22,7
@@
typedef __uint32_t __uintptr_t;
#elif defined(ARCHDIR_is_x86_64)
typedef __int64_t __intptr_t;
typedef __uint64_t __uintptr_t;
#elif defined(ARCHDIR_is_x86_64)
typedef __int64_t __intptr_t;
typedef __uint64_t __uintptr_t;
-#elif defined(ARCHDIR_is_armv7)
+#elif defined(ARCHDIR_is_armv7)
| defined(ARCHDIR_is_armv6)
typedef __int32_t __intptr_t;
typedef __uint32_t __uintptr_t;
#else
typedef __int32_t __intptr_t;
typedef __uint32_t __uintptr_t;
#else
UCC
git Repository :: git.ucc.asn.au