summaryrefslogtreecommitdiff
path: root/usr/src/lib/libc/amd64/unwind/unwind.c
diff options
context:
space:
mode:
authorraf <none@none>2008-06-06 14:02:15 -0700
committerraf <none@none>2008-06-06 14:02:15 -0700
commit7257d1b4d25bfac0c802847390e98a464fd787ac (patch)
treec73fc17df920bc2ca9438c25fea3529890296afd /usr/src/lib/libc/amd64/unwind/unwind.c
parent455903679f53d12d92035adc60bc7c3d95e6b6a2 (diff)
downloadillumos-joyent-7257d1b4d25bfac0c802847390e98a464fd787ac.tar.gz
PSARC 2008/309 expunge synonyms.h
6700179 expunge synonyms.h --HG-- rename : usr/src/cmd/sgs/libelf/common/syn.h => deleted_files/usr/src/cmd/sgs/libelf/common/syn.h rename : usr/src/cmd/sgs/librtld/common/lintsup.c => deleted_files/usr/src/cmd/sgs/librtld/common/lintsup.c rename : usr/src/cmd/sgs/rtld/common/_synonyms.h => deleted_files/usr/src/cmd/sgs/rtld/common/_synonyms.h rename : usr/src/common/atomic/atomic_asm_weak.h => deleted_files/usr/src/common/atomic/atomic_asm_weak.h rename : usr/src/lib/common/inc/c_synonyms.h => deleted_files/usr/src/lib/common/inc/c_synonyms.h rename : usr/src/lib/libc/amd64/gen/lexp10.c => deleted_files/usr/src/lib/libc/amd64/gen/lexp10.c rename : usr/src/lib/libc/amd64/gen/llog10.c => deleted_files/usr/src/lib/libc/amd64/gen/llog10.c rename : usr/src/lib/libc/amd64/gen/ltostr.c => deleted_files/usr/src/lib/libc/amd64/gen/ltostr.c rename : usr/src/lib/libc/i386/gen/lexp10.c => deleted_files/usr/src/lib/libc/i386/gen/lexp10.c rename : usr/src/lib/libc/i386/gen/llog10.c => deleted_files/usr/src/lib/libc/i386/gen/llog10.c rename : usr/src/lib/libc/i386/gen/ltostr.c => deleted_files/usr/src/lib/libc/i386/gen/ltostr.c rename : usr/src/lib/libc/inc/synonyms.h => deleted_files/usr/src/lib/libc/inc/synonyms.h rename : usr/src/lib/libc/sparcv9/gen/lexp10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/lexp10.c rename : usr/src/lib/libc/sparcv9/gen/llog10.c => deleted_files/usr/src/lib/libc/sparcv9/gen/llog10.c rename : usr/src/lib/libc_psr/inc.flg => deleted_files/usr/src/lib/libc_psr/inc.flg rename : usr/src/lib/libcrypt/inc/des_synonyms.h => deleted_files/usr/src/lib/libcrypt/inc/des_synonyms.h rename : usr/src/lib/libgen/inc/gen_synonyms.h => deleted_files/usr/src/lib/libgen/inc/gen_synonyms.h rename : usr/src/lib/libtsnet/common/synonyms.h => deleted_files/usr/src/lib/libtsnet/common/synonyms.h rename : usr/src/tools/scripts/check_fnames.sh => deleted_files/usr/src/tools/scripts/check_fnames.sh rename : usr/src/lib/libc/sparc/gen/lexp10.c => usr/src/lib/libc/port/gen/lexp10.c rename : usr/src/lib/libc/sparc/gen/llog10.c => usr/src/lib/libc/port/gen/llog10.c
Diffstat (limited to 'usr/src/lib/libc/amd64/unwind/unwind.c')
-rw-r--r--usr/src/lib/libc/amd64/unwind/unwind.c40
1 files changed, 19 insertions, 21 deletions
diff --git a/usr/src/lib/libc/amd64/unwind/unwind.c b/usr/src/lib/libc/amd64/unwind/unwind.c
index 1fb774a28e..788d7b2d68 100644
--- a/usr/src/lib/libc/amd64/unwind/unwind.c
+++ b/usr/src/lib/libc/amd64/unwind/unwind.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -21,7 +20,7 @@
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -131,22 +130,21 @@
#define _Unwind_SetGR _SUNW_Unwind_SetGR
#define _Unwind_SetIP _SUNW_Unwind_SetIP
#else
-#pragma weak _Unwind_DeleteException = _SUNW_Unwind_DeleteException
-#pragma weak _Unwind_ForcedUnwind = _SUNW_Unwind_ForcedUnwind
-#pragma weak _Unwind_GetCFA = _SUNW_Unwind_GetCFA
-#pragma weak _Unwind_GetGR = _SUNW_Unwind_GetGR
-#pragma weak _Unwind_GetIP = _SUNW_Unwind_GetIP
-#pragma weak _Unwind_GetLanguageSpecificData = \
- _SUNW_Unwind_GetLanguageSpecificData
-#pragma weak _Unwind_GetRegionStart = _SUNW_Unwind_GetRegionStart
-#pragma weak _Unwind_RaiseException = _SUNW_Unwind_RaiseException
-#pragma weak _Unwind_Resume = _SUNW_Unwind_Resume
-#pragma weak _Unwind_SetGR = _SUNW_Unwind_SetGR
-#pragma weak _Unwind_SetIP = _SUNW_Unwind_SetIP
-
-#include "synonyms.h"
+#pragma weak _SUNW_Unwind_DeleteException = _Unwind_DeleteException
+#pragma weak _SUNW_Unwind_ForcedUnwind = _Unwind_ForcedUnwind
+#pragma weak _SUNW_Unwind_GetCFA = _Unwind_GetCFA
+#pragma weak _SUNW_Unwind_GetGR = _Unwind_GetGR
+#pragma weak _SUNW_Unwind_GetIP = _Unwind_GetIP
+#pragma weak _SUNW_Unwind_GetLanguageSpecificData = \
+ _Unwind_GetLanguageSpecificData
+#pragma weak _SUNW_Unwind_GetRegionStart = _Unwind_GetRegionStart
+#pragma weak _SUNW_Unwind_RaiseException = _Unwind_RaiseException
+#pragma weak _SUNW_Unwind_Resume = _Unwind_Resume
+#pragma weak _SUNW_Unwind_SetGR = _Unwind_SetGR
+#pragma weak _SUNW_Unwind_SetIP = _Unwind_SetIP
#endif
+#include "lint.h"
#include <string.h>
#include "stack_unwind.h"
#include "reg_num.h"
@@ -376,7 +374,7 @@ _Unwind_ForcedUnwind_Body(struct _Unwind_Exception *exception_object,
finish_capture(ctx, resume);
if (resume && down_one(ctx, ctx))
- return (_URC_FATAL_PHASE2_ERROR);
+ return (_URC_FATAL_PHASE2_ERROR);
do {
again = 0;
@@ -418,8 +416,8 @@ _Unwind_ForcedUnwind_Body(struct _Unwind_Exception *exception_object,
case _URC_END_OF_STACK:
ctx->cfa = ctx->ra = ctx->pc = 0;
res = (*stop)(1, phase,
- exception_object->exception_class,
- exception_object, ctx, stop_parameter);
+ exception_object->exception_class,
+ exception_object, ctx, stop_parameter);
return (_URC_END_OF_STACK);
break;
default: