summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2018-05-22 16:36:03 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2018-05-22 16:36:03 (GMT)
commiteb8d35dd8cfd7339c203f758cf9637ac1cdc7a96 (patch)
tree2d3f083cd94255015fac5c996bfce2a2f391e001
parentf4c33600ab91e0511898d2bd3a5473aaf7dcd2f7 (diff)
parent78e1372ad5e35fc3ef691767148f7d2eea2feea4 (diff)
downloadhdf5-eb8d35dd8cfd7339c203f758cf9637ac1cdc7a96.zip
hdf5-eb8d35dd8cfd7339c203f758cf9637ac1cdc7a96.tar.gz
hdf5-eb8d35dd8cfd7339c203f758cf9637ac1cdc7a96.tar.bz2
Merge pull request #1075 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit '78e1372ad5e35fc3ef691767148f7d2eea2feea4': fix typo Add release note Correct attribute location
-rw-r--r--config/cmake/ConversionTests.c12
-rw-r--r--release_docs/RELEASE.txt11
2 files changed, 16 insertions, 7 deletions
diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c
index 002bc88..321d879 100644
--- a/config/cmake/ConversionTests.c
+++ b/config/cmake/ConversionTests.c
@@ -25,7 +25,7 @@
#include <string.h>
#include <stdlib.h>
-int main(void) HDF_NO_UBSAN
+int HDF_NO_UBSAN main(void)
{
long double ld = 20041683600089727.779961L;
long ll;
@@ -86,7 +86,7 @@ done:
#include <string.h>
#include <stdlib.h>
-int main(void) HDF_NO_UBSAN
+int HDF_NO_UBSAN main(void)
{
long double ld;
long ll;
@@ -149,7 +149,7 @@ done:
#include <string.h>
#include <stdlib.h>
-int main(void) HDF_NO_UBSAN
+int HDF_NO_UBSAN main(void)
{
long double ld = 20041683600089727.779961L;
long long ll;
@@ -192,7 +192,7 @@ done:
#include <string.h>
#include <stdlib.h>
-int main(void) HDF_NO_UBSAN
+int HDF_NO_UBSAN main(void)
{
long double ld;
long long ll;
@@ -253,8 +253,8 @@ int FC_DUMMY_MAIN()
{ return 1;}
#endif
#endif
-int
-main () HDF_NO_UBSAN
+int HDF_NO_UBSAN
+main ()
{
char *chp = "beefs";
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 1c5ca46..0a1b892 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -121,7 +121,16 @@ Bug Fixes since HDF5-1.10.2 release
Configuration
-------------
- Reworked java test suite into individual JUnit tests.
+ - Moved the location of gcc attribute.
+
+ The gcc attribute(no_sanitize), named as the macro HDF_NO_UBSAN,
+ was located after the function name. Builds with GCC 7 did not
+ indicate any problem, but GCC 8 issued errors. Moved the
+ attribute before the function name, as required.
+
+ (ADB 2018/05/22, HDFFV-10473)
+
+ - Reworked java test suite into individual JUnit tests.
Testing the whole suite of java unit tests in a single JUnit run
made it difficult to determine actual failures when tests would fail.