about summary refs log tree commit diff
path: root/ports
diff options
context:
space:
mode:
authorCarlos O'Donell <carlos@systemhalted.org>2012-11-29 10:24:41 -0500
committerCarlos O'Donell <carlos@systemhalted.org>2012-11-29 17:59:59 -0500
commit80ceeaeef9ae1f4941546beb47f4b603a836208b (patch)
treeb1b9394b50deeea75a514d95abda3a4386995c8c /ports
parente10c4e4fdb3b90f398c0f26dde0143c2558834b5 (diff)
downloadglibc-80ceeaeef9ae1f4941546beb47f4b603a836208b.tar.gz
glibc-80ceeaeef9ae1f4941546beb47f4b603a836208b.tar.xz
glibc-80ceeaeef9ae1f4941546beb47f4b603a836208b.zip
hppa: Cleanup two build warnings for integer to pointers casts.
Diffstat (limited to 'ports')
-rw-r--r--ports/ChangeLog.hppa5
-rw-r--r--ports/sysdeps/hppa/fpu/feholdexcpt.c4
-rw-r--r--ports/sysdeps/unix/sysv/linux/hppa/mmap.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/ports/ChangeLog.hppa b/ports/ChangeLog.hppa
index 06332fe87f..034808d4a7 100644
--- a/ports/ChangeLog.hppa
+++ b/ports/ChangeLog.hppa
@@ -1,3 +1,8 @@
+2012-11-29  Carlos O'Donell  <carlos@systemhalted.org>
+
+	* sysdeps/hppa/fpu/feholdexcpt.c: Cast return to unsigned long long *.
+	* sysdeps/unix/sysv/linux/hppa/mmap.c: Cast return to __ptr_t.
+
 2012-11-19  Mike Frysinger  <vapier@gentoo.org>
 
 	* sysdeps/unix/sysv/linux/hppa/nptl/pthread_once.c: Replace _internal
diff --git a/ports/sysdeps/hppa/fpu/feholdexcpt.c b/ports/sysdeps/hppa/fpu/feholdexcpt.c
index 6e3cabd88a..ad2b0d0b48 100644
--- a/ports/sysdeps/hppa/fpu/feholdexcpt.c
+++ b/ports/sysdeps/hppa/fpu/feholdexcpt.c
@@ -1,5 +1,5 @@
 /* Store current floating-point environment and clear exceptions.
-   Copyright (C) 2000 Free Software Foundation, Inc.
+   Copyright (C) 2000-2012 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by David Huggins-Daines <dhd@debian.org>, 2000
 
@@ -42,7 +42,7 @@ feholdexcept (fenv_t *envp)
 
   /* Load the new environment. Note: fr0 must load last to enable T-bit 
      Thus we start bufptr at the end and work backwards */
-  bufptr = (unsigned int)(clear.buf) + sizeof(unsigned int)*4;
+  bufptr = (unsigned long long *)((unsigned int)(clear.buf) + sizeof(unsigned int)*4);
   __asm__ (
 	   "fldd,mb -8(%0),%%fr0\n"
 	   : : "r" (bufptr), "m" (clear) : "%r0");
diff --git a/ports/sysdeps/unix/sysv/linux/hppa/mmap.c b/ports/sysdeps/unix/sysv/linux/hppa/mmap.c
index 420d6567a6..12e700dcbb 100644
--- a/ports/sysdeps/unix/sysv/linux/hppa/mmap.c
+++ b/ports/sysdeps/unix/sysv/linux/hppa/mmap.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994, 1995, 1996, 1997 Free Software Foundation, Inc.
+/* Copyright (C) 1994-2012 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
@@ -36,7 +36,7 @@ __mmap (__ptr_t addr, size_t len, int prot, int flags, int fd, off_t offset)
 	
 	__ptr_t ret;
 
-	ret = INLINE_SYSCALL(mmap, 6, addr, len, prot, flags, fd, offset);
+	ret = (__ptr_t) INLINE_SYSCALL (mmap, 6, addr, len, prot, flags, fd, offset);
 
 	/* check if it's really a negative number */
 	if(((unsigned long)ret & 0xfffff000) == 0xfffff000)