Fix no-op shift in shmget by casting to 64-bit.
Generate a new Product GUID for fio 2.0.8.
Add the 32-bit MinGW-w64 compiler executable name in Makefile.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
LIBS += -lpthread -lpsapi -lws2_32
CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
CC = x86_64-w64-mingw32-gcc
LIBS += -lpthread -lpsapi -lws2_32
CFLAGS += -DPSAPI_VERSION=1 -Ios/windows/posix/include -Wno-format
CC = x86_64-w64-mingw32-gcc
+ #CC = i686-w64-mingw32-gcc
endif
OBJS = $(SOURCE:.c=.o)
endif
OBJS = $(SOURCE:.c=.o)
<?define ProgramDirectory = ProgramFiles64Folder ?>\r
<?endif?>\r
\r
<?define ProgramDirectory = ProgramFiles64Folder ?>\r
<?endif?>\r
\r
- <Product Id="CCE88492-8C5A-4EAF-8B82-E22A90CEC47B"\r
+ <Product Id="2BA394F9-0D9E-4597-BB9D-6B18097D64BB"\r
Codepage="1252" Language="1033"\r
Manufacturer="fio" Name="fio"\r
UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.8">\r
Codepage="1252" Language="1033"\r
Manufacturer="fio" Name="fio"\r
UpgradeCode="2338A332-5511-43cf-b9BD-5C60496CCFCC" Version="2.0.8">\r
int shmget(key_t key, size_t size, int shmflg)
{
int mapid = -1;
int shmget(key_t key, size_t size, int shmflg)
{
int mapid = -1;
- HANDLE hMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, (PAGE_EXECUTE_READWRITE | SEC_RESERVE), size >> 32, size & 0xFFFFFFFF, NULL);
+ uint32_t size_low = size & 0xFFFFFFFF;
+ uint32_t size_high = ((uint64_t)size) >> 32;
+ HANDLE hMapping = CreateFileMapping(INVALID_HANDLE_VALUE, NULL, (PAGE_EXECUTE_READWRITE | SEC_RESERVE), size_high, size_low, NULL);
if (hMapping != NULL) {
fileMappings[nFileMappings] = hMapping;
mapid = nFileMappings;
if (hMapping != NULL) {
fileMappings[nFileMappings] = hMapping;
mapid = nFileMappings;