Skip to content

Commit

Permalink
8294281: Allow warnings to be disabled on a per-file basis
Browse files Browse the repository at this point in the history 
Reviewed-by: erikj
  • Loading branch information
@magicus
magicus committed Sep 23, 2022
1 parent 664e5b1 commit e45f3d5
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions make/common/NativeCompilation.gmk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -343,10 +343,15 @@ define SetupCompileNativeFileBody
endif
endif

ifneq ($(DISABLE_WARNING_PREFIX), )
$1_WARNINGS_FLAGS := $$(addprefix $(DISABLE_WARNING_PREFIX), \
$$($$($1_BASE)_DISABLED_WARNINGS_$(TOOLCHAIN_TYPE)_$$($1_FILENAME)))
endif

$1_BASE_CFLAGS := $$($$($1_BASE)_CFLAGS) $$($$($1_BASE)_EXTRA_CFLAGS) \
$$($$($1_BASE)_SYSROOT_CFLAGS)
$$($$($1_BASE)_SYSROOT_CFLAGS) $$($1_WARNINGS_FLAGS)
$1_BASE_CXXFLAGS := $$($$($1_BASE)_CXXFLAGS) $$($$($1_BASE)_EXTRA_CXXFLAGS) \
$$($$($1_BASE)_SYSROOT_CFLAGS) $$($1_EXTRA_CXXFLAGS)
$$($$($1_BASE)_SYSROOT_CFLAGS) $$($1_EXTRA_CXXFLAGS) $$($1_WARNINGS_FLAGS)
$1_BASE_ASFLAGS := $$($$($1_BASE)_ASFLAGS) $$($$($1_BASE)_EXTRA_ASFLAGS)

ifneq ($$(filter %.c, $$($1_FILENAME)), )
Expand Down

3 comments on commit e45f3d5

@openjdk-notifier
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Review

Issues

@mrserb
Copy link
Member

@mrserb mrserb commented on e45f3d5 Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/backport jdk11u-dev

@openjdk
Copy link

@openjdk openjdk bot commented on e45f3d5 Aug 30, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mrserb the backport was successfully created on the branch mrserb-backport-e45f3d51 in my personal fork of openjdk/jdk11u-dev. To create a pull request with this backport targeting openjdk/jdk11u-dev:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit e45f3d51 from the openjdk/jdk repository.

The commit being backported was authored by Magnus Ihse Bursie on 23 Sep 2022 and was reviewed by Erik Joelsson.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk11u-dev:

$ git fetch https://github.com/openjdk-bots/jdk11u-dev.git mrserb-backport-e45f3d51:mrserb-backport-e45f3d51
$ git checkout mrserb-backport-e45f3d51
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk11u-dev.git mrserb-backport-e45f3d51

Please sign in to comment.