diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-07-12 18:26:36 +0000 |
| commit | 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (patch) | |
| tree | 2ea1f8305970753e4a657acb2ccc15ca3eec8e2c /sysdeps/wordsize-32 | |
| parent | 7d58530341304d403a6626d7f7a1913165fe2f32 (diff) | |
| download | glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.gz glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.tar.xz glibc-0ecb606cb6cf65de1d9fc8a919bceb4be476c602.zip | |
2.5-18.1
Diffstat (limited to 'sysdeps/wordsize-32')
| -rw-r--r-- | sysdeps/wordsize-32/Dist | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/Makefile | 1 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/divdi3.c | 6 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/llabs.c | 4 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/lldiv.c | 4 | ||||
| -rw-r--r-- | sysdeps/wordsize-32/symbol-hacks.h | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/sysdeps/wordsize-32/Dist b/sysdeps/wordsize-32/Dist deleted file mode 100644 index 2459c7d95b..0000000000 --- a/sysdeps/wordsize-32/Dist +++ /dev/null @@ -1 +0,0 @@ -divdi3.c diff --git a/sysdeps/wordsize-32/Makefile b/sysdeps/wordsize-32/Makefile index b50c0b1635..82beac44ed 100644 --- a/sysdeps/wordsize-32/Makefile +++ b/sysdeps/wordsize-32/Makefile @@ -2,5 +2,6 @@ ifeq ($(subdir),csu) ifeq (yes,$(build-shared)) sysdep_routines += divdi3 shared-only-routines += divdi3 +CPPFLAGS-divdi3.c = -Din_divdi3_c endif endif diff --git a/sysdeps/wordsize-32/divdi3.c b/sysdeps/wordsize-32/divdi3.c index 94fb008f1f..8fa6343841 100644 --- a/sysdeps/wordsize-32/divdi3.c +++ b/sysdeps/wordsize-32/divdi3.c @@ -1,6 +1,6 @@ /* 64-bit multiplication and division - Copyright (C) 1989, 1992-1999, 2000, 2001, 2002, 2003, 2004 - Free Software Foundation, Inc. + Copyright (C) 1989, 1992-1999,2000,2001,2002,2003,2004,2005 + 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 @@ -309,7 +309,7 @@ __moddi3 (DWtype u, DWtype v) } if (v < 0) v = -v; - __udivmoddi4 (u, v, &w); + __udivmoddi4 (u, v, (UDWtype *) &w); if (c) w = -w; return w; diff --git a/sysdeps/wordsize-32/llabs.c b/sysdeps/wordsize-32/llabs.c index 3087fd6b71..04a93f4eaf 100644 --- a/sysdeps/wordsize-32/llabs.c +++ b/sysdeps/wordsize-32/llabs.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2005 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 @@ -18,6 +18,6 @@ #include <inttypes.h> -#include <sysdeps/generic/llabs.c> +#include <stdlib/llabs.c> weak_alias (llabs, imaxabs) diff --git a/sysdeps/wordsize-32/lldiv.c b/sysdeps/wordsize-32/lldiv.c index 5cefd35c22..1d543ba0ff 100644 --- a/sysdeps/wordsize-32/lldiv.c +++ b/sysdeps/wordsize-32/lldiv.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1999, 2000, 2002 Free Software Foundation, Inc. +/* Copyright (C) 1999, 2000, 2002, 2005 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 @@ -21,7 +21,7 @@ #include <inttypes.h> -#include <sysdeps/generic/lldiv.c> +#include <stdlib/lldiv.c> #undef imaxdiv weak_alias (lldiv, imaxdiv) diff --git a/sysdeps/wordsize-32/symbol-hacks.h b/sysdeps/wordsize-32/symbol-hacks.h index ee53e1257f..c167cb9472 100644 --- a/sysdeps/wordsize-32/symbol-hacks.h +++ b/sysdeps/wordsize-32/symbol-hacks.h @@ -22,7 +22,7 @@ therefore we get PLTs. Unnecessarily so. Changing gcc is a big task which might not be worth it so we play tricks with the assembler. */ -#if !defined __ASSEMBLER__ && !defined NOT_IN_libc && defined SHARED +#if !defined __ASSEMBLER__ && !defined in_divdi3_c && !defined NOT_IN_libc && defined SHARED asm ("__divdi3 = __divdi3_internal"); asm ("__udivdi3 = __udivdi3_internal"); asm ("__moddi3 = __moddi3_internal"); |