qbe: Use extern for globals with external linkage

michaelforney · michaelforney · commit 942f67804bdf · 2026-04-27T16:45:31.000-07:00
diff --git a/qbe.c b/qbe.c
@@ -19,8 +19,9 @@ struct value {
 		VALUE_TYPE,
 		VALUE_LABEL,
 
-		VALUE_THREAD = 1<<4,
-		VALUE_QUOTE = 1<<5,
+		VALUE_EXTERN = 1<<4,
+		VALUE_THREAD = 1<<5,
+		VALUE_QUOTE = 1<<6,
 	} kind;
 	unsigned id;
 	union {
@@ -139,6 +140,8 @@ mkglobal(struct decl *d)
 
 	v = xmalloc(sizeof(*v));
 	v->kind = VALUE_GLOBAL;
+	if (d->linkage == LINKEXTERN)
+		v->kind |= VALUE_EXTERN;
 	if (d->kind == DECLOBJECT && d->u.obj.storage == SDTHREAD)
 		v->kind |= VALUE_THREAD;
 	if (d->asmname) {
@@ -1173,6 +1176,8 @@ emitvalue(struct value *v)
 		printf("d_%.17g", v->u.f);
 		break;
 	case VALUE_GLOBAL:
+		if (v->kind & VALUE_EXTERN)
+			fputs("extern ", stdout);
 		if (v->kind & VALUE_THREAD)
 			fputs("thread ", stdout);
 		/* fallthrough */
diff --git a/test/add-int-pointer.qbe b/test/add-int-pointer.qbe
@@ -4,7 +4,7 @@ function $f() {
 @body.2
 	%.1 =l extsw 1
 	%.2 =l mul %.1, 4
-	%.3 =l add $x, %.2
+	%.3 =l add extern $x, %.2
 	ret
 }
 export data $x = align 4 { z 8 }
diff --git a/test/alignas-vla-strict.qbe b/test/alignas-vla-strict.qbe
@@ -3,7 +3,7 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =w loadw $n
+	%.1 =w loadw extern $n
 	%.2 =l extsw %.1
 	%.3 =l mul %.2, 1
 	%.4 =l add %.3, 48
diff --git a/test/bitfield-assignment-sign-extend.qbe b/test/bitfield-assignment-sign-extend.qbe
@@ -2,7 +2,7 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =l add $s, 0
+	%.1 =l add extern $s, 0
 	%.2 =w shl 15, 0
 	%.3 =w shl %.2, 28
 	%.4 =w sar %.3, 28
diff --git a/test/bitfield-compound-assign.qbe b/test/bitfield-compound-assign.qbe
@@ -2,7 +2,7 @@ export
 function $f() {
 @start.1
 @body.2
-	%.1 =l add $s, 0
+	%.1 =l add extern $s, 0
 	%.2 =w loadw %.1
 	%.3 =w shl %.2, 19
 	%.4 =w sar %.3, 23
diff --git a/test/bitfield-integer-promotion.qbe b/test/bitfield-integer-promotion.qbe
@@ -3,7 +3,7 @@ function w $main() {
 @start.1
 @body.2
 	%.1 =w neg 1
-	%.2 =l add $s, 0
+	%.2 =l add extern $s, 0
 	%.3 =w loadw %.2
 	%.4 =w shl %.3, 30
 	%.5 =w shr %.4, 30
diff --git a/test/bitfield-load-signed.qbe b/test/bitfield-load-signed.qbe
@@ -2,7 +2,7 @@ export
 function $f() {
 @start.1
 @body.2
-	%.1 =l add $s, 0
+	%.1 =l add extern $s, 0
 	%.2 =w loadw %.1
 	%.3 =w shl %.2, 13
 	%.4 =w sar %.3, 17
diff --git a/test/bitfield-load-unsigned.qbe b/test/bitfield-load-unsigned.qbe
@@ -2,7 +2,7 @@ export
 function $f() {
 @start.1
 @body.2
-	%.1 =l add $s, 0
+	%.1 =l add extern $s, 0
 	%.2 =w loadw %.1
 	%.3 =w shl %.2, 13
 	%.4 =w shr %.3, 17
diff --git a/test/bitfield-short.qbe b/test/bitfield-short.qbe
@@ -3,7 +3,7 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =l add $s, 0
+	%.1 =l add extern $s, 0
 	%.2 =w loadsh %.1
 	%.3 =w shl %.2, 25
 	%.4 =w sar %.3, 25
diff --git a/test/builtin-expect.qbe b/test/builtin-expect.qbe
@@ -2,7 +2,7 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =w loadw $x
+	%.1 =w loadw extern $x
 	ret %.1
 }
 export data $x = align 4 { z 4 }
diff --git a/test/builtin-vaarg-vm.qbe b/test/builtin-vaarg-vm.qbe
@@ -31,7 +31,7 @@ function w $main() {
 	%.3 =l mul %.2, 4
 	%.4 =l add %.1, %.3
 	storew 123, %.4
-	%.5 =w call $f(w 3, ..., l %.1)
+	%.5 =w call extern $f(w 3, ..., l %.1)
 	%.6 =w cnew %.5, 127
 	ret %.6
 }
diff --git a/test/conditional.qbe b/test/conditional.qbe
@@ -2,7 +2,7 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =w loadw $i
+	%.1 =w loadw extern $i
 	jnz %.1, @cond_true.5, @cond_false.6
 @cond_true.5
 	jmp @cond_join.7
@@ -13,7 +13,7 @@ function w $main() {
 @if_true.3
 	ret 1
 @if_false.4
-	%.3 =s loads $f
+	%.3 =s loads extern $f
 	%.4 =w cnes %.3, s_0
 	jnz %.4, @cond_true.10, @cond_false.11
 @cond_true.10
@@ -25,7 +25,7 @@ function w $main() {
 @if_true.8
 	ret 1
 @if_false.9
-	%.6 =l loadl $p
+	%.6 =l loadl extern $p
 	%.7 =w cnel %.6, 0
 	jnz %.7, @cond_true.15, @cond_false.16
 @cond_true.15
diff --git a/test/float-promote.qbe b/test/float-promote.qbe
@@ -3,7 +3,7 @@ function $f() {
 @start.1
 @body.2
 	%.1 =d exts s_1
-	call $g1(w 0, ..., d %.1)
-	call $g2(s s_1)
+	call extern $g1(w 0, ..., d %.1)
+	call extern $g2(s s_1)
 	ret
 }
diff --git a/test/float-to-uint32.qbe b/test/float-to-uint32.qbe
@@ -2,7 +2,7 @@ export
 function w $f() {
 @start.1
 @body.2
-	%.1 =s call $g()
+	%.1 =s call extern $g()
 	%.2 =w stoui %.1
 	ret %.2
 }
diff --git a/test/float-to-uint64.qbe b/test/float-to-uint64.qbe
@@ -2,7 +2,7 @@ export
 function l $f() {
 @start.1
 @body.2
-	%.1 =s call $g()
+	%.1 =s call extern $g()
 	%.2 =l stoui %.1
 	ret %.2
 }
diff --git a/test/for-loop.qbe b/test/for-loop.qbe
@@ -10,7 +10,7 @@ function $f() {
 	jnz %.3, @for_body.4, @for_join.6
 @for_body.4
 	%.4 =w loadw %.1
-	call $g(w %.4)
+	call extern $g(w %.4)
 @for_cont.5
 	%.5 =w loadw %.1
 	%.6 =w add %.5, 1
diff --git a/test/func-noreturn.qbe b/test/func-noreturn.qbe
@@ -8,7 +8,7 @@ function $f() {
 	%.1 =w loadw $.Lc.2
 	jnz %.1, @while_body.4, @while_join.5
 @while_body.4
-	%.2 =w call $puts(l $.Lstring.3)
+	%.2 =w call extern $puts(l $.Lstring.3)
 	jmp @while_cond.3
 @while_join.5
 	hlt
@@ -17,12 +17,12 @@ export
 function w $main() {
 @start.6
 @body.7
-	call $exit(w 0)
+	call extern $exit(w 0)
 	hlt
 @dead.8
-	call $f()
+	call extern $f()
 	hlt
 @dead.9
-	call $f()
+	call extern $f()
 	hlt
 }
diff --git a/test/func-vla.qbe b/test/func-vla.qbe
@@ -17,7 +17,7 @@ function w $main() {
 @start.3
 	%.1 =l alloc8 40
 @body.4
-	%.2 =w call $f(w 5, l %.1)
+	%.2 =w call extern $f(w 5, l %.1)
 	%.3 =l extsw %.2
 	%.4 =w cnel %.3, 40
 	ret %.4
diff --git a/test/hello.qbe b/test/hello.qbe
@@ -3,6 +3,6 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =w call $puts(l $.Lstring.2)
+	%.1 =w call extern $puts(l $.Lstring.2)
 	ret 0
 }
diff --git a/test/logical-and.qbe b/test/logical-and.qbe
@@ -2,22 +2,22 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =w loadw $i
+	%.1 =w loadw extern $i
 	jnz %.1, @logic_and.5, @if_false.4
 @logic_and.5
 	jnz 1, @if_true.3, @if_false.4
 @if_true.3
 	ret 1
 @if_false.4
-	%.2 =s loads $f
+	%.2 =s loads extern $f
 	%.3 =w cnes %.2, s_0
 	jnz %.3, @logic_and.8, @if_false.7
 @logic_and.8
 	jnz 1, @if_true.6, @if_false.7
 @if_true.6
 	ret 1
 @if_false.7
-	%.4 =l loadl $p
+	%.4 =l loadl extern $p
 	%.5 =w cnel %.4, 0
 	jnz %.5, @logic_and.11, @if_false.10
 @logic_and.11
diff --git a/test/logical-or.qbe b/test/logical-or.qbe
@@ -2,22 +2,22 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =w loadw $i
+	%.1 =w loadw extern $i
 	jnz %.1, @if_true.3, @logic_or.5
 @logic_or.5
 	jnz 0, @if_true.3, @if_false.4
 @if_true.3
 	ret 1
 @if_false.4
-	%.2 =s loads $f
+	%.2 =s loads extern $f
 	%.3 =w cnes %.2, s_0
 	jnz %.3, @if_true.6, @logic_or.8
 @logic_or.8
 	jnz 0, @if_true.6, @if_false.7
 @if_true.6
 	ret 1
 @if_false.7
-	%.4 =l loadl $p
+	%.4 =l loadl extern $p
 	%.5 =w cnel %.4, 0
 	jnz %.5, @if_true.9, @logic_or.11
 @logic_or.11
diff --git a/test/lvalue-conversion.qbe b/test/lvalue-conversion.qbe
@@ -5,10 +5,10 @@ function $f() {
 @body.2
 	%.1 =w loadub $.Lc.2
 	%.2 =w extub %.1
-	call $g(w %.2)
+	call extern $g(w %.2)
 	%.3 =w loadub $.Lc.2
 	%.4 =w extub %.3
 	%.5 =w xor %.4, 18446744073709551615
-	call $g(w %.5)
+	call extern $g(w %.5)
 	ret
 }
diff --git a/test/sizeof-vla.qbe b/test/sizeof-vla.qbe
@@ -18,22 +18,22 @@ function w $main() {
 	%.10 =w add %.8, %.9
 	storew %.10, %.1
 	%.11 =w loadw %.1
-	%.12 =w loadw $c
+	%.12 =w loadw extern $c
 	%.13 =w cnew %.12, 0
 	%.14 =w add %.11, %.13
 	storew %.14, %.1
 	%.15 =w loadw %.1
-	%.16 =w loadw $c
+	%.16 =w loadw extern $c
 	%.17 =w add %.16, 1
-	storew %.17, $c
+	storew %.17, extern $c
 	%.18 =l loadl %.6
 	%.19 =l extsw 2
 	%.20 =l mul %.19, 4
 	%.21 =w cnel %.5, %.20
 	%.22 =w add %.15, %.21
 	storew %.22, %.1
 	%.23 =w loadw %.1
-	%.24 =w loadw $c
+	%.24 =w loadw extern $c
 	%.25 =w cnew %.24, 1
 	%.26 =w add %.23, %.25
 	storew %.26, %.1
@@ -42,7 +42,7 @@ function w $main() {
 	%.29 =w add %.27, %.28
 	storew %.29, %.1
 	%.30 =w loadw %.1
-	%.31 =w loadw $c
+	%.31 =w loadw extern $c
 	%.32 =w cnew %.31, 1
 	%.33 =w add %.30, %.32
 	storew %.33, %.1
@@ -77,9 +77,9 @@ function w $main() {
 	%.57 =w add %.54, %.56
 	storew %.57, %.1
 	%.58 =w loadw %.1
-	%.59 =w loadw $c
+	%.59 =w loadw extern $c
 	%.60 =w add %.59, 1
-	storew %.60, $c
+	storew %.60, extern $c
 	%.61 =l extsw 5
 	%.62 =l mul %.61, 4
 	%.63 =l extsw 5
@@ -88,7 +88,7 @@ function w $main() {
 	%.66 =w add %.58, %.65
 	storew %.66, %.1
 	%.67 =w loadw %.1
-	%.68 =w loadw $c
+	%.68 =w loadw extern $c
 	%.69 =w cnew %.68, 2
 	%.70 =w add %.67, %.69
 	storew %.70, %.1
diff --git a/test/struct-copy.qbe b/test/struct-copy.qbe
@@ -4,9 +4,9 @@ function w $main() {
 @start.1
 	%.1 =l alloc4 16
 @body.2
-	%.2 =w loadw $x
+	%.2 =w loadw extern $x
 	storew %.2, %.1
-	%.3 =l add $x, 4
+	%.3 =l add extern $x, 4
 	%.4 =l add %.1, 4
 	%.5 =w loadw %.3
 	storew %.5, %.4
diff --git a/test/struct-packed.qbe b/test/struct-packed.qbe
@@ -3,13 +3,13 @@ export
 function w $main() {
 @start.1
 @body.2
-	%.1 =l add $s, 0
+	%.1 =l add extern $s, 0
 	%.2 =w loadsb %.1
 	%.3 =l extsb %.2
-	%.4 =l add $s, 1
+	%.4 =l add extern $s, 1
 	%.5 =l loadl %.4
 	%.6 =l add %.3, %.5
-	%.7 =l add $s, 9
+	%.7 =l add extern $s, 9
 	%.8 =w loadsh %.7
 	%.9 =l extsh %.8
 	%.10 =l sub %.6, %.9
diff --git a/test/struct-passing-call.qbe b/test/struct-passing-call.qbe
@@ -3,7 +3,7 @@ export
 function $g() {
 @start.1
 @body.2
-	call $f(:s.1 $s)
+	call extern $f(:s.1 extern $s)
 	ret
 }
 export data $s = align 4 { z 4 }
diff --git a/test/struct-return-2.qbe b/test/struct-return-2.qbe
@@ -3,7 +3,7 @@ export
 function w $f() {
 @start.1
 @body.2
-	%.1 =:.1 call $g()
+	%.1 =:.1 call extern $g()
 	%.2 =l add %.1, 4
 	%.3 =w loadw %.2
 	ret %.3
diff --git a/test/switch.qbe b/test/switch.qbe
diff --git a/test/thread-local.qbe b/test/thread-local.qbe
diff --git a/test/typeof-vm.qbe b/test/typeof-vm.qbe
diff --git a/test/uint32-to-float.qbe b/test/uint32-to-float.qbe
diff --git a/test/uint64-to-float.qbe b/test/uint64-to-float.qbe
diff --git a/test/unused-return.qbe b/test/unused-return.qbe
diff --git a/test/varargs+aarch64.qbe b/test/varargs+aarch64.qbe
diff --git a/test/varargs+riscv64.qbe b/test/varargs+riscv64.qbe
diff --git a/test/varargs+x86_64-sysv.qbe b/test/varargs+x86_64-sysv.qbe
diff --git a/test/vla-2d.qbe b/test/vla-2d.qbe
diff --git a/test/vla-nested.qbe b/test/vla-nested.qbe
diff --git a/test/vla-pointer-incdec.qbe b/test/vla-pointer-incdec.qbe
diff --git a/test/vla.qbe b/test/vla.qbe

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ function $f() {`
`4`	`4`	`@body.2`
`5`	`5`	`%.1 =l extsw 1`
`6`	`6`	`%.2 =l mul %.1, 4`
`7`		`- %.3 =l add $x, %.2`
	`7`	`+ %.3 =l add extern $x, %.2`
`8`	`8`	`ret`
`9`	`9`	`}`
`10`	`10`	`export data $x = align 4 { z 8 }`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ export`
`2`	`2`	`function w $main() {`
`3`	`3`	`@start.1`
`4`	`4`	`@body.2`
`5`		`- %.1 =w loadw $x`
	`5`	`+ %.1 =w loadw extern $x`
`6`	`6`	`ret %.1`
`7`	`7`	`}`
`8`	`8`	`export data $x = align 4 { z 4 }`