summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert de Bath <rdebath@poboxes.com>2000-11-04 12:50:12 +0100
committerLubomir Rintel <lkundrak@v3.sk>2013-10-23 23:47:02 +0200
commit4b55feb026b1f64555d7c11c2840fddd8fd029fe (patch)
tree55c2dd8aca1c551306cbc8e04d1d9647d978ccfb
parentdfab97edd018b8904568bce77536037dd76b7507 (diff)
downloaddev86-4b55feb026b1f64555d7c11c2840fddd8fd029fe.tar.gz
Import Dev86src-0.15.4.tar.gzv0.15.4
-rw-r--r--Libc_version2
-rw-r--r--as/assemble.c2
-rw-r--r--libc/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/Libc_version b/Libc_version
index 1985d91..7ffdfa1 100644
--- a/Libc_version
+++ b/Libc_version
@@ -1 +1 @@
-0.15.3
+0.15.4
diff --git a/as/assemble.c b/as/assemble.c
index 062ec6d..175d5cc 100644
--- a/as/assemble.c
+++ b/as/assemble.c
@@ -245,7 +245,7 @@ PRIVATE void asline()
labelerror(RELAB);
label = symptr;
- if (pass /* && last_pass>1 */)
+ if (pass && !(symptr->type & VARBIT) /*&& last_pass>1*/)
{
label->data = (label->data & FORBIT) | lcdata;
label->value_reg_or_op.value = lc;
diff --git a/libc/Makefile b/libc/Makefile
index 2e3406f..41865d6 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -11,7 +11,7 @@ endif
VERMAJOR=0
VERMINOR=15
-VERPATCH=3
+VERPATCH=4
VER=$(VERMAJOR).$(VERMINOR).$(VERPATCH)
CC=bcc