summary refs log tree commit diff
path: root/fold.c
diff options
context:
space:
mode:
authorQuentin Carbonneaux <quentin@c9x.me>2022-09-09 18:00:29 +0200
committerQuentin Carbonneaux <quentin@c9x.me>2022-10-08 21:48:47 +0200
commit4e90b4210edc439bf749f495855e29f711d7e99e (patch)
tree9f3b3e137f98fa65bf1c61e235d32afce4f24f7f /fold.c
parent2e38c86af6c91bfb23dfb06b517a00c11fd4c1b3 (diff)
downloadroux-4e90b4210edc439bf749f495855e29f711d7e99e.tar.gz
"rel" fields become "reloc"
Diffstat (limited to 'fold.c')
-rw-r--r--fold.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fold.c b/fold.c
index 0bbf8a7..2bb3a2f 100644
--- a/fold.c
+++ b/fold.c
@@ -346,12 +346,12 @@ foldint(Con *res, int op, int w, Con *cl, Con *cr)
 			if (cr->type == CAddr)
 				return 1;
 			lab = cl->label;
-			rel = cl->rel;
+			rel = cl->reloc;
 			typ = CAddr;
 		}
 		else if (cr->type == CAddr) {
 			lab = cr->label;
-			rel = cr->rel;
+			rel = cr->reloc;
 			typ = CAddr;
 		}
 	}
@@ -359,7 +359,7 @@ foldint(Con *res, int op, int w, Con *cl, Con *cr)
 		if (cl->type == CAddr) {
 			if (cr->type != CAddr) {
 				lab = cl->label;
-				rel = cl->rel;
+				rel = cl->reloc;
 				typ = CAddr;
 			} else if (cl->label != cr->label)
 				return 1;
@@ -408,7 +408,7 @@ foldint(Con *res, int op, int w, Con *cl, Con *cr)
 		x = l.u;
 		if (cl->type == CAddr) {
 			lab = cl->label;
-			rel = cl->rel;
+			rel = cl->reloc;
 			typ = CAddr;
 		}
 		break;
@@ -462,7 +462,7 @@ foldint(Con *res, int op, int w, Con *cl, Con *cr)
 		else
 			die("unreachable");
 	}
-	*res = (Con){.type=typ, .label=lab, .rel=rel, .bits={.i=x}};
+	*res = (Con){.type=typ, .label=lab, .reloc=rel, .bits={.i=x}};
 	return 0;
 }