This is an automated email from the ASF dual-hosted git repository. entl pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push: new 98957f72c9 The CPPLight debugger works on aarch64. 98957f72c9 is described below commit 98957f72c993a3b801ce77ca83d9bd73c722b5cc Author: Martin Entlicher <martin.entlic...@oracle.com> AuthorDate: Fri Jul 1 21:08:10 2022 +0200 The CPPLight debugger works on aarch64. --- .../modules/cpplite/debugger/CPPLiteDebugger.java | 2 +- ide/dlight.nativeexecution/external/binaries-list | 2 +- ...hlp-1.0-license.txt => exechlp-1.2-license.txt} | 2 +- .../nbproject/project.properties | 143 +++++++++++---------- .../release/bin/nativeexecution/hostinfo.sh | 4 +- .../modules/nativeexecution/api/HostInfo.java | 1 + .../nativeexecution/api/pty/PtySupport.java | 3 +- .../api/util/MacroExpanderFactory.java | 2 +- .../nativeexecution/api/util/UnbufferSupport.java | 5 +- ide/dlight.nativeexecution/tools/Makefile | 1 + ide/dlight.nativeexecution/tools/killall/Makefile | 2 + ide/dlight.nativeexecution/tools/pty/Makefile | 1 + ide/dlight.nativeexecution/tools/unbuffer/Makefile | 2 + 13 files changed, 93 insertions(+), 77 deletions(-) diff --git a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java index 2f143c6a14..7435261f83 100644 --- a/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java +++ b/cpplite/cpplite.debugger/src/org/netbeans/modules/cpplite/debugger/CPPLiteDebugger.java @@ -388,7 +388,7 @@ public final class CPPLiteDebugger { return ; } breakpointsHandler.dispose(); - if (sendExit) { + if (sendExit && proxy != null) { proxy.send(new Command("-gdb-exit")); } Utils.unmarkCurrent (); diff --git a/ide/dlight.nativeexecution/external/binaries-list b/ide/dlight.nativeexecution/external/binaries-list index f33e33e755..e2eb41e8c8 100644 --- a/ide/dlight.nativeexecution/external/binaries-list +++ b/ide/dlight.nativeexecution/external/binaries-list @@ -14,4 +14,4 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -89E5CF21801B51580FF00D6CC1209676EDE420FA exechlp-1.0.zip +4B4DCA62F8C4A1954AE6D286955C36CC50B8CC3A exechlp-1.2.zip diff --git a/ide/dlight.nativeexecution/external/exechlp-1.0-license.txt b/ide/dlight.nativeexecution/external/exechlp-1.2-license.txt similarity index 99% rename from ide/dlight.nativeexecution/external/exechlp-1.0-license.txt rename to ide/dlight.nativeexecution/external/exechlp-1.2-license.txt index b71517ad3a..6235148193 100644 --- a/ide/dlight.nativeexecution/external/exechlp-1.0-license.txt +++ b/ide/dlight.nativeexecution/external/exechlp-1.2-license.txt @@ -1,6 +1,6 @@ Name: exechlp Description: binaries that used by dlight.nativeexecution module (process_start, pty, pty_open - used for dealing with pseude terminals; sigqueue, killall - sending signals to processes; stat - getting detailed file information; unbuffer.so - used when unbuffering is required) -Version: 1.0 +Version: 1.2 License: CDDL-1.0 Origin: NetBeans Comment: needed for dlight.nativeexecution module to provide system-dependent services diff --git a/ide/dlight.nativeexecution/nbproject/project.properties b/ide/dlight.nativeexecution/nbproject/project.properties index 350e9d08b1..5562ead990 100644 --- a/ide/dlight.nativeexecution/nbproject/project.properties +++ b/ide/dlight.nativeexecution/nbproject/project.properties @@ -40,72 +40,79 @@ test.config.stableBTD.excludes=\ **/TerminalConfigurationProviderTest.class,\ **/WindowsSupportTest.class -release.external/exechlp-1.0.zip!/Linux-x86/process_start = bin/nativeexecution/Linux-x86/process_start -release.external/exechlp-1.0.zip!/Linux-x86/pty = bin/nativeexecution/Linux-x86/pty -release.external/exechlp-1.0.zip!/Linux-x86/pty_open = bin/nativeexecution/Linux-x86/pty_open -release.external/exechlp-1.0.zip!/Linux-x86/sigqueue = bin/nativeexecution/Linux-x86/sigqueue -release.external/exechlp-1.0.zip!/Linux-x86/stat = bin/nativeexecution/Linux-x86/stat -release.external/exechlp-1.0.zip!/Linux-x86/unbuffer.so = bin/nativeexecution/Linux-x86/unbuffer.so -release.external/exechlp-1.0.zip!/Linux-x86/killall = bin/nativeexecution/Linux-x86/killall -release.external/exechlp-1.0.zip!/Linux-x86_64/process_start = bin/nativeexecution/Linux-x86_64/process_start -release.external/exechlp-1.0.zip!/Linux-x86_64/pty = bin/nativeexecution/Linux-x86_64/pty -release.external/exechlp-1.0.zip!/Linux-x86_64/pty_open = bin/nativeexecution/Linux-x86_64/pty_open -release.external/exechlp-1.0.zip!/Linux-x86_64/sigqueue = bin/nativeexecution/Linux-x86_64/sigqueue -release.external/exechlp-1.0.zip!/Linux-x86_64/stat = bin/nativeexecution/Linux-x86_64/stat -release.external/exechlp-1.0.zip!/Linux-x86_64/unbuffer.so = bin/nativeexecution/Linux-x86_64/unbuffer.so -release.external/exechlp-1.0.zip!/Linux-x86_64/killall = bin/nativeexecution/Linux-x86_64/killall -release.external/exechlp-1.0.zip!/Linux-sparc_64/process_start = bin/nativeexecution/Linux-sparc_64/process_start -release.external/exechlp-1.0.zip!/Linux-sparc_64/pty = bin/nativeexecution/Linux-sparc_64/pty -release.external/exechlp-1.0.zip!/Linux-sparc_64/pty_open = bin/nativeexecution/Linux-sparc_64/pty_open -release.external/exechlp-1.0.zip!/Linux-sparc_64/sigqueue = bin/nativeexecution/Linux-sparc_64/sigqueue -release.external/exechlp-1.0.zip!/Linux-sparc_64/stat = bin/nativeexecution/Linux-sparc_64/stat -release.external/exechlp-1.0.zip!/Linux-sparc_64/unbuffer.so = bin/nativeexecution/Linux-sparc_64/unbuffer.so -release.external/exechlp-1.0.zip!/Linux-sparc_64/killall = bin/nativeexecution/Linux-sparc_64/killall -release.external/exechlp-1.0.zip!/Windows-x86/process_start = bin/nativeexecution/Windows-x86/process_start -release.external/exechlp-1.0.zip!/Windows-x86/pty = bin/nativeexecution/Windows-x86/pty -release.external/exechlp-1.0.zip!/Windows-x86/pty_open = bin/nativeexecution/Windows-x86/pty_open -release.external/exechlp-1.0.zip!/Windows-x86/sigqueue = bin/nativeexecution/Windows-x86/sigqueue -release.external/exechlp-1.0.zip!/Windows-x86/unbuffer.dll = bin/nativeexecution/Windows-x86/unbuffer.dll -release.external/exechlp-1.0.zip!/Windows-x86/killall = bin/nativeexecution/Windows-x86/killall -release.external/exechlp-1.0.zip!/Windows-x86_64/process_start = bin/nativeexecution/Windows-x86_64/process_start -release.external/exechlp-1.0.zip!/Windows-x86_64/pty = bin/nativeexecution/Windows-x86_64/pty -release.external/exechlp-1.0.zip!/Windows-x86_64/pty_open = bin/nativeexecution/Windows-x86_64/pty_open -release.external/exechlp-1.0.zip!/Windows-x86_64/sigqueue = bin/nativeexecution/Windows-x86_64/sigqueue -release.external/exechlp-1.0.zip!/Windows-x86_64/killall = bin/nativeexecution/Windows-x86_64/killall -release.external/exechlp-1.0.zip!/Windows-x86_64/unbuffer.dll = bin/nativeexecution/Windows-x86_64/unbuffer.dll -release.external/exechlp-1.0.zip!/MacOSX-x86/process_start = bin/nativeexecution/MacOSX-x86/process_start -release.external/exechlp-1.0.zip!/MacOSX-x86/pty = bin/nativeexecution/MacOSX-x86/pty -release.external/exechlp-1.0.zip!/MacOSX-x86/pty_open = bin/nativeexecution/MacOSX-x86/pty_open -release.external/exechlp-1.0.zip!/MacOSX-x86/stat = bin/nativeexecution/MacOSX-x86/stat -release.external/exechlp-1.0.zip!/MacOSX-x86/unbuffer.dylib = bin/nativeexecution/MacOSX-x86/unbuffer.dylib -release.external/exechlp-1.0.zip!/MacOSX-x86/killall = bin/nativeexecution/MacOSX-x86/killall -release.external/exechlp-1.0.zip!/MacOSX-x86_64/process_start = bin/nativeexecution/MacOSX-x86_64/process_start -release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty = bin/nativeexecution/MacOSX-x86_64/pty -release.external/exechlp-1.0.zip!/MacOSX-x86_64/pty_open = bin/nativeexecution/MacOSX-x86_64/pty_open -release.external/exechlp-1.0.zip!/MacOSX-x86_64/stat = bin/nativeexecution/MacOSX-x86_64/stat -release.external/exechlp-1.0.zip!/MacOSX-x86_64/unbuffer.dylib = bin/nativeexecution/MacOSX-x86_64/unbuffer.dylib -release.external/exechlp-1.0.zip!/MacOSX-x86_64/killall = bin/nativeexecution/MacOSX-x86_64/killall -release.external/exechlp-1.0.zip!/SunOS-sparc_64/privp = bin/nativeexecution/SunOS-sparc_64/privp -release.external/exechlp-1.0.zip!/SunOS-sparc_64/process_start = bin/nativeexecution/SunOS-sparc_64/process_start -release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty = bin/nativeexecution/SunOS-sparc_64/pty -release.external/exechlp-1.0.zip!/SunOS-sparc_64/pty_open = bin/nativeexecution/SunOS-sparc_64/pty_open -release.external/exechlp-1.0.zip!/SunOS-sparc_64/sigqueue = bin/nativeexecution/SunOS-sparc_64/sigqueue -release.external/exechlp-1.0.zip!/SunOS-sparc_64/stat = bin/nativeexecution/SunOS-sparc_64/stat -release.external/exechlp-1.0.zip!/SunOS-sparc_64/unbuffer.so = bin/nativeexecution/SunOS-sparc_64/unbuffer.so -release.external/exechlp-1.0.zip!/SunOS-sparc_64/killall = bin/nativeexecution/SunOS-sparc_64/killall -release.external/exechlp-1.0.zip!/SunOS-x86/privp = bin/nativeexecution/SunOS-x86/privp -release.external/exechlp-1.0.zip!/SunOS-x86/process_start = bin/nativeexecution/SunOS-x86/process_start -release.external/exechlp-1.0.zip!/SunOS-x86/pty = bin/nativeexecution/SunOS-x86/pty -release.external/exechlp-1.0.zip!/SunOS-x86/pty_open = bin/nativeexecution/SunOS-x86/pty_open -release.external/exechlp-1.0.zip!/SunOS-x86/sigqueue = bin/nativeexecution/SunOS-x86/sigqueue -release.external/exechlp-1.0.zip!/SunOS-x86/stat = bin/nativeexecution/SunOS-x86/stat -release.external/exechlp-1.0.zip!/SunOS-x86/unbuffer.so = bin/nativeexecution/SunOS-x86/unbuffer.so -release.external/exechlp-1.0.zip!/SunOS-x86/killall = bin/nativeexecution/SunOS-x86/killall -release.external/exechlp-1.0.zip!/SunOS-x86_64/process_start = bin/nativeexecution/SunOS-x86_64/process_start -release.external/exechlp-1.0.zip!/SunOS-x86_64/pty = bin/nativeexecution/SunOS-x86_64/pty -release.external/exechlp-1.0.zip!/SunOS-x86_64/pty_open = bin/nativeexecution/SunOS-x86_64/pty_open -release.external/exechlp-1.0.zip!/SunOS-x86_64/sigqueue = bin/nativeexecution/SunOS-x86_64/sigqueue -release.external/exechlp-1.0.zip!/SunOS-x86_64/stat = bin/nativeexecution/SunOS-x86_64/stat -release.external/exechlp-1.0.zip!/SunOS-x86_64/unbuffer.so = bin/nativeexecution/SunOS-x86_64/unbuffer.so -release.external/exechlp-1.0.zip!/SunOS-x86_64/killall = bin/nativeexecution/SunOS-x86_64/killall +release.external/exechlp-1.2.zip!/Linux-aarch64/process_start = bin/nativeexecution/Linux-aarch64/process_start +release.external/exechlp-1.2.zip!/Linux-aarch64/pty = bin/nativeexecution/Linux-aarch64/pty +release.external/exechlp-1.2.zip!/Linux-aarch64/pty_open = bin/nativeexecution/Linux-aarch64/pty_open +release.external/exechlp-1.2.zip!/Linux-aarch64/sigqueue = bin/nativeexecution/Linux-aarch64/sigqueue +release.external/exechlp-1.2.zip!/Linux-aarch64/stat = bin/nativeexecution/Linux-aarch64/stat +release.external/exechlp-1.2.zip!/Linux-aarch64/unbuffer.so = bin/nativeexecution/Linux-aarch64/unbuffer.so +release.external/exechlp-1.2.zip!/Linux-aarch64/killall = bin/nativeexecution/Linux-aarch64/killall +release.external/exechlp-1.2.zip!/Linux-x86/process_start = bin/nativeexecution/Linux-x86/process_start +release.external/exechlp-1.2.zip!/Linux-x86/pty = bin/nativeexecution/Linux-x86/pty +release.external/exechlp-1.2.zip!/Linux-x86/pty_open = bin/nativeexecution/Linux-x86/pty_open +release.external/exechlp-1.2.zip!/Linux-x86/sigqueue = bin/nativeexecution/Linux-x86/sigqueue +release.external/exechlp-1.2.zip!/Linux-x86/stat = bin/nativeexecution/Linux-x86/stat +release.external/exechlp-1.2.zip!/Linux-x86/unbuffer.so = bin/nativeexecution/Linux-x86/unbuffer.so +release.external/exechlp-1.2.zip!/Linux-x86/killall = bin/nativeexecution/Linux-x86/killall +release.external/exechlp-1.2.zip!/Linux-x86_64/process_start = bin/nativeexecution/Linux-x86_64/process_start +release.external/exechlp-1.2.zip!/Linux-x86_64/pty = bin/nativeexecution/Linux-x86_64/pty +release.external/exechlp-1.2.zip!/Linux-x86_64/pty_open = bin/nativeexecution/Linux-x86_64/pty_open +release.external/exechlp-1.2.zip!/Linux-x86_64/sigqueue = bin/nativeexecution/Linux-x86_64/sigqueue +release.external/exechlp-1.2.zip!/Linux-x86_64/stat = bin/nativeexecution/Linux-x86_64/stat +release.external/exechlp-1.2.zip!/Linux-x86_64/unbuffer.so = bin/nativeexecution/Linux-x86_64/unbuffer.so +release.external/exechlp-1.2.zip!/Linux-x86_64/killall = bin/nativeexecution/Linux-x86_64/killall +release.external/exechlp-1.2.zip!/Linux-sparc_64/process_start = bin/nativeexecution/Linux-sparc_64/process_start +release.external/exechlp-1.2.zip!/Linux-sparc_64/pty = bin/nativeexecution/Linux-sparc_64/pty +release.external/exechlp-1.2.zip!/Linux-sparc_64/pty_open = bin/nativeexecution/Linux-sparc_64/pty_open +release.external/exechlp-1.2.zip!/Linux-sparc_64/sigqueue = bin/nativeexecution/Linux-sparc_64/sigqueue +release.external/exechlp-1.2.zip!/Linux-sparc_64/stat = bin/nativeexecution/Linux-sparc_64/stat +release.external/exechlp-1.2.zip!/Linux-sparc_64/unbuffer.so = bin/nativeexecution/Linux-sparc_64/unbuffer.so +release.external/exechlp-1.2.zip!/Linux-sparc_64/killall = bin/nativeexecution/Linux-sparc_64/killall +release.external/exechlp-1.2.zip!/Windows-x86/process_start = bin/nativeexecution/Windows-x86/process_start +release.external/exechlp-1.2.zip!/Windows-x86/pty = bin/nativeexecution/Windows-x86/pty +release.external/exechlp-1.2.zip!/Windows-x86/pty_open = bin/nativeexecution/Windows-x86/pty_open +release.external/exechlp-1.2.zip!/Windows-x86/sigqueue = bin/nativeexecution/Windows-x86/sigqueue +release.external/exechlp-1.2.zip!/Windows-x86/unbuffer.dll = bin/nativeexecution/Windows-x86/unbuffer.dll +release.external/exechlp-1.2.zip!/Windows-x86/killall = bin/nativeexecution/Windows-x86/killall +release.external/exechlp-1.2.zip!/Windows-x86_64/process_start = bin/nativeexecution/Windows-x86_64/process_start +release.external/exechlp-1.2.zip!/Windows-x86_64/pty = bin/nativeexecution/Windows-x86_64/pty +release.external/exechlp-1.2.zip!/Windows-x86_64/pty_open = bin/nativeexecution/Windows-x86_64/pty_open +release.external/exechlp-1.2.zip!/Windows-x86_64/sigqueue = bin/nativeexecution/Windows-x86_64/sigqueue +release.external/exechlp-1.2.zip!/Windows-x86_64/killall = bin/nativeexecution/Windows-x86_64/killall +release.external/exechlp-1.2.zip!/Windows-x86_64/unbuffer.dll = bin/nativeexecution/Windows-x86_64/unbuffer.dll +release.external/exechlp-1.2.zip!/MacOSX-x86/process_start = bin/nativeexecution/MacOSX-x86/process_start +release.external/exechlp-1.2.zip!/MacOSX-x86/pty = bin/nativeexecution/MacOSX-x86/pty +release.external/exechlp-1.2.zip!/MacOSX-x86/pty_open = bin/nativeexecution/MacOSX-x86/pty_open +release.external/exechlp-1.2.zip!/MacOSX-x86/stat = bin/nativeexecution/MacOSX-x86/stat +release.external/exechlp-1.2.zip!/MacOSX-x86/unbuffer.dylib = bin/nativeexecution/MacOSX-x86/unbuffer.dylib +release.external/exechlp-1.2.zip!/MacOSX-x86/killall = bin/nativeexecution/MacOSX-x86/killall +release.external/exechlp-1.2.zip!/MacOSX-x86_64/process_start = bin/nativeexecution/MacOSX-x86_64/process_start +release.external/exechlp-1.2.zip!/MacOSX-x86_64/pty = bin/nativeexecution/MacOSX-x86_64/pty +release.external/exechlp-1.2.zip!/MacOSX-x86_64/pty_open = bin/nativeexecution/MacOSX-x86_64/pty_open +release.external/exechlp-1.2.zip!/MacOSX-x86_64/stat = bin/nativeexecution/MacOSX-x86_64/stat +release.external/exechlp-1.2.zip!/MacOSX-x86_64/unbuffer.dylib = bin/nativeexecution/MacOSX-x86_64/unbuffer.dylib +release.external/exechlp-1.2.zip!/MacOSX-x86_64/killall = bin/nativeexecution/MacOSX-x86_64/killall +release.external/exechlp-1.2.zip!/SunOS-sparc_64/privp = bin/nativeexecution/SunOS-sparc_64/privp +release.external/exechlp-1.2.zip!/SunOS-sparc_64/process_start = bin/nativeexecution/SunOS-sparc_64/process_start +release.external/exechlp-1.2.zip!/SunOS-sparc_64/pty = bin/nativeexecution/SunOS-sparc_64/pty +release.external/exechlp-1.2.zip!/SunOS-sparc_64/pty_open = bin/nativeexecution/SunOS-sparc_64/pty_open +release.external/exechlp-1.2.zip!/SunOS-sparc_64/sigqueue = bin/nativeexecution/SunOS-sparc_64/sigqueue +release.external/exechlp-1.2.zip!/SunOS-sparc_64/stat = bin/nativeexecution/SunOS-sparc_64/stat +release.external/exechlp-1.2.zip!/SunOS-sparc_64/unbuffer.so = bin/nativeexecution/SunOS-sparc_64/unbuffer.so +release.external/exechlp-1.2.zip!/SunOS-sparc_64/killall = bin/nativeexecution/SunOS-sparc_64/killall +release.external/exechlp-1.2.zip!/SunOS-x86/privp = bin/nativeexecution/SunOS-x86/privp +release.external/exechlp-1.2.zip!/SunOS-x86/process_start = bin/nativeexecution/SunOS-x86/process_start +release.external/exechlp-1.2.zip!/SunOS-x86/pty = bin/nativeexecution/SunOS-x86/pty +release.external/exechlp-1.2.zip!/SunOS-x86/pty_open = bin/nativeexecution/SunOS-x86/pty_open +release.external/exechlp-1.2.zip!/SunOS-x86/sigqueue = bin/nativeexecution/SunOS-x86/sigqueue +release.external/exechlp-1.2.zip!/SunOS-x86/stat = bin/nativeexecution/SunOS-x86/stat +release.external/exechlp-1.2.zip!/SunOS-x86/unbuffer.so = bin/nativeexecution/SunOS-x86/unbuffer.so +release.external/exechlp-1.2.zip!/SunOS-x86/killall = bin/nativeexecution/SunOS-x86/killall +release.external/exechlp-1.2.zip!/SunOS-x86_64/process_start = bin/nativeexecution/SunOS-x86_64/process_start +release.external/exechlp-1.2.zip!/SunOS-x86_64/pty = bin/nativeexecution/SunOS-x86_64/pty +release.external/exechlp-1.2.zip!/SunOS-x86_64/pty_open = bin/nativeexecution/SunOS-x86_64/pty_open +release.external/exechlp-1.2.zip!/SunOS-x86_64/sigqueue = bin/nativeexecution/SunOS-x86_64/sigqueue +release.external/exechlp-1.2.zip!/SunOS-x86_64/stat = bin/nativeexecution/SunOS-x86_64/stat +release.external/exechlp-1.2.zip!/SunOS-x86_64/unbuffer.so = bin/nativeexecution/SunOS-x86_64/unbuffer.so +release.external/exechlp-1.2.zip!/SunOS-x86_64/killall = bin/nativeexecution/SunOS-x86_64/killall diff --git a/ide/dlight.nativeexecution/release/bin/nativeexecution/hostinfo.sh b/ide/dlight.nativeexecution/release/bin/nativeexecution/hostinfo.sh index eb85297deb..100cb3e8bd 100755 --- a/ide/dlight.nativeexecution/release/bin/nativeexecution/hostinfo.sh +++ b/ide/dlight.nativeexecution/release/bin/nativeexecution/hostinfo.sh @@ -39,7 +39,7 @@ else BITNESS=64 fi else - uname -a | egrep "x86_64|WOW64|sparc64" >/dev/null + uname -a | egrep "x86_64|WOW64|sparc64|aarch64" >/dev/null if [ $? -eq 0 ]; then BITNESS=64 fi @@ -187,4 +187,4 @@ echo TMPDIRBASE=${TMPDIRBASE} echo DATETIME=${DATETIME} echo ENVFILE=${ENVFILE} echo ID=${ID} -exit 0 \ No newline at end of file +exit 0 diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/HostInfo.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/HostInfo.java index 65fd11c19a..667acc7401 100644 --- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/HostInfo.java +++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/HostInfo.java @@ -28,6 +28,7 @@ public interface HostInfo { SPARC, X86, ARM, + AARCH64, UNKNOWN; } diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/pty/PtySupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/pty/PtySupport.java index 9420be6f79..8848070d7f 100644 --- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/pty/PtySupport.java +++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/pty/PtySupport.java @@ -168,7 +168,8 @@ public final class PtySupport { case LINUX: return hostInfo.getCpuFamily().equals(CpuFamily.X86) || hostInfo.getCpuFamily().equals(CpuFamily.SPARC) - || (hostInfo.getCpuFamily().equals(CpuFamily.ARM) && Boolean.getBoolean("cnd.pty.arm.support")); + || (hostInfo.getCpuFamily().equals(CpuFamily.ARM) && Boolean.getBoolean("cnd.pty.arm.support")) + || hostInfo.getCpuFamily().equals(CpuFamily.AARCH64); case SUNOS: return true; case FREEBSD: diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroExpanderFactory.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroExpanderFactory.java index 198f8bece4..c1779546c7 100644 --- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroExpanderFactory.java +++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/MacroExpanderFactory.java @@ -277,7 +277,7 @@ public final class MacroExpanderFactory { predefinedMacros.put("soext", soext); // NOI18N predefinedMacros.put("osname", osname); // NOI18N predefinedMacros.put("isa", os.getBitness().toString()); // NOI18N - predefinedMacros.put("_isa", os.getBitness() == HostInfo.Bitness._64 ? "_64" : ""); // NOI18N + predefinedMacros.put("_isa", os.getBitness() == HostInfo.Bitness._64 && hostInfo.getCpuFamily() != HostInfo.CpuFamily.AARCH64 ? "_64" : ""); // NOI18N String platform = hostInfo.getCpuFamily().name().toLowerCase(); if (style == ExpanderStyle.SUNSTUDIO_STYLE) { diff --git a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/UnbufferSupport.java b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/UnbufferSupport.java index cc358f22e2..c3928a2b23 100644 --- a/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/UnbufferSupport.java +++ b/ide/dlight.nativeexecution/src/org/netbeans/modules/nativeexecution/api/util/UnbufferSupport.java @@ -73,9 +73,10 @@ public class UnbufferSupport { return; case LINUX: if (!hinfo.getCpuFamily().equals(CpuFamily.X86) && - !hinfo.getCpuFamily().equals(CpuFamily.SPARC)) { + !hinfo.getCpuFamily().equals(CpuFamily.SPARC) && + !hinfo.getCpuFamily().equals(CpuFamily.AARCH64)) { // Unbuffer is available for x86 only - //and now for sparc linux + // and now for sparc and aarch64 linux return; } break; diff --git a/ide/dlight.nativeexecution/tools/Makefile b/ide/dlight.nativeexecution/tools/Makefile index 0796cbdcf0..4eab98e186 100644 --- a/ide/dlight.nativeexecution/tools/Makefile +++ b/ide/dlight.nativeexecution/tools/Makefile @@ -31,6 +31,7 @@ CF_Linux-x86 = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m32 CF_Linux-x86_64 = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m64 CF_Linux-sparc_64 = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m64 CF_Linux-arm = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99 +CF_Linux-aarch64 = -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99 CF_MacOSX-x86 = -DMAXOSX -D_DARWIN_C_SOURCE -m32 CF_MacOSX-x86_64 = -DMAXOSX -D_DARWIN_C_SOURCE -m64 CF_SunOS-sparc_64 = -DSOLARIS -D__EXTENSIONS__ -m64 diff --git a/ide/dlight.nativeexecution/tools/killall/Makefile b/ide/dlight.nativeexecution/tools/killall/Makefile index fde9873db5..dd2c1811b3 100644 --- a/ide/dlight.nativeexecution/tools/killall/Makefile +++ b/ide/dlight.nativeexecution/tools/killall/Makefile @@ -52,6 +52,7 @@ SOURCES_SunOS-x86_64=$(SOURCES_SunOS) SOURCES_SunOS-sparc_64=$(SOURCES_SunOS) SOURCES_Linux-x86=$(SOURCES_Linux) SOURCES_Linux-arm=$(SOURCES_Linux) +SOURCES_Linux-aarch64=$(SOURCES_Linux) SOURCES_Linux-x86_64=$(SOURCES_Linux) SOURCES_Linux-sparc_64=$(SOURCES_Linux) SOURCES_MacOSX-x86=$(SOURCES_Mac) @@ -84,6 +85,7 @@ CF_SunOS-x86 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m32 CF_Windows-x86 = $(CF_COMMON) -DWINDOWS -m32 CF_Linux-x86_64 = $(CF_COMMON) -DLINUX -m64 +CF_Linux-aarch64 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99 CF_Linux-sparc_64 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m64 CF_MacOSX-x86_64 = $(CF_COMMON) -DMACOSX -m64 CF_SunOS-sparc_64 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m64 diff --git a/ide/dlight.nativeexecution/tools/pty/Makefile b/ide/dlight.nativeexecution/tools/pty/Makefile index 83d8bd8fe2..a40b0c01af 100644 --- a/ide/dlight.nativeexecution/tools/pty/Makefile +++ b/ide/dlight.nativeexecution/tools/pty/Makefile @@ -51,6 +51,7 @@ CF_Linux-x86 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m3 CF_Linux-x86_64 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m64 CF_Linux-sparc_64 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -m64 CF_Linux-arm = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99 +CF_Linux-aarch64 = $(CF_COMMON) -DLINUX -D_GNU_SOURCE -D_XOPEN_SOURCE=700 -std=c99 CF_MacOSX-x86 = $(CF_COMMON) -DMAXOSX -D_DARWIN_C_SOURCE -m32 CF_MacOSX-x86_64 = $(CF_COMMON) -DMAXOSX -D_DARWIN_C_SOURCE -m64 CF_SunOS-sparc_64 = $(CF_COMMON) -DSOLARIS -D__EXTENSIONS__ -m64 diff --git a/ide/dlight.nativeexecution/tools/unbuffer/Makefile b/ide/dlight.nativeexecution/tools/unbuffer/Makefile index b7c028ea1f..f3b17acd10 100644 --- a/ide/dlight.nativeexecution/tools/unbuffer/Makefile +++ b/ide/dlight.nativeexecution/tools/unbuffer/Makefile @@ -38,6 +38,8 @@ CF_Linux-x86 = $(CF_COMMON) -DLINUX -shared -fPIC -m32 EX_Linux-x86 = unbuffer.so CF_Linux-arm = $(CF_COMMON) -DLINUX -shared -fPIC EX_Linux-arm = unbuffer.so +CF_Linux-aarch64 = $(CF_COMMON) -DLINUX -shared -fPIC +EX_Linux-aarch64 = unbuffer.so CF_Linux-x86_64 = $(CF_COMMON) -DLINUX -shared -fPIC -m64 EX_Linux-x86_64 = unbuffer.so CF_Linux-sparc_64 = $(CF_COMMON) -DLINUX -shared -fPIC -m64 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@netbeans.apache.org For additional commands, e-mail: commits-h...@netbeans.apache.org For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists