]> git.hungrycats.org Git - linux/commitdiff
[PATCH] M68k build fixes
authorGeert Uytterhoeven <geert@linux-m68k.org>
Sun, 3 Nov 2002 07:53:14 +0000 (23:53 -0800)
committerLinus Torvalds <torvalds@penguin.transmeta.com>
Sun, 3 Nov 2002 07:53:14 +0000 (23:53 -0800)
M68k build fixes, caused by kbuild changes in 2.5.41:
  - 68040 Floating Point and 68060 Integer and Floating Point Support Packages:
    use cpp includes instead of gas includes
  - Add `$(obj)' and `$(src)' where necessary to fix building of generated
    header files

37 files changed:
arch/m68k/fpsp040/bindec.S
arch/m68k/fpsp040/binstr.S
arch/m68k/fpsp040/bugfix.S
arch/m68k/fpsp040/decbin.S
arch/m68k/fpsp040/do_func.S
arch/m68k/fpsp040/gen_except.S
arch/m68k/fpsp040/get_op.S
arch/m68k/fpsp040/kernel_ex.S
arch/m68k/fpsp040/res_func.S
arch/m68k/fpsp040/round.S
arch/m68k/fpsp040/satan.S
arch/m68k/fpsp040/scale.S
arch/m68k/fpsp040/setox.S
arch/m68k/fpsp040/sgetem.S
arch/m68k/fpsp040/sint.S
arch/m68k/fpsp040/skeleton.S
arch/m68k/fpsp040/slogn.S
arch/m68k/fpsp040/smovecr.S
arch/m68k/fpsp040/srem_mod.S
arch/m68k/fpsp040/ssin.S
arch/m68k/fpsp040/stan.S
arch/m68k/fpsp040/stanh.S
arch/m68k/fpsp040/sto_res.S
arch/m68k/fpsp040/stwotox.S
arch/m68k/fpsp040/util.S
arch/m68k/fpsp040/x_bsun.S
arch/m68k/fpsp040/x_fline.S
arch/m68k/fpsp040/x_operr.S
arch/m68k/fpsp040/x_ovfl.S
arch/m68k/fpsp040/x_snan.S
arch/m68k/fpsp040/x_store.S
arch/m68k/fpsp040/x_unfl.S
arch/m68k/fpsp040/x_unimp.S
arch/m68k/fpsp040/x_unsupp.S
arch/m68k/ifpsp060/fskeleton.S
arch/m68k/ifpsp060/iskeleton.S
arch/m68k/kernel/Makefile

index 9fb65e320e55276229927b29940cc1ddd617158f..b0ce37b74e53f6a4365313b95c4af697c42f3d96 100644 (file)
 
 |BINDEC    idnt    2,1 | Motorola 040 Floating Point Software Package
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |section        8
 
index 58aa43ad05fa5dc1c2ced274da9202bc6de4dfeb..b3816424d85435ebd43a0ca9f039ec5bedbfbc14 100644 (file)
@@ -68,7 +68,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        .global binstr
 binstr:
index f0beee2299ee9f751a74eabf09802721f806ac4c..654ed5a764466a3b46c6560a86da441325a32252 100644 (file)
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   fpsp_fmt_error
 
index d2bf1b641e121c95a34fc2ac1c6ae25f958d45aa..1862d509aafbfded16783ad3a5874cc272ee8c92 100644 (file)
@@ -77,7 +77,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 |
 |      PTENRN, PTENRM, and PTENRP are arrays of powers of 10 rounded
index 0a9c776f004a46ff3373761668efd097e31ba2fe..3fa7087c486bccbe999123ee906743868b4f97e8 100644 (file)
@@ -30,7 +30,7 @@ DO_FUNC:      |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   t_dz2
        |xref   t_operr
index edd8108d02ec25c95f643dc05638633726c05a3a..628637b8b8a2d5c18062e2e68508e7ee0fc868ee 100644 (file)
@@ -37,7 +37,7 @@ GEN_EXCEPT:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section 8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   real_trace
        |xref   fpsp_done
index 480405d4ff304cffe038ea81d85073e4088a2d89..63d238ca8cee2c5b9fd7e1d2aecfc34427fd9802 100644 (file)
@@ -62,7 +62,7 @@ GET_OP:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        .global PIRN,PIRZRM,PIRP
        .global SMALRN,SMALRZRM,SMALRP
index 05f7e305d67ddb6cf1868d97fd04894893534cbd..2cc09767624b6716ec15a26d805042d1c6d86ea6 100644 (file)
@@ -20,7 +20,7 @@ KERNEL_EX:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section    8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 mns_inf:  .long 0xffff0000,0x00000000,0x00000000
 pls_inf:  .long 0x7fff0000,0x00000000,0x00000000
index 66e42d74927880f5e312c1a8e6f807481166acfe..95bac414f7dbd54f1e5fcaca5eab6e1196ab2eed 100644 (file)
@@ -24,7 +24,7 @@ RES_FUNC:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 sp_bnds:       .short  0x3f81,0x407e
                .short  0x3f6a,0x0000
