# HG changeset patch
# User mir3636
# Date 1518766675 -32400
# Node ID 1d371d93ab4f412c3760a5e7247ddd98665c21c6
# Parent  be7ae6f2993bc7a8667221536903ef4d6d1d602f
commit

diff -r be7ae6f2993b -r 1d371d93ab4f qemu-system-arm
--- a/qemu-system-arm	Sat Jan 27 19:26:44 2018 +0900
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-#!/bin/bash
-#
-# Quick'n'dirty qemu-system-arm wrapper
-#
-# This is a temporary wrapper script to enable 
-# qemu-system-arm 0.12.3 to be managed by libvirt 0.7.6
-# (Fedora 13 Alpha). To use it:
-# 1. mv /usr/bin/qemu-system-arm /usr/bin/qemu-system-arm.bin
-# 2. save this script as /usr/bin/qemu-system-arm with 
-#    appropriate permissions
-#
-# Chris Tyler 2010-03-11
-#
-
-LOGFILE=/dev/null
-# LOGFILE=/tmp/aaa.log
-
-ARGS="$(echo "$*"|                                              \
-        sed     -e "s/pci.[0-9]*/pci/g"                         \
-                -e "s/bus=scsi[^,]*//g"                         \
-                -e "s/-vga cirrus//g"                         \
-                -e "s/if=none,/if=scsi,/g"                      \
-                -e "s/-device scsi-disk[^ ]*//g"                \
-                -e "s/-device rtl[^ ]*mac=\([a-fA-F0-9:]*\)[^ ]*/-net nic,macaddr=\1,vlan=0,name=nic.0/g"                       \
-                -e "s/-device [^ ]*//g"                         \
-)"
-
-echo "Date: $(date)" >>$LOGFILE
-echo "Original args: $ARGS" >>$LOGFILE
-echo "Edited args: $ARGS" >>$LOGFILE
-
-/bin/qemu-system-arm.bin $ARGS
-
-RESULT=$?
-echo "Result code: $RESULT" >>$LOGFILE
-# (echo "ID: ";id) >>/tmp/qemu.log
-
-exit $?
diff -r be7ae6f2993b -r 1d371d93ab4f src/entry.S
--- a/src/entry.S	Sat Jan 27 19:26:44 2018 +0900
+++ b/src/entry.S	Fri Feb 16 16:37:55 2018 +0900
@@ -14,7 +14,8 @@
 
 1:
     CMP     r1, r2
-    STMLTIA r1!, {r3}
+#    STMLTIA r1!, {r3}
+    STMIALT r1!, {r3}
     BLT     1b
 
     # initialize stack pointers for svc modes
@@ -30,4 +31,4 @@
     MOV     r0, sp
     ADD     r0, r0, #KERNBASE
     MOV     sp, r0
-    MOV     pc, lr
\ No newline at end of file
+    MOV     pc, lr
diff -r be7ae6f2993b -r 1d371d93ab4f src/makefile.inc
--- a/src/makefile.inc	Sat Jan 27 19:26:44 2018 +0900
+++ b/src/makefile.inc	Fri Feb 16 16:37:55 2018 +0900
@@ -1,20 +1,25 @@
 # Cross-compiling (e.g., on Mac OS X, install arm-none-eabi-gcc with MacPorts)
+
 CROSSCOMPILE := arm-linux-gnu-
 
-CC = $(CROSSCOMPILE)gcc
+CC = /mnt/dalmore-home/one/src/after_update/time_release/bin/clang
 AS = $(CROSSCOMPILE)as
 LD = $(CROSSCOMPILE)ld
 OBJCOPY = $(CROSSCOMPILE)objcopy
 OBJDUMP = $(CROSSCOMPILE)objdump
 
-CFLAGS = -march=armv6 -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -Werror -I. -g -O0
+# CFLAGS = -march=armv6 -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -Werror -I. -g -O0
+CFLAGS = -target armv6-arm-none-eabi -I /net/open/Linux/arm/gcc-arm-none-eabi-7-2017-q4-major/arm-none-eabi/include/ /net/open/Linux/arm/gcc-arm-none-eabi-7-2017-q4-major/lib/gcc/arm-none-eabi/7.2.1/include-fixed/ -fno-pic -static -fno-builtin -fno-strict-aliasing -Wall -I. -g -O0
 LDFLAGS = -L.
-ASFLAGS = -march=armv6 
+# ASFLAGS = -march=armv6
+ASFLAGS = -target armv6-arm-none-eabi
 
-LIBGCC = $(shell $(CC) -print-libgcc-file-name)
+#LIBGCC = $(shell $(gcc) -print-libgcc-file-name)
+LIBGCC = /net/open/Linux/arm/gcc-arm-none-eabi-7-2017-q4-major/lib/gcc/arm-none-eabi/7.2.1/libgcc.a 
 
 # host compiler
-HOSTCC_preferred = gcc
+# HOSTCC_preferred = gcc
+HOSTCC_preferred = /mnt/dalmore-home/one/src/after_update/time_release/bin/clang
 define get_hostcc
     $(if $(shell which $(HOSTCC_preferred)),$(HOSTCC_preferred),"cc")
 endef
diff -r be7ae6f2993b -r 1d371d93ab4f src/tools/Makefile
--- a/src/tools/Makefile	Sat Jan 27 19:26:44 2018 +0900
+++ b/src/tools/Makefile	Fri Feb 16 16:37:55 2018 +0900
@@ -1,6 +1,6 @@
 include ../makefile.inc
 
-CFLAGS = -Werror -Wall
+CFLAGS = -Wall
 CFLAGS += -iquote ../
 
 all: mkfs