diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-30 15:43:34 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-30 15:43:34 -0700 |
| commit | d48d04460a971592cf80defcf3ea7471b96cef84 (patch) | |
| tree | e0487d25a6e811dd5fa6cfe74c7dcca36cc97099 | |
| parent | 7dc00e0d3c1f94b00ee49052c65da50f0795c8a2 (diff) | |
| download | glibc-d48d04460a971592cf80defcf3ea7471b96cef84.tar.gz glibc-d48d04460a971592cf80defcf3ea7471b96cef84.tar.xz glibc-d48d04460a971592cf80defcf3ea7471b96cef84.zip | |
Use x86_64 bits/setjmp.h for i386/x86_64
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | sysdeps/i386/bits/setjmp.h | 31 | ||||
| -rw-r--r-- | sysdeps/x86/bits/setjmp.h (renamed from sysdeps/x86_64/bits/setjmp.h) | 0 |
3 files changed, 4 insertions, 31 deletions
diff --git a/ChangeLog b/ChangeLog index 5bde649436..5669dddbda 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,10 @@ 2012-05-30 H.J. Lu <hongjiu.lu@intel.com> [BZ #14117] + * sysdeps/i386/bits/setjmp.h: Removed. + * sysdeps/x86_64/bits/setjmp.h: Renamed to ... + * sysdeps/x86/bits/setjmp.h: This. + * sysdeps/i386/bits/mathdef.h: Removed. * sysdeps/x86_64/bits/mathdef.h: Renamed to ... * sysdeps/x86/bits/mathdef.h: This. diff --git a/sysdeps/i386/bits/setjmp.h b/sysdeps/i386/bits/setjmp.h deleted file mode 100644 index dc065ce398..0000000000 --- a/sysdeps/i386/bits/setjmp.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright (C) 1997,1998,2000,2001,2003,2005,2006 - 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 - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - The GNU C Library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with the GNU C Library; if not, see - <http://www.gnu.org/licenses/>. */ - -/* Define the machine-dependent type `jmp_buf'. Intel 386 version. */ -#ifndef _BITS_SETJMP_H -#define _BITS_SETJMP_H 1 - -#if !defined _SETJMP_H && !defined _PTHREAD_H -# error "Never include <bits/setjmp.h> directly; use <setjmp.h> instead." -#endif - -#ifndef _ASM -typedef int __jmp_buf[6]; -#endif - -#endif /* bits/setjmp.h */ diff --git a/sysdeps/x86_64/bits/setjmp.h b/sysdeps/x86/bits/setjmp.h index bb6920d44e..bb6920d44e 100644 --- a/sysdeps/x86_64/bits/setjmp.h +++ b/sysdeps/x86/bits/setjmp.h |