index b1030fde7ae0d7f19eb9cf677bedc4bff677f478..abcbf86969bd703276c3c349100f3c7ed85858ae 100644 (file)
@@ -16,7 +16,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 |
 |      round --- round result according to precision/mode
index 282c462b08dbfe2aa9873df05a3bad85ca67571a..429b3c64a271bbc39b5665e929263d33f5e22dda 100644 (file)
@@ -51,7 +51,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
        
 BOUNDS1:       .long 0x3FFB8000,0x4002FFFF
 
index 1f01fb1d509c9a0edfe412bc0b705ca0a0018507..f940f04931af25f67e988d9c95cbb6747ef180b7 100644 (file)
@@ -29,7 +29,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   t_ovfl2
        |xref   t_unfl
index 01cf3d8dbbf7f6689c8dd51a2989f19a8ecaa52a..cfb4ed4e38d7473f44da8a4312f35bd71eb92f9a 100644 (file)
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 L2:    .long   0x3FDC0000,0x82E30865,0x4361C4C6,0x00000000
 
index 2fed3316f3638f95f62bade176ffc758311a2c4b..3308278f34edd41310d2f675d2983c1c3457790d 100644 (file)
@@ -32,7 +32,7 @@
 
        |section 8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   nrm_set
 
index 9ca3fb6c4d6792a79f50591def5460c82bd47353..f04653e7177e5a4bd83de7513a47403f83c63eea 100644 (file)
@@ -59,7 +59,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   dnrm_lp
        |xref   nrm_set
index 9d239b3fecc0fa135a63cd2fbc69f9889e0235bc..4198b4ed4bb2a72b4d6e777d14cc333a40b3485b 100644 (file)
@@ -51,7 +51,7 @@
 
        |section 8
  
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   b1238_fix
 
index 20c5bae9f3583c563cba588a6f31f14f73af16e2..68bd283ff2dade444a156522d32381feff96315b 100644 (file)
@@ -71,7 +71,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:  .long 0x3FFEF07D,0x3FFF8841
 BOUNDS2:  .long 0x3FFE8000,0x3FFFC000
index 134959555a29e0af30700c85644cd4f8b691c17a..09b5c389a17a4da1d8980fbb769a1bf0f690b174 100644 (file)
@@ -23,7 +23,7 @@
 
        |section 8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   nrm_set
        |xref   round
index 7db14a1d47d16ab0f804f096bee738b711dee19c..dd2b39266dc7a1d1f832139e63032d726f6851a6 100644 (file)
@@ -74,7 +74,7 @@ SREM_MOD:    |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section    8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        .set    Mod_Flag,L_SCR3
        .set    SignY,FP_SCR3+4
index 96e0e7141570d63c20f3e552ff6e98774fb3a6c1..88629044040cea4407155a558a661cebebffde59 100644 (file)
@@ -91,7 +91,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:       .long 0x3FD78000,0x4004BC7E
 TWOBYPI:       .long 0x3FE45F30,0x6DC9C883
index 6bd2dda6006acb75cdea7aee18fb0ef580eaff61..e0b4daf91da316eef8e86dcbafdef54c1b0b6e54 100644 (file)
@@ -58,7 +58,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:       .long 0x3FD78000,0x4004BC7E
 TWOBYPI:       .long 0x3FE45F30,0x6DC9C883
index 6af196f250dc9f999f53dd6a5f85e8abdcb99c59..889915f9cd3a9e4254af27844b98d683ed1eca96 100644 (file)
@@ -57,7 +57,7 @@
 
        |section        8
        
-       .include "fpsp.h"
+#include "fpsp.h"
 
        .set    X,FP_SCR5
        .set    XDCARE,X+2
index 6be6dd5ac72a149142f8e001b7ecf5fd7715b826..c3996adc3d09233bbfbbbb0a3dc0f950fe593454 100644 (file)
@@ -28,7 +28,7 @@ STO_RES:      |idnt   2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        .global sto_cos
 sto_cos:
index da06e31c1945078dd2fc080a9e05d2fe3df9949c..5d5d75d2fa71f931596b7a7cebf56785eca6e5b7 100644 (file)
@@ -84,7 +84,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
 BOUNDS1:       .long 0x3FB98000,0x400D80C0 | ... 2^(-70),16480
 BOUNDS2:       .long 0x3FB98000,0x400B9B07 | ... 2^(-70),16480 LOG2/LOG10
index cc9ae013b038a856b616c972ffeb97b5b9bb240a..009eeb15d349552aabe8cdce123a8138c14ef84f 100644 (file)
@@ -24,7 +24,7 @@
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   mem_read
 
index 42faf9bf08f6fc9c656d2768d9e604589c3c26f1..751c98bf162bfc8cfffba423170072c4d58e5698 100644 (file)
@@ -21,7 +21,7 @@ X_BSUN:       |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   real_bsun
 
index d8fdf3f068855fb5eb1f9ca4f799770a0b87c51b..8eb55c8dc2087450b0778c88868cd56545c09bad 100644 (file)
@@ -21,7 +21,7 @@ X_FLINE:      |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   real_fline
        |xref   fpsp_unimp
