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

Compilation issues #2

Open
StidOfficial opened this issue Mar 9, 2024 · 0 comments
Open

Compilation issues #2

StidOfficial opened this issue Mar 9, 2024 · 0 comments

Comments

@StidOfficial
Copy link
Owner

../fpu/softfloat.c:1588:39: error: conflicting types for 'parts64_compare' due to enum/integer mismatch; have 'FloatRelation(FloatParts64 *, FloatParts64 *, float_status *, _Bool)' [-Werror=enum-int-mismatch]
../replay/replay-time.c:34:6: error: conflicting types for 'replay_read_next_clock' due to enum/integer mismatch; have 'void(ReplayClockKind)' [-Werror=enum-int-mismatch]
../stubs/replay-tools.c:10:9: error: conflicting types for 'replay_save_clock' due to enum/integer mismatch; have 'int64_t(unsigned int,  int64_t,  int64_t)' {aka 'long int(unsigned int,  long int,  long int)'} [-Werror=enum-int-mismatch]
../stubs/replay-tools.c:16:9: error: conflicting types for 'replay_read_clock' due to enum/integer mismatch; have 'int64_t(unsigned int,  int64_t)' {aka 'long int(unsigned int,  long int)'} [-Werror=enum-int-mismatch]
/usr/src/qemu/include/qemu/queue.h:303:22: error: storing the address of local variable 'slice' in '*ctx.bh_slice_list.sqh_last' [-Werror=dangling-pointer=]

Fixed by :

./configure --target-list=arm-softmmu --disable-docs --enable-gtk --disable-werror

$ git diff
diff --git a/fpu/softfloat.c b/fpu/softfloat.c
index 6e769f990c..375450f14e 100644
--- a/fpu/softfloat.c
+++ b/fpu/softfloat.c
@@ -869,10 +869,10 @@ static FloatParts128 *parts128_minmax(FloatParts128 *a, FloatParts128 *b,
 #define parts_minmax(A, B, S, F) \
     PARTS_GENERIC_64_128(minmax, A)(A, B, S, F)
 
-static int parts64_compare(FloatParts64 *a, FloatParts64 *b,
-                           float_status *s, bool q);
-static int parts128_compare(FloatParts128 *a, FloatParts128 *b,
-                            float_status *s, bool q);
+static FloatRelation parts64_compare(FloatParts64 *a, FloatParts64 *b,
+                                    float_status *s, bool q);
+static FloatRelation parts128_compare(FloatParts128 *a, FloatParts128 *b,
+                                      float_status *s, bool q);
 
 #define parts_compare(A, B, S, Q) \
     PARTS_GENERIC_64_128(compare, A)(A, B, S, Q)
diff --git a/replay/replay-internal.h b/replay/replay-internal.h
index 97649ed8d7..b4238226f4 100644
--- a/replay/replay-internal.h
+++ b/replay/replay-internal.h
@@ -141,7 +141,7 @@ bool replay_next_event_is(int event);
 /*! Reads next clock value from the file.
     If clock kind read from the file is different from the parameter,
     the value is not used. */
-void replay_read_next_clock(unsigned int kind);
+void replay_read_next_clock(ReplayClockKind kind);
 
 /* Asynchronous events queue */
 
diff --git a/stubs/replay-tools.c b/stubs/replay-tools.c
index 43296b3d4e..d2d6c1c93c 100644
--- a/stubs/replay-tools.c
+++ b/stubs/replay-tools.c
@@ -7,13 +7,13 @@ bool replay_events_enabled(void)
     return false;
 }
 
-int64_t replay_save_clock(unsigned int kind, int64_t clock, int64_t raw_icount)
+int64_t replay_save_clock(ReplayClockKind kind, int64_t clock, int64_t raw_icount)
 {
     abort();
     return 0;
 }
 
-int64_t replay_read_clock(unsigned int kind, int64_t raw_icount)
+int64_t replay_read_clock(ReplayClockKind kind, int64_t raw_icount)
 {
     abort();
     return 0;
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant