diff options
| author | Rong Xu <xur@google.com> | 2014-07-21 16:47:22 -0700 |
|---|---|---|
| committer | Rong Xu <xur@google.com> | 2014-07-29 15:31:03 -0700 |
| commit | 38a8aecfb882072900434499696b5c32a2274515 (patch) | |
| tree | 2aac97f0ae24b03cd98c1a06e989c031c173f889 /gcc-4.9/gcc/except.c | |
| parent | c231900e5dcc14d8296bd9f62b45997a49d4d5e7 (diff) | |
| download | toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.gz toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.tar.bz2 toolchain_gcc-38a8aecfb882072900434499696b5c32a2274515.zip | |
[4.9] Switch gcc-4.9 to use google/gcc-4_9 branch.
This source drop uses svn version r212828 of google/gcc-4.9 branch.
We also cherry-picked r213062, r213063 and r213064 to fix windows
build issues.
All gcc-4.9 patches before July 3rd are ported to google/gcc-4.9.
The following prior commits has not been merged to google branch yet.
(They are included in this commit).
e7af147f979e657fe2df00808e5b4319b0e088c6,
baf87df3cb2683649ba7e9872362a7e721117c23, and
c231900e5dcc14d8296bd9f62b45997a49d4d5e7.
Change-Id: I4bea3ea470387ff751c2be4cb0d4a12059b9299b
Diffstat (limited to 'gcc-4.9/gcc/except.c')
| -rw-r--r-- | gcc-4.9/gcc/except.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gcc-4.9/gcc/except.c b/gcc-4.9/gcc/except.c index 908954cbb..d67b4e427 100644 --- a/gcc-4.9/gcc/except.c +++ b/gcc-4.9/gcc/except.c @@ -1191,7 +1191,7 @@ sjlj_emit_function_enter (rtx dispatch_label) char buf[20]; rtx sym; - ASM_GENERATE_INTERNAL_LABEL (buf, "LLSDA", current_function_funcdef_no); + ASM_GENERATE_INTERNAL_LABEL (buf, "LLSDA", FUNC_LABEL_ID (cfun)); sym = gen_rtx_SYMBOL_REF (Pmode, ggc_strdup (buf)); SYMBOL_REF_FLAGS (sym) = SYMBOL_FLAG_LOCAL; emit_move_insn (mem, sym); @@ -2953,7 +2953,7 @@ output_one_function_exception_table (int section) #ifdef HAVE_AS_LEB128 ASM_GENERATE_INTERNAL_LABEL (ttype_label, section ? "LLSDATTC" : "LLSDATT", - current_function_funcdef_no); + FUNC_LABEL_ID (cfun)); #endif tt_format_size = size_of_encoded_value (tt_format); @@ -2961,7 +2961,7 @@ output_one_function_exception_table (int section) } targetm.asm_out.internal_label (asm_out_file, section ? "LLSDAC" : "LLSDA", - current_function_funcdef_no); + FUNC_LABEL_ID (cfun)); /* The LSDA header. */ @@ -2994,7 +2994,7 @@ output_one_function_exception_table (int section) char ttype_after_disp_label[32]; ASM_GENERATE_INTERNAL_LABEL (ttype_after_disp_label, section ? "LLSDATTDC" : "LLSDATTD", - current_function_funcdef_no); + FUNC_LABEL_ID (cfun)); dw2_asm_output_delta_uleb128 (ttype_label, ttype_after_disp_label, "@TType base offset"); ASM_OUTPUT_LABEL (asm_out_file, ttype_after_disp_label); @@ -3041,10 +3041,10 @@ output_one_function_exception_table (int section) #ifdef HAVE_AS_LEB128 ASM_GENERATE_INTERNAL_LABEL (cs_after_size_label, section ? "LLSDACSBC" : "LLSDACSB", - current_function_funcdef_no); + FUNC_LABEL_ID (cfun)); ASM_GENERATE_INTERNAL_LABEL (cs_end_label, section ? "LLSDACSEC" : "LLSDACSE", - current_function_funcdef_no); + FUNC_LABEL_ID (cfun)); dw2_asm_output_delta_uleb128 (cs_end_label, cs_after_size_label, "Call-site table length"); ASM_OUTPUT_LABEL (asm_out_file, cs_after_size_label); |