Skip to content
This repository has been archived by the owner on Feb 8, 2024. It is now read-only.

Commit

Permalink
druntime: build on mingw-w64
Browse files Browse the repository at this point in the history 
*add FILE definition
*use ms's stdio functions
*fix "undefined references" in sections_ldc.d
*phobos will be fixed later
  • Loading branch information
wirx6 committed Oct 8, 2017
1 parent 9ec9ff4 commit ccfbcdb
Show file tree
Hide file tree
Showing 3 changed files with 86 additions and 132 deletions.
186 changes: 69 additions & 117 deletions src/core/stdc/stdio.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ version( CRuntime_DigitalMars )
///
enum int L_tmpnam = _P_tmpdir.length + 12;
}
else version( CRuntime_Microsoft )
else version( Windows )
{
enum
{
Expand Down Expand Up @@ -265,6 +265,23 @@ else version( CRuntime_Microsoft )
///
alias shared(_iobuf) FILE;
}
else version( MinGW )
{
alias long fpos_t;

struct _iobuf {
char *_ptr;
int _cnt;
char *_base;
int _flag;
int _file;
int _charbuf;
int _bufsiz;
char *_tmpfname;
};

alias shared(_iobuf) FILE;
}
else version( CRuntime_Glibc )
{
import core.stdc.wchar_ : mbstate_t;
Expand Down Expand Up @@ -556,7 +573,7 @@ version( CRuntime_DigitalMars )
///
shared stdprn = &_iob[4];
}
else version( CRuntime_Microsoft )
else version( Windows )
{
enum
{
Expand Down Expand Up @@ -748,98 +765,30 @@ FILE* freopen(in char* filename, in char* mode, FILE* stream);
void setbuf(FILE* stream, char* buf);
///
int setvbuf(FILE* stream, char* buf, int mode, size_t size);

version (MinGW)
{
// Prefer the MinGW versions over the MSVC ones, as the latter don't handle
// reals at all.
///
int __mingw_fprintf(FILE* stream, in char* format, ...);
///
alias __mingw_fprintf fprintf;

///
int __mingw_fscanf(FILE* stream, in char* format, ...);
///
alias __mingw_fscanf fscanf;

///
int __mingw_sprintf(char* s, in char* format, ...);
///
alias __mingw_sprintf sprintf;

///
int __mingw_sscanf(in char* s, in char* format, ...);
///
alias __mingw_sscanf sscanf;

///
int __mingw_vfprintf(FILE* stream, in char* format, va_list arg);
///
alias __mingw_vfprintf vfprintf;

///
int __mingw_vfscanf(FILE* stream, in char* format, va_list arg);
///
alias __mingw_vfscanf vfscanf;

///
int __mingw_vsprintf(char* s, in char* format, va_list arg);
///
alias __mingw_vsprintf vsprintf;

///
int __mingw_vsscanf(in char* s, in char* format, va_list arg);
///
alias __mingw_vsscanf vsscanf;

///
int __mingw_vprintf(in char* format, va_list arg);
///
alias __mingw_vprintf vprintf;

///
int __mingw_vscanf(in char* format, va_list arg);
///
alias __mingw_vscanf vscanf;

///
int __mingw_printf(in char* format, ...);
///
alias __mingw_printf printf;

///
int __mingw_scanf(in char* format, ...);
///
alias __mingw_scanf scanf;
}
else
{
///
int fprintf(FILE* stream, in char* format, ...);
///
int fscanf(FILE* stream, in char* format, ...);
///
int sprintf(char* s, in char* format, ...);
///
int sscanf(in char* s, in char* format, ...);
///
int vfprintf(FILE* stream, in char* format, va_list arg);
///
int vfscanf(FILE* stream, in char* format, va_list arg);
///
int vsprintf(char* s, in char* format, va_list arg);
///
int vsscanf(in char* s, in char* format, va_list arg);
///
int vprintf(in char* format, va_list arg);
///
int vscanf(in char* format, va_list arg);
///
int printf(in char* format, ...);
///
int scanf(in char* format, ...);
}
///
int fprintf(FILE* stream, in char* format, ...);
///
int fscanf(FILE* stream, in char* format, ...);
///
int sprintf(char* s, in char* format, ...);
///
int sscanf(in char* s, in char* format, ...);
///
int vfprintf(FILE* stream, in char* format, va_list arg);
///
int vfscanf(FILE* stream, in char* format, va_list arg);
///
int vsprintf(char* s, in char* format, va_list arg);
///
int vsscanf(in char* s, in char* format, va_list arg);
///
int vprintf(in char* format, va_list arg);
///
int vscanf(in char* format, va_list arg);
///
int printf(in char* format, ...);
///
int scanf(in char* format, ...);

// No unsafe pointer manipulation.
@trusted
Expand Down Expand Up @@ -896,35 +845,37 @@ size_t fwrite(in void* ptr, size_t size, size_t nmemb, FILE* stream);

version( MinGW )
{
// No unsafe pointer manipulation.
extern (D) @trusted
{
///
void rewind(FILE* stream) { fseek(stream,0L,SEEK_SET); stream._flag = stream._flag & ~_IOERR; }
///
pure void clearerr(FILE* stream) { stream._flag = stream._flag & ~(_IOERR|_IOEOF); }
// No unsafe pointer manipulation.
@trusted
{
///
void rewind(FILE* stream);
///
pure void clearerr(FILE* stream);
///
pure int feof(FILE* stream);
///
pure int ferror(FILE* stream);
///
pure int fileno(FILE* stream);
}

///
pure int feof(FILE* stream) { return stream._flag&_IOEOF; }
int _snprintf(char* s, size_t n, in char* format, ...);
///
pure int ferror(FILE* stream) { return stream._flag&_IOERR; }
}
///
int __mingw_snprintf(char* s, size_t n, in char* fmt, ...);
int snprintf(char* s, size_t n, in char* format, ...);

///
alias __mingw_snprintf _snprintf;
int _vsnprintf(char* s, size_t n, in char* format, va_list arg);
///
alias __mingw_snprintf snprintf;

int vsnprintf(char* s, size_t n, in char* format, va_list arg);
///
int __mingw_vsnprintf(char* s, size_t n, in char* format, va_list arg);
int _lock_file(FILE *fp);
///
alias __mingw_vsnprintf _vsnprintf;
int _unlock_file(FILE *fp);

///
alias __mingw_vsnprintf vsnprintf;

uint _set_output_format(uint format);
enum _TWO_DIGIT_EXPONENT = 1;

intptr_t _get_osfhandle(int fd);
int _open_osfhandle(intptr_t osfhandle, int flags);
}
Expand Down Expand Up @@ -1232,7 +1183,7 @@ version(CRuntime_DigitalMars)
FILE *_wfdopen(int fd, const(wchar)* flags); ///

}
else version (CRuntime_Microsoft)
else version (Windows)
{
int _open(const char* filename, int oflag, ...); ///
int _wopen(const wchar* filename, int oflag, ...); ///
Expand All @@ -1241,6 +1192,7 @@ else version (CRuntime_Microsoft)
int _close(int fd); ///
FILE *_fdopen(int fd, const(char)* flags); ///
FILE *_wfdopen(int fd, const(wchar)* flags); ///
alias _fdopen fdopen;
}

version (Windows)
Expand Down
2 changes: 1 addition & 1 deletion src/rt/sections.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ else version (OSX)
public import rt.sections_osx;
else version (CRuntime_DigitalMars)
public import rt.sections_win32;
else version (CRuntime_Microsoft)
else version (Windows)
public import rt.sections_win64;
else version (CRuntime_Bionic)
public import rt.sections_android;
Expand Down
30 changes: 16 additions & 14 deletions src/rt/sections_ldc.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,22 +96,28 @@ private
Section(SEG_DATA, SECT_COMMON)
];
}
else version (CRuntime_Microsoft)
version (MinGW)
{
extern extern (C) __gshared
extern (C) __gshared
{
void* _data_start__;
void* _data_end__;
void* _bss_start__;
void* _bss_end__;
void* __data_start__;
void* __data_end__;
void* __bss_start__;
void* __bss_end__;
}
alias _data_start__ = __data_start__;
alias _data_end__ = __data_end__;
alias _bss_start__ = __bss_start__;
alias _bss_end__ = __bss_end__;
}
else version (Windows)
{
extern extern (C) __gshared
extern (C) __gshared
{
int _data_start__;
int _bss_end__;
void* _data_start__;
void* _data_end__;
void* _bss_start__;
void* _bss_end__;
}
}
else version (UseELF)
Expand Down Expand Up @@ -371,18 +377,14 @@ void initSections()
}
_dyld_register_func_for_add_image(&scanSections);
}
else version (CRuntime_Microsoft)
else version (Windows)
{
pushRange(_data_start__, _data_end__);
if (_bss_start__ != null)
{
pushRange(_bss_start__, _bss_end__);
}
}
else version (Windows)
{
pushRange(&_data_start__, &_bss_end__);
}
else version (UseELF)
{
dl_phdr_info phdr = void;
Expand Down

0 comments on commit ccfbcdb

Please sign in to comment.