This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
PATCH: Use x86_64 bits/setjmp.h for i386/x86_64
- From: "H.J. Lu" <hongjiu dot lu at intel dot com>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Wed, 30 May 2012 15:33:44 -0700
- Subject: PATCH: Use x86_64 bits/setjmp.h for i386/x86_64
- Reply-to: "H.J. Lu" <hjl dot tools at gmail dot com>
Hi,
This patch uses x86_64 bits/setjmp.h for i386/x86_64. Ok to install?
Thanks.
H.J.
---
[BZ #14117]
* sysdeps/i386/bits/setjmp.h: Removed.
* sysdeps/x86_64/bits/setjmp.h: Renamed to ...
* sysdeps/x86/bits/setjmp.h: This.
diff --git a/sysdeps/i386/bits/setjmp.h b/sysdeps/i386/bits/setjmp.h
deleted file mode 100644
index dc065ce..0000000
--- 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
similarity index 100%
rename from sysdeps/x86_64/bits/setjmp.h
rename to sysdeps/x86/bits/setjmp.h