summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xConfigure12
-rwxr-xr-xconfig_h.SH18
-rw-r--r--uconfig.h20
3 files changed, 25 insertions, 25 deletions
diff --git a/Configure b/Configure
index df7c5cd0f3..406f0e8ffc 100755
--- a/Configure
+++ b/Configure
@@ -28,7 +28,7 @@
# See Porting/pumpkin.pod for more information on metaconfig.
#
-# Generated on Fri Aug 16 14:21:14 CEST 2013 [metaconfig 3.5 PL0]
+# Generated on Thu Aug 29 09:37:19 CEST 2013 [metaconfig 3.5 PL0]
# (with additional metaconfig patches by perlbug@perl.org)
cat >c1$$ <<EOF
@@ -3255,6 +3255,9 @@ EOM
*) osvers=$tmp;;
esac
;;
+ bitrig) osname=bitrig
+ osvers="$3"
+ ;;
bsd386) osname=bsd386
osvers=`$uname -r`
;;
@@ -3312,9 +3315,6 @@ EOM
;;
next*) osname=next ;;
nonstop-ux) osname=nonstopux ;;
- bitrig) osname=bitrig
- osvers="$3"
- ;;
openbsd) osname=openbsd
osvers="$3"
;;
@@ -5863,7 +5863,7 @@ case "$use64bitint" in
: other platforms:
echo " "
echo "Checking if your C library has broken 64-bit functions..." >&4
- $cat >try.c <<EOCP
+ cat >try.c <<EOCP
#include <stdio.h>
typedef $uquadtype myULL;
int main (void)
@@ -5897,7 +5897,7 @@ EOCP
echo "Assuming that your C library's 64-bit functions are ok."
libcquad="ok"
fi
- $rm -f try.c try
+ $rm_try
case "$libcquad" in
buggy*)
diff --git a/config_h.SH b/config_h.SH
index 5c09d96ea6..4af9925b7c 100755
--- a/config_h.SH
+++ b/config_h.SH
@@ -927,6 +927,15 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
#define OSNAME "$osname" /**/
#define OSVERS "$osvers" /**/
+/* MULTIARCH:
+ * This symbol, if defined, signifies that the build
+ * process will produce some binary files that are going to be
+ * used in a cross-platform environment. This is the case for
+ * example with the NeXT "fat" binaries that contain executables
+ * for several CPUs.
+ */
+#$multiarch MULTIARCH /**/
+
/* USE_CROSS_COMPILE:
* This symbol, if defined, indicates that Perl is being cross-compiled.
*/
@@ -939,15 +948,6 @@ sed <<!GROK!THIS! >$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un
#define PERL_TARGETARCH "$targetarch" /**/
#endif
-/* MULTIARCH:
- * This symbol, if defined, signifies that the build
- * process will produce some binary files that are going to be
- * used in a cross-platform environment. This is the case for
- * example with the NeXT "fat" binaries that contain executables
- * for several CPUs.
- */
-#$multiarch MULTIARCH /**/
-
/* MEM_ALIGNBYTES:
* This symbol contains the number of bytes required to align a
* double, or a long double when applicable. Usual values are 2,
diff --git a/uconfig.h b/uconfig.h
index 0af7286ef5..1290ccc171 100644
--- a/uconfig.h
+++ b/uconfig.h
@@ -892,6 +892,15 @@
#define OSNAME "unknown" /**/
#define OSVERS "unknown" /**/
+/* MULTIARCH:
+ * This symbol, if defined, signifies that the build
+ * process will produce some binary files that are going to be
+ * used in a cross-platform environment. This is the case for
+ * example with the NeXT "fat" binaries that contain executables
+ * for several CPUs.
+ */
+/*#define MULTIARCH / **/
+
/* USE_CROSS_COMPILE:
* This symbol, if defined, indicates that Perl is being cross-compiled.
*/
@@ -904,15 +913,6 @@
#define PERL_TARGETARCH "" /**/
#endif
-/* MULTIARCH:
- * This symbol, if defined, signifies that the build
- * process will produce some binary files that are going to be
- * used in a cross-platform environment. This is the case for
- * example with the NeXT "fat" binaries that contain executables
- * for several CPUs.
- */
-/*#define MULTIARCH / **/
-
/* MEM_ALIGNBYTES:
* This symbol contains the number of bytes required to align a
* double, or a long double when applicable. Usual values are 2,
@@ -4753,6 +4753,6 @@
#endif
/* Generated from:
- * 2c9dc3f21d37b1665f6a59dfc6d79e6cb08bdf36a9c3e427d11d6b9ddffe2439 config_h.SH
+ * 3631b2b781d1779dc1855cb35ab72d5176a9eb36a527f74231c7e3f274021182 config_h.SH
* e0e303f4b6a586f3c94ed5c08078b3b837c1cc5683e61b0dd6c6b84cd8c44774 uconfig.sh
* ex: set ro: */