aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJozef Lawrynowicz <jozef.l@mittosystems.com>2020-05-20 22:15:18 +0100
committerJozef Lawrynowicz <jozef.l@mittosystems.com>2020-05-20 22:29:01 +0100
commitedd482f310f4ec46310e7c2c82c88dad64b5a4ff (patch)
tree5cbe90b7321e605caa888b67e9168e370c90bcaa /gcc
parent4b38d56dbac6742b038551a36ec80200313123a1 (diff)
downloadgcc-edd482f310f4ec46310e7c2c82c88dad64b5a4ff.zip
gcc-edd482f310f4ec46310e7c2c82c88dad64b5a4ff.tar.gz
gcc-edd482f310f4ec46310e7c2c82c88dad64b5a4ff.tar.bz2
TESTSUITE: Fix Wconversion-null*.C tests for aarch64 -mabi=ilp32
This fixes regressions for aarch64 with -mabi=ilp32 of the Wconversion-null*.C tests, introduced by 92ea8e1bccc. The "g (int)" declaration is required for that target where sizeof(int) == sizeof(long) == sizeof(void *). To handle the msp430/-mlarge case, an explicit declaration of "g (__int20)" is required. gcc/testsuite/ChangeLog: * g++.dg/warn/Wconversion-null-2.C: Add explicit declarations for l() and g() with int, long, long long and __int20 arguments. * g++.dg/warn/Wconversion-null.C: Likewise.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/testsuite/g++.dg/warn/Wconversion-null-2.C20
-rw-r--r--gcc/testsuite/g++.dg/warn/Wconversion-null.C20
2 files changed, 36 insertions, 4 deletions
diff --git a/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C b/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C
index 0f5bf58..3ba756e 100644
--- a/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C
+++ b/gcc/testsuite/g++.dg/warn/Wconversion-null-2.C
@@ -3,7 +3,12 @@
#include <cstddef>
-void g(__INTPTR_TYPE__) {}
+void g(int) {}
+void g(long) {}
+void g(long long) {}
+#ifdef __MSP430X_LARGE__
+void g(__int20) {}
+#endif
extern void g(void*);
template <int I>
@@ -15,7 +20,18 @@ template <class T>
void l(T);
template <>
-void l(__INTPTR_TYPE__) {}
+void l(int) {}
+
+template <>
+void l(long) {}
+
+template <>
+void l(long long) {}
+
+#ifdef __MSP430X_LARGE__
+template <>
+void l(__int20) {}
+#endif
void warn_for_NULL()
{
diff --git a/gcc/testsuite/g++.dg/warn/Wconversion-null.C b/gcc/testsuite/g++.dg/warn/Wconversion-null.C
index 4cac267..4c68d23 100644
--- a/gcc/testsuite/g++.dg/warn/Wconversion-null.C
+++ b/gcc/testsuite/g++.dg/warn/Wconversion-null.C
@@ -3,7 +3,12 @@
#include <cstddef>
-void g(__INTPTR_TYPE__) {}
+void g(int) {}
+void g(long) {}
+void g(long long) {}
+#ifdef __MSP430X_LARGE__
+void g(__int20) {}
+#endif
extern void g(void*);
template <int I>
@@ -15,7 +20,18 @@ template <class T>
void l(T);
template <>
-void l(__INTPTR_TYPE__) {}
+void l(int) {}
+
+template <>
+void l(long) {}
+
+template <>
+void l(long long) {}
+
+#ifdef __MSP430X_LARGE__
+template <>
+void l(__int20) {}
+#endif
int main()
{