# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1543658878 -3600
# Node ID 16d1d23aefeef7934df64bd60b4a2509491f44b4
# Parent  c836f6d2eff8a9354fd77000a6ce1a4536b388e2
Remove linux-mmc

diff -r c836f6d2eff8 -r 16d1d23aefee linld/stuff/src/HIMEM.CPP
--- a/linld/stuff/src/HIMEM.CPP	Fri Nov 30 15:12:24 2018 +0100
+++ b/linld/stuff/src/HIMEM.CPP	Sat Dec 01 11:07:58 2018 +0100
@@ -58,11 +58,13 @@
         // 'Gathering' copy in chunks of PAGE_SIZE
         // No risk of overlapping: kernel is copied from above to 1m mark
         m->size = pm2initrd(m)->size = PAGE_SIZE;
+#define ADD_PAGE(x)	(*(unsigned long *)(((char *)&x)+1)+=PAGE_SIZE/256)
+#define SUB_PAGE(x)	(*(unsigned long *)(((char *)&x)+1)-=PAGE_SIZE/256)
 	reset_bufv(q);
 	do {
             m->buf = *q;
             memcpy_image(m);
-            next(q); m->fallback+=PAGE_SIZE;
+            next(q); ADD_PAGE(m->fallback);
         } while(*q);
         // Move initrd
 	m = pm2initrd(m);
@@ -75,10 +77,10 @@
             q=m->bufv;
 	    reset_bufv(q);
             do {
-                next(q); m->fallback+=PAGE_SIZE;
+                next(q); ADD_PAGE(m->fallback);
             } while(*q);
             do {
-                prev(q); m->fallback-=PAGE_SIZE;
+                prev(q); SUB_PAGE(m->fallback);
                 m->buf = *q;
                 memcpy_image(m);
             } while(q != m->bufv);
diff -r c836f6d2eff8 -r 16d1d23aefee linld/stuff/src/ISO9660.CPP
--- a/linld/stuff/src/ISO9660.CPP	Fri Nov 30 15:12:24 2018 +0100
+++ b/linld/stuff/src/ISO9660.CPP	Sat Dec 01 11:07:58 2018 +0100
@@ -51,7 +51,8 @@
 	}
 	x->fileofs = (* (unsigned long *) (p + 2)) << SECTORBITS;
 	x->filesize = * (unsigned long *) (p + 10);
-	x->filemod = (p[25] & 2) ? 0040755 : 0100755;
+	x->filemod = 0x81ED; if (p[25] & 2) ((char *)&(x->filemod))[1] = 0x41;
+	//x->filemod = (p[25] & 2) ? 0040755 : 0100755;
 	//x->filemod = 0100755 - ((p[25] & (char)2) << 13);
 #ifdef __ROCKRIDGE
 	endname = NULL;
