Skip to content

Fix architecture typo x64_64 -> x86_64 #6909

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

Merged
merged 1 commit into from
Jun 8, 2022
Merged

Fix architecture typo x64_64 -> x86_64 #6909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 7 additions & 3 deletions regression/ansi-c/sizeof1/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,20 @@ STATIC_ASSERT(sizeof(void *)==sizeof(size_t));

#ifdef _WIN32

#ifdef _WIN64
# ifdef _WIN64

STATIC_ASSERT(sizeof(void *)==8);
STATIC_ASSERT(sizeof(int)==4);
STATIC_ASSERT(sizeof(long int)==4);
STATIC_ASSERT(sizeof(long long int)==8);
STATIC_ASSERT(sizeof(wchar_t)==2);
# ifdef __MINGW64__
STATIC_ASSERT(sizeof(long double) == 16);
# else
STATIC_ASSERT(sizeof(long double)==8);
# endif

#else
# else

STATIC_ASSERT(sizeof(void *)==4);
STATIC_ASSERT(sizeof(int)==4);
Expand All @@ -30,7 +34,7 @@ STATIC_ASSERT(sizeof(long long int)==8);
STATIC_ASSERT(sizeof(wchar_t)==2);
STATIC_ASSERT(sizeof(long double)==8);

#endif
# endif

#else

Expand Down
2 changes: 1 addition & 1 deletion src/util/config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,7 @@ bool configt::set(const cmdlinet &cmdline)

// long double is the same as double in Visual Studio,
// but it's 16 bytes with GCC with the 64-bit target.
if(arch=="x64_64" && cmdline.isset("gcc"))
if(arch == "x86_64" && cmdline.isset("gcc"))
ansi_c.long_double_width=16*8;
else
ansi_c.long_double_width=8*8;
Expand Down