From: cinap_lenrek@felloff.net
To: 9front@9front.org
Subject: Re: [9front] T60 regression?
Date: Fri, 4 Jan 2019 02:55:52 +0100 [thread overview]
Message-ID: <98B4E166BE5C7B1C797BA96880E71335@felloff.net> (raw)
In-Reply-To: 4B72C35BD44794BFBF5B123F980C2931@felloff.net
ok, i think i got it. the mem.h dependency was not expressed
correctly for apbootstrap.h in pc64. there was a "apboostrap.$O: mem.h"
dependency but this is wrong as apoostrap.$O is an intermediate file
that never gets referenced in the dependency graph. the real dependency
needs to be on apboostrap.h.
changeset: 6986:b048db97b5ea
tag: tip
user: cinap_lenrek@felloff.net
date: Fri Jan 04 02:51:29 2019 +0100
summary: pc, pc64: properly track dependencies for mem.h on autogenerated apbootstrap.h and reboot.h targets
diff -r 8c50688cb280 -r b048db97b5ea sys/src/9/pc/mkfile
--- a/sys/src/9/pc/mkfile Wed Jan 02 10:26:38 2019 +0100
+++ b/sys/src/9/pc/mkfile Fri Jan 04 02:51:29 2019 +0100
@@ -8,8 +8,9 @@
p=9
# must match mem.h
+KTZERO=0xF0100020
APBOOTSTRAP=0xF0007000
-KTZERO=0xF0100020
+REBOOTADDR=0x11000
DEVS=`{rc ../port/mkdevlist $CONF}
@@ -143,15 +144,15 @@
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
echo '};'} > init.h
-reboot.h:D: rebootcode.s
+reboot.h:D: rebootcode.s mem.h
$AS rebootcode.s
- $LD -l -s -T0x11000 -R4 -o reboot.out rebootcode.$O
+ $LD -l -s -T$REBOOTADDR -R4 -o reboot.out rebootcode.$O
{echo 'uchar rebootcode[]={'
xd -1x reboot.out |
sed -e '1,2d' -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
echo '};'} > reboot.h
-apbootstrap.h: apbootstrap.s mem.h
+apbootstrap.h:D: apbootstrap.s mem.h
$AS $prereq
$LD -o apbootstrap.out -T$APBOOTSTRAP -R4 -l -s apbootstrap.$O
{echo 'uchar apbootstrap[]={'
diff -r 8c50688cb280 -r b048db97b5ea sys/src/9/pc64/mkfile
--- a/sys/src/9/pc64/mkfile Wed Jan 02 10:26:38 2019 +0100
+++ b/sys/src/9/pc64/mkfile Fri Jan 04 02:51:29 2019 +0100
@@ -5,6 +5,7 @@
</$objtype/mkfile
p=9
+# must match mem.h
KTZERO=0xffffffff80110000
APBOOTSTRAP=0xffffffff80007000
REBOOTADDR=0x11000
@@ -99,7 +100,7 @@
<../port/portmkfile
<|../port/mkbootrules $CONF
-l.$O apbootstrap.$O: mem.h
+l.$O: mem.h
$ETHER: ../port/etherif.h ../port/netif.h
$AUDIO: ../port/audioif.h
@@ -144,7 +145,7 @@
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
echo '};'} > init.h
-reboot.h: rebootcode.s
+reboot.h:D: rebootcode.s mem.h
$AS rebootcode.s
$LD -l -R1 -s -o reboot.out -T$REBOOTADDR rebootcode.$O
{echo 'uchar rebootcode[]={'
@@ -153,7 +154,7 @@
sed -e 's/^[0-9a-f]+ //' -e 's/ ([0-9a-f][0-9a-f])/0x\1,/g'
echo '};'} > $target
-apbootstrap.h: apbootstrap.s
+apbootstrap.h:D: apbootstrap.s mem.h
$AS apbootstrap.s
$LD -l -R1 -s -o apbootstrap.out -T$APBOOTSTRAP apbootstrap.$O
{echo 'uchar apbootstrap[]={'
next reply other threads:[~2019-01-04 1:55 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-04 1:55 cinap_lenrek [this message]
2019-01-04 20:06 ` istvan bak
-- strict thread matches above, loose matches on Subject: below --
2019-01-04 1:33 cinap_lenrek
2019-01-03 16:07 cinap_lenrek
2019-01-03 17:20 ` Stanley Lieber
2019-01-04 0:23 ` istvan bak
2019-01-03 8:31 cinap_lenrek
2019-01-03 9:56 ` [9front] " Kurt H Maier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=98B4E166BE5C7B1C797BA96880E71335@felloff.net \
--to=cinap_lenrek@felloff.net \
--cc=9front@9front.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).