diff -r c836f6d2eff8 -r 16d1d23aefee linld/stuff/src/LOAD.CPP
--- a/linld/stuff/src/LOAD.CPP	Fri Nov 30 15:12:24 2018 +0100
+++ b/linld/stuff/src/LOAD.CPP	Sat Dec 01 11:07:58 2018 +0100
@@ -138,7 +138,6 @@
 
     char *version_string;
   {
-    struct first1k_t *first1k;
     struct kernelparams_t *kernelparams;
     kernelparams = &(((first1k_t*) (rm_buf = (u8 *)malloc_or_die(_32k)))->params);
 #define first1k		((first1k_t*)((u8 *)kernelparams-0x1F1))
diff -r c836f6d2eff8 -r 16d1d23aefee linld/stuff/src/pipehole.awk
--- a/linld/stuff/src/pipehole.awk	Fri Nov 30 15:12:24 2018 +0100
+++ b/linld/stuff/src/pipehole.awk	Sat Dec 01 11:07:58 2018 +0100
@@ -4,7 +4,7 @@
 	if (hold == 0) {
 		s=$0
 		if (/^	mov	.[ix],bx$/ || /^	mov	.[ix],.i$/) {
-			r=$2
+			r=$2; kept=0
 			hold=1; split($2,regs,","); next
 		}
 		if (/^	inc	e?.[ix]/ || /^	dec	e?.[ix]/) {
@@ -14,21 +14,36 @@
 			hold=3; split($2,regs,","); next
 		}
 		if (/^	movzx	eax,ax$/) { hold=4; next }
+		if (/^	cmp	word ptr/ || /^  cmp     [abcd]x,/) {
+			split($0,regs,",")
+			if (isnum(regs[2]) && regs[2] != 0 &&
+				 (regs[2] % 256) == 0) {
+				hold=5
+				next
+			}
+		}
 		if (/^	mov	cl,4$/)   { hold=8; next }
 	}
 	else if (hold == 1) {
-		if (/^   ;/) { print; next }
+		if (/^   ;/) { line[kept++]=$0; next }
 		hold=0; split($2,args,","); op=""
 		if ($1 == "add") op="+"
 		if ($1 == "sub") op="-"
-		if (op != "" && regs[1] == args[1] && isnum(args[2])) {
-			print "\tlea\t" regs[1] ",[" regs[2] op args[2] "]"
+		if (op != "" && regs[1] == args[1]) {
+			if (isnum(args[2])) {
+				print "\tlea\t" regs[1] ",[" regs[2] op args[2] "]"
+				for (i = 0; i < kept; i++) print line[i]; kept=0
+				next
+			}
+			line[kept++]=$0
+			hold=1
 			next
 		}
 		if (/^	pop	[ds]i/ && regs[2] ~ /^[ds]i$/) {
 			print "	xchg	" r
 		}
-		else print "\tmov\t" regs[1] "," regs[2]
+		else print s
+		for (i = 0; i < kept; i++) print line[i]; kept=0
 	}
 	else if (hold == 2) {
 		hold=0; split($2,args,","); print s
@@ -52,6 +67,15 @@
 			print "	push	0"; print "	push	ax"; next
 		} else { print s }
 	}
+	else if (hold == 5) {
+		hold=0
+		if ($1 == "jae" || $1 == "jb") {
+			sub(/word ptr/,"byte ptr",s); sub(/x,/,"h,",s)
+			sub(/\],/,"+1],",s) || sub(/,/,"+1,",s)
+			s = s "/256"
+		}
+		print s
+	}
 	else if (hold == 8) {
 		hold=0
 		if (/^	call	near ptr N_LXURSH@$/) {
@@ -118,30 +142,29 @@
 			print "	and	" substr(args[1],2) "," args[2]; next
 		}
 	}
-	if (/^	add	[bcd]x,/ || /^	sub	[bcd]x,/) {
+	if (/^	add	word ptr/ || /^	sub	word ptr/ ||
+	    /^	add	[abcd]x,/ || /^	sub	[abcd]x,/) {
 		split($0,args,",")
 		if (isnum(args[2]) && (args[2] % 256 == 0)) {
-			sub(/x,/,"h,",s)
+			sub(/word ptr/,"byte ptr",s); sub(/x,/,"h,",s)
+			sub(/\],/,"+1],",s) || sub(/,/,"+1,",s)
 			print s "/256"; next
 		}
 	}
-	if (/^	add	word ptr/ || /^	sub	word ptr/) {
+	if (/^	add	dword ptr/ || /^	sub	dword ptr/ ||
+	    /^	add	e[abcd]x,/ || /^	sub	e[abcd]x,/) {
 		split($0,args,",")
-		if (isnum(args[2]) && (args[2] % 256 == 0)) {
-			sub(/word/,"byte",s); sub(/\]/,"+1]",s)
-			print s "/256"; next
-		}
-	}
-	if (/^	add	dword ptr/ || /^	sub	dword ptr/) {
-		split($0,args,",")
-		if (args[2] == "large") { split(args[2],args," ") }
+		if (args[2] == "large") { args[2] = $3 }
 		if (isnum(args[2])) {
 			if (args[2] % 16777216 == 0) {
-				sub(/dword/,"byte",s); sub(/\]/,"+3]",s)
+				sub(/dword/,"byte",s);
+				sub(/	e/,"",s); sub(/x,/,"h,",s)
+				sub(/\],/,"+3],",s) || sub(/,/,"+3,",s)
 				print s "/16777216"; next
 			}
 			if (args[2] % 65536 == 0) {
-				sub(/dword/,"word",s); sub(/\]/,"+2]",s)
+				sub(/dword/,"word",s); sub(/	e/,"",s)
+				sub(/\],/,"+2],",s) || sub(/,/,"+2,",s)
 				print s "/65536"; next
 			}
 		}
