OpenBSD: use portable strtoll instead of strtonum to allow cross-compilation test

Christian Jullien committed 5 years ago

Commit 00d467d1 parent 4d254312 files · +9 −7Browse files

Unified · Split

2 files

@@ -1111,7 +1111,7 @@ ST_FUNC char tcc_openbsd_library_soversion(TCCState s, const char *libraryname · 1110 unmodified lines
1111	{	1111	{
1112	DIR *dirp;	1112	DIR *dirp;
1113	struct dirent *dp;	1113	struct dirent *dp;
1114	const char *e;	1114	char *e;
1115	char *libpaths, t, u, v;	1115	char *libpaths, t, u, v;
1116	char soname[1024];	1116	char soname[1024];
1117	long long maj, min, tmaj, tmin;	1117	long long maj, min, tmaj, tmin;
@@ -1134,16 +1134,18 @@ ST_FUNC char tcc_openbsd_library_soversion(TCCState s, const char *libraryname · 16 unmodified lines
1134	u = strrchr(t, '.');	1134	u = strrchr(t, '.');
1135	*u = '\0';	1135	*u = '\0';
1136		1136
1137	tmin = strtonum(u + 1, 0, LLONG_MAX, &e);	1137	tmin = strtoll(u + 1, &e, 10);
1138	if (e != NULL) {	1138
		1139	if (*e != 0) {
1139	tcc_free(t);	1140	tcc_free(t);
1140	t = NULL;	1141	t = NULL;
1141	continue;	1142	continue;
1142	}	1143	}
1143		1144
1144	v = strrchr(t, '.');	1145	v = strrchr(t, '.');
1145	tmaj = strtonum(v + 1, 0, LLONG_MAX, &e);	1146	tmaj = strtoll(v + 1, &e, 10);
1146	if (e != NULL) {	1147
		1148	if (*e != 0) {
1147	tcc_free(t);	1149	tcc_free(t);
1148	t = NULL;	1150	t = NULL;
1149	continue;	1151	continue;

@@ -2540,9 +2540,9 @@ static int elf_output_file(TCCState s1, const char filename) · 2539 unmodified lines
2540	struct ro_inf roinf;	2540	struct ro_inf roinf;
2541	ElfW(Phdr) *phdr;	2541	ElfW(Phdr) *phdr;
2542	Section strsec, interp, dynamic, dynstr, *note = NULL;	2542	Section strsec, interp, dynamic, dynstr, *note = NULL;
2543	#ifndef ELF_OBJ_ONLY	2543	//#ifndef ELF_OBJ_ONLY
2544	struct ro_inf *roinf_use = NULL;	2544	struct ro_inf *roinf_use = NULL;
2545	#endif	2545	//#endif
2546		2546
2547	file_type = s1->output_type;	2547	file_type = s1->output_type;
2548		2548

Keyboard shortcuts