Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

FFS upstream, long double alignment #3005

Merged
merged 2 commits into from
Jan 16, 2022
Merged

FFS upstream, long double alignment #3005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2158bd
ffs 2022-01-14 (b75a792b)
Jan 14, 2022
0ef6f8a
Merge branch 'upstream-ffs' into FFSUpstream
eisenhauer Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion thirdparty/ffs/ffs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ if(NOT HAS_IOV_BASE_IOVEC)
endif()

if(NOT DEFINED FORMAT_SERVER_HOST)
set(FORMAT_SERVER_HOST "formathost.cercs.gatech.edu")
set(FORMAT_SERVER_HOST "eisenhauer.dyndns.org")
endif()

if(NOT DEFINED FORMAT_SERVICE_DOMAIN)
Expand Down
8 changes: 7 additions & 1 deletion thirdparty/ffs/ffs/fm/fm_formats.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -893,6 +893,11 @@ typedef struct {
double d;
} *sd;

typedef struct {
char tmp;
long double ld;
} *sld;

static int
type_alignment(fmformat, field)
FMFormat fmformat;
Expand Down Expand Up @@ -928,7 +933,8 @@ int field;
case float_type:
if (size < sizeof(float)) return size;
if (size < sizeof(double)) return FMOffset(sf, f);
return FMOffset(sd, d);
if (size < sizeof(long double)) return FMOffset(sd, d);
return FMOffset(sld, ld);
}
break;
}
Expand Down