debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

m68k updates 

svn path=/dists/trunk/linux-2.6/; revision=6911
This commit is contained in:
Christian T. Steigies 2006-06-27 22:46:47 +00:00
parent 08ee3c903e
commit 2f050944e8
6 changed files with 12039 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
debian/arch/m68k/defines vendored
View File

@ -1,15 +1,15 @@
[base]
compiler: gcc-3.3
compiler: gcc-4.1
flavours:
amiga
atari
bvme6000
hp
# atari
# bvme6000
# hp
mac
mvme147
mvme16x
q40
sun3
# mvme147
# mvme16x
# q40
# sun3
kernel-arch: m68k
kernel-header-dirs: m68k

8
debian/changelog vendored
View File

@ -16,7 +16,13 @@ linux-2.6 (2.6.17-2) UNRELEASED; urgency=low
* [mipsel] Update configs.
* [mipsel] Add a build fix for the Cobalt early console support.
-- Sven Luther <luther@debian.org> Tue, 27 Jun 2006 13:52:03 +0200
[ Christian T. Steigies ]
* [m68k] Update patches for 2.6.17.
* [m68k] Add m68k-as and m68k-macro patch which allow building with current binutils.
* [m68k] Use gcc 4.1.
* [m68k] Disable all subarches but amiga and mac for official linux-images.
-- Christian T. Steigies <cts@debian.org> Wed, 28 Jun 2006 00:41:00 +0200
linux-2.6 (2.6.17-1) unstable; urgency=low

11564
debian/patches/m68k-2.6.17.patch vendored Normal file
View File

File diff suppressed because it is too large Load Diff

308
debian/patches/m68k-as.patch vendored Normal file
View File

