From ca22d28f2cf9dad22671b66ee8fa5b2d8275dd10 Mon Sep 17 00:00:00 2001 From: astrelsky Date: Fri, 31 Jan 2020 21:58:14 -0500 Subject: [PATCH 1/2] Platforms default to 64 bit. All UNKNOWN Platform variants now default to 64 bit since 32 bit platforms are no longer supported. --- .../Generic/src/main/java/ghidra/framework/Platform.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java index 8a4c54b78b..1325955f4e 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java @@ -1,5 +1,6 @@ /* ### * IP: GHIDRA + * REVIEWED: NO * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -38,7 +39,7 @@ public enum Platform { /** * Identifies a Windows OS, the architecture for which we do not know or have not encountered */ - WIN_UNKOWN(OperatingSystem.WINDOWS, Architecture.UNKNOWN, "win32", ".dll", ".exe"), + WIN_UNKOWN(OperatingSystem.WINDOWS, Architecture.UNKNOWN, "win64", ".dll", ".exe"), /** * Identifies a Linux OS. @@ -46,14 +47,14 @@ public enum Platform { LINUX(OperatingSystem.LINUX, Architecture.X86, "linux32", ".so", ""), /** - * Identifies a Linux OS. + * Identifies a Linux OS x86-64. */ LINUX_64(OperatingSystem.LINUX, Architecture.X86_64, "linux64", ".so", ""), /** * Identifies a Linux OS, the architecture for which we do not know or have not encountered */ - LINUX_UKNOWN(OperatingSystem.LINUX, Architecture.UNKNOWN, "linux32", ".so", ""), + LINUX_UKNOWN(OperatingSystem.LINUX, Architecture.UNKNOWN, "linux64", ".so", ""), /** * Identifies a Mac OS X for the Intel x86 32-bit platform. From 66103225b664e113b4d427a31d4dd4738790595e Mon Sep 17 00:00:00 2001 From: ghidorahrex Date: Tue, 24 Mar 2020 10:39:39 -0400 Subject: [PATCH 2/2] GT-3615: Fix certify header comment in Platform.java --- .../Generic/src/main/java/ghidra/framework/Platform.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java index 1325955f4e..60b36878ff 100644 --- a/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java +++ b/Ghidra/Framework/Generic/src/main/java/ghidra/framework/Platform.java @@ -1,6 +1,5 @@ /* ### * IP: GHIDRA - * REVIEWED: NO * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License.