Merge branch 'bugfix/force_objdump_to_use_local_setting' into 'master'

ldgen: override LC_ALL to C before running objdump

Closes IDFGH-6231

See merge request espressif/esp-idf!15964
This commit is contained in:
Roland Dobai 2021-11-16 09:48:05 +00:00
commit 5ae464b843
2 changed files with 5 additions and 15 deletions

View File

@ -3620,7 +3620,6 @@ tools/kconfig_new/test/gen_kconfig_doc/test_kconfig_out.py
tools/kconfig_new/test/gen_kconfig_doc/test_target_visibility.py
tools/ldgen/entity.py
tools/ldgen/fragments.py
tools/ldgen/ldgen.py
tools/ldgen/ldgen_common.py
tools/ldgen/output_commands.py
tools/ldgen/samples/template.ld

View File

@ -1,18 +1,7 @@
#!/usr/bin/env python
#
# Copyright 2021 Espressif Systems (Shanghai) CO LTD
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
# SPDX-FileCopyrightText: 2021 Espressif Systems (Shanghai) CO LTD
# SPDX-License-Identifier: Apache-2.0
#
import argparse
@ -131,7 +120,9 @@ def main():
for library in libraries_file:
library = library.strip()
if library:
dump = StringIO(subprocess.check_output([objdump, '-h', library]).decode())
new_env = os.environ.copy()
new_env['LC_ALL'] = 'C'
dump = StringIO(subprocess.check_output([objdump, '-h', library], env=new_env).decode())
dump.name = library
sections_infos.add_sections_info(dump)