diff -r c836f6d2eff8 -r 16d1d23aefee linux-mmc/receipt
--- a/linux-mmc/receipt	Fri Nov 30 15:12:24 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="linux-mmc"
-VERSION="3.16.55"
-CATEGORY="base-system"
-SHORT_DESC="The Linux kernel mmc modules (card reader)."
-MAINTAINER="devel@slitaz.org"
-LICENSE="GPL2"
-DEPENDS="linux"
-WANTED="linux"
-WEB_SITE="https://www.kernel.org/"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    local path
-    path=lib/modules/$VERSION-slitaz/kernel
-    mkdir -p $fs/$path
-    export src install
-    $wanted_stuff/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.xz | \
-	while read module; do
-    	dir=$path/$(dirname $module)
-    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
-        cp -a $install/$path/$module $fs/$dir
-    done
-
-    for i in $(cat $wanted_stuff/modules.list); do
-        if [ -f $fs/$path/$i ]; then
-	    rm -f $fs/$path/$i
-	fi
-    done
-}
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	chroot "$root/" depmod -a $VERSION-slitaz
-}
-
-post_remove()
-{
-	chroot "$root/" depmod -a $VERSION-slitaz
-}
-
diff -r c836f6d2eff8 -r 16d1d23aefee linux/stuff/linux-slitaz.config
--- a/linux/stuff/linux-slitaz.config	Fri Nov 30 15:12:24 2018 +0100
+++ b/linux/stuff/linux-slitaz.config	Sat Dec 01 11:07:58 2018 +0100
@@ -1526,8 +1526,8 @@
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
+CONFIG_TIFM_CORE=y
+CONFIG_TIFM_7XX1=y
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_CS5535_MFGPT is not set
@@ -4702,39 +4702,39 @@
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
+CONFIG_SDIO_UART=y
 # CONFIG_MMC_TEST is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
 # CONFIG_MMC_RICOH_MMC is not set
 # CONFIG_MMC_SDHCI_ACPI is not set
-CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
-CONFIG_MMC_USDHI6ROL0=m
-CONFIG_MMC_REALTEK_PCI=m
-CONFIG_MMC_REALTEK_USB=m
+CONFIG_MMC_WBSD=y
+CONFIG_MMC_TIFM_SD=y
+CONFIG_MMC_SDRICOH_CS=y
+CONFIG_MMC_CB710=y
+CONFIG_MMC_VIA_SDMMC=y
+CONFIG_MMC_VUB300=y
+CONFIG_MMC_USHC=y
+CONFIG_MMC_USDHI6ROL0=y
+CONFIG_MMC_REALTEK_PCI=y
+CONFIG_MMC_REALTEK_USB=y
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
 
diff -r c836f6d2eff8 -r 16d1d23aefee linux/stuff/linux-slitaz.config64
--- a/linux/stuff/linux-slitaz.config64	Fri Nov 30 15:12:24 2018 +0100
+++ b/linux/stuff/linux-slitaz.config64	Sat Dec 01 11:07:58 2018 +0100
@@ -1481,8 +1481,8 @@
 # CONFIG_IBM_ASM is not set
 # CONFIG_PHANTOM is not set
 # CONFIG_SGI_IOC4 is not set