index 99d1a843052b7e622d16e559d959a40d7f8aaf37..526e6a3f10b0acf571fd357b058674340f075d43 100644 (file)
@@ -51,7 +51,7 @@ X_OPERR:      |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   mem_write
        |xref   real_operr
index e311508cac7d6828f32999d41de95e47645dc8e9..61ab8cc00866934b9a34d2c1f79a5c42c546b7f2 100644 (file)
@@ -43,7 +43,7 @@ X_OVFL:       |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   ovf_r_x2
        |xref   ovf_r_x3
index aaba75c1803dd7995313c43c3cbc6f7f9af1c3f4..29b966288c8219e789b6e92e783aecd7691aa867 100644 (file)
@@ -30,7 +30,7 @@ X_SNAN:       |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   get_fline
        |xref   mem_write
index b3357fd658b5347bfabdaa39b65eaefea65df0d9..4c407057a33a56e08ae55fa0e2c6f37b5299c5fe 100644 (file)
@@ -22,7 +22,7 @@ X_STORE:      |idnt    2,1 | Motorola 040 Floating Point Software Package
 fpreg_mask:
        .byte   0x80,0x40,0x20,0x10,0x08,0x04,0x02,0x01
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   mem_write
        |xref   get_fline
index f9bd1d0d6493718afdf285b30d76dc22915819c2..b64dd998361e34beaa75a0257938f15751704fa5 100644 (file)
@@ -29,7 +29,7 @@ X_UNFL:       |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   denorm
        |xref   round
index 36b0f7bbd2a66fc1effa9f9321729abad9676970..6c561dfcf0b6596c09bb03747457947df7feace8 100644 (file)
@@ -30,7 +30,7 @@ X_UNIMP:      |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   get_op
        |xref   do_func
index 1d7b99f4412fd414c855509c879bce0392b12e5a..894b251daa989e1d1557fd6b5356c4ad538fbb72 100644 (file)
@@ -31,7 +31,7 @@ X_UNSUPP:     |idnt    2,1 | Motorola 040 Floating Point Software Package
 
        |section        8
 
-       .include "fpsp.h"
+#include "fpsp.h"
 
        |xref   get_op
        |xref   res_func
index 9e206f4550ee8ca44ac5fe7aae70e11a501ab838..e1d9c032542cc548c6cc4ecba9435cbe54aab582 100644 (file)
@@ -340,4 +340,4 @@ _FP_CALL_TOP:
 
 | 060 FPSP KERNEL PACKAGE NEEDS TO GO HERE!!!
 
-       .include "fpsp.sa"
+#include "fpsp.sa"
index 3a35c413efa2c7bea5afc740b30822ec47754507..6c72c14c9c73536260eceb8055679d27ae1f8cb5 100644 (file)
@@ -304,4 +304,4 @@ _I_CALL_TOP:
 |###########################################################################
 
 | 060 INTEGER KERNEL PACKAGE MUST GO HERE!!!
-       .include "isp.sa"
+#include "isp.sa"
index 47f3ce8b69631baa379b026233c92ef428691a48..c519447128fe7f064b04931e29ed0b47a0aee24a 100644 (file)
@@ -19,18 +19,19 @@ EXTRA_AFLAGS := -traditional
 
 include $(TOPDIR)/Rules.make
 
-head.o: head.S m68k_defs.h
+$(obj)/head.o: $(obj)/head.S $(obj)/m68k_defs.h
 
-entry.o: entry.S m68k_defs.h
+$(obj)/entry.o: $(obj)/entry.S $(obj)/m68k_defs.h
 
-sun3-head.o: sun3-head.S m68k_defs.h
+$(obj)/sun3-head.o: $(obj)/sun3-head.S $(obj)/m68k_defs.h
 
-m68k_defs.h: m68k_defs.c m68k_defs.head
-       rm -f m68k_defs.d
-       SUNPRO_DEPENDENCIES="m68k_defs.d m68k_defs.h" \
-       $(CC) $(filter-out -MD,$(CFLAGS)) -S m68k_defs.c
-       cp m68k_defs.head m68k_defs.h
-       grep '^#define' m68k_defs.s >> m68k_defs.h
-       rm m68k_defs.s
--include m68k_defs.d
+$(obj)/m68k_defs.h: $(src)/m68k_defs.c $(src)/m68k_defs.head
+       rm -f $(obj)/m68k_defs.d
+       SUNPRO_DEPENDENCIES="$(obj)/m68k_defs.d $(obj)/m68k_defs.h" \
+       $(CC) $(filter-out -MD,$(CFLAGS)) -S $(src)/m68k_defs.c -o \
+       $(obj)/m68k_defs.s
+       cp $(src)/m68k_defs.head $(obj)/m68k_defs.h
+       grep '^#define' $(obj)/m68k_defs.s >> $(obj)/m68k_defs.h
+       rm $(obj)/m68k_defs.s
+-include $(obj)/m68k_defs.d