Change 30027 by [EMAIL PROTECTED] on 2007/01/27 12:18:00
Integrate:
[ 26993]
Subject: Re: [patch] s/ar ts/ar s/g
From: "Philippe M. Chiasson" <[EMAIL PROTECTED]>
Date: Thu, 26 Jan 2006 13:53:07 -0800
Message-ID: <[EMAIL PROTECTED]>
[ 28362]
Subject: [PATCH]Teach Configure that icc is not gcc
From: Steve Peters <[EMAIL PROTECTED]>
Date: Tue, 6 Jun 2006 10:33:12 -0500
Message-ID: <[EMAIL PROTECTED]>
[ 28637]
ANSI-C headers in test snippets to please g++ (and the rest)
Subject: [PATCH] (back) towards g++ compilation (in Tru64, and
elsewhere)
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Mon, 31 Jul 2006 23:44:55 +0300
Message-ID: <[EMAIL PROTECTED]>
[ 28651]
Subject: [PATCH] g++ heavy shoveling
From: Jarkko Hietaniemi <[EMAIL PROTECTED]>
Date: Wed, 02 Aug 2006 00:04:42 +0300
Message-ID: <[EMAIL PROTECTED]>
Affected files ...
... //depot/maint-5.8/perl/Configure#81 integrate
Differences ...
==== //depot/maint-5.8/perl/Configure#81 (xtext) ====
Index: perl/Configure
--- perl/Configure#80~28443~ 2006-06-27 15:39:26.000000000 -0700
+++ perl/Configure 2007-01-27 04:18:00.000000000 -0800
@@ -26,7 +26,7 @@
# $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $
#
-# Generated on Mon May 22 19:21:39 CEST 2006 [metaconfig 3.0 PL70]
+# Generated on Wed Aug 2 13:20:07 CEST 2006 [metaconfig 3.0 PL70]
# (with additional metaconfig patches by [EMAIL PROTECTED])
cat >c1$$ <<EOF
@@ -4308,7 +4308,7 @@
$cat >try.c <<EOM
#include <stdio.h>
int main() {
-#ifdef __GNUC__
+#if defined(__GNUC__) && !defined(__INTEL_COMPILER)
#ifdef __VERSION__
printf("%s\n", __VERSION__);
#else
@@ -7107,7 +7107,7 @@
{
#ifdef __GLIBC__
# ifdef __GLIBC_MINOR__
-# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1
+# if __GLIBC__ >= 2 && __GLIBC_MINOR__ >= 1 && !defined(__cplusplus)
# include <gnu/libc-version.h>
printf("%s\n", gnu_get_libc_version());
# else
@@ -7590,6 +7590,10 @@
eval $inlibc
runnm="$xxx_runnm"
+: see if this is a unistd.h system
+set unistd.h i_unistd
+eval $inhdr
+
: determine which dynamic loading, if any, to compile in
echo " "
dldir="ext/DynaLoader"
@@ -7693,6 +7697,10 @@
#ifdef I_STDLIB
#include <stdlib.h>
#endif
+#$i_unistd I_UNISTD
+#ifdef I_UNISTD
+#include <unistd.h>
+#endif
int main() {
char b[4];
int i = open("a.out",O_RDONLY);
@@ -10102,10 +10110,6 @@
set bcopy d_bcopy
eval $inlibc
-: see if this is a unistd.h system
-set unistd.h i_unistd
-eval $inhdr
-
: see if getpgrp exists
set getpgrp d_getpgrp
eval $inlibc
@@ -10351,6 +10355,7 @@
p = va_arg(ap, char *);
#endif
va_end(ap);
+ return 0;
}
EOP
$cat > varargs <<EOP
@@ -10505,7 +10510,7 @@
#endif
#include <sys/types.h>
#include <signal.h>
-$signal_t blech(s) int s; { exit(3); }
+$signal_t blech(int s) { exit(3); }
int main()
{
$xxx i32;
@@ -10563,11 +10568,11 @@
#endif
#include <sys/types.h>
#include <signal.h>
-$signal_t blech(s) int s; { exit(7); }
-$signal_t blech_in_list(s) int s; { exit(4); }
-unsigned long dummy_long(p) unsigned long p; { return p; }
-unsigned int dummy_int(p) unsigned int p; { return p; }
-unsigned short dummy_short(p) unsigned short p; { return p; }
+$signal_t blech(int s) { exit(7); }
+$signal_t blech_in_list(int s) { exit(4); }
+unsigned long dummy_long(unsigned long p) { return p; }
+unsigned int dummy_int(unsigned int p) { return p; }
+unsigned short dummy_short(unsigned short p) { return p; }
int main()
{
double f;
@@ -12062,7 +12067,7 @@
#else
#include <strings.h>
#endif
-$signal_t blech(x) int x; { exit(3); }
+$signal_t blech(int x) { exit(3); }
EOCP
$cat >> try.c <<'EOCP'
int main()
@@ -12495,7 +12500,7 @@
#include <unistd.h>
#include <fcntl.h>
#include <signal.h>
-$signal_t blech(x) int x; { exit(3); }
+$signal_t blech(int x) { exit(3); }
int main() {
#if defined(F_SETLK) && defined(F_SETLKW)
struct flock flock;
@@ -15048,7 +15053,7 @@
#include <signal.h>
#ifdef SIGFPE
$volatile int bletched = 0;
-$signal_t blech(s) int s; { bletched = 1; }
+$signal_t blech(int s) { bletched = 1; }
#endif
int main() {
$uvtype u = 0;
@@ -15120,7 +15125,7 @@
#include <signal.h>
#ifdef SIGFPE
$volatile int bletched = 0;
-$signal_t blech(s) int s; { bletched = 1; }
+$signal_t blech(int s) { bletched = 1; }
#endif
int checkit($nvtype d, char *where) {
@@ -17736,7 +17741,7 @@
#define U8 $u8type
#include <signal.h>
#ifdef SIGBUS
-$signal_t bletch(s) int s; { exit(4); }
+$signal_t bletch(int s) { exit(4); }
#endif
int main() {
#if BYTEORDER == 0x1234 || BYTEORDER == 0x4321
@@ -19409,6 +19414,12 @@
if [ "X$ranlib" = "X" ]; then
ranlib=":"
fi
+elif $ar s bar$_a >/dev/null 2>&1 &&
+ $cc -o foobar $ccflags $ldflags foo$_o bar$_a $libs > /dev/null 2>&1 &&
+ $run ./foobar >/dev/null 2>&1; then
+ echo "a table of contents needs to be added with '$ar s'."
+ orderlib=false
+ ranlib="$ar s"
elif $ar ts bar$_a >/dev/null 2>&1 &&
$cc -o foobar $ccflags $ldflags foo$_o bar$_a $libs > /dev/null 2>&1 &&
$run ./foobar >/dev/null 2>&1; then
@@ -19433,7 +19444,7 @@
ranlib=":"
fi
fi
-$rm -f foo* bar*
+$rm -f foo* bar*
: check for type of arguments to select.
case "$selecttype" in
@@ -19530,7 +19541,7 @@
#define NBYTES (S * 8 > MINBITS ? S : MINBITS/8)
#define NBITS (NBYTES * 8)
int main() {
- char *s = malloc(NBYTES);
+ char *s = (char *)malloc(NBYTES);
struct timeval t;
int i;
FILE* fp;
End of Patch.
