Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 8fee658

Browse files
committed
Fix wrong merge of configure.in
1 parent a2ec0f0 commit 8fee658

File tree

2 files changed

+27
-8
lines changed

2 files changed

+27
-8
lines changed

config/c-compiler.m4

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ if test x"$pgac_cv__128bit_int" = xyes ; then
135135
# If not cross-compiling, we can test for bugs and disable use of __int128
136136
# with buggy compilers. If cross-compiling, hope for the best.
137137
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
138-
[AC_RUN_IFELSE([AC_LANG_PROGRAM([
138+
AC_RUN_IFELSE([AC_LANG_PROGRAM([
139139
/* This must match the corresponding code in c.h: */
140140
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
141141
#define pg_attribute_aligned(a) __attribute__((aligned(a)))
@@ -157,7 +157,7 @@ if (q != holder)
157157
])],
158158
[pgac_cv__128bit_int_bug=ok],
159159
[pgac_cv__128bit_int_bug=broken],
160-
[pgac_cv__128bit_int_bug="assuming ok"])])
160+
[pgac_cv__128bit_int_bug="assuming ok"]))
161161
if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
162162
AC_DEFINE(PG_INT128_TYPE, __int128, [Define to the name of a signed 128-bit integer type.])
163163
AC_CHECK_ALIGNOF(PG_INT128_TYPE)

configure

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15100,7 +15100,12 @@ if test x"$pgac_cv__128bit_int" = xyes ; then
1510015100
# If not cross-compiling, we can test for bugs and disable use of __int128
1510115101
# with buggy compilers. If cross-compiling, hope for the best.
1510215102
# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
15103-
AC_RUN_IFELSE([AC_LANG_PROGRAM([
15103+
if test "$cross_compiling" = yes; then :
15104+
pgac_cv__128bit_int_bug="assuming ok"
15105+
else
15106+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
15107+
/* end confdefs.h. */
15108+
1510415109
/* This must match the corresponding code in c.h: */
1510515110
#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
1510615111
#define pg_attribute_aligned(a) __attribute__((aligned(a)))
@@ -15112,17 +15117,31 @@ pg_attribute_aligned(8)
1511215117
;
1511315118
int128a holder;
1511415119
void pass_by_val(void *buffer, int128a par) { holder = par; }
15115-
],[
15120+
15121+
int
15122+
main ()
15123+
{
15124+
1511615125
long int i64 = 97656225L << 12;
1511715126
int128a q;
1511815127
pass_by_val(main, (int128a) i64);
1511915128
q = (int128a) i64;
1512015129
if (q != holder)
1512115130
return 1;
15122-
])],
15123-
[pgac_cv__128bit_int_bug=ok],
15124-
[pgac_cv__128bit_int_bug=broken],
15125-
[pgac_cv__128bit_int_bug="assuming ok"]))
15131+
15132+
;
15133+
return 0;
15134+
}
15135+
_ACEOF
15136+
if ac_fn_c_try_run "$LINENO"; then :
15137+
pgac_cv__128bit_int_bug=ok
15138+
else
15139+
pgac_cv__128bit_int_bug=broken
15140+
fi
15141+
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
15142+
conftest.$ac_objext conftest.beam conftest.$ac_ext
15143+
fi
15144+
)
1512615145
if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
1512715146

1512815147
$as_echo "#define PG_INT128_TYPE __int128" >>confdefs.h

0 commit comments

Comments
 (0)