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.

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

[FFI/JTreg] Remove the pragma lines for AIX in test suites #32

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
13 changes: 6 additions & 7 deletions test/jdk/java/foreign/nested/libNested.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,17 @@
* questions.
*/

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
* ===========================================================================
*/

#ifdef _WIN64
#define EXPORT __declspec(dllexport)
#else
#define EXPORT
#endif
#ifdef _AIX
#pragma align (natural)
#endif

struct S1{ double f0; long long f1; double f2; int f3; };
union U1{ short f0; long long f1; short f2; char f3[4][3]; };
Expand Down Expand Up @@ -95,7 +98,3 @@ EXPORT struct S13 test_S13(struct S13 arg, struct S13(*cb)(struct S13)) { return
EXPORT struct S14 test_S14(struct S14 arg, struct S14(*cb)(struct S14)) { return cb(arg); }
EXPORT union U16 test_U16(union U16 arg, union U16(*cb)(union U16)) { return cb(arg); }
EXPORT struct S15 test_S15(struct S15 arg, struct S15(*cb)(struct S15)) { return cb(arg); }

#ifdef _AIX
#pragma align (reset)
#endif
13 changes: 6 additions & 7 deletions test/jdk/java/foreign/shared.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@
* questions.
*/

/*
* ===========================================================================
* (c) Copyright IBM Corp. 2024, 2024 All Rights Reserved
* ===========================================================================
*/

#ifdef __clang__
#pragma clang optimize off
#elif defined __GNUC__
Expand All @@ -34,9 +40,6 @@
#else
#define EXPORT
#endif
#ifdef _AIX
#pragma align (natural)
#endif

struct S_I { int p0; };
struct S_F { float p0; };
Expand Down Expand Up @@ -123,7 +126,3 @@ struct S_PPF { void* p0; void* p1; float p2; };
struct S_PPD { void* p0; void* p1; double p2; };
struct S_PPP { void* p0; void* p1; void* p2; };
struct S_FFFF { float p0; float p1; float p2; float p3; };

#ifdef _AIX
#pragma align (reset)
#endif