-CONFIG_TIFM_CORE=m
-CONFIG_TIFM_7XX1=m
+CONFIG_TIFM_CORE=y
+CONFIG_TIFM_7XX1=y
 # CONFIG_ICS932S401 is not set
 # CONFIG_ENCLOSURE_SERVICES is not set
 # CONFIG_CS5535_MFGPT is not set
@@ -4226,36 +4226,36 @@
 CONFIG_UWB_HWA=m
 CONFIG_UWB_WHCI=m
 CONFIG_UWB_I1480U=m
-CONFIG_MMC=m
+CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_CLKGATE is not set
 
 #
 # MMC/SD/SDIO Card Drivers
 #
-CONFIG_MMC_BLOCK=m
+CONFIG_MMC_BLOCK=y
 CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_BLOCK_BOUNCE=y
-CONFIG_SDIO_UART=m
+CONFIG_SDIO_UART=y
 # CONFIG_MMC_TEST is not set
 
 #
 # MMC/SD/SDIO Host Controller Drivers
 #
-CONFIG_MMC_SDHCI=m
-CONFIG_MMC_SDHCI_PCI=m
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_PCI=y
 # CONFIG_MMC_RICOH_MMC is not set
 # CONFIG_MMC_SDHCI_ACPI is not set
-CONFIG_MMC_SDHCI_PLTFM=m
+CONFIG_MMC_SDHCI_PLTFM=y
 # CONFIG_MMC_SDHCI_PXAV3 is not set
 # CONFIG_MMC_SDHCI_PXAV2 is not set
-CONFIG_MMC_WBSD=m
-CONFIG_MMC_TIFM_SD=m
-CONFIG_MMC_SDRICOH_CS=m
-CONFIG_MMC_CB710=m
-CONFIG_MMC_VIA_SDMMC=m
-CONFIG_MMC_VUB300=m
-CONFIG_MMC_USHC=m
+CONFIG_MMC_WBSD=y
+CONFIG_MMC_TIFM_SD=y
+CONFIG_MMC_SDRICOH_CS=y
+CONFIG_MMC_CB710=y
+CONFIG_MMC_VIA_SDMMC=y
+CONFIG_MMC_VUB300=y
+CONFIG_MMC_USHC=y
 # CONFIG_MMC_USDHI6ROL0 is not set
 CONFIG_MEMSTICK=m
 # CONFIG_MEMSTICK_DEBUG is not set
diff -r c836f6d2eff8 -r 16d1d23aefee linux64-mmc/receipt
--- a/linux64-mmc/receipt	Fri Nov 30 15:12:24 2018 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-# SliTaz package receipt.
-
-PACKAGE="linux64-mmc"
-VERSION="3.16.55"
-CATEGORY="base-system"
-SHORT_DESC="The Linux kernel mmc modules (card reader)."
-MAINTAINER="devel@slitaz.org"
-LICENSE="GPL2"
-DEPENDS="linux64"
-WANTED="linux"
-PROVIDE="linux-mmc:linux64"
-WEB_SITE="https://www.kernel.org/"
-
-# Rules to gen a SliTaz package suitable for Tazpkg.
-genpkg_rules()
-{
-    local path
-    src=$WOK/linux64/source/tmp
-    install=$install/linux64
-    path=lib/modules/$VERSION-slitaz64/kernel
-    mkdir -p $fs/$path
-    export src
-    export install
-    $wanted_stuff/list_modules.sh drivers/mmc drivers/misc/tifm_7xx1.ko.xz | \
-	while read module; do
-    	dir=$path/$(dirname $module)
-    	[ -d $fs/$dir ] || mkdir -p $fs/$dir
-        cp -a $install/$path/$module $fs/$dir
-    done
-
-    for i in $(cat $wanted_stuff/modules.list); do
-        if [ -f $fs/$path/$i ]; then
-	    rm -f $fs/$path/$i
-	fi
-    done
-}
-
-# Post install/remove commands for Tazpkg.
-post_install()
-{
-	chroot "$root/" depmod -a $VERSION-slitaz64
-}
-
-post_remove()
-{
-	chroot "$root/" depmod -a $VERSION-slitaz64
-}
-