[Uclinux-h8-devel] Re: uClinux-dist-20051110

Back to archive index

Yoshinori Sato ysato****@users*****
2006年 1月 6日 (金) 17:03:50 JST


何度もすみません。
どうやっても添付が消えてしまうようなので、ファイルを張り付けておきます。
切り出して使ってください。

-- 
Yoshinori Sato
<ysato****@users*****>

===File ~/AE3069.diff=======================================
--- lib/Makefile~	2005-09-01 09:46:25.000000000 +0900
+++ lib/Makefile	2005-12-31 23:02:21.000000000 +0900
@@ -130,6 +130,8 @@
 #
 #
 LINKLIBS=\
+	$(ROOTDIR)/lib/$(LIBCDIR)/lib/crt*.o \
+	$(ROOTDIR)/lib/$(LIBCDIR)/lib/*.a \
 	$(ROOTDIR)/lib/libjpeg/*.a \
 	$(ROOTDIR)/lib/libpng/*.a \
 	$(ROOTDIR)/lib/libm/*.a \
--- linux-2.4.x/mmnommu/mmap.c~	2005-10-06 13:32:06.000000000 +0900
+++ linux-2.4.x/mmnommu/mmap.c	2005-12-31 19:56:51.000000000 +0900
@@ -1423,6 +1423,7 @@
 		 * keep romptr alive a little longer until everything is converted
 		 * to membacked
 		 */
+#ifdef MAGIC_ROM_PTR
 		if (file->f_op->romptr && !(prot & PROT_WRITE)) {
 			struct vm_area_struct my_vma;
 			memset(&my_vma, 0, sizeof(my_vma));
@@ -1434,7 +1435,7 @@
 			if (file->f_op->romptr(file, &my_vma) == 0)
 				membacked = 1;
 		}
-
+#endif
 		if (flags & MAP_SHARED) {
 			/* do checks for writing, appending and locking */
 			if ((prot & PROT_WRITE) && !(file->f_mode & FMODE_WRITE))
@@ -1756,8 +1757,12 @@
 			if (!(vma->vm_flags & (VM_IO | VM_SHARED)) && vma->vm_start) {
 				realalloc -= ksize((void *) vma->vm_start);
 				askedalloc -= vma->vm_end - vma->vm_start;
+#ifdef MAGIC_ROM_PTR
 				if (!is_in_rom(vma->vm_start))
 					kfree((void *) vma->vm_start);
+#else
+				kfree((void *) vma->vm_start);
+#endif
 			}
 
 			realalloc -= ksize(vma);
--- uClibc/libc/sysdeps/linux/h8300/bits/kernel_types.h~	2005-01-26 15:37:25.000000000 +0900
+++ uClibc/libc/sysdeps/linux/h8300/bits/kernel_types.h	2005-12-31 22:12:48.000000000 +0900
@@ -1,5 +1,5 @@
-#ifndef _BITS_KERNEL_TYPES_H
-#define _BITS_KERNEL_TYPES_H
+#ifndef __ARCH_H8300_POSIX_TYPES_H
+#define __ARCH_H8300_POSIX_TYPES_H
 
 /* Sigh.  We need to carefully wrap this one...  No guarantees
  * that the asm/posix_types.h kernel header is working.  Many
@@ -41,4 +41,4 @@
 #endif
 } __kernel_fsid_t;
 
-#endif /* _BITS_KERNEL_TYPES_H */
+#endif /* __ARCH_H8300_POSIX_TYPES_H */
--- ./uClibc/libc/sysdeps/linux/h8300/crt0.S~	2005-01-26 15:37:24.000000000 +0900
+++ ./uClibc/libc/sysdeps/linux/h8300/crt0.S	2005-12-31 23:11:07.000000000 +0900
@@ -21,8 +21,8 @@
 
 	.global	_start
 	.global __exit
-	.global atexit
-	.global main
+	.global _atexit
+	.global _main
 
 #ifdef __H8300S__
 	.h8300s
--- ./vendors/Akizuki/AE3068/Makefile~	2004-05-13 10:48:56.000000000 +0900
+++ ./vendors/Akizuki/AE3068/Makefile	2005-12-31 23:17:20.000000000 +0900
@@ -29,10 +29,8 @@
 	$(ROMFSINST) -s /var/tmp /tmp
 	$(ROMFSINST) -s /var/tmp/log /dev/log
 	> $(ROMFSDIR)/etc/inetd.conf
-	echo "boa:unknown:/bin/boa" > $(ROMFSDIR)/etc/default/inittab
 	> $(ROMFSDIR)/etc/default/start
 	$(ROMFSINST) /etc/rc
-	$(ROMFSINST) /etc/inittab
 	$(ROMFSINST) ../../Generic/romfs/etc/services /etc/services
 	case "$(LINUXDIR)" in \
 	*2.4.*) ;; \
--- ./include/Makefile~	2005-12-31 21:38:44.000000000 +0900
+++ ./include/Makefile	2005-12-31 21:54:46.000000000 +0900
@@ -6,12 +6,26 @@
 #
 
 #
+# we need the standard gcc includes
+#
+
+#GCC_DIR   := $(shell $(CC) -v 2>&1|grep specs|sed -e 's/.* \(.*\)specs/\1\./')
+GCC_INC_DIR := $(shell $(CC) -print-file-name=include)
+
+#
 # glibc contains lots of nasty headers in a bad location,  so we need
 # to cheat a little here
 #
 
+ifeq ($(findstring glibc,$(LIBCDIR)),glibc)
+LIBCINC := $(LIBCDIR)/build
+else
+LIBCINC := $(LIBCDIR)
+endif
+
 LINKHDRS = \
 	$(ROOTDIR)/lib/STLport/stlport/*,STLport \
+	$(ROOTDIR)/lib/$(LIBCINC)/include/*,. \
 	$(ROOTDIR)/lib/libgmp/gmp.h,. \
 	$(ROOTDIR)/lib/libgmp/mp.h,. \
 	$(ROOTDIR)/lib/libgmp/gmp-impl.h,. \
@@ -44,6 +58,7 @@
 	$(ROOTDIR)/$(LINUXDIR)/include/asm,. \
 	$(ROOTDIR)/$(LINUXDIR)/include/mtd,. \
 	$(ROOTDIR)/config,. \
+	$(GCC_INC_DIR)/*,include \
 	$(ROOTDIR)/lib/expat/lib/expat.h,. \
 	$(ROOTDIR)/user/tinytcl/*.h,. \
 	$(ROOTDIR)/prop/config/config*.h,. \
============================================================



Uclinux-h8-devel メーリングリストの案内
Back to archive index