support weak attribute on variables

Joe Soroka committed 15 years ago

Commit 4d5105c1 parent 68393824 files · +29 −4Browse files

Unified · Split

4 files

@@ -429,7 +429,7 @@ ST_FUNC void put_extern_sym2(Sym sym, Section section, · 428 unmodified lines
429	429	if (sym->type.t & VT_STATIC)
430	430	sym_bind = STB_LOCAL;
431	431	else {
432		− if (sym_type == STT_FUNC && sym->type.ref && FUNC_WEAK(sym->type.ref->r))
	432	+ if (sym->type.t & VT_WEAK)
433	433	sym_bind = STB_WEAK;
434	434	else
435	435	sym_bind = STB_GLOBAL;

tcc.h+3−3

@@ -293,7 +293,6 @@ typedef struct AttributeDef { · 292 unmodified lines
293	293	#define FUNC_ARGS(r) (((AttributeDef*)&(r))->func_args)
294	294	#define FUNC_ALIGN(r) (((AttributeDef*)&(r))->aligned)
295	295	#define FUNC_PACKED(r) (((AttributeDef*)&(r))->packed)
296		−#define FUNC_WEAK(r) (((AttributeDef*)&(r))->weak)
297	296	#define ATTR_MODE(r) (((AttributeDef*)&(r))->mode)
298	297	#define INT_ATTR(ad) ((int)(ad))
299	298
@@ -629,11 +628,12 @@ struct TCCState { · 329 unmodified lines
629	628	#define VT_INLINE 0x00000400 /* inline definition */
630	629	#define VT_IMPORT 0x00004000 /* win32: extern data imported from dll */
631	630	#define VT_EXPORT 0x00008000 /* win32: data exported from dll */
	631	+#define VT_WEAK 0x00010000 /* win32: data exported from dll */
632	632
633		−#define VT_STRUCT_SHIFT 16 /* shift for bitfield shift values */
	633	+#define VT_STRUCT_SHIFT 17 /* shift for bitfield shift values */
634	634
635	635	/* type mask (except storage) */
636		−#define VT_STORAGE (VT_EXTERN \| VT_STATIC \| VT_TYPEDEF \| VT_INLINE \| VT_IMPORT \| VT_EXPORT)
	636	+#define VT_STORAGE (VT_EXTERN \| VT_STATIC \| VT_TYPEDEF \| VT_INLINE \| VT_IMPORT \| VT_EXPORT \| VT_WEAK)
637	637	#define VT_TYPE (~(VT_STORAGE))
638	638
639	639	/* token values */

@@ -2922,6 +2922,9 @@ static int parse_btype(CType type, AttributeDef ad) · 2921 unmodified lines
2922	2922	case TOK_ATTRIBUTE1:
2923	2923	case TOK_ATTRIBUTE2:
2924	2924	parse_attribute(ad);
	2925	+ if (ad->weak) {
	2926	+ t \|= VT_WEAK;
	2927	+ }
2925	2928	if (ad->mode) {
2926	2929	u = ad->mode -1;
2927	2930	t = (t & ~VT_BTYPE) \| u;
@@ -3189,6 +3192,10 @@ static void type_decl(CType type, AttributeDef ad, int *v, int td) · 261 unmodified lines
3189	3192	post_type(type, ad);
3190	3193	if (tok == TOK_ATTRIBUTE1 \|\| tok == TOK_ATTRIBUTE2)
3191	3194	parse_attribute(ad);
	3195	+
	3196	+ if (ad->weak)
	3197	+ type->t \|= VT_WEAK;
	3198	+
3192	3199	if (!type1.t)
3193	3200	return;
3194	3201	/* append type at the end of type1 */

@@ -82,6 +82,7 @@ void local_label_test(void); · 81 unmodified lines
82	82	void statement_expr_test(void);
83	83	void asm_test(void);
84	84	void builtin_test(void);
	85	+void weak_test(void);
85	86
86	87	int fib(int n);
87	88	void num(int n);
@@ -537,6 +538,7 @@ int main(int argc, char **argv) · 449 unmodified lines
537	538	local_label_test();
538	539	asm_test();
539	540	builtin_test();
	541	+ weak_test();
540	542	return 0;
541	543	}
542	544
@@ -2227,6 +2229,22 @@ void builtin_test(void) · 1684 unmodified lines
2227	2229	}
2228	2230
2229	2231
	2232	+extern int __attribute__((weak)) weak_f1(void);
	2233	+extern int __attribute__((weak)) weak_f2(void);
	2234	+extern int __attribute__((weak)) weak_v1;
	2235	+extern int __attribute__((weak)) weak_v2;
	2236	+
	2237	+void __attribute__((weak)) weak_test(void)
	2238	+{
	2239	+ printf("weak_f1=%d\n", weak_f1 ? weak_f1() : 123);
	2240	+ printf("weak_f2=%d\n", weak_f2 ? weak_f2() : 123);
	2241	+ printf("weak_v1=%d\n",&weak_v1 ? weak_v1 : 123);
	2242	+ printf("weak_v2=%d\n",&weak_v2 ? weak_v2 : 123);
	2243	+}
	2244	+
	2245	+int __attribute__((weak)) weak_f2() { return 222; }
	2246	+int __attribute__((weak)) weak_v2 = 222;
	2247	+
2230	2248	void const_func(const int a)
2231	2249	{
2232	2250	}

Keyboard shortcuts