From 8432c71ab7bacf17bbcefa3a9b9caadbfd1755e4 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 18 Jun 1999 18:06:00 +0000
Subject: [PATCH] Update.

1999-06-18  Ulrich Drepper  <drepper@cygnus.com>

	* sysdeps/unix/sysv/linux/init-first.h: Add extra cast in argc
	assignment to avoid warning on 64bit platforms.
---
 ChangeLog                            | 5 +++++
 sysdeps/unix/sysv/linux/configure    | 2 +-
 sysdeps/unix/sysv/linux/init-first.h | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 836c7cd554..acf9b74ef2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+1999-06-18  Ulrich Drepper  <drepper@cygnus.com>
+
+	* sysdeps/unix/sysv/linux/init-first.h: Add extra cast in argc
+	assignment to avoid warning on 64bit platforms.
+
 1999-06-17  Ulrich Drepper  <drepper@cygnus.com>
 
 	* libio/libio.h (_IO_codecvt): Change __P ot __PMT.
diff --git a/sysdeps/unix/sysv/linux/configure b/sysdeps/unix/sysv/linux/configure
index fcdf97dc5c..b6530d18ae 100644
--- a/sysdeps/unix/sysv/linux/configure
+++ b/sysdeps/unix/sysv/linux/configure
@@ -13,7 +13,7 @@ if test -n "$sysheaders"; then
 fi
 echo $ac_n "checking installed Linux kernel header files""... $ac_c" 1>&6
 echo "configure:16: checking installed Linux kernel header files" >&5
-if eval "test \"`echo '$''{'libc_cv_linux2010'+set}'`\" = set"; then
+if eval "test \"\${libc_cv_linux2010+set}\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
diff --git a/sysdeps/unix/sysv/linux/init-first.h b/sysdeps/unix/sysv/linux/init-first.h
index a9df8da52d..aaf8a4f4dc 100644
--- a/sysdeps/unix/sysv/linux/init-first.h
+++ b/sysdeps/unix/sysv/linux/init-first.h
@@ -1,5 +1,5 @@
 /* Prepare arguments for library initialization function.
-   Copyright (C) 1997 Free Software Foundation, Inc.
+   Copyright (C) 1997, 1999 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -35,13 +35,13 @@ void NAME (void *arg)							      \
 									      \
   if (!__libc_multiple_libcs)						      \
     {									      \
-      argc = (int) arg;							      \
+      argc = (int) (long int) arg;					      \
       argv = (char **) &arg + 1;					      \
       envp = &argv[argc+1];						      \
     }									      \
   else									      \
     {									      \
-      argc = (int) arg;							      \
+      argc = (int) (long int) arg;					      \
       argv = ((char ***) &arg)[1];					      \
       envp = ((char ***) &arg)[2];					      \
     }									      \