Skip to content

Commit

Permalink
Neon/AArch64: Don't put GAS functions in .rodata
Browse files Browse the repository at this point in the history
Regression introduced by 240ba41

Closes #546
  • Loading branch information
dcommander committed Aug 25, 2021
1 parent 0a9b972 commit 129f0cb
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ if(CMAKE_EXECUTABLE_SUFFIX)
endif()

project(libjpeg-turbo C)
set(VERSION 2.1.1)
set(VERSION 2.1.2)
string(REPLACE "." ";" VERSION_TRIPLET ${VERSION})
list(GET VERSION_TRIPLET 0 VERSION_MAJOR)
list(GET VERSION_TRIPLET 1 VERSION_MINOR)
Expand Down
12 changes: 12 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
2.1.2
=====

1. Fixed a regression introduced by 2.1 beta1[13] that caused the remaining
GAS implementations of AArch64 (Arm 64-bit) Neon SIMD functions (which are used
by default with GCC for performance reasons) to be placed in the `.rodata`
section rather than in the `.text` section. This caused the GNU linker to
automatically place the `.rodata` section in an executable segment, which
prevented libjpeg-turbo from working properly with other linkers and also
represented a potential security risk.


2.1.1
=====

Expand Down
2 changes: 2 additions & 0 deletions simd/arm/aarch64/jsimd_neon.S
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,8 @@ Ljsimd_huff_encode_one_block_neon_consts:
.byte 4, 5, 6, 7, 255, 255, 255, 255, \
255, 255, 255, 255, 255, 255, 255, 255 /* L7 : 1 line OK */

.text


/*****************************************************************************/

Expand Down

0 comments on commit 129f0cb

Please sign in to comment.