@ -0,0 +1,308 @@
From: Al Viro <viro@zeniv.linux.org.uk>
Date: 1134413482 -0500
recent as(1) doesn't think that . terminates a macro name, so
getuser.l is _not_ treated as invoking getuser with .l as the
first argument.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/m68k/math-emu/fp_cond.S | 2 +-
arch/m68k/math-emu/fp_decode.h | 4 ++--
arch/m68k/math-emu/fp_move.S | 14 +++++++-------
arch/m68k/math-emu/fp_movem.S | 16 ++++++++--------
arch/m68k/math-emu/fp_scan.S | 22 +++++++++++-----------
arch/m68k/math-emu/fp_util.S | 16 ++++++++--------
6 files changed, 37 insertions(+), 37 deletions(-)
3c4ab44571b5a46917ad28620995c326e386a909
diff --git a/arch/m68k/math-emu/fp_cond.S b/arch/m68k/math-emu/fp_cond.S
index ddae8b1..1cddeb0 100644
--- a/arch/m68k/math-emu/fp_cond.S
+++ b/arch/m68k/math-emu/fp_cond.S
@@ -163,7 +163,7 @@ fp_absolute_long:
fp_do_scc:
swap %d1
- putuser.b %d1,(%a0),fp_err_ua1,%a0
+ putuser .b,%d1,(%a0),fp_err_ua1,%a0
printf PDECODE,"\n"
jra fp_end
diff --git a/arch/m68k/math-emu/fp_decode.h b/arch/m68k/math-emu/fp_decode.h
index 759679d..a2595d9 100644
--- a/arch/m68k/math-emu/fp_decode.h
+++ b/arch/m68k/math-emu/fp_decode.h
@@ -311,7 +311,7 @@ debug move.l "(%sp)+,%d1"
btst #2,%d2
jne 1f
printf PDECODE,")@("
- getuser.l (%a1),%a1,fp_err_ua1,%a1
+ getuser .l,(%a1),%a1,fp_err_ua1,%a1
debug jra "2f"
1: printf PDECODE,","
2:
@@ -322,7 +322,7 @@ debug jra "2f"
btst #2,%d2
jeq 1f
printf PDECODE,")@("
- getuser.l (%a1),%a1,fp_err_ua1,%a1
+ getuser .l,(%a1),%a1,fp_err_ua1,%a1
debug jra "2f"
1: printf PDECODE,","
2:
diff --git a/arch/m68k/math-emu/fp_move.S b/arch/m68k/math-emu/fp_move.S
index 71bdf83..9bd0334 100644
--- a/arch/m68k/math-emu/fp_move.S
+++ b/arch/m68k/math-emu/fp_move.S
@@ -200,12 +200,12 @@ fp_putdest:
fp_format_long:
jsr fp_conv_ext2long
- putuser.l %d0,(%a1),fp_err_ua1,%a1
+ putuser .l,%d0,(%a1),fp_err_ua1,%a1
jra fp_finish_move
fp_format_single:
jsr fp_conv_ext2single
- putuser.l %d0,(%a1),fp_err_ua1,%a1
+ putuser .l,%d0,(%a1),fp_err_ua1,%a1
jra fp_finish_move
fp_format_extended:
@@ -213,11 +213,11 @@ fp_format_extended:
lsl.w #1,%d0
lsl.l #7,%d0
lsl.l #8,%d0
- putuser.l %d0,(%a1)+,fp_err_ua1,%a1
+ putuser .l,%d0,(%a1)+,fp_err_ua1,%a1
move.l (%a0)+,%d0
- putuser.l %d0,(%a1)+,fp_err_ua1,%a1
+ putuser .l,%d0,(%a1)+,fp_err_ua1,%a1
move.l (%a0),%d0
- putuser.l %d0,(%a1),fp_err_ua1,%a1
+ putuser .l,%d0,(%a1),fp_err_ua1,%a1
jra fp_finish_move
fp_format_packed:
@@ -227,7 +227,7 @@ fp_format_packed:
fp_format_word:
jsr fp_conv_ext2short
- putuser.w %d0,(%a1),fp_err_ua1,%a1
+ putuser .w,%d0,(%a1),fp_err_ua1,%a1
jra fp_finish_move
fp_format_double:
@@ -236,7 +236,7 @@ fp_format_double:
fp_format_byte:
jsr fp_conv_ext2byte
- putuser.b %d0,(%a1),fp_err_ua1,%a1
+ putuser .b,%d0,(%a1),fp_err_ua1,%a1
| jra fp_finish_move
fp_finish_move:
diff --git a/arch/m68k/math-emu/fp_movem.S b/arch/m68k/math-emu/fp_movem.S
index 8354d39..9c74134 100644
--- a/arch/m68k/math-emu/fp_movem.S
+++ b/arch/m68k/math-emu/fp_movem.S
@@ -141,14 +141,14 @@ fpr_do_movem:
| move register from memory into fpu
jra 3f
1: printf PMOVEM,"(%p>%p)",2,%a0,%a1
- getuser.l (%a0)+,%d2,fp_err_ua1,%a0
+ getuser .l,(%a0)+,%d2,fp_err_ua1,%a0
lsr.l #8,%d2
lsr.l #7,%d2
lsr.w #1,%d2
move.l %d2,(%a1)+
- getuser.l (%a0)+,%d2,fp_err_ua1,%a0
+ getuser .l,(%a0)+,%d2,fp_err_ua1,%a0
move.l %d2,(%a1)+
- getuser.l (%a0),%d2,fp_err_ua1,%a0
+ getuser .l,(%a0),%d2,fp_err_ua1,%a0
move.l %d2,(%a1)
subq.l #8,%a0
subq.l #8,%a1
@@ -164,11 +164,11 @@ fpr_do_movem:
lsl.w #1,%d2
lsl.l #7,%d2
lsl.l #8,%d2
- putuser.l %d2,(%a0)+,fp_err_ua1,%a0
+ putuser .l,%d2,(%a0)+,fp_err_ua1,%a0
move.l (%a1)+,%d2
- putuser.l %d2,(%a0)+,fp_err_ua1,%a0
+ putuser .l,%d2,(%a0)+,fp_err_ua1,%a0
move.l (%a1),%d2
- putuser.l %d2,(%a0),fp_err_ua1,%a0
+ putuser .l,%d2,(%a0),fp_err_ua1,%a0
subq.l #8,%a1
subq.l #8,%a0
add.l %d0,%a0
@@ -325,7 +325,7 @@ fpc_do_movem:
| move register from memory into fpu
jra 3f
1: printf PMOVEM,"(%p>%p)",2,%a0,%a1
- getuser.l (%a0)+,%d0,fp_err_ua1,%a0
+ getuser .l,(%a0)+,%d0,fp_err_ua1,%a0
move.l %d0,(%a1)
2: addq.l #4,%a1
3: lsl.b #1,%d1
@@ -336,7 +336,7 @@ fpc_do_movem:
| move register from fpu into memory
1: printf PMOVEM,"(%p>%p)",2,%a1,%a0
move.l (%a1),%d0
- putuser.l %d0,(%a0)+,fp_err_ua1,%a0
+ putuser .l,%d0,(%a0)+,fp_err_ua1,%a0
2: addq.l #4,%a1
4: lsl.b #1,%d1
jcs 1b
diff --git a/arch/m68k/math-emu/fp_scan.S b/arch/m68k/math-emu/fp_scan.S
index e4146ed..5f49b93 100644
--- a/arch/m68k/math-emu/fp_scan.S
+++ b/arch/m68k/math-emu/fp_scan.S
@@ -64,7 +64,7 @@ fp_scan:
| normal fpu instruction? (this excludes fsave/frestore)
fp_get_pc %a0
printf PDECODE,"%08x: ",1,%a0
- getuser.b (%a0),%d0,fp_err_ua1,%a0
+ getuser .b,(%a0),%d0,fp_err_ua1,%a0
#if 1
cmp.b #0xf2,%d0 | cpid = 1
#else
@@ -72,7 +72,7 @@ fp_scan:
#endif
jne fp_nonstd
| first two instruction words are kept in %d2
- getuser.l (%a0)+,%d2,fp_err_ua1,%a0
+ getuser .l,(%a0)+,%d2,fp_err_ua1,%a0
fp_put_pc %a0
fp_decode_cond: | separate conditional instr
fp_decode_cond_instr_type
@@ -230,7 +230,7 @@ fp_immediate:
movel %a0,%a1
clr.l %d1
jra 2f
-1: getuser.b (%a1)+,%d1,fp_err_ua1,%a1
+1: getuser .b,(%a1)+,%d1,fp_err_ua1,%a1
printf PDECODE,"%02x",1,%d1
2: dbra %d0,1b
movem.l (%sp)+,%d0/%d1
@@ -252,24 +252,24 @@ fp_fetchsource:
.long fp_byte, fp_ill
fp_long:
- getuser.l (%a1),%d0,fp_err_ua1,%a1
+ getuser .l,(%a1),%d0,fp_err_ua1,%a1
jsr fp_conv_long2ext
jra fp_getdest
fp_single:
- getuser.l (%a1),%d0,fp_err_ua1,%a1
+ getuser .l,(%a1),%d0,fp_err_ua1,%a1
jsr fp_conv_single2ext
jra fp_getdest
fp_ext:
- getuser.l (%a1)+,%d0,fp_err_ua1,%a1
+ getuser .l,(%a1)+,%d0,fp_err_ua1,%a1
lsr.l #8,%d0
lsr.l #7,%d0
lsr.w #1,%d0
move.l %d0,(%a0)+
- getuser.l (%a1)+,%d0,fp_err_ua1,%a1
+ getuser .l,(%a1)+,%d0,fp_err_ua1,%a1
move.l %d0,(%a0)+
- getuser.l (%a1),%d0,fp_err_ua1,%a1
+ getuser .l,(%a1),%d0,fp_err_ua1,%a1
move.l %d0,(%a0)
subq.l #8,%a0
jra fp_getdest
@@ -279,7 +279,7 @@ fp_pack:
jra fp_ill
fp_word:
- getuser.w (%a1),%d0,fp_err_ua1,%a1
+ getuser .w,(%a1),%d0,fp_err_ua1,%a1
ext.l %d0
jsr fp_conv_long2ext
jra fp_getdest
@@ -289,7 +289,7 @@ fp_double:
jra fp_getdest
fp_byte:
- getuser.b (%a1),%d0,fp_err_ua1,%a1
+ getuser .b,(%a1),%d0,fp_err_ua1,%a1
extb.l %d0
jsr fp_conv_long2ext
| jra fp_getdest
@@ -465,7 +465,7 @@ fp_fdsub:
fp_nonstd:
fp_get_pc %a0
- getuser.l (%a0),%d0,fp_err_ua1,%a0
+ getuser .l,(%a0),%d0,fp_err_ua1,%a0
printf ,"nonstd ((%08x)=%08x)\n",2,%a0,%d0
moveq #-1,%d0
rts
diff --git a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S
index a9f7f01..f9f24d5 100644
--- a/arch/m68k/math-emu/fp_util.S
+++ b/arch/m68k/math-emu/fp_util.S
@@ -160,11 +160,11 @@ fp_s2e_large:
fp_conv_double2ext:
#ifdef FPU_EMU_DEBUG
- getuser.l %a1@(0),%d0,fp_err_ua2,%a1
- getuser.l %a1@(4),%d1,fp_err_ua2,%a1
+ getuser .l,%a1@(0),%d0,fp_err_ua2,%a1
+ getuser .l,%a1@(4),%d1,fp_err_ua2,%a1
printf PCONV,"d2e: %p%p -> %p(",3,%d0,%d1,%a0
#endif
- getuser.l (%a1)+,%d0,fp_err_ua2,%a1
+ getuser .l,(%a1)+,%d0,fp_err_ua2,%a1
move.l %d0,%d1
lsl.l #8,%d0 | shift high mantissa
lsl.l #3,%d0
@@ -178,7 +178,7 @@ fp_conv_double2ext:
add.w #0x3fff-0x3ff,%d1 | re-bias the exponent.
9: move.l %d1,(%a0)+ | fp_ext.sign, fp_ext.exp
move.l %d0,(%a0)+
- getuser.l (%a1)+,%d0,fp_err_ua2,%a1
+ getuser .l,(%a1)+,%d0,fp_err_ua2,%a1
move.l %d0,%d1
lsl.l #8,%d0
lsl.l #3,%d0
@@ -1287,17 +1287,17 @@ fp_conv_ext2double:
lsr.l #4,%d0
lsr.l #8,%d0
or.l %d2,%d0
- putuser.l %d0,(%a1)+,fp_err_ua2,%a1
+ putuser .l,%d0,(%a1)+,fp_err_ua2,%a1
moveq #21,%d0
lsl.l %d0,%d1
move.l (%a0),%d0
lsr.l #4,%d0
lsr.l #7,%d0
or.l %d1,%d0
- putuser.l %d0,(%a1),fp_err_ua2,%a1
+ putuser .l,%d0,(%a1),fp_err_ua2,%a1
#ifdef FPU_EMU_DEBUG
- getuser.l %a1@(-4),%d0,fp_err_ua2,%a1
- getuser.l %a1@(0),%d1,fp_err_ua2,%a1
+ getuser .l,%a1@(-4),%d0,fp_err_ua2,%a1
+ getuser .l,%a1@(0),%d1,fp_err_ua2,%a1
printf PCONV,"%p(%08x%08x)\n",3,%a1,%d0,%d1
#endif
rts
--
0.99.9.GIT
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

149
debian/patches/m68k-macro.patch vendored Normal file
View File

@ -0,0 +1,149 @@
From: Al Viro <viro@zeniv.linux.org.uk>
Date: 1134435322 -0500
cretinous thing doesn't believe that (%a0)+ is one macro argument and
splits it in two; worked around by quoting the argument...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---
arch/m68k/math-emu/fp_move.S | 4 ++--
arch/m68k/math-emu/fp_movem.S | 12 ++++++------
arch/m68k/math-emu/fp_scan.S | 6 +++---
arch/m68k/math-emu/fp_util.S | 6 +++---
4 files changed, 14 insertions(+), 14 deletions(-)
5ea87cc472a0aebf479e94ac287c50e1c070f741
diff --git a/arch/m68k/math-emu/fp_move.S b/arch/m68k/math-emu/fp_move.S
index 9bd0334..19363b3 100644
--- a/arch/m68k/math-emu/fp_move.S
+++ b/arch/m68k/math-emu/fp_move.S
@@ -213,9 +213,9 @@ fp_format_extended:
lsl.w #1,%d0
lsl.l #7,%d0
lsl.l #8,%d0
- putuser .l,%d0,(%a1)+,fp_err_ua1,%a1
+ putuser .l,%d0,"(%a1)+",fp_err_ua1,%a1
move.l (%a0)+,%d0
- putuser .l,%d0,(%a1)+,fp_err_ua1,%a1
+ putuser .l,%d0,"(%a1)+",fp_err_ua1,%a1
move.l (%a0),%d0
putuser .l,%d0,(%a1),fp_err_ua1,%a1
jra fp_finish_move
diff --git a/arch/m68k/math-emu/fp_movem.S b/arch/m68k/math-emu/fp_movem.S
index 9c74134..4173655 100644
--- a/arch/m68k/math-emu/fp_movem.S
+++ b/arch/m68k/math-emu/fp_movem.S
@@ -141,12 +141,12 @@ fpr_do_movem:
| move register from memory into fpu
jra 3f
1: printf PMOVEM,"(%p>%p)",2,%a0,%a1
- getuser .l,(%a0)+,%d2,fp_err_ua1,%a0
+ getuser .l,"(%a0)+",%d2,fp_err_ua1,%a0
lsr.l #8,%d2
lsr.l #7,%d2
lsr.w #1,%d2
move.l %d2,(%a1)+
- getuser .l,(%a0)+,%d2,fp_err_ua1,%a0
+ getuser .l,"(%a0)+",%d2,fp_err_ua1,%a0
move.l %d2,(%a1)+
getuser .l,(%a0),%d2,fp_err_ua1,%a0
move.l %d2,(%a1)
@@ -164,9 +164,9 @@ fpr_do_movem:
lsl.w #1,%d2
lsl.l #7,%d2
lsl.l #8,%d2
- putuser .l,%d2,(%a0)+,fp_err_ua1,%a0
+ putuser .l,%d2,"(%a0)+",fp_err_ua1,%a0
move.l (%a1)+,%d2
- putuser .l,%d2,(%a0)+,fp_err_ua1,%a0
+ putuser .l,%d2,"(%a0)+",fp_err_ua1,%a0
move.l (%a1),%d2
putuser .l,%d2,(%a0),fp_err_ua1,%a0
subq.l #8,%a1
@@ -325,7 +325,7 @@ fpc_do_movem:
| move register from memory into fpu
jra 3f
1: printf PMOVEM,"(%p>%p)",2,%a0,%a1
- getuser .l,(%a0)+,%d0,fp_err_ua1,%a0
+ getuser .l,"(%a0)+",%d0,fp_err_ua1,%a0
move.l %d0,(%a1)
2: addq.l #4,%a1
3: lsl.b #1,%d1
@@ -336,7 +336,7 @@ fpc_do_movem:
| move register from fpu into memory
1: printf PMOVEM,"(%p>%p)",2,%a1,%a0
move.l (%a1),%d0
- putuser .l,%d0,(%a0)+,fp_err_ua1,%a0
+ putuser .l,%d0,"(%a0)+",fp_err_ua1,%a0
2: addq.l #4,%a1
4: lsl.b #1,%d1
jcs 1b
diff --git a/arch/m68k/math-emu/fp_scan.S b/arch/m68k/math-emu/fp_scan.S
index 5f49b93..6a71ed1 100644
--- a/arch/m68k/math-emu/fp_scan.S
+++ b/arch/m68k/math-emu/fp_scan.S
@@ -72,7 +72,7 @@ fp_scan:
#endif
jne fp_nonstd
| first two instruction words are kept in %d2
- getuser .l,(%a0)+,%d2,fp_err_ua1,%a0
+ getuser .l,"(%a0)+",%d2,fp_err_ua1,%a0
fp_put_pc %a0
fp_decode_cond: | separate conditional instr
fp_decode_cond_instr_type
@@ -262,12 +262,12 @@ fp_single:
jra fp_getdest
fp_ext:
- getuser .l,(%a1)+,%d0,fp_err_ua1,%a1
+ getuser .l,"(%a1)+",%d0,fp_err_ua1,%a1
lsr.l #8,%d0
lsr.l #7,%d0
lsr.w #1,%d0
move.l %d0,(%a0)+
- getuser .l,(%a1)+,%d0,fp_err_ua1,%a1
+ getuser .l,"(%a1)+",%d0,fp_err_ua1,%a1
move.l %d0,(%a0)+
getuser .l,(%a1),%d0,fp_err_ua1,%a1
move.l %d0,(%a0)
diff --git a/arch/m68k/math-emu/fp_util.S b/arch/m68k/math-emu/fp_util.S
index f9f24d5..170110a 100644
--- a/arch/m68k/math-emu/fp_util.S
+++ b/arch/m68k/math-emu/fp_util.S
@@ -164,7 +164,7 @@ fp_conv_double2ext:
getuser .l,%a1@(4),%d1,fp_err_ua2,%a1
printf PCONV,"d2e: %p%p -> %p(",3,%d0,%d1,%a0
#endif
- getuser .l,(%a1)+,%d0,fp_err_ua2,%a1
+ getuser .l,"(%a1)+",%d0,fp_err_ua2,%a1
move.l %d0,%d1
lsl.l #8,%d0 | shift high mantissa
lsl.l #3,%d0
@@ -178,7 +178,7 @@ fp_conv_double2ext:
add.w #0x3fff-0x3ff,%d1 | re-bias the exponent.
9: move.l %d1,(%a0)+ | fp_ext.sign, fp_ext.exp
move.l %d0,(%a0)+
- getuser .l,(%a1)+,%d0,fp_err_ua2,%a1
+ getuser .l,"(%a1)+",%d0,fp_err_ua2,%a1
move.l %d0,%d1
lsl.l #8,%d0
lsl.l #3,%d0
@@ -1287,7 +1287,7 @@ fp_conv_ext2double:
lsr.l #4,%d0
lsr.l #8,%d0
or.l %d2,%d0
- putuser .l,%d0,(%a1)+,fp_err_ua2,%a1
+ putuser .l,%d0,"(%a1)+",fp_err_ua2,%a1
moveq #21,%d0
lsl.l %d0,%d1
move.l (%a0),%d0
--
0.99.9.GIT
-
To unsubscribe from this list: send the line "unsubscribe linux-m68k" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html

3
debian/patches/series/1-extra vendored
View File

@ -5,3 +5,6 @@
+ hppa.patch hppa
+ vserver-version.patch *_vserver *_xen-vserver
+ vserver-vs2.0.2-rc24.patch *_vserver *_xen-vserver
+ m68k-2.6.17.patch m68k
+ m68k-as.patch m68k
+ m68k-macro.